Changeset 1422 in MondoRescue

Timestamp:

May 9, 2007, 11:02:24 AM (17 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

Files:

• include/mr_conf.h (modified) (1 diff)
• lib/mr_conf.c (modified) (5 diffs)
• lib/mr_err.c (modified) (1 diff)
• mondoarchive/mondoarchive.c (modified) (1 diff)

branches/stable/mondo/src/include/mr_conf.h

@@ -14 +14 @@
 #ifndef MR_CONF_H
 #define MR_CONF_H
+
+#include "mr_types.h"
 
 /* mondoarchive structure storing conf info 

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);

branches/stable/mondo/src/mondoarchive/mondoarchive.c

@@ -136 +136 @@
     
     char *p = NULL;
-
-    mr_asprintf(&p, mr_conf_sread("mondo_iso_creation_cmd"));
+    char *s = NULL;
+
+    s = mr_conf_sread("mondo_iso_creation_cmd");
+    fprintf(stderr,"s: %s\n",s);
+    mr_asprintf(&p, s);
     mr_cnf->iso_creation_cmd = p;
-    mr_asprintf(&mr_cnf->iso_creation_options, mr_conf_sread("mondo_iso_creation_options"));
-    mr_asprintf(&mr_cnf->iso_burning_cmd, mr_conf_sread("mondo_iso_burning_cmd"));
-    mr_asprintf(&mr_cnf->iso_burning_options, mr_conf_sread("mondo_iso_burning_options"));
+    p = NULL;
+
+    mr_asprintf(&p, mr_conf_sread("mondo_iso_creation_options"));
+    mr_cnf->iso_creation_options = p;
+    p = NULL;
+
+    mr_asprintf(&p, mr_conf_sread("mondo_iso_burning_cmd"));
+    mr_cnf->iso_burning_cmd = p;
+    p = NULL;
+
+    mr_asprintf(&p, mr_conf_sread("mondo_iso_burning_options"));
+    mr_cnf->iso_burning_options = p;
+    p = NULL;
+
     mr_cnf->iso_burning_speed = mr_conf_iread("mondo_iso_burning_speed");
     mr_cnf->media_size = mr_conf_iread("mondo_media_size");
-    mr_asprintf(&mr_cnf->media_device, mr_conf_sread("mondo_media_device"));
+
+    mr_asprintf(&p, mr_conf_sread("mondo_media_device"));
+    mr_cnf->media_device = p;
+    p = NULL;
+
     mr_cnf->manual_tray = mr_conf_bread("mondo_manual_tray");
     mr_cnf->log_level = mr_conf_iread("mondo_log_level");
-    mr_asprintf(&mr_cnf->prefix, mr_conf_sread("mondo_prefix"));
+
+    mr_asprintf(&p, mr_conf_sread("mondo_prefix"));
+    mr_cnf->prefix = p;
+    p = NULL;
+
     mr_cnf->external_tape_blocksize = mr_conf_iread("mondo_external_tape_blocksize");
     mr_cnf->internal_tape_blocksize = mr_conf_iread("mondo_internal_tape_blocksize");
     mr_cnf->slice_size = mr_conf_iread("mondo_slice_size");
-    mr_asprintf(&mr_cnf->deplist_file, mr_conf_sread("mondo_deplist_file"));
+
+    mr_asprintf(&p, mr_conf_sread("mondo_deplist_file"));
+    mr_cnf->deplist_file = p;
+    p = NULL;
+
     mr_cnf->write_boot_floppy = mr_conf_bread("mondo_write_boot_floppy");
     mr_cnf->create_mindi_cd = mr_conf_bread("mondo_create_mindi_cd");
-    mr_asprintf(&mr_cnf->kernel, mr_conf_sread("mondo_kernel"));
-    mr_asprintf(&mr_cnf->additional_modules, mr_conf_sread("mondo_additional_modules"));
-    mr_asprintf(&mr_cnf->boot_loader, mr_conf_sread("mondo_boot_loader"));
+
+    mr_asprintf(&p, mr_conf_sread("mondo_kernel"));
+    mr_cnf->kernel = p;
+    p = NULL;
+
+    mr_asprintf(&p, mr_conf_sread("mondo_additional_modules"));
+    mr_cnf->additional_modules = p;
+    p = NULL;
+
+    mr_asprintf(&p, mr_conf_sread("mondo_boot_loader"));
+    mr_cnf->boot_loader = p;
+    p = NULL;
+
     mr_cnf->differential = mr_conf_bread("mondo_differential");
-    mr_asprintf(&mr_cnf->compression_tool, mr_conf_sread("mondo_compression_tool"));
+
+    mr_asprintf(&p, mr_conf_sread("mondo_compression_tool"));
+    mr_cnf->compression_tool = p;
+    p = NULL;
+
     mr_cnf->compression_level = mr_conf_iread("mondo_compression_level");
-    mr_asprintf(&mr_cnf->exclude_paths, mr_conf_sread("mondo_exclude_paths"));
-    mr_asprintf(&mr_cnf->include_paths, mr_conf_sread("mondo_include_paths"));
-    mr_asprintf(&mr_cnf->ui_mode, mr_conf_sread("mondo_ui_mode"));
+
+    mr_asprintf(&p, mr_conf_sread("mondo_exclude_paths"));
+    mr_cnf->exclude_paths = p;
+    p = NULL;
+
+    mr_asprintf(&p, mr_conf_sread("mondo_include_paths"));
+    mr_cnf->include_paths = p;
+    p = NULL;
+
+    mr_asprintf(&p, mr_conf_sread("mondo_ui_mode"));
+    mr_cnf->ui_mode = p;
+    p = NULL;
+
     mr_cnf->automatic_restore = mr_conf_bread("mondo_automatic_restore");
-    mr_asprintf(&mr_cnf->scratch_dir, mr_conf_sread("mondo_scratch_dir"));
-    mr_asprintf(&mr_cnf->tmp_dir, mr_conf_sread("mondo_tmp_dir"));
-    mr_asprintf(&mr_cnf->images_dir, mr_conf_sread("mondo_images_dir"));
+
+    mr_asprintf(&p, mr_conf_sread("mondo_scratch_dir"));
+    mr_cnf->scratch_dir = p;
+    p = NULL;
+
+    mr_asprintf(&p, mr_conf_sread("mondo_tmp_dir"));
+    mr_cnf->tmp_dir = p;
+    p = NULL;
+
+    mr_asprintf(&p, mr_conf_sread("mondo_images_dir"));
+    mr_cnf->images_dir = p;
+    p = NULL;
     mr_msg(5, "Directory for images is %s", mr_cnf->images_dir);
 }