Changeset 3833 in MondoRescue

Timestamp:

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

Author:

Bruno Cornec

Message:

manages tmpdir dynamically

Location:

branches/3.3/mondo/src

Files:

• common/libmondo-tools.c (modified) (3 diffs)
• common/mondostructures.h (modified) (1 diff)
• common/newt-specific.c (modified) (2 diffs)
• mondorestore/mondo-rstr-tools.c (modified) (2 diffs)
• mondorestore/mondorestore.c (modified) (1 diff)

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);

branches/3.3/mondo/src/common/mondostructures.h

@@ -489 +489 @@
    * of space here.
    */
-    char tmpdir[MAX_STR_LEN / 4];
+    char *tmpdir;
 
   /**

branches/3.3/mondo/src/common/newt-specific.c

@@ -402 +402 @@
             mr_free(command);
         }
-        if (bkpinfo->tmpdir) {
+        if (bkpinfo->tmpdir != NULL) {
             log_msg(8,"tempdir is %s",bkpinfo->tmpdir);
             if (strstr(bkpinfo->tmpdir ,"mondo.tmp.") != NULL) {
@@ -439 +439 @@
         mr_free(bkpinfo->zip_exe);
         mr_free(bkpinfo->zip_suffix);
+        mr_free(bkpinfo->tmpdir);
         /* Then free the structure */
         paranoid_free(bkpinfo);

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);