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

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/src/common

Files:

• libmondo-mountlist-EXT.h (modified) (1 diff)
• libmondo-mountlist.c (modified) (4 diffs)
• libmondo-mountlist.h (modified) (1 diff)
• libmondo-string-EXT.h (modified) (1 diff)
• libmondo-string.c (modified) (3 diffs)
• libmondo-string.h (modified) (1 diff)

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