Changeset 171 in MondoRescue for trunk/mondo/mondo/common/libmondo-string.c

Timestamp:

Dec 8, 2005, 5:20:29 PM (18 years ago)

Author:

bcornec

Message:

memory management continues:

• mondoarchive handled completely
• bkpinfo, begining of dyn. alloc.
• lot of changes around memory everywhere

=> even if it compiles, i'm pretty sure it doesn't work yet (even not tried)

File:

• trunk/mondo/mondo/common/libmondo-string.c (modified) (3 diffs)

trunk/mondo/mondo/common/libmondo-string.c

@@ -106 +106 @@
 }
 
+/* sout is allocated here and must be freed by the caller */
 
 inline void turn_wildcard_chars_into_literal_chars(char *sout, char *sin)
 {
-    char *p, *q;
-
-    for (p = sin, q = sout; *p != '\0'; *(q++) = *(p++)) {
+    char *p;
+    char *q = NULL;
+    char *sav;
+    char r;
+    bool end = FALSE;
+
+    asprintf(&sav, sin);
+    p = sav;
+    while ((*p != '\0') && (! end)) {
         if (strchr("[]*?", *p)) {
-            *(q++) = '\\';
+            r = *p;                 // keep the wildcard char
+            *p = '\0';              // trunc the final string
+            p++;                    // continue on sav
+                                    // build the new string by recursion
+            turn_wildcard_chars_into_literal_chars(q,p);
+            asprintf(&sout, "%s\\%c%s", sav, r, q);
+            paranoid_free(q);
+            paranoid_free(sav);
+            end = TRUE;
         }
-    }
-    *q = *p;                    // for the final '\0'
+        p++;
+    }
+    if (!end) {
+        sout = sav;
+    }
 }
 
@@ -345 +363 @@
         break;
     default:
-        asprintf(&outstr, "%s", "BLK_UNKNOWN (%d)", marker);
+        asprintf(&outstr, "%s (%d)", "BLK_UNKNOWN", marker);
         break;
     }
@@ -530 +548 @@
         asprintf(&suffix, ".%s", s);
     } else {
-        asprintf(&suffix, "%s", "");
+        asprintf(&suffix, "%s", " ");
     }
     asprintf(&output, "%s/slice-%07ld.%05ld.dat%s", path, bigfileno,