Changeset 2327 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-filelist.c

Timestamp:

Aug 18, 2009, 3:20:37 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3338@localhost: bruno | 2009-08-11 23:03:30 +0200
bkpinfo->zip_suffix, bkpinfo->image_devs and bkpinfo->restore_path are now allocated dynmically

File:

• branches/2.2.10/mondo/src/common/libmondo-filelist.c (modified) (3 diffs)

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

@@ -87 +87 @@
 
     /*@ pointers ********************** */
-    char *ptr;
+    char *ptr = NULL;
     FILE *fout;
 
@@ -117 +117 @@
     mr_free(tempfile);
 
-    log_it(bkpinfo->image_devs);
-
-    ptr = bkpinfo->image_devs;
-
-    malloc_string(dev);
-    while (ptr && *ptr) {
-        strcpy(dev, ptr);
-        log_it("Examining imagedev %s", dev);
-        for (i = 0; i < (int) strlen(dev) && dev[i] != ' '; i++);
-        dev[i] = '\0';
-        if (!strlen(dev)) {
-            continue;
-        }
-        fprintf(fout, "%s\n", dev);
-        log_it("Adding '%s' to biggielist", dev);
-        if ((ptr = strchr(ptr, ' '))) {
-            ptr++;
+    if (bkpinfo->image_devs) {
+        log_it("image_devs : %s", bkpinfo->image_devs);
+
+        ptr = bkpinfo->image_devs;
+
+        while (ptr && *ptr) {
+            mr_asprintf(dev, "%s", ptr);
+            log_it("Examining imagedev %s", dev);
+            for (i = 0; i < (int) strlen(dev) && dev[i] != ' '; i++);
+            dev[i] = '\0';
+            if (!strlen(dev)) {
+                mr_free(dev);
+                continue;
+            }
+            fprintf(fout, "%s\n", dev);
+            log_it("Adding '%s' to biggielist", dev);
+            if ((ptr = strchr(ptr, ' '))) {
+                ptr++;
+            }
+            mr_free(dev);
         }
     }
@@ -139 +142 @@
     mvaddstr_and_log_it(g_currentY++, 74, "Done.");
 
-    paranoid_free(dev);
     return (retval);
 }
-