Changeset 2352 in MondoRescue

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)

Location:

branches/2.2.10/mondo

Files:

• src/common/libmondo-mountlist-EXT.h (modified) (1 diff)
• src/common/libmondo-mountlist.c (modified) (4 diffs)
• src/common/libmondo-mountlist.h (modified) (1 diff)
• src/common/libmondo-string-EXT.h (modified) (1 diff)
• src/common/libmondo-string.c (modified) (3 diffs)
• src/common/libmondo-string.h (modified) (1 diff)
• src/mondorestore/mondo-rstr-newt.c (modified) (5 diffs)
• src/mondorestore/mondo-rstr-newt.h (modified) (2 diffs)
• src/mondorestore/mondorestore.c (modified) (3 diffs)
• src/mondorestore/mr-externs.h (modified) (1 diff)
• test/test-mountlist.c (modified) (2 diffs)

branches/2.2.10/mondo/src/common/libmondo-mountlist-EXT.h

@@ -1 +1 @@
 /* libmondo-mountlist-EXT.h */
 
-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);
 extern int find_device_in_mountlist(struct mountlist_itself *mountlist,
                                     char *device);

branches/2.2.10/mondo/src/common/libmondo-mountlist.c

@@ -519 +519 @@
  * @see evaluate_drive_within_mountlist
  */
-int
-evaluate_mountlist(struct mountlist_itself *mountlist, char *flaws_str_A,
-                   char *flaws_str_B, char *flaws_str_C)
-{
+char *evaluate_mountlist(struct mountlist_itself *mountlist, int *res) {
 
     /*@ buffer *********************************************************** */
@@ -531 +528 @@
     /*@ int ************************************************************** */
     int i = 0;
-    int res = 0;
 
     /*@ initialize ******************************************************* */
 
+    *res = 0;
     drivelist = malloc(sizeof(struct list_of_disks));
     assert(mountlist != NULL);
-    assert(flaws_str_A != NULL);
-    assert(flaws_str_B != NULL);
-    assert(flaws_str_C != NULL);
 
     mr_asprintf(flaws_str, "%s", "");
@@ -556 +550 @@
             tmp = evaluate_drive_within_mountlist(mountlist, drivelist->el[i].device);
             if (tmp == NULL) {
-                res++;
+                (*res)++;
             }
         }
@@ -567 +561 @@
         }
     }
-    res += look_for_duplicate_mountpoints(mountlist, flaws_str);
-    res = spread_flaws_across_three_lines(flaws_str, flaws_str_A, flaws_str_B, flaws_str_C,res);
-    mr_free(flaws_str);
-    return(res);
+    *res += look_for_duplicate_mountpoints(mountlist, flaws_str);
+    return(flaws_str);
 }
 

branches/2.2.10/mondo/src/common/libmondo-mountlist.h

@@ -4 +4 @@
 
 
-int evaluate_mountlist(struct mountlist_itself *mountlist,
-                       char *flaws_str_A, char *flaws_str_B,
-                       char *flaws_str_C);
+char *evaluate_mountlist(struct mountlist_itself *mountlist, int *res);
 int find_device_in_mountlist(struct mountlist_itself *mountlist,
                              char *device);

branches/2.2.10/mondo/src/common/libmondo-string-EXT.h

@@ -19 +19 @@
                          char *s);
 extern int special_dot_char(int i);
-extern bool spread_flaws_across_three_lines(char *flaws_str,
+extern void spread_flaws_across_three_lines(char *flaws_str,
                                             char *flaws_str_A,
                                             char *flaws_str_B,
-                                            char *flaws_str_C, int res);
+                                            char *flaws_str_C);
 extern int strcmp_inc_numbers(char *stringA, char *stringB);
 extern char *strip_afio_output_line(char *input);

branches/2.2.10/mondo/src/common/libmondo-string.c

@@ -599 +599 @@
  * @param flaws_str_B Where to put the second 74-or-less characters.
  * @param flaws_str_C Where to put the rest.
- * @param res The result of the original evaluate_mountlist() operation.
- * @return TRUE if res == 0, FALSE otherwise.
- */
-bool
+ */
+void
 spread_flaws_across_three_lines(char *flaws_str, char *flaws_str_A,
-                                char *flaws_str_B, char *flaws_str_C,
-                                int res)
+                                char *flaws_str_B, char *flaws_str_C)
 {
 
@@ -612 +609 @@
 
     /*@ initialize ****************************************************** */
-    assert(flaws_str_A != NULL);
-    assert(flaws_str_B != NULL);
-    assert(flaws_str_C != NULL);
     assert(flaws_str != NULL);
 
-    if (!res && !strlen(flaws_str)) {
-        return (TRUE);
-    }
     if (strlen(flaws_str) > 0) {
-        paranoid_free(flaws_str_A);
         mr_asprintf(flaws_str_A, "%s", flaws_str + 1);
     }
     if (strlen(flaws_str_A) >= 74) {
         for (i = 74; flaws_str_A[i] != ' '; i--);
-        paranoid_free(flaws_str_B);
         mr_asprintf(flaws_str_B, "%s", flaws_str_A + i + 1);
         flaws_str_A[i] = '\0';
@@ -632 +621 @@
     if (strlen(flaws_str_B) >= 74) {
         for (i = 74; flaws_str_B[i] != ' '; i--);
-        paranoid_free(flaws_str_C);
         mr_asprintf(flaws_str_C, "%s", flaws_str_B + i + 1);
         flaws_str_B[i] = '\0';
-    }
-    if (res) {
-        return (FALSE);
-    } else {
-        return (TRUE);
     }
 }

branches/2.2.10/mondo/src/common/libmondo-string.h

@@ -17 +17 @@
 char *slice_fname(long bigfileno, long sliceno, char *path, char *s);
 int special_dot_char(int i);
-bool spread_flaws_across_three_lines(char *flaws_str, char *flaws_str_A,
-                                     char *flaws_str_B, char *flaws_str_C,
-                                     int res);
+void spread_flaws_across_three_lines(char *flaws_str, char *flaws_str_A,
+                                     char *flaws_str_B, char *flaws_str_C);
 int strcmp_inc_numbers(char *stringA, char *stringB);
 char *strip_afio_output_line(char *input);

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

branches/2.2.10/mondo/test/test-mountlist.c

@@ -49 +49 @@
 
 struct mountlist_itself *mountlist = NULL;
-struct raidlist_itself *raidlist;
-char *tmpA = NULL;
-char *tmpB = NULL;
-char *tmpC = NULL;
-bool ret = FALSE;
+struct raidlist_itself *raidlist = NULL;
+int ret = 0;
+char *flaws_str = NULL;
 
 mr_asprintf(MONDO_LOGFILE,"/tmp/mrtest-mountlist.log");
@@ -82 +80 @@
 log_it("after edit_mountlist");
 
-mr_asprintf(tmpA, "%s", "         ");
-mr_asprintf(tmpB, "%s", "         ");
-mr_asprintf(tmpC, "%s", "         ");
-ret = evaluate_mountlist(mountlist, tmpA, tmpB, tmpC);
+flaws_str = evaluate_mountlist(mountlist, &ret);
 log_it("after evaluate_mountlist");
+mr_free(flaws_str);
 
 mr_free(MONDO_LOGFILE);