Changeset 3833 in MondoRescue for branches/3.3/mondo/src/mondorestore

Timestamp:

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

Author:

Bruno Cornec

Message:

manages tmpdir dynamically

Location:

branches/3.3/mondo/src/mondorestore

Files:

• mondo-rstr-tools.c (modified) (2 diffs)
• mondorestore.c (modified) (1 diff)

branches/3.3/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -1819 +1819 @@
 void setup_MR_global_filenames()
 {
-    char *temppath;
-
     assert(bkpinfo != NULL);
 
@@ -1833 +1831 @@
     malloc_string(g_isodir_format);
 
-    temppath = bkpinfo->tmpdir;
-
-    sprintf(g_biggielist_txt, "%s/%s", temppath, BIGGIELIST_TXT_STUB);
-    sprintf(g_filelist_full, "%s/%s", temppath, FILELIST_FULL_STUB);
-    sprintf(g_filelist_imagedevs, "%s/tmp/filelist.imagedevs", temppath);
-//  sprintf(g_imagedevs_pot, "%s/tmp/imagedevs.pot", temppath);
+    sprintf(g_biggielist_txt, "%s/%s", bkpinfo->tmpdir, BIGGIELIST_TXT_STUB);
+    sprintf(g_filelist_full, "%s/%s", bkpinfo->tmpdir, FILELIST_FULL_STUB);
+    sprintf(g_filelist_imagedevs, "%s/tmp/filelist.imagedevs", bkpinfo->tmpdir);
+//  sprintf(g_imagedevs_pot, "%s/tmp/imagedevs.pot", bkpinfo->tmpdir);
     sprintf(g_imagedevs_restthese, "%s/tmp/imagedevs.restore-these",
-            temppath);
+            bkpinfo->tmpdir);
     if (bkpinfo->disaster_recovery) {
         sprintf(g_mondo_cfg_file, "/%s", MONDO_CFG_FILE_STUB);
         sprintf(g_mountlist_fname, "/%s", MOUNTLIST_FNAME_STUB);
     } else {
-        sprintf(g_mondo_cfg_file, "%s/%s", temppath, MONDO_CFG_FILE_STUB);
-        sprintf(g_mountlist_fname, "%s/%s", temppath, MOUNTLIST_FNAME_STUB);
+        sprintf(g_mondo_cfg_file, "%s/%s", bkpinfo->tmpdir, MONDO_CFG_FILE_STUB);
+        sprintf(g_mountlist_fname, "%s/%s", bkpinfo->tmpdir, MOUNTLIST_FNAME_STUB);
     }
 }

branches/3.3/mondo/src/mondorestore/mondorestore.c

@@ -2820 +2820 @@
 
         log_msg(2, "Still here. Yay.");
-        if ((strlen(bkpinfo->tmpdir) > 0) && (strstr(bkpinfo->tmpdir,"mondo.tmp.") != NULL)) {
+        if ((bkpinfo->tmpdir != NULL) && (strlen(bkpinfo->tmpdir) > 0) && (strstr(bkpinfo->tmpdir,"mondo.tmp.") != NULL)) {
             mr_asprintf(tmp, "rm -Rf %s/*", bkpinfo->tmpdir);
             run_program_and_log_output(tmp, FALSE);