Changeset 3279 in MondoRescue for branches/3.2/mondo/src/common/libmondo-mountlist.c

Timestamp:

Apr 30, 2014, 1:05:17 PM (10 years ago)

Author:

Bruno Cornec

Message:

• flaws_str should be NULL if no error detected not ""
• Try to redirect back fd at restore time before launching mondorestore to avoid garbage in log

File:

• branches/3.2/mondo/src/common/libmondo-mountlist.c (modified) (3 diffs)

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

@@ -556 +556 @@
     drivelist = malloc(sizeof(struct list_of_disks));
     assert(mountlist != NULL);
-    mr_asprintf(flaws_str, "%s", "");
 
     make_list_of_drives_in_mountlist(mountlist, drivelist);
@@ -573 +572 @@
         if (tmp != NULL) {
             log_msg(8,"Adding: %s to flaws_str", tmp);
-            mr_strcat(flaws_str, "%s", tmp);
+            if (flaws_str != NULL) {
+                mr_strcat(flaws_str, "%s", tmp);
+            } else {
+                mr_asprintf(flaws_str, "%s", tmp);
+            }
             mr_free(tmp);
         }
@@ -591 +594 @@
         if (copies > 1 && last_copy == currline && strcmp(curr_mountpoint, "raid")) {
             mr_asprintf(tmp, " %s %s's.", number_to_text(copies), curr_mountpoint);
-            mr_strcat(flaws_str, "%s", tmp);
             log_msg(8,"Adding: %s to flaws_str", tmp);
+            if (flaws_str != NULL) {
+                mr_strcat(flaws_str, "%s", tmp);
+            } else {
+                mr_asprintf(flaws_str, "%s", tmp);
+            }
             mr_free(tmp);
         }
         mr_free(curr_mountpoint);
     }
-
     return(flaws_str);
 }