Changeset 3291 in MondoRescue for branches/3.2

Timestamp:

May 27, 2014, 5:53:12 PM (10 years ago)

Author:

Bruno Cornec

Message:

• good_format string is now dynamically allocated

File:

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

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

@@ -1015 +1015 @@
     char *command = NULL;
     char *format_sz = NULL;
-    char *p;
+    char *p = NULL;
 
     FILE *pin;
     int retval;
-    malloc_string(good_formats);
 
     assert_string_is_neither_NULL_nor_zerolength(format);
@@ -1038 +1037 @@
         retval = 0;
     } else {
-        strcpy(good_formats, " ");
-        p = fgets(good_formats + 1, MAX_STR_LEN - 1, pin);
-        if (pclose(pin) && (p != NULL)) {
-            log_OS_error("Cannot pclose good formats");
-        }
-        strip_spaces(good_formats);
-        strcat(good_formats, " swap lvm raid ntfs-3g ntfs 7 "); // " ntfs 7 " -- um, cheating much? :)
+        mr_getline(p, pin);
+        mr_asprintf(good_formats, " %s",p);
+        (void)pclose(pin);
+        mr_strip_spaces(good_formats);
+        mr_strcat(good_formats, " swap lvm raid ntfs-3g ntfs 7 ");  // " ntfs 7 " -- um, cheating much? :)
         if (strstr(good_formats, format_sz)) {
             retval = 1;
@@ -1051 +1048 @@
         }
     }
-    paranoid_free(good_formats);
+    mr_free(good_formats);
     mr_free(format_sz);