Changeset 3859 in MondoRescue for branches/3.3/mondo/src/common/libmondo-string.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-string.c (modified) (3 diffs)

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