Changeset 2230 in MondoRescue for branches/2.2.9/mondo/src/common/libmondo-string.c

Timestamp:

Jun 17, 2009, 10:53:23 PM (15 years ago)

Author:

Bruno Cornec

Message:

• Simplify log_it calls when possible (with just a fixed string)
• issue with truncate_to_drive_name reported by valgrind at restore time. Needs rewrite IMO

File:

• branches/2.2.9/mondo/src/common/libmondo-string.c (modified) (2 diffs)

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

@@ -841 +841 @@
     int i = strlen(partition) - 1;
     char *c;
+    char *trunc = NULL;
+
+    mr_asprintf(&trunc, "%s", partition);
 
 #ifdef __FreeBSD__
 
-    if (islower(partition[i]))  // BSD subpartition
+    if (islower(trunc[i]))  // BSD subpartition
         i--;
-    if (partition[i - 1] == 's') {
-        while (isdigit(partition[i]))
+    if (trunc[i-1] == 's') {
+        while (isdigit(trunc[i]))
             i--;
         i--;
     }
-    partition[i + 1] = '\0';
+    trunc[i+1] = '\0';
 
 #else
@@ -857 +860 @@
     assert_string_is_neither_NULL_nor_zerolength(partition);
     /* first see if it's a devfs style device */
-    c = strrchr(partition, '/');
+    c = strrchr(trunc, '/');
     if (c && strncmp(c, "/part", 5) == 0) {
         /* yup it's devfs, return the "disc" path */
         strcpy(c + 1, "disc");
-        return partition;
+        return trunc;
     }
     /* then see if it's a dm style device */
     if (c && strncmp(c, "/dm-", 4) == 0) {
         /* yup it's dm, return the full path */
-        return partition;
-    }
-
-
-    for (i = strlen(partition); isdigit(partition[i - 1]); i--)
+        return trunc;
+    }
+
+
+    for (i = strlen(trunc); isdigit(trunc[i-1]); i--)
         continue;
-    if (partition[i - 1] == 'p' && isdigit(partition[i - 2])) {
+    if (trunc[i-1] == 'p' && isdigit(trunc[i-2])) {
         i--;
     } else {
         /* Some full devices like this /dev/mapper/mpath0
            /dev/cciss/c0d0 may be used as partition names */
-        if ((strstr(partition,"/dev/mapper/mpath") != NULL) ||
-            (strstr(partition,"/dev/cciss/c") != NULL) ||
-            (strstr(partition,"/dev/rd/") != NULL)) {
-                return partition;
+        if ((strstr(trunc,"/dev/mapper/mpath") != NULL) ||
+            (strstr(trunc,"/dev/cciss/c") != NULL) ||
+            (strstr(trunc,"/dev/rd/") != NULL)) {
+                return trunc;
             }
     }
-    partition[i] = '\0';
+    trunc[i] = '\0';
 
 #endif
 
-    return partition;
+    return trunc;
 }