Changeset 2320 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-devices.c

Timestamp:

Aug 18, 2009, 2:37:39 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3331@localhost: bruno | 2009-08-06 01:34:32 +0200

• bkpinfo->scratchdir is now dynamically allocated
• mondoarchive tests made in text+newt env. Seems OK. Valgrind errors to be fixed

File:

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

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

@@ -1979 +1979 @@
             finish(1);
         }
-        strcpy(bkpinfo->scratchdir, p);
-        mr_free(p);
+        mr_free(bkpinfo->scratchdir);
+        bkpinfo->scratchdir = p;
 
 // Interactive mode:
@@ -2156 +2156 @@
     if (tmp[0] != '/') {
         mr_asprintf(&sz, "%s", tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
         mr_asprintf(&tmp, "/%s", sz);
         mr_free(sz);
@@ -2166 +2166 @@
     log_it("bkpinfo->tmpdir is being set to %s", bkpinfo->tmpdir);
 
-    sprintf(bkpinfo->scratchdir, "%s/mondo.scratch.%d", tmp,
-            (int) (random() % 32768));
+    mr_asprintf(&sz, "%s/mondo.scratch.%d", tmp, (int) (random() % 32768));
+    mr_free(bkpinfo->scratchdir);
+    bkpinfo->scratchdir = sz;
     log_it("bkpinfo->scratchdir is being set to %s", bkpinfo->scratchdir);
 
     mr_asprintf(&command, "rm -Rf %s/tmp.mondo.* %s/mondo.scratch.*", tmp, tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     paranoid_system(command);