Changeset 1429 in MondoRescue

Timestamp:

May 10, 2007, 12:49:13 AM (18 years ago)

Author:

Bruno Cornec

Message:

Should solve mix and match of comments and quotes in conf file

File:

• branches/stable/mondo/src/lib/mr_conf.c (modified) (3 diffs)

branches/stable/mondo/src/lib/mr_conf.c

@@ -287 +287 @@
     size_t k;                   /*conditioned iterator for tmp_buffer */
     bool found_quote = FALSE;
+    bool found_comment = FALSE;
 
     length = strlen(buffer);
@@ -295 +296 @@
     while (i < length) {
         /* Handle quotes to detect strings */
-        if (buffer[i] == '"') {
+        if ((buffer[i] == '"') && (! found_comment)) {
             if (found_quote) {
                 found_quote = FALSE;
@@ -302 +303 @@
             }
         }
-        if ((buffer[i] != MRCONF_COMM_CHAR) || (found_quote)) {
+        /* Handle start of comment - only when not in a string */
+        if (buffer[i] == MRCONF_COMM_CHAR) {
+            if (found_quote) {
+                found_comment = FALSE;
+            } else {
+                found_comment = TRUE;
+            }
+        }
+        /* Comments end with EOL */
+        if (buffer[i] == '\n') {
+            found_comment = FALSE;
+        }
+        if (! found_comment) {
             k++;
             i++;
         } else {
-            /* Skip comment as it's not inside a string */
+            /* Skip comment */
             while ((buffer[i] != '\n') && (buffer[i] != (char) 0)) {
                 i++;