Changeset 3263 in MondoRescue for branches/3.2/mondo/src/mondorestore/mondo-rstr-tools.c

Timestamp:

Apr 22, 2014, 11:06:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Fix a bug due to lack of memory allocation for a tmp var to display
• Fix another bug in the call to labeling which used a bad variable

File:

• branches/3.2/mondo/src/mondorestore/mondo-rstr-tools.c (modified) (7 diffs)

branches/3.2/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -185 +185 @@
 {
 while (get_cfg_file_from_archive()) {
-if (!ask_me_yes_or_no
-    ("Failed to find config file/archives. Choose another source?"))
-{
-    fatal_error("Could not find config file/archives. Aborting.");
-}
-interactively_obtain_media_parameters_from_user(FALSE);
-}
+    if (!ask_me_yes_or_no("Failed to find config file/archives. Choose another source?")) {
+        fatal_error("Could not find config file/archives. Aborting.");
+    }
+    interactively_obtain_media_parameters_from_user(FALSE);
+    }
 }
 
@@ -2118 +2116 @@
             log_msg(2, "gcffa --- calling mount_media now :)");
             if (!mount_media()) {
-                log_msg(2,
-                        "gcffa --- managed to mount CD; so, no need for Plan B");
+                log_msg(2, "gcffa --- managed to mount CD; so, no need for Plan B");
                 try_plan_B = FALSE;
             } else {
@@ -2176 +2173 @@
                 }
 
-                log_msg(2,
-                        "gcffa --- Plan B, a.k.a. untarring some file from all.tar.gz");
+                log_msg(2, "gcffa --- Plan B, a.k.a. untarring some file from all.tar.gz");
                 mr_asprintf(command, "tar -zxvf " MNT_CDROM "/images/all.tar.gz ./%s ./%s ./%s ./%s ./%s", MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB);    // add -b TAPE_BLOCK_SIZE if you _really_ think it's necessary
                 run_program_and_log_output(command, TRUE);
@@ -2200 +2196 @@
         mr_asprintf(command, "cp -f %s %s", tmp, cfg_file);
         log_it("%s",command);
-        if (strcmp(tmp, cfg_file)
-            && run_program_and_log_output(command, 1)) {
+        if (strcmp(tmp, cfg_file) && run_program_and_log_output(command, 1)) {
             log_msg(1,
                     "... but an error occurred when I tried to move it to %s",
@@ -2213 +2208 @@
         log_it("%s",command);
         if (extract_mountlist_stub) {
-            if (strcmp(tmp, cfg_file)
-                && run_program_and_log_output(command, 1)) {
+            if (strcmp(tmp, cfg_file) && run_program_and_log_output(command, 1)) {
                 log_msg(1, "Failed to get mountlist");
             } else {
@@ -2238 +2232 @@
         log_it("%s",cfg_file);
         log_msg(1, "%s not found", cfg_file);
-        log_to_screen
-            ("Oh dear. Unable to recover configuration file from boot disk");
+        log_to_screen("Oh dear. Unable to recover configuration file from boot disk");
         return (1);
     }
@@ -2246 +2239 @@
     if (!does_file_exist(MOUNTLIST_FNAME_STUB)) {
         log_to_screen("...but not mountlist.txt - a pity, really...");
-    }
-    else {
+    } else {
             /* Is this code really useful ??? */
         if (extract_mountlist_stub) {