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

Timestamp:

Mar 5, 2024, 1:24:48 AM (4 months ago)

Author:

Bruno Cornec

Message:

manages tmpdir dynamically

File:

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

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

@@ -710 +710 @@
 
     char *tmp = NULL;
-    char *p = NULL;
-
-    if (bkpinfo->tmpdir[0] != '\0') {
+
+    if (bkpinfo->tmpdir != NULL) {
         /* purging a potential old tmpdir */
         if (chdir("/tmp")) {
@@ -744 +743 @@
         mr_asprintf(tmp, "/tmp/mondo.tmp.XXXXXX");
     }
-    p = mkdtemp(tmp);
-    if (p == NULL) {
+    bkpinfo->tmpdir = mkdtemp(tmp);
+    if (bkpinfo->tmpdir == NULL) {
         printf("Failed to create global tmp directory %s for Mondo.",tmp);
         mr_free(tmp);
         finish(-1);
     }
-    strcpy(bkpinfo->tmpdir,p);
-    mr_free(tmp);
-
     log_it("bkpinfo->tmpdir is being set to %s", bkpinfo->tmpdir);
-
     mr_system("mkdir -p %s/tmpfs", bkpinfo->tmpdir);
 }
@@ -833 +828 @@
     
     /*  We need tmpdir as early as possible for further function calls */
-    bkpinfo->tmpdir[0] = '\0';          // Really setup after
+    bkpinfo->tmpdir = NULL;         // Really setup after
     bkpinfo->scratchdir[0] = '\0';          // Really setup after
     setup_tmpdir(NULL);