Changeset 1427 in MondoRescue

Timestamp:

May 9, 2007, 12:15:34 PM (18 years ago)

Author:

Bruno Cornec

Message:

String detection corrected

File:

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

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

@@ -58 +58 @@
 #define MRCONF_STR_CALL_BUT_NOT_OPEN _("attempt to use mr_conf when it has not been opened yet")
 #define MRCONF_STR_STRING_QUOTE     _("string should be surrounded by quotes")
+#define MRCONF_STR_STRING_ENDQUOTE      _("a string is not finished by a quote")
 
 /*Flags of internal state*/
@@ -293 +294 @@
     i = 0;
     while (i < length) {
-        /* Handle quotes */
+        /* Handle quotes to detect strings */
         if (buffer[i] == '"') {
             if (found_quote) {
@@ -301 +302 @@
             }
         }
-        if ((buffer[i] != MRCONF_COMM_CHAR) && (! found_quote)){
+        if ((buffer[i] != MRCONF_COMM_CHAR) || (found_quote)) {
             k++;
             i++;
         } else {
+            /* Skip comment as it's not inside a string */
             while ((buffer[i] != '\n') && (buffer[i] != (char) 0)) {
                 i++;
+            }
+            if (buffer[i] == (char) 0) {
+                mr_conf_error_msg(MRCONF_STRING_ENDQUOTE, "");
             }
         }
@@ -323 +328 @@
             }
         }
-        if ((buffer[i] != MRCONF_COMM_CHAR) && (! found_quote)){
+        if ((buffer[i] != MRCONF_COMM_CHAR) || (found_quote)) {
             tmp_buf[k++] = buffer[i++];
         } else {
+            /* Skip comment as it's not inside a string */
             while ((buffer[i] != '\n') && (buffer[i] != (char) 0)) {
                 i++;