Changeset 2316 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-string.c

Timestamp:

Aug 18, 2009, 2:34:29 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3327@localhost: bruno | 2009-08-04 00:17:46 +0200
popup_and_get_string and build_partition_name now return an allocated string

File:

• branches/2.2.10/mondo/src/common/libmondo-string.c (modified) (1 diff)

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

@@ -34 +34 @@
  * @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.
  * @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 *p, *c;
-
-    assert(partition != NULL);
+char *build_partition_name(const char *drive, int partno)
+{
+    char *c = NULL;
+    char *partition = NULL;
+
     assert_string_is_neither_NULL_nor_zerolength(drive);
     assert(partno >= 0);
 
-    p = strcpy(partition, drive);
+    mr_asprintf(&partition, drive);
     /* is this a devfs device path? */
     c = strrchr(partition, '/');
     if (c && strncmp(c, "/disc", 5) == 0) {
         /* yup it's devfs, return the "part" path */
+        /* This strcpy is safe */
         strcpy(c + 1, "part");
-        p = c + 5;
     } else {
-        p += strlen(p);
-        if (isdigit(p[-1])) {
-            *p++ =
+        if (isdigit(partition[-1])) {
+            mr_strcat(partition,
 #ifdef BSD
-                's';
+                's');
 #else
-                'p';
+                'p');
 #endif
         }
     }
-    sprintf(p, "%d", partno);
-    return (partition);
-}
-
-
-
-
-
-
-
-
-
-
-
+    mr_strcat(partition, "%d", partno);
+    return(partition);
+}