Changeset 2321 in MondoRescue for branches/2.2.10/mondo/src/mondorestore/mondorestore.c

Timestamp:

Aug 18, 2009, 2:37:55 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3332@localhost: bruno | 2009-08-07 23:59:34 +0200

• bkpinfo->tmpchdir is now dynamically allocated
• reorganize how tmpdir and scratchdir are initialized and the startup of the main sections
• change of interface for maintain_collection_of_recent_archives, mondo_makefilelist, chop_filelist
• sensibly_set_tmpdir_and_scratchdir => sensibly_set_scratchdir
• reset_bkpinfo => init_bkpinfo
• add function mr_free_bkpinfo
• Fix a bug in mr_strtok
• mondoarchive seems to globally work. Newt stuff needs more testing

File:

• branches/2.2.10/mondo/src/mondorestore/mondorestore.c (modified) (6 diffs)

branches/2.2.10/mondo/src/mondorestore/mondorestore.c

@@ -2720 +2720 @@
         exit(127);
     }
-    if (!
-        (bkpinfo = malloc(sizeof(struct s_bkpinfo)))) {
-        fatal_error("Cannot malloc bkpinfo");
-    }
-    reset_bkpinfo();
+    bkpinfo = (struct s_bkpinfo *)mr_malloc(sizeof(struct s_bkpinfo));
+    init_bkpinfo();
 
     g_loglevel = DEFAULT_MR_LOGLEVEL;
 
-/* Configure global variables */
+    /* Configure global variables */
+    malloc_libmondo_global_strings();
 #ifdef __FreeBSD__
-    if (strstr
-        (call_program_and_get_last_line_of_output("cat /tmp/cmdline"),
-         "textonly"))
+    if (strstr(call_program_and_get_last_line_of_output("cat /tmp/cmdline"), "textonly"))
 #else
-    if (strstr
-        (call_program_and_get_last_line_of_output("cat /proc/cmdline"),
-         "textonly"))
+    if (strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "textonly"))
 #endif
     {
@@ -2744 +2738 @@
         g_text_mode = FALSE;
     }                           // newt :-)
-    if (!(mountlist = malloc(sizeof(struct mountlist_itself)))) {
-        fatal_error("Cannot malloc mountlist");
-    }
-    if (!(raidlist = malloc(sizeof(struct raidlist_itself)))) {
-        fatal_error("Cannot malloc raidlist");
-    }
-
-    malloc_libmondo_global_strings();
-
-    strcpy(g_mondo_home,
-           call_program_and_get_last_line_of_output("which mondorestore"));
+
+    /* Init GUI */
+    setup_newt_stuff();         /* call newtInit and setup screen log */
+
+    strcpy(g_mondo_home, call_program_and_get_last_line_of_output("which mondorestore"));
     g_current_media_number = 1; // precaution
 
@@ -2774 +2762 @@
     log_msg(1, "FYI - g_mountlist_fname = %s", g_mountlist_fname);
     if (strlen(g_mountlist_fname) < 3) {
-        fatal_error
-            ("Serious error in malloc()'ing. Could be a bug in your glibc.");
+        fatal_error("Serious error in malloc()'ing. Could be a bug in your glibc.");
     }
     mkdir(MNT_CDROM, 0x770);
@@ -2783 +2770 @@
     mr_asprintf(&tmp, "%s.orig", g_mountlist_fname);
     if (!does_file_exist(g_mountlist_fname)) {
-        log_msg(2,
-                "%ld: Warning - g_mountlist_fname (%s) does not exist yet",
-                __LINE__, g_mountlist_fname);
+        log_msg(2, "%ld: Warning - g_mountlist_fname (%s) does not exist yet", __LINE__, g_mountlist_fname);
     } else if (!does_file_exist(tmp)) {
         mr_free(tmp);
@@ -2797 +2782 @@
     make_hole_for_dir("/tmp/tmpfs");    /* just in case... */
     run_program_and_log_output("umount " MNT_CDROM, FALSE);
-    /*
-    run_program_and_log_output("ln -sf /var/log/mondo-archive.log /tmp/mondorestore.log",
-         FALSE);
-         */
 
     run_program_and_log_output("rm -Rf /tmp/tmpfs/mondo.tmp.*", FALSE);
 
-    /* Init GUI */
-    setup_newt_stuff();         /* call newtInit and setup screen log */
     welcome_to_mondorestore();
     if (bkpinfo->disaster_recovery) {
@@ -2814 +2793 @@
 
     log_it("what time is it");
+
+    mountlist = (struct mountlist_itself *)mr_malloc(sizeof(struct mountlist_itself));
+    raidlist = (struct raidlist_itself *)mr_malloc(sizeof(struct raidlist_itself));
 
     /* Process command-line parameters */