Changeset 3859 in MondoRescue for branches/3.3/mondo/src/common/libmondo-devices.c

Timestamp:

Mar 7, 2024, 1:33:54 AM (3 months ago)

Author:

Bruno Cornec

Message:

Fix build_partition_name to allocate dynamically and change proto accordingly

File:

• branches/3.3/mondo/src/common/libmondo-devices.c (modified) (4 diffs)

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

@@ -356 +356 @@
     assert(partno >= 0 && partno < 999);
 
-    malloc_string(searchstr);
-
 #ifdef __FreeBSD__
     // We assume here that this is running from mondorestore. (It is.)
-    mr_asprintf(program, "ls %s %s >/dev/null 2>&1", drive, build_partition_name(tmp, drive, partno));
+    tmp = build_partition_name(drive, partno);
+    mr_asprintf(program, "ls %s %s >/dev/null 2>&1", drive, tmp);
+    mr_free(tmp);
     res = system(program);
     mr_free(program);
@@ -376 +376 @@
     mr_free(program);
 
-    (void) build_partition_name(searchstr, drive, partno);
-    strcat(searchstr, " ");
+    searchstr = build_partition_name(drive, partno);
+    mr_strcat(searchstr, " ");
     for (res = 0, mr_getline(incoming, fin); !res && !feof(fin) ; mr_getline(incoming, fin)) {
         if (strstr(incoming, searchstr)) {
@@ -384 +384 @@
         mr_free(incoming);
     }
+    mr_free(searchstr);
     mr_free(incoming);
 
@@ -389 +390 @@
         log_OS_error("Cannot pclose fin");
     }
-    paranoid_free(searchstr);
     return (res);
 }