Changeset 1422 in MondoRescue for branches/stable/mondo/src/lib

Timestamp:

May 9, 2007, 11:02:24 AM (18 years ago)

Author:

Bruno Cornec

Message:

mr_conf now handles # inside strings correctly (before they were considered as a comment which they are not !)

Location:

branches/stable/mondo/src/lib

Files:

• mr_conf.c (modified) (5 diffs)
• mr_err.c (modified) (1 diff)

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

@@ -67 +67 @@
 /*"private" members declarations*/
 static size_t mr_conf_filesize(const char *name);
-static void mr_conf_error_msg(int error_code, const char *add_line);
+#define mr_conf_error_msg(x, y) {mr_conf_error_msg_int(x, y, __LINE__,__FILE__);}
+static void mr_conf_error_msg_int(int error_code, const char *add_line, int line, const char *file);
 static void mr_conf_remove_comments(void);
 static int mr_conf_check_int_flag(const int flag);
@@ -284 +285 @@
     size_t i;                   /*iterator */
     size_t k;                   /*conditioned iterator for tmp_buffer */
+    bool found_quote = FALSE;
 
     length = strlen(buffer);
@@ -291 +293 @@
     i = 0;
     while (i < length) {
-        if (buffer[i] != MRCONF_COMM_CHAR) {
+        /* Handle quotes */
+        if (buffer[i] = '"') {
+            if (found_quote) {
+                found_quote = FALSE;
+            } else {
+                found_quote = TRUE;
+            }
+        if ((buffer[i] != MRCONF_COMM_CHAR) && (! found_quote)){
             k++;
             i++;
@@ -306 +315 @@
     i = 0;
     while (i < length) {
-        if (buffer[i] != MRCONF_COMM_CHAR) {
+        if (buffer[i] = '"') {
+            if (found_quote) {
+                found_quote = FALSE;
+            } else {
+                found_quote = TRUE;
+            }
+        if ((buffer[i] != MRCONF_COMM_CHAR) && (! found_quote)){
             tmp_buf[k++] = buffer[i++];
         } else {
@@ -352 +367 @@
 
 /*output error message*/
-static void mr_conf_error_msg(int error_code, const char *add_line) {
+static void mr_conf_error_msg_int(int error_code, const char *add_line, int line, const char *file) {
     if ((mr_conf_flags & MRCONF_FLAG_VERBOSE)) {    /*if verbose mode */
         switch (error_code) {
         case MRCONF_BAD_FILE:
-            mr_msg(0,"%s %s %s\n", MRCONF_STR_ERROR, MRCONF_STR_BAD_FILE,
+            mr_msg_int(0,line,file,"%s %s %s\n", MRCONF_STR_ERROR, MRCONF_STR_BAD_FILE,
                    add_line);
             break;
 
         case MRCONF_READING_FAILED:
-            mr_msg(0,"%s %s\n", MRCONF_STR_ERROR, MRCONF_STR_READING_FAILED);
+            mr_msg_int(0,line,file,"%s %s\n", MRCONF_STR_ERROR, MRCONF_STR_READING_FAILED);
             break;
 
         case MRCONF_FIELD_NOT_FOUND:
-            mr_msg(0,"%s %s \"%s\"\n", MRCONF_STR_ERROR, MRCONF_STR_FIELD_NOT_FOUND, add_line);
-            mr_msg(0,"%s %s\n", MRCONF_STR_WARNING, MRCONF_STR_SET_TO_ZERO);
+            mr_msg_int(0,line,file,"%s %s \"%s\"\n", MRCONF_STR_ERROR, MRCONF_STR_FIELD_NOT_FOUND, add_line);
+            mr_msg_int(0,line,file,"%s %s\n", MRCONF_STR_WARNING, MRCONF_STR_SET_TO_ZERO);
             break;
 
         case MRCONF_FIELD_NO_VALUE:
-            mr_msg(0,"%s %s \"%s\"\n", MRCONF_STR_ERROR, MRCONF_STR_FIELD_NO_VALUE, add_line);
-            mr_msg(0,"%s %s\n", MRCONF_STR_WARNING, MRCONF_STR_IGNORE);
+            mr_msg_int(0,line,file,"%s %s \"%s\"\n", MRCONF_STR_ERROR, MRCONF_STR_FIELD_NO_VALUE, add_line);
+            mr_msg_int(0,line,file,"%s %s\n", MRCONF_STR_WARNING, MRCONF_STR_IGNORE);
             break;
 
         case MRCONF_CLOSE_BUT_NOT_OPEN:
-            mr_msg(0,"%s %s\n", MRCONF_STR_WARNING, MRCONF_STR_CLOSE_BUT_NOT_OPEN);
+            mr_msg_int(0,line,file,"%s %s\n", MRCONF_STR_WARNING, MRCONF_STR_CLOSE_BUT_NOT_OPEN);
             break;
 
         case MRCONF_CALL_BUT_NOT_OPEN:
-            mr_msg(0,"%s %s\n", MRCONF_STR_WARNING, MRCONF_STR_CALL_BUT_NOT_OPEN);
+            mr_msg_int(0,line,file,"%s %s\n", MRCONF_STR_WARNING, MRCONF_STR_CALL_BUT_NOT_OPEN);
             break;
 
         case MRCONF_OPEN_OPENED:
-            mr_msg(0,"%s %s\n", MRCONF_STR_ERROR, MRCONF_STR_OPEN_OPENED);
+            mr_msg_int(0,line,file,"%s %s\n", MRCONF_STR_ERROR, MRCONF_STR_OPEN_OPENED);
             break;
 
         case MRCONF_STRING_QUOTE:
-            mr_msg(0,"%s %s\n", MRCONF_STR_ERROR, MRCONF_STR_STRING_QUOTE);
+            mr_msg_int(0,line,file,"%s %s\n", MRCONF_STR_ERROR, MRCONF_STR_STRING_QUOTE);
             break;
 
         default:
-            mr_msg(0,"%s %s\n", MRCONF_STR_ERROR, MRCONF_STR_DEFAULT_ERROR);
-            break;
-        }
-    }
-}
+            mr_msg_int(0,line,file,"%s %s\n", MRCONF_STR_ERROR, MRCONF_STR_DEFAULT_ERROR);
+            break;
+        }
+    }
+}

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

@@ -25 +25 @@
 void mr_exit(int errorcode, const char *message) {
 
-    mr_cleanup();
+    if (mr_cleanup != NULL) {
+        mr_cleanup();
+    }
     if (message != NULL) {
         fprintf(stderr,"%s\n",message);