Changeset 1653 in MondoRescue for branches/2.2.5/mondo/src/mondorestore/mondo-restore.c

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

File:

• branches/2.2.5/mondo/src/mondorestore/mondo-restore.c (modified) (4 diffs)

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... */