Changeset 2352 in MondoRescue for branches/2.2.10/mondo/src/mondorestore/mondorestore.c

Timestamp:

Aug 28, 2009, 2:46:29 AM (15 years ago)

Author:

Bruno Cornec

Message:

Change inerface of evaluate_mountlist and spread_flaws_across_three_lines in order to solve bugs linked to strings management in these functions. May fix a restoration crash seen by some customers (backport from 2.2.9)

File:

• branches/2.2.10/mondo/src/mondorestore/mondorestore.c (modified) (3 diffs)

branches/2.2.10/mondo/src/mondorestore/mondorestore.c

@@ -752 +752 @@
   /** malloc **/
     char *tmp = NULL;
-    char *tmpA = NULL;
-    char *tmpB = NULL;
-    char *tmpC = NULL;
+    char *flaws_str = NULL;
 
     assert(bkpinfo != NULL);
     assert(mountlist != NULL);
     assert(raidlist != NULL);
-
-    mr_asprintf(tmpA, "%s", "         ");
-    mr_asprintf(tmpB, "%s", "         ");
-    mr_asprintf(tmpC, "%s", "         ");
 
     log_msg(2, "nuke_mode --- starting");
@@ -773 +767 @@
         resize_mountlist_proportionately_to_suit_new_drives(mountlist);
     }
-    if (!evaluate_mountlist(mountlist, tmpA, tmpB, tmpC)) {
-        mr_asprintf(tmp, "Mountlist analyzed. Result: \"%s %s %s\" Switch to Interactive Mode?", tmpA, tmpB, tmpC);
+    flaws_str = evaluate_mountlist(mountlist, &res);
+    if (!res) {
+        mr_asprintf(tmp, "Mountlist analyzed. Result: \"%s\" Switch to Interactive Mode?", flaws_str);
+        mr_free(flaws_str);
         res = ask_me_yes_or_no(tmp);
         mr_free(tmp);
@@ -784 +780 @@
         }
     }
+    mr_free(flaws_str);
+
     save_mountlist_to_disk(mountlist, g_mountlist_fname);
     mvaddstr_and_log_it(1, 30, "Restoring Automatically");