Changeset 3859 in MondoRescue for branches/3.3/mondo/src/common

Timestamp:

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

Author:

Bruno Cornec

Message:

Fix build_partition_name to allocate dynamically and change proto accordingly

Location:

branches/3.3/mondo/src/common

Files:

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

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

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

@@ -3 +3 @@
  */
 
-extern char *build_partition_name(char *partition, const char *drive,
-                                  int partno);
+extern char *build_partition_name(const char *drive, int partno);
 extern char *commarize(char *);
 extern char *disklist_entry_to_string(struct list_of_disks *disklist,

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

@@ -35 +35 @@
  * @param drive The drive basename of the partition name (e.g. /dev/hda)
  * @param partno The partition number (e.g. 1)
- * @param partition Where to put the partition name (e.g. /dev/hda1)
- * @return @p partition.
+ * @return @p the partition name (e.g. /dev/hda1)
  * @note If @p drive ends in a digit, then 'p' (on Linux) or 's' (on *BSD) is added before @p partno.
  */
-char *build_partition_name(char *partition, const char *drive, int partno)
+char *build_partition_name(const char *drive, int partno)
 {
     char *p, *c;
 
-    assert(partition != NULL);
     assert_string_is_neither_NULL_nor_zerolength(drive);
     assert(partno >= 0);
 
-    p = strcpy(partition, drive);
+    mr_free(partition);
+    mr_asprintf(partition, "%s", drive);
+    p = partition;
     /* is this a devfs device path? */
     c = strrchr(partition, '/');
@@ -54 +54 @@
         /* This strcpy is safe */
         strcpy(c + 1, "part");
-        p = c + 5;
     } else {
         p += strlen(p);
         if (isdigit(p[-1])) {
-            *p++ =
+            mr_strcat(partition, "%c",
 #ifdef BSD
                 's';
@@ -64 +63 @@
                 'p';
 #endif
+                );
         }
     }
-    sprintf(p, "%d", partno);
+    mr_strcat(partition, "%d", partno);
     return(partition);
 }

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

@@ -3 +3 @@
  */
 
-char *build_partition_name(char *partition, const char *drive, int partno);
 char *commarize(char *);
 char *disklist_entry_to_string(struct list_of_disks *disklist, int lino);