Changeset 1626 in MondoRescue for branches

Timestamp:

Sep 9, 2007, 1:36:41 AM (18 years ago)

Author:

Bruno Cornec

Message:

Fix the latest pb with mr_rs_conf and compilation works

Location:

branches/stable/mondo/src

Files:

• common/libmondo-fork.c (modified) (1 diff)
• mondoarchive/mondo-cli.c (modified) (1 diff)
• mondorestore/mondorestore.c (modified) (4 diffs)

branches/stable/mondo/src/common/libmondo-fork.c

@@ -24 +24 @@
 extern char *MONDO_LOGFILE;
 pid_t g_buffer_pid = 0;
-extern struct mr_ar_conf *mr_conf = NULL;
+extern struct mr_ar_conf *mr_conf;
 
 /**

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

@@ -29 +29 @@
 extern bool g_sigpipe;
 
-extern struct mr_ar_conf *mr_conf = NULL;
+extern struct mr_ar_conf *mr_conf;
 
 /*@ file pointer **************************************************/

branches/stable/mondo/src/mondorestore/mondorestore.c

@@ -35 +35 @@
 
 extern void twenty_seconds_til_yikes(void);
-extern struct mr_ar_conf *mr_conf = NULL;
-
 
 /* For use in other programs (ex. XMondo) */
@@ -134 +132 @@
                                  char direction);
 
-struct mr_rs_conf mr_conf;
+struct mr_rs_conf *mr_conf = NULL;
 
 /* destroy the mr_rs_conf structure's content */
@@ -167 +165 @@
 
     mr_msg_close();
+}
+
+/* reset/empty the mr_ar_conf structure from mondo's conf file */
+static void mr_rs_reset_conf(struct mr_rs_conf *mr_cnf) {
+
+    /* This should correspond to the default conf file */
+    /* Especially for boolean values */
+    mr_cnf->media_size = 0;
+    mr_cnf->media_device = NULL;
+    mr_cnf->manual_tray = FALSE;
+    mr_cnf->log_level = 0;
+    mr_cnf->prefix = NULL;
+    mr_cnf->external_tape_blocksize = 0;
+    mr_cnf->internal_tape_blocksize = 0;
+    mr_cnf->slice_size = 0;
+    mr_cnf->boot_loader = NULL;
+    mr_cnf->differential = FALSE;
+    mr_cnf->compression_tool = NULL;
+    mr_cnf->ui_mode = NULL;
+    mr_cnf->automatic_restore = FALSE;
+    mr_cnf->images_dir = NULL;
 }
 
@@ -2819 +2838 @@
         mr_exit(127, NULL);
     }
+    /* Conf file management */
+    mr_conf = mr_malloc(sizeof(struct mr_rs_conf));
+    mr_rs_reset_conf(mr_conf);
 
     mr_conf->log_level = DEFAULT_MR_LOGLEVEL;