Changeset 1653 in MondoRescue for branches/2.2.5

Timestamp:

Sep 24, 2007, 2:01:42 PM (17 years ago)

Author:

Bruno Cornec

Message:

reset_bkpinfo called as early as possible by both main program.
It creates a tmpdir cleanly with mkdtemp in setup_tmpdir subfunction, which takes in account TMPIR and TMP env var.
Remains to see what tmpfs does and tests

Location:

branches/2.2.5/mondo/src

Files:

• common/libmondo-tools.c (modified) (5 diffs)
• mondorestore/mondo-restore.c (modified) (4 diffs)

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

@@ -182 +182 @@
 #include <sys/socket.h>
 #include <netdb.h>
+#include <stdlib.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -944 +945 @@
 
     unlink(MONDO_TRACEFILE);
-    asprintf(&tmp,"rm -Rf %s/changed.files*",bkpinfo->tmpdir);
+    asprintf(&tmp,"rm -Rf %s/changed.files*",MINDI_CACHE);
     run_program_and_log_output(tmp, FALSE);
     paranoid_free(tmp);
@@ -962 +963 @@
 }
 
-
+void setup_tmpdir() {
+    
+    char *tmp = NULL;
+
+    if (getenv("TMPDIR")) {
+        asprintf(&tmp, "%s/mondo.tmp.XXXXXX", getenv("TMPDIR"));
+    } else if (getenv("TMP")) {
+        asprintf(&tmp, "%s/mondo.tmp.XXXXXX", getenv("TMP"));
+    } else {
+        asprintf(&tmp, "/tmp/mondo.tmp.XXXXXX");
+    }
+    if ((bkpinfo->tmpdir = mkdtemp(bkpinfo->tmpdir)) == NULL) {
+        log_it("Failed to create global tmp directory %s for Mondo.",bkpinfo->tmpdir);
+        finish(-1);
+    }
+    //sprintf(bkpinfo->tmpdir, "%s/tmpfs/mondo.tmp.%d", "/tmp", (int) (random() % 32768));  // for mondorestore
+}
 
 
@@ -976 +993 @@
     assert(bkpinfo != NULL);
     memset((void *) bkpinfo, 0, sizeof(struct s_bkpinfo));
+
+    /* special case for tmpdir as used eveywhere after */
+    setup_tmpdir();
+
     bkpinfo->manual_cd_tray = FALSE;
     bkpinfo->internal_tape_block_size = DEFAULT_INTERNAL_TAPE_BLOCK_SIZE;
@@ -1004 +1025 @@
     bkpinfo->scratchdir[0] = '\0';
     bkpinfo->make_filelist = TRUE;  // unless -J supplied to mondoarchive
-    sprintf(bkpinfo->tmpdir, "%s/tmpfs/mondo.tmp.%d", "/tmp", (int) (random() % 32768));    // for mondorestore
     bkpinfo->optimal_set_size = 0;
     bkpinfo->backup_media_type = none;

branches/2.2.5/mondo/src/mondorestore/mondo-restore.c

@@ -2892 +2892 @@
         exit(127);
     }
+    if (!
+        (bkpinfo = malloc(sizeof(struct s_bkpinfo)))) {
+        fatal_error("Cannot malloc bkpinfo");
+    }
+    reset_bkpinfo();
 
     g_loglevel = DEFAULT_MR_LOGLEVEL;
@@ -2912 +2917 @@
         g_text_mode = FALSE;
     }                           // newt :-)
-    if (!
-        (bkpinfo = malloc(sizeof(struct s_bkpinfo)))) {
-        fatal_error("Cannot malloc bkpinfo");
-    }
     if (!(mountlist = malloc(sizeof(struct mountlist_itself)))) {
         fatal_error("Cannot malloc mountlist");
@@ -2938 +2939 @@
     malloc_string(b);
     setup_MR_global_filenames();    // malloc() and set globals, using bkpinfo->tmpdir etc.
-    reset_bkpinfo();
     bkpinfo->backup_media_type = none;  // in case boot disk was made for one backup type but user wants to restore from another backup type
     bkpinfo->restore_data = TRUE;   // Well, yeah :-)
@@ -2970 +2970 @@
 
 /* Init directories */
-    make_hole_for_dir(bkpinfo->tmpdir);
-    sprintf(tmp, "mkdir -p %s", bkpinfo->tmpdir);
-    run_program_and_log_output(tmp, FALSE);
     make_hole_for_dir("/var/log");
     make_hole_for_dir("/tmp/tmpfs");    /* just in case... */