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

Timestamp:

Aug 28, 2009, 2:46:29 AM (16 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)

Location:

branches/2.2.10/mondo/src/mondorestore

Files:

• mondo-rstr-newt.c (modified) (5 diffs)
• mondo-rstr-newt.h (modified) (2 diffs)
• mondorestore.c (modified) (3 diffs)
• mr-externs.h (modified) (1 diff)

branches/2.2.10/mondo/src/mondorestore/mondo-rstr-newt.c

@@ -1924 +1924 @@
     /** int **************************************************************/
     int i = 0;
+    int res = 0;
     int currline = 0;
     int finished = FALSE;
@@ -1929 +1930 @@
     /** buffers **********************************************************/
     char *tmp = NULL;
+    char *flaws_str = NULL;
     char *flaws_str_A = NULL;
     char *flaws_str_B = NULL;
@@ -1936 +1938 @@
     assert(raidlist != NULL);
 
-    mr_asprintf(flaws_str_A, "%s", "         ");
-    mr_asprintf(flaws_str_B, "%s", "         ");
-    mr_asprintf(flaws_str_C, "%s", "         ");
     if (mountlist->entries > ARBITRARY_MAXIMUM) {
         log_to_screen("Arbitrary limits suck, man!");
@@ -1954 +1953 @@
     mr_asprintf(tmp, "%-24s %-24s %-8s  %s", "Device", "Mountpoint", "Format", "Size (MB)");
     headerMsg = newtLabel(2, 1, tmp);
-    flawsLabelA = newtLabel(2, 13, flaws_str_A);
-    flawsLabelB = newtLabel(2, 14, flaws_str_B);
-    flawsLabelC = newtLabel(2, 15, flaws_str_C);
+    flawsLabelA = newtLabel(2, 13, "         ");
+    flawsLabelB = newtLabel(2, 14, "         ");
+    flawsLabelC = newtLabel(2, 15, "         ");
     partitionsListbox =
         newtListbox(2, 2, 10, NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
@@ -1966 +1965 @@
                           bEdit, bDelete, bReload, bCancel, bOK, NULL);
     while (!finished) {
-        evaluate_mountlist(mountlist, flaws_str_A, flaws_str_B,
-                           flaws_str_C);
+        flaws_str = evaluate_mountlist(mountlist, &res);
+        spread_flaws_across_three_lines(flaws_str, flaws_str_A, flaws_str_B, flaws_str_C);
+
+        mr_free(flaws_str);
+
         newtLabelSetText(flawsLabelA, flaws_str_A);
         newtLabelSetText(flawsLabelB, flaws_str_B);
         newtLabelSetText(flawsLabelC, flaws_str_C);
         b_res = newtRunForm(myForm);
+        mr_free(flaws_str_A);
+        mr_free(flaws_str_B);
+        mr_free(flaws_str_C);
+
         if (b_res == bOK) {
-            if (!evaluate_mountlist
-                (mountlist, flaws_str_A, flaws_str_B, flaws_str_C)) {
+            flaws_str = evaluate_mountlist(mountlist, &res);
+            mr_free(flaws_str);
+            if (!res) {
                 finished =
                     ask_me_yes_or_no

branches/2.2.10/mondo/src/mondorestore/mondo-rstr-newt.h

@@ -137 +137 @@
                    struct raidlist_itself *);
 void edit_raidrec_additional_vars(struct raid_device_record *);
-int evaluate_mountlist(struct mountlist_itself *, char *, char *, char *);
+char *evaluate_mountlist(struct mountlist_itself *, int *);
 int find_device_in_mountlist(struct mountlist_itself *, char *);
 int find_next_free_index_in_disklist(struct list_of_disks *);
@@ -180 +180 @@
 void setup_newt_stuff(void);
 long size_of_specific_device(struct mountlist_itself *, char *);
-bool spread_flaws_across_three_lines(char *, char *, char *, char *, int);
+void spread_flaws_across_three_lines(char *, char *, char *, char *);
 char *turn_raid_level_number_to_string(int);
 void update_evalcall_form(int);

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

branches/2.2.10/mondo/src/mondorestore/mr-externs.h

@@ -109 +109 @@
 extern bool g_restoring_live_from_nfs;
 extern int fput_string_one_char_at_a_time(FILE *, char *);
-
-
-
-
-
-extern int
-evaluate_mountlist(struct mountlist_itself *mountlist, char *flaws_str_A,
-                   char *flaws_str_B, char *flaws_str_C);
-
+extern char *evaluate_mountlist(struct mountlist_itself *mountlist, int *res);