Changeset 3834 in MondoRescue for branches/3.3/mondo/src/common/libmondo-tools.c

Timestamp:

Mar 5, 2024, 1:57:03 AM (4 months ago)

Author:

Bruno Cornec

Message:

manages scratchdir dynamically

File:

• branches/3.3/mondo/src/common/libmondo-tools.c (modified) (4 diffs)

branches/3.3/mondo/src/common/libmondo-tools.c

@@ -743 +743 @@
         mr_asprintf(tmp, "/tmp/mondo.tmp.XXXXXX");
     }
+    mr_free(bkpinfo->tmpdir);
     bkpinfo->tmpdir = mkdtemp(tmp);
     if (bkpinfo->tmpdir == NULL) {
@@ -756 +757 @@
 
     char *tmp = NULL;
-    char *p = NULL;
 
     if (bkpinfo->scratchdir != NULL) {
@@ -786 +786 @@
         mr_asprintf(tmp, "/tmp/mondo.scratch.XXXXXX");
     }
-    p = mkdtemp(tmp);
-    if (p == NULL) {
+    mr_free(bkpinfo->scratchdir);
+    bkpinfo->scratchdir = mkdtemp(tmp);
+    if (bkpinfo->scratchdir == NULL) {
         log_it("Failed to create global scratch directory %s for Mondo.",tmp);
+        mr_free(tmp);
         finish(-1);
     }
-    strcpy(bkpinfo->scratchdir,p);
     log_it("bkpinfo->scratchdir is being set to %s", bkpinfo->scratchdir);
-    paranoid_free(tmp);
-
-    mr_asprintf(tmp, "mkdir -p %s", bkpinfo->scratchdir);
-    paranoid_system(tmp);
-    mr_free(tmp);
+    mr_system("mkdir -p %s", bkpinfo->scratchdir);
 }
 
@@ -828 +825 @@
     
     /*  We need tmpdir as early as possible for further function calls */
-    bkpinfo->tmpdir = NULL;         // Really setup after
-    bkpinfo->scratchdir[0] = '\0';          // Really setup after
+    bkpinfo->tmpdir = NULL;             // Really setup just after
+    bkpinfo->scratchdir = NULL;         // Really setup just after
     setup_tmpdir(NULL);
     setup_scratchdir(NULL);