Changeset 1422 in MondoRescue for branches/stable/mondo/src/mondoarchive/mondoarchive.c

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

File:

• branches/stable/mondo/src/mondoarchive/mondoarchive.c (modified) (1 diff)

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