Changeset 1663 in MondoRescue for branches/stable/mondo/src/mondorestore

Timestamp:

Sep 27, 2007, 12:21:18 PM (17 years ago)

Author:

Bruno Cornec

Message:

• Fix bug #197 (based on an initial patch of Scott Cummings)
• Fix a bug where df was using locale to print messages and wasn't filtered correctly
• mkdtemp checked in configure
• 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
• configure.in should also be filtered.
• Remove g_bkpinfo_DONTUSETHIS
• remove bkpinfo also from header files
• Render bkpinfo global (potential issue on thread, but should not be a problem as that structure is indeed static during archive)
• Apply patch from Andree Leidenfrost, modified a bit to use bkpinfo->tmpdir instead of /tmp or MINDI_CACHE when appropriate. Fix security issues in mondo. Thanks al ot Andree for catching all those issues.
• /tmp => /var/log for mondorestore.log in mindi
• Update linux terminfo to fix a color issue (Andree Leidenfrost)
• Removes useless log file (Andree Leidenfrost)
• replace vi with find_my_editor during restore (Andree Leidenfrost)
• sync in bg in mindi (VMWare issue to look at)
• mindi/mindi-busybox have a different version than mondo for pb
• PB-SUF also added to spec file
• Fix a bug for pb build (omission of PB-SUF declaration)

(merge -r1631:1662 $SVN_M/branches/2.2.5)

Location:

branches/stable/mondo/src/mondorestore

Files:

• mondo-restore-EXT.h (modified) (2 diffs)
• mondo-restore.h (modified) (1 diff)
• mondo-rstr-compare-EXT.h (modified) (1 diff)
• mondo-rstr-compare.c (modified) (23 diffs)
• mondo-rstr-compare.h (modified) (1 diff)
• mondo-rstr-newt.c (modified) (1 diff)
• mondo-rstr-newt.h (modified) (1 diff)
• mondo-rstr-tools-EXT.h (modified) (2 diffs)
• mondo-rstr-tools.c (modified) (17 diffs)
• mondo-rstr-tools.h (modified) (3 diffs)
• mondorestore.c (modified) (65 diffs)
• mondorestore.h (modified) (1 diff)
• mr-externs.h (modified) (5 diffs)

branches/stable/mondo/src/mondorestore/mondo-restore-EXT.h

@@ -25 +25 @@
 
 extern void ask_about_these_imagedevs(char *, char *);
-extern int catchall_mode(struct s_bkpinfo *, struct mountlist_itself *,
+extern int catchall_mode(struct mountlist_itself *,
                          struct raidlist_itself *);
 extern void sort_mountlist_by_device(struct mountlist_itself *);
-extern int interactive_mode(struct s_bkpinfo *, struct mountlist_itself *,
+extern int interactive_mode(struct mountlist_itself *,
                             struct raidlist_itself *);
-extern int nuke_mode(struct s_bkpinfo *, struct mountlist_itself *,
+extern int nuke_mode(struct mountlist_itself *,
                      struct raidlist_itself *);
-extern int compare_mode(struct s_bkpinfo *, struct mountlist_itself *,
+extern int compare_mode(struct mountlist_itself *,
                         struct raidlist_itself *);
-extern int iso_mode(struct s_bkpinfo *bkpinfo,
+extern int iso_mode(
                     struct mountlist_itself *mountlist,
                     struct raidlist_itself *raidlist, bool nuke_me_please);
 extern int load_mountlist(struct mountlist_itself *, char *);
 extern int load_raidtab_into_raidlist(struct raidlist_itself *, char *);
-extern int restore_mode(struct s_bkpinfo *, struct mountlist_itself *,
+extern int restore_mode(struct mountlist_itself *,
                         struct raidlist_itself *);
 extern int save_raidlist_to_raidtab(struct raidlist_itself *, char *);
 extern void process_raidtab_line(FILE *, struct raid_device_record *,
                                  char *, char *);
-extern int restore_a_biggiefile_from_CD(struct s_bkpinfo *, long,
+extern int restore_a_biggiefile_from_CD(long,
                                         struct s_node *);
-extern int restore_a_biggiefile_from_stream(struct s_bkpinfo *, char *,
+extern int restore_a_biggiefile_from_stream(char *,
                                             long, char *, long long,
                                             struct s_node *);
 extern int restore_a_tarball_from_CD(char *, int, struct s_node *, struct s_bkpinfo *);
-extern int restore_a_tarball_from_stream(struct s_bkpinfo *, char *, int,
+extern int restore_a_tarball_from_stream(char *, int,
                                          struct s_node *, long long);
-extern int restore_all_biggiefiles_from_CD(struct s_bkpinfo *,
+extern int restore_all_biggiefiles_from_CD(
                                            struct s_node *);
-extern int restore_all_biggiefiles_from_stream(struct s_bkpinfo *,
+extern int restore_all_biggiefiles_from_stream(
                                                struct s_node *);
-extern int restore_all_tarballs_from_CD(struct s_bkpinfo *,
+extern int restore_all_tarballs_from_CD(
                                         struct s_node *);
-extern int restore_all_tarballs_from_stream(struct s_bkpinfo *,
+extern int restore_all_tarballs_from_stream(
                                             struct s_node *);
-extern int restore_everything(struct s_bkpinfo *, struct s_node *);
-extern int restore_live_from_monitas_server(struct s_bkpinfo *, char *,
+extern int restore_everything(struct s_node *);
+extern int restore_live_from_monitas_server(char *,
                                             char *, char *);
-extern int restore_to_live_filesystem(struct s_bkpinfo *);
+extern int restore_to_live_filesystem();
 extern void swap_mountlist_entries(struct mountlist_itself *, int, int);
 extern void sort_mountlist_by_mountpoint(struct mountlist_itself *, bool);
@@ -74 +74 @@
 extern int save_raidlist_to_raidtab(struct raidlist_itself *raidlist,
                                     char *fname);
-extern int what_number_cd_is_this(struct s_bkpinfo *);
+extern int what_number_cd_is_this();
 
 #ifdef __FreeBSD__

branches/stable/mondo/src/mondorestore/mondo-restore.h

@@ -8 +8 @@
 
 void ask_about_these_imagedevs(char *, char *);
-int catchall_mode(struct s_bkpinfo *, struct mountlist_itself *,
+int catchall_mode(struct mountlist_itself *,
                   struct raidlist_itself *);
-int interactive_mode(struct s_bkpinfo *, struct mountlist_itself *,
+int interactive_mode(struct mountlist_itself *,
                      struct raidlist_itself *);
-int nuke_mode(struct s_bkpinfo *, struct mountlist_itself *,
+int nuke_mode(struct mountlist_itself *,
               struct raidlist_itself *);
-int compare_mode(struct s_bkpinfo *, struct mountlist_itself *,
+int compare_mode(struct mountlist_itself *,
                  struct raidlist_itself *);
-int iso_mode(struct s_bkpinfo *bkpinfo, struct mountlist_itself *mountlist,
+int iso_mode(struct mountlist_itself *mountlist,
              struct raidlist_itself *raidlist, bool nuke_me_please);
-int restore_mode(struct s_bkpinfo *, struct mountlist_itself *,
+int restore_mode(struct mountlist_itself *,
                  struct raidlist_itself *);
-int restore_a_biggiefile_from_CD(struct s_bkpinfo *, long, struct s_node *,
+int restore_a_biggiefile_from_CD(long, struct s_node *,
                                  char *);
-int restore_a_biggiefile_from_stream(struct s_bkpinfo *, char *, long,
+int restore_a_biggiefile_from_stream(char *, long,
                                      char *, long long, struct s_node *,
                                      int, char *);
 int restore_a_tarball_from_CD(char *, long, struct s_node *, struct s_bkpinfo *);
-int restore_a_tarball_from_stream(struct s_bkpinfo *, char *, long,
+int restore_a_tarball_from_stream(char *, long,
                                   struct s_node *, long long, char *,
                                   char *);
-int restore_all_biggiefiles_from_CD(struct s_bkpinfo *, struct s_node *);
-int restore_all_biggiefiles_from_stream(struct s_bkpinfo *,
+int restore_all_biggiefiles_from_CD(struct s_node *);
+int restore_all_biggiefiles_from_stream(
                                         struct s_node *);
-int restore_all_tarballs_from_CD(struct s_bkpinfo *, struct s_node *);
-int restore_all_tarballs_from_stream(struct s_bkpinfo *, struct s_node *);
-int restore_everything(struct s_bkpinfo *, struct s_node *);
-int restore_live_from_monitas_server(struct s_bkpinfo *, char *, char *,
+int restore_all_tarballs_from_CD(struct s_node *);
+int restore_all_tarballs_from_stream(struct s_node *);
+int restore_everything(struct s_node *);
+int restore_live_from_monitas_server(char *, char *,
                                      char *);
-int restore_to_live_filesystem(struct s_bkpinfo *);
+int restore_to_live_filesystem();
 void swap_mountlist_entries(struct mountlist_itself *, int, int);
 void sort_mountlist_by_mountpoint(struct mountlist_itself *, bool);
 void sort_mountlist_by_device(struct mountlist_itself *);
-int what_number_cd_is_this(struct s_bkpinfo *);
+int what_number_cd_is_this();

branches/stable/mondo/src/mondorestore/mondo-rstr-compare-EXT.h

@@ -4 +4 @@
 
 
-extern int compare_to_CD(struct s_bkpinfo *);
-extern int compare_to_cdstream(struct s_bkpinfo *);
-extern int compare_to_tape(struct s_bkpinfo *);
-extern int compare_mode(struct s_bkpinfo *bkpinfo,
-                        struct mountlist_itself *mountlist,
+extern int compare_to_CD();
+extern int compare_to_cdstream();
+extern int compare_to_tape();
+extern int compare_mode(struct mountlist_itself *mountlist,
                         struct raidlist_itself *raidlist);

branches/stable/mondo/src/mondorestore/mondo-rstr-compare.c

@@ -19 +19 @@
 extern char *MONDO_LOGFILE;
 
+/* Reference to global bkpinfo */
+extern struct s_bkpinfo *bkpinfo;
+
 //static char cvsid[] = "$Id$";
 
@@ -34 +37 @@
  * @note This function uses an MD5 checksum.
  */
-int compare_a_biggiefile(struct s_bkpinfo *bkpinfo, long bigfileno)
+int compare_a_biggiefile(long bigfileno)
 {
 
@@ -58 +61 @@
     if (!does_file_exist(slice_fname(bigfileno, 0, ARCHIVES_PATH, ""))) {
         if (does_file_exist(MNT_CDROM "/archives/NOT-THE-LAST")) {
-            insist_on_this_cd_number(bkpinfo, (++g_current_media_number));
+            insist_on_this_cd_number((++g_current_media_number));
         } else {
             mr_msg(2, "No CD's left. No biggiefiles left. No problem.");
@@ -133 +136 @@
 
     if (retval) {
-        if (!(fout = fopen("/tmp/changed.txt", "a"))) {
+        if (!(fout = fopen(MINDI_CACHE"/changed.txt", "a"))) {
             fatal_error("Cannot openout changed.txt");
         }
@@ -151 +154 @@
 /**
  * Compare all biggiefiles in the backup.
- * @param bkpinfo The backup information structure. Used only in compare_a_biggiefile().
  * @return 0 for success, nonzero for failure.
  */
-int compare_all_biggiefiles(struct s_bkpinfo *bkpinfo)
+int compare_all_biggiefiles()
 {
     int retval = 0;
@@ -161 +163 @@
     char *tmp = NULL;
 
-    assert(bkpinfo != NULL);
     mr_msg(1, "Comparing biggiefiles");
 
@@ -187 +188 @@
         mr_free(tmp);
 
-        res = compare_a_biggiefile(bkpinfo, bigfileno);
+        res = compare_a_biggiefile(bigfileno);
         retval += res;
         g_current_progress++;
@@ -303 +304 @@
     if (length_of_file(logfile) > 5) {
         mr_asprintf(&command,
-                "sed s/': \\\"'/\\|/ %s | sed s/'\\\": '/\\|/ | cut -d'|' -f2 | sort -u | grep -vE \"^dev/.*\" >> /tmp/changed.txt",
+                "sed s/': \\\"'/\\|/ %s | sed s/'\\\": '/\\|/ | cut -d'|' -f2 | sort -u | grep -vE \"^dev/.*\" >> "MINDI_CACHE"/changed.txt",
                 logfile);
         system(command);
@@ -330 +331 @@
  * @return 0 for success, nonzero for failure.
  */
-int compare_all_tarballs(struct s_bkpinfo *bkpinfo)
+int compare_all_tarballs()
 {
     int retval = 0;
@@ -361 +362 @@
 
     for (;;) {
-        insist_on_this_cd_number(bkpinfo, g_current_media_number);
+        insist_on_this_cd_number(g_current_media_number);
         update_progress_form(progress_str);
         mr_asprintf(&tarball_fname,
@@ -441 +442 @@
  * @return 0 for success, nonzero for failure.
  */
-int compare_to_CD(struct s_bkpinfo *bkpinfo)
+int compare_to_CD()
 {
   /** needs malloc *********/
@@ -460 +461 @@
     chdir(bkpinfo->restore_path);
     getcwd(new, MAX_STR_LEN - 1);
-    insist_on_this_cd_number(bkpinfo, g_current_media_number);
-    unlink("/tmp/changed.txt");
-
-    resA = compare_all_tarballs(bkpinfo);
-    resB = compare_all_biggiefiles(bkpinfo);
+    insist_on_this_cd_number(g_current_media_number);
+    unlink(MINDI_CACHE"/changed.txt");
+
+    resA = compare_all_tarballs();
+    resB = compare_all_biggiefiles();
     chdir(cwd);
-    noof_changed_files = count_lines_in_file("/tmp/changed.txt");
+    noof_changed_files = count_lines_in_file(MINDI_CACHE"/changed.txt");
     if (noof_changed_files) {
         log_to_screen(_("%ld files do not match the backup            "),
                 noof_changed_files);
-        mr_asprintf(&command, "cat /tmp/changed.txt >> %s", MONDO_LOGFILE);
+        mr_asprintf(&command, "cat "MINDI_CACHE"/changed.txt >> %s", MONDO_LOGFILE);
         paranoid_system(command);
         mr_free(command);
@@ -501 +502 @@
  */
 int
-compare_mode(struct s_bkpinfo *bkpinfo,
-             struct mountlist_itself *mountlist,
+compare_mode(struct mountlist_itself *mountlist,
              struct raidlist_itself *raidlist)
 {
@@ -522 +522 @@
     assert(raidlist != NULL);
 
-    while (get_cfg_file_from_archive(bkpinfo)) {
+    while (get_cfg_file_from_archive()) {
         if (!ask_me_yes_or_no
             (_
@@ -529 +529 @@
             fatal_error("Unable to find config file/archives. Aborting.");
         }
-        interactively_obtain_media_parameters_from_user(bkpinfo, FALSE);
-    }
-
-    read_cfg_file_into_bkpinfo(g_mondo_cfg_file, bkpinfo);
+        interactively_obtain_media_parameters_from_user(FALSE);
+    }
+
+    read_cfg_file_into_bkpinfo(g_mondo_cfg_file);
     g_current_media_number = 1;
     mvaddstr_and_log_it(1, 30, _("Comparing Automatically"));
@@ -544 +544 @@
     if (bkpinfo->backup_media_type == tape
         || bkpinfo->backup_media_type == udev) {
-        retval += compare_to_tape(bkpinfo);
+        retval += compare_to_tape();
     } else if (bkpinfo->backup_media_type == cdstream) {
-        retval += compare_to_cdstream(bkpinfo);
-    } else {
-        retval += compare_to_CD(bkpinfo);
+        retval += compare_to_cdstream();
+    } else {
+        retval += compare_to_CD();
     }
     if (retval) {
@@ -557 +557 @@
     }
 
-    if (count_lines_in_file("/tmp/changed.txt") > 0) {
+    if (count_lines_in_file(MINDI_CACHE"/changed.txt") > 0) {
         mvaddstr_and_log_it(g_currentY++, 0,
                             _
                             ("Differences found while files were being compared."));
-        streamline_changes_file("/tmp/changed.files", "/tmp/changed.txt");
-        if (count_lines_in_file("/tmp/changed.files") <= 0) {
+        streamline_changes_file(MINDI_CACHE"/changed.files", MINDI_CACHE"/changed.txt");
+        if (count_lines_in_file(MINDI_CACHE"/changed.files") <= 0) {
             mvaddstr_and_log_it(g_currentY++, 0,
                                 _
@@ -569 +569 @@
                           ("The differences were logfiles and temporary files. Your archives are fine."));
         } else {
-            q = count_lines_in_file("/tmp/changed.files");
+            q = count_lines_in_file(MINDI_CACHE"/changed.files");
             mr_asprintf(&tmp, _("%ld significant difference%s found."), q,
                     (q != 1) ? "s" : "");
@@ -586 +586 @@
             chdir(bkpinfo->restore_path);
             getcwd(new, MAX_STR_LEN - 1);
-            popup_changelist_from_file("/tmp/changed.files");
+            popup_changelist_from_file(MINDI_CACHE"/changed.files");
             mr_msg(2, "Returning from popup_changelist_from_file()");
             chdir(cwd);
@@ -616 +616 @@
  * @return 0 for success, nonzero for failure.
  */
-int compare_to_cdstream(struct s_bkpinfo *bkpinfo)
+int compare_to_cdstream()
 {
     int res;
@@ -642 +642 @@
                last_line_of_file("/tmp/CDROM-LIVES-HERE"));
     }
-    res = verify_tape_backups(bkpinfo);
+    res = verify_tape_backups();
     chdir(dir);
-    if (length_of_file("/tmp/changed.txt") > 2
-        && length_of_file("/tmp/changed.files") > 2) {
+    if (length_of_file(MINDI_CACHE"/changed.txt") > 2
+        && length_of_file(MINDI_CACHE"/changed.files") > 2) {
         mr_msg(0,
-                "Type 'less /tmp/changed.files' to see which files don't match the archives");
+                "Type 'less "MINDI_CACHE"/changed.files' to see which files don't match the archives");
         mr_msg(2, "Calling popup_changelist_from_file()");
-        popup_changelist_from_file("/tmp/changed.files");
+        popup_changelist_from_file(MINDI_CACHE"/changed.files");
         mr_msg(2, "Returned from popup_changelist_from_file()");
     }
@@ -674 +674 @@
  * returns: int                                                           *
  **************************************************************************/
-int compare_to_tape(struct s_bkpinfo *bkpinfo)
+int compare_to_tape()
 {
     int res = 0;
@@ -692 +692 @@
     mvaddstr_and_log_it(g_currentY,
                         0, _("Verifying archives against filesystem"));
-    res = verify_tape_backups(bkpinfo);
+    res = verify_tape_backups();
     chdir(dir);
     if (res) {

branches/stable/mondo/src/mondorestore/mondo-rstr-compare.h

@@ -4 +4 @@
 
 
-int compare_to_CD(struct s_bkpinfo *);
-int compare_to_cdstream(struct s_bkpinfo *);
-int compare_to_tape(struct s_bkpinfo *);
+int compare_to_CD();
+int compare_to_cdstream();
+int compare_to_tape();
 
 int
-compare_mode(struct s_bkpinfo *bkpinfo,
-             struct mountlist_itself *mountlist,
+compare_mode(struct mountlist_itself *mountlist,
              struct raidlist_itself *raidlist);

branches/stable/mondo/src/mondorestore/mondo-rstr-newt.c

@@ -26 +26 @@
 
 extern char err_log_lines[NOOF_ERR_LINES][MAX_STR_LEN];
-
 
 /**

branches/stable/mondo/src/mondorestore/mondo-rstr-newt.h

@@ -43 +43 @@
 extern struct s_node *find_node_in_filelist(struct s_node *,
                                             char *filename);
-extern int what_number_cd_is_this(struct s_bkpinfo *);
+extern int what_number_cd_is_this();
 //extern void fatal_error (char *);
 extern void sort_mountlist_by_device(struct mountlist_itself *);

branches/stable/mondo/src/mondorestore/mondo-rstr-tools-EXT.h

@@ -4 +4 @@
 
 extern void free_MR_global_filenames(void);
-extern void get_cfg_file_from_archive_or_bust(struct s_bkpinfo *);
+extern void get_cfg_file_from_archive_or_bust();
 extern bool is_file_in_list(char *, char *, char *);    /* needle, haystack, preamble */
-extern int iso_fiddly_bits(struct s_bkpinfo *bkpinfo, bool nuke_me_please);
+extern int iso_fiddly_bits(bool nuke_me_please);
 extern void kill_petris(void);
-extern int mount_cdrom(struct s_bkpinfo *bkpinfo);
+extern int mount_cdrom();
 extern int mount_all_devices(struct mountlist_itself *, bool);
 extern void protect_against_braindead_sysadmins(void);
-extern int read_cfg_file_into_bkpinfo(char *cfg_file,
-                                      struct s_bkpinfo *bkpinfo);
-struct s_node *process_filelist_and_biggielist(struct s_bkpinfo *);
+extern int read_cfg_file_into_bkpinfo(char *cfg_file);
+struct s_node *process_filelist_and_biggielist();
 extern int backup_crucial_file(char *path_root, char *filename);
 extern int run_boot_loader(bool);
@@ -24 +23 @@
 extern void streamline_changes_file(char *, char *);
 extern void set_signals(int on);
-extern void setup_MR_global_filenames(struct s_bkpinfo *bkpinfo);
+extern void setup_MR_global_filenames();
 extern void terminate_daemon(int);
 extern void termination_in_progress(int);
 extern int unmount_all_devices(struct mountlist_itself *);
-extern int get_cfg_file_from_archive(struct s_bkpinfo *bkpinfo);
+extern int get_cfg_file_from_archive();
 extern int
-extract_config_file_from_ramdisk(struct s_bkpinfo *bkpinfo,
+extract_config_file_from_ramdisk(
                                  char *ramdisk_fname,
                                  char *output_cfg_file,

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

@@ -49 +49 @@
 extern char *MONDO_LOGFILE;
 
+/* Reference to global bkpinfo */
+extern struct s_bkpinfo *bkpinfo;
+
 /* Should we use or not extended attributes and acl when restoring */
 char *g_getfattr = NULL;
@@ -141 +144 @@
  */
 int
-extract_config_file_from_ramdisk(struct s_bkpinfo *bkpinfo,
-                                 char *ramdisk_fname,
-                                 char *output_cfg_file,
-                                 char *output_mountlist_file)
+extract_config_file_from_ramdisk(char *ramdisk_fname,
+                         char *output_cfg_file,
+                         char *output_mountlist_file)
 {
     char *mountpt = NULL;
@@ -211 +213 @@
 /**
  * Keep trying to get mondo-restore.cfg from the archive, until the user gives up.
- * @param bkpinfo The backup information structure.
- */
-void get_cfg_file_from_archive_or_bust(struct s_bkpinfo *bkpinfo)
-{
-    while (get_cfg_file_from_archive(bkpinfo)) {
+ */
+void get_cfg_file_from_archive_or_bust()
+{
+    while (get_cfg_file_from_archive()) {
         if (!ask_me_yes_or_no
             (_
@@ -222 +223 @@
             fatal_error("Could not find config file/archives. Aborting.");
         }
-        interactively_obtain_media_parameters_from_user(bkpinfo, FALSE);
+        interactively_obtain_media_parameters_from_user(FALSE);
     }
 }
@@ -285 +286 @@
  * @return 0 for success, nonzero for failure.
  */
-int iso_fiddly_bits(struct s_bkpinfo *bkpinfo, bool nuke_me_please)
+int iso_fiddly_bits(bool nuke_me_please)
 {
     char *mount_isodir_command = NULL;
@@ -341 +342 @@
     }
     if (!IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-        mount_cdrom(bkpinfo);
-    }
-    i = what_number_cd_is_this(bkpinfo);    /* has the side-effect of calling mount_cdrom() */
+        mount_cdrom();
+    }
+    i = what_number_cd_is_this();   /* has the side-effect of calling mount_cdrom() */
     mr_msg(1, "%s #%d has been mounted via loopback mount",
             bkpinfo->backup_media_string, i);
@@ -601 +602 @@
  * @return 0 for success, nonzero for failure.
  */
-int mount_cdrom(struct s_bkpinfo *bkpinfo)
+int mount_cdrom()
 {
     char *mount_cmd = NULL;
@@ -750 +751 @@
  * @return 0 for success, nonzero for failure.
  */
-int read_cfg_file_into_bkpinfo(char *cfgf, struct s_bkpinfo *bkpinfo)
+int read_cfg_file_into_bkpinfo(char *cfgf)
 {
     char *value = NULL;
@@ -1019 +1020 @@
                     mr_asprintf(&iso_mnt, "");
                     mr_asprintf(&iso_path, "");
-                    if (mount_cdrom(bkpinfo)) {
+                    if (mount_cdrom()) {
                         fatal_error
                             ("Unable to mount isodir. Failed to mount CD-ROM as well.");
@@ -1043 +1044 @@
                 mr_msg(2,
                         "bkpinfo->backup_media_type != media_specified_by_user, so I'd better ask :)");
-                interactively_obtain_media_parameters_from_user(bkpinfo, FALSE);
+                interactively_obtain_media_parameters_from_user(FALSE);
                 media_specified_by_user = bkpinfo->backup_media_type;
-                get_cfg_file_from_archive(bkpinfo);
+                get_cfg_file_from_archive();
             }
         }
@@ -1072 +1073 @@
  */
 struct
-s_node *process_filelist_and_biggielist(struct s_bkpinfo *bkpinfo)
+s_node *process_filelist_and_biggielist()
 {
     struct s_node *filelist = NULL;
@@ -1115 +1116 @@
                     "Calling insist_on_this_cd_number; bkpinfo->isodir=%s",
                     bkpinfo->isodir);
-            insist_on_this_cd_number(bkpinfo, 1);
+            insist_on_this_cd_number(1);
             mr_msg(2, "Back from iotcn");
             run_program_and_log_output("mount", 1);
@@ -1125 +1126 @@
                     FILELIST_FULL_STUB,
                     "tmp/i-want-my-lvm", MONDO_CFG_FILE_STUB);
-
             mr_msg(1, "tarcommand = %s", command);
             run_program_and_log_output(command, 1);
@@ -1790 +1790 @@
  * - @c bkpinfo->disaster_recovery
  */
-void setup_MR_global_filenames(struct s_bkpinfo *bkpinfo)
+void setup_MR_global_filenames()
 {
     char *temppath;
@@ -2081 +2081 @@
  * @return 0 for success, nonzero for failure.
  */
-int get_cfg_file_from_archive(struct s_bkpinfo *bkpinfo)
+int get_cfg_file_from_archive()
 {
     int retval = 0;
@@ -2125 +2125 @@
         } else {
             mr_msg(2, "gcffa --- calling mount_cdrom now :)");
-            if (!mount_cdrom(bkpinfo)) {
+            if (!mount_cdrom()) {
                 mr_msg(2,
                         "gcffa --- managed to mount CD; so, no need for Plan B");
@@ -2132 +2132 @@
                 try_plan_B = TRUE;
             }
-            if (what_number_cd_is_this(bkpinfo) > 1) {
-                insist_on_this_cd_number(bkpinfo,
-                                         (g_current_media_number = 1));
+            if (what_number_cd_is_this() > 1) {
+                insist_on_this_cd_number((g_current_media_number = 1));
             }
         }

branches/stable/mondo/src/mondorestore/mondo-rstr-tools.h

@@ -4 +4 @@
 
 void free_global_filenames(void);
-void get_cfg_file_from_archive_or_bust(struct s_bkpinfo *);
+void get_cfg_file_from_archive_or_bust();
 bool is_file_in_list(char *, char *, char *);   /* needle, haystack, preamble */
-int iso_fiddly_bits(struct s_bkpinfo *bkpinfo, bool nuke_me_please);
+int iso_fiddly_bits(bool nuke_me_please);
 void kill_petris(void);
-int mount_cdrom(struct s_bkpinfo *bkpinfo);
+int mount_cdrom();
 int mount_device(char *, char *, char *, bool);
 int mount_all_devices(struct mountlist_itself *, bool);
 void protect_against_braindead_sysadmins(void);
-int read_cfg_file_into_bkpinfo(char *cfg_file, struct s_bkpinfo *bkpinfo);
-struct s_node *process_filelist_and_biggielist(struct s_bkpinfo *);
+int read_cfg_file_into_bkpinfo(char *cfg_file);
+struct s_node *process_filelist_and_biggielist();
 int backup_crucial_file(char *path_root, char *filename);
 
@@ -24 +24 @@
 void streamline_changes_file(char *, char *);
 void set_signals(int on);
-void setup_global_filenames(struct s_bkpinfo *bkpinfo);
+void setup_global_filenames();
 void twenty_seconds_til_yikes(void);
 int run_raw_mbr(bool offer_to_hack_scripts, char *bd);
@@ -30 +30 @@
 void termination_in_progress(int);
 int unmount_all_devices(struct mountlist_itself *);
-int get_cfg_file_from_archive(struct s_bkpinfo *bkpinfo);
+int get_cfg_file_from_archive();
 void ask_about_these_imagedevs(char *infname, char *outfname);

branches/stable/mondo/src/mondorestore/mondorestore.c

@@ -35 +35 @@
 
 extern void twenty_seconds_til_yikes(void);
+
+/* Reference to global bkpinfo */
+struct s_bkpinfo *bkpinfo;
 
 /* For use in other programs (ex. XMondo) */
@@ -205 +208 @@
  * @ingroup restoreGuiGroup
  */
-int let_user_edit_the_mountlist(struct s_bkpinfo *bkpinfo,
-                                struct mountlist_itself *mountlist,
+int let_user_edit_the_mountlist(struct mountlist_itself *mountlist,
                                 struct raidlist_itself *raidlist)
 {
@@ -306 +308 @@
  */
 int
-catchall_mode(struct s_bkpinfo *bkpinfo,
-              struct mountlist_itself *mountlist,
+catchall_mode(struct mountlist_itself *mountlist,
               struct raidlist_itself *raidlist)
 {
@@ -321 +322 @@
     iamhere("post wrm");
     if (c == 'I' || c == 'N' || c == 'C') {
-        interactively_obtain_media_parameters_from_user(bkpinfo, FALSE);
+        interactively_obtain_media_parameters_from_user(FALSE);
     } else {
         popup_and_OK(_("No restoring or comparing will take place today."));
@@ -338 +339 @@
 
     if (bkpinfo->backup_media_type == iso) {
-        if (iso_fiddly_bits(bkpinfo, (c == 'N') ? TRUE : FALSE)) {
+        if (iso_fiddly_bits((c == 'N') ? TRUE : FALSE)) {
             mr_msg(2,
                     "catchall_mode --- iso_fiddly_bits returned w/ error");
@@ -349 +350 @@
     if (c == 'I') {
         mr_msg(2, "IM selected");
-        retval += interactive_mode(bkpinfo, mountlist, raidlist);
+        retval += interactive_mode(mountlist, raidlist);
     } else if (c == 'N') {
         mr_msg(2, "NM selected");
-        retval += nuke_mode(bkpinfo, mountlist, raidlist);
+        retval += nuke_mode(mountlist, raidlist);
     } else if (c == 'C') {
         mr_msg(2, "CM selected");
-        retval += compare_mode(bkpinfo, mountlist, raidlist);
+        retval += compare_mode(mountlist, raidlist);
     }
     return (retval);
@@ -368 +369 @@
  **************************************************************************/
 
-static void clean_blkid(struct s_bkpinfo *bkpinfo) {
+static void clean_blkid() {
 
     char *tmp1 = NULL;
@@ -396 +397 @@
  */
 int
-interactive_mode(struct s_bkpinfo *bkpinfo,
-                 struct mountlist_itself *mountlist,
+interactive_mode(struct mountlist_itself *mountlist,
                  struct raidlist_itself *raidlist)
 {
@@ -434 +434 @@
 
     iamhere("About to load config file");
-    get_cfg_file_from_archive_or_bust(bkpinfo);
-    read_cfg_file_into_bkpinfo(g_mondo_cfg_file, bkpinfo);
+    get_cfg_file_from_archive_or_bust();
+    read_cfg_file_into_bkpinfo(g_mondo_cfg_file);
     iamhere("Done loading config file; resizing ML");
     mr_asprintf(&tmp,bkpinfo->prefix);
@@ -560 +560 @@
     {
         mr_msg(1, "Restoring all data");
-        retval += restore_everything(bkpinfo, NULL);
+        retval += restore_everything(NULL);
     } else if ((restore_all =
              ask_me_yes_or_no
@@ -567 +567 @@
         for (done = FALSE; !done;) {
             unlink("/tmp/filelist.full");
-            filelist = process_filelist_and_biggielist(bkpinfo);
+            filelist = process_filelist_and_biggielist();
             /* Now you have /tmp/tmpfs/filelist.restore-these and /tmp/tmpfs/biggielist.restore-these;
                the former is a list of regular files; the latter, biggiefiles and imagedevs.
@@ -587 +587 @@
                     strcpy(bkpinfo->restore_path, tmp1);
                     mr_msg(1, "Restoring subset");
-                    retval += restore_everything(bkpinfo, filelist);
+                    retval += restore_everything(filelist);
                     free_filelist(filelist);
                 } else {
@@ -622 +622 @@
     }
 
-    clean_blkid(bkpinfo);
+    clean_blkid();
     protect_against_braindead_sysadmins();
     retval += unmount_all_devices(mountlist);
@@ -671 +671 @@
  * Run an arbitrary restore mode (prompt the user), but from ISO images
  * instead of real media.
- * @param bkpinfo The backup information structure. Most fields are used.
  * @param mountlist The mountlist containing information about the user's partitions.
  * @param raidlist The raidlist that goes with @p mountlist.
@@ -678 +677 @@
  */
 int
-iso_mode(struct s_bkpinfo *bkpinfo,
-         struct mountlist_itself *mountlist,
+iso_mode(struct mountlist_itself *mountlist,
          struct raidlist_itself *raidlist, bool nuke_me_please)
 {
@@ -685 +683 @@
     int retval = 0;
 
-    assert(bkpinfo != NULL);
     assert(mountlist != NULL);
     assert(raidlist != NULL);
-    if (iso_fiddly_bits(bkpinfo, nuke_me_please)) {
+    if (iso_fiddly_bits(nuke_me_please)) {
         mr_msg(1, "iso_mode --- returning w/ error");
         return (1);
@@ -694 +691 @@
         c = which_restore_mode();
         if (c == 'I' || c == 'N' || c == 'C') {
-            interactively_obtain_media_parameters_from_user(bkpinfo,
-                                                            FALSE);
+            interactively_obtain_media_parameters_from_user(FALSE);
         }
         if (c == 'I') {
-            retval += interactive_mode(bkpinfo, mountlist, raidlist);
+            retval += interactive_mode(mountlist, raidlist);
         } else if (c == 'N') {
-            retval += nuke_mode(bkpinfo, mountlist, raidlist);
+            retval += nuke_mode(mountlist, raidlist);
         } else if (c == 'C') {
-            retval += compare_mode(bkpinfo, mountlist, raidlist);
+            retval += compare_mode(mountlist, raidlist);
         } else {
             log_to_screen(_("OK, I shan't restore/compare any files."));
@@ -761 +757 @@
  */
 int
-nuke_mode(struct s_bkpinfo *bkpinfo,
-          struct mountlist_itself *mountlist,
+nuke_mode(struct mountlist_itself *mountlist,
           struct raidlist_itself *raidlist)
 {
@@ -778 +773 @@
     mr_msg(2, "nuke_mode --- starting");
 
-    get_cfg_file_from_archive_or_bust(bkpinfo);
+    get_cfg_file_from_archive_or_bust();
     load_mountlist(mountlist, g_mountlist_fname);   // in case read_cfg_file_into_bkpinfo updated the mountlist
 #ifdef __FreeBSD__
@@ -796 +791 @@
         if (ask_me_yes_or_no(tmp)) {
             mr_free(tmp);
-            retval = interactive_mode(bkpinfo, mountlist, raidlist);
+            retval = interactive_mode(mountlist, raidlist);
             call_me_after_the_nuke(retval);
             return(retval);
@@ -852 +847 @@
 
         if (ask_me_yes_or_no(_("Try in interactive mode instead?"))) {
-            retval = interactive_mode(bkpinfo, mountlist, raidlist);
+            retval = interactive_mode(mountlist, raidlist);
             call_me_after_the_nuke(retval);
             return(retval);
@@ -869 +864 @@
     }
     iamhere("Restoring everything");
-    retval += restore_everything(bkpinfo, NULL);
+    retval += restore_everything(NULL);
     if (!run_boot_loader(FALSE)) {
         mr_msg(1,
@@ -875 +870 @@
         boot_loader_installed = TRUE;
     }
-    clean_blkid(bkpinfo);
+    clean_blkid();
     protect_against_braindead_sysadmins();
     retval += unmount_all_devices(mountlist);
@@ -910 +905 @@
  * @return 0 for success, or the number of errors encountered.
  */
-int restore_to_live_filesystem(struct s_bkpinfo *bkpinfo)
+int restore_to_live_filesystem()
 {
     int retval = 0;
@@ -932 +927 @@
         sleep(1);
     }
-    interactively_obtain_media_parameters_from_user(bkpinfo, FALSE);
+    interactively_obtain_media_parameters_from_user(FALSE);
     if (!bkpinfo->media_device) {
         mr_msg(2, "Warning - failed to find media dev");
@@ -944 +939 @@
     open_evalcall_form(_("Thinking..."));
 
-    get_cfg_file_from_archive_or_bust(bkpinfo);
-    read_cfg_file_into_bkpinfo(g_mondo_cfg_file, bkpinfo);
+    get_cfg_file_from_archive_or_bust();
+    read_cfg_file_into_bkpinfo(g_mondo_cfg_file);
     load_mountlist(mountlist, g_mountlist_fname);   // in case read_cfg_file_into_bkpinfo 
 
@@ -951 +946 @@
     retval = load_mountlist(mountlist, g_mountlist_fname);
     load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
-    filelist = process_filelist_and_biggielist(bkpinfo);
+    filelist = process_filelist_and_biggielist();
     if (filelist) {
         save_filelist(filelist, "/tmp/selected-files.txt");
@@ -959 +954 @@
                                  bkpinfo->restore_path, MAX_STR_LEN)) {
             iamhere("Restoring everything");
-            retval += restore_everything(bkpinfo, filelist);
+            retval += restore_everything(filelist);
         }
         free_filelist(filelist);
@@ -1006 +1001 @@
  */
 int
-restore_a_biggiefile_from_CD(struct s_bkpinfo *bkpinfo,
-                             long bigfileno,
+restore_a_biggiefile_from_CD(long bigfileno,
                              struct s_node *filelist,
                              char *pathname_of_last_file_restored)
@@ -1178 +1172 @@
                     bkpinfo->backup_media_string,
                     g_current_media_number);
-            insist_on_this_cd_number(bkpinfo, g_current_media_number);
+            insist_on_this_cd_number(g_current_media_number);
             log_to_screen(_("Continuing to restore."));
         } else {
@@ -1307 +1301 @@
  * @return 0 for success (or skip), nonzero for failure.
  */
-int restore_a_biggiefile_from_stream(struct s_bkpinfo *bkpinfo, char *orig_bf_fname, long biggiefile_number, char *orig_checksum,   //UNUSED
+int restore_a_biggiefile_from_stream(char *orig_bf_fname, long biggiefile_number, char *orig_checksum,  //UNUSED
                                      long long biggiefile_size, //UNUSED
                                      struct s_node *filelist,
@@ -1474 +1468 @@
         if (current_slice_number == 0) {
             res =
-                read_file_from_stream_to_file(bkpinfo,
-                                              "/tmp/biggie-blah.txt",
+                read_file_from_stream_to_file("/tmp/biggie-blah.txt",
                                               slice_siz);
             if (!(fin = fopen("/tmp/biggie-blah.txt", "r"))) {
@@ -1491 +1484 @@
         } else {
             res =
-                read_file_from_stream_to_stream(bkpinfo, pout, slice_siz);
+                read_file_from_stream_to_stream(pout, slice_siz);
         }
         retval += res;
@@ -1776 +1769 @@
  */
 int
-restore_a_tarball_from_stream(struct s_bkpinfo *bkpinfo,
-                              char *tarball_fname,
+restore_a_tarball_from_stream(char *tarball_fname,
                               long current_tarball_number,
                               struct s_node *filelist,
@@ -1817 +1809 @@
     mr_asprintf(&filelist_subset_fname, "%s/filelist-subset-%ld.tmp",
             bkpinfo->tmpdir, current_tarball_number);
-    res = read_file_from_stream_to_file(bkpinfo, afio_fname, size);
+    res = read_file_from_stream_to_file(afio_fname, size);
     if (strstr(tarball_fname, ".star")) {
         bkpinfo->use_star = TRUE;
@@ -1951 +1943 @@
  */
 int
-restore_all_biggiefiles_from_CD(struct s_bkpinfo *bkpinfo,
-                                struct s_node *filelist)
+restore_all_biggiefiles_from_CD(struct s_node *filelist)
 {
     int retval = 0;
@@ -2018 +2009 @@
                         "I'll continue to scan this CD for bigfiles to be restored.");
             } else if (does_file_exist(MNT_CDROM "/archives/NOT-THE-LAST")) {
-                insist_on_this_cd_number(bkpinfo,
-                                         ++g_current_media_number);
+                insist_on_this_cd_number(++g_current_media_number);
                 log_to_screen(_("Restoring from %s #%d"),
-                        bkpinfo->backup_media_string,
+                        media_descriptor_string(bkpinfo->backup_media_type),
                         g_current_media_number);
                 just_changed_cds = TRUE;
@@ -2037 +2027 @@
 
             res =
-                restore_a_biggiefile_from_CD(bkpinfo, bigfileno, filelist,
-                                             pathname_of_last_biggie_restored);
+                restore_a_biggiefile_from_CD(bigfileno, filelist, pathname_of_last_biggie_restored);
             iamhere(pathname_of_last_biggie_restored);
             if (fbw && pathname_of_last_biggie_restored[0]) {
@@ -2097 +2086 @@
  */
 int
-restore_all_tarballs_from_CD(struct s_bkpinfo *bkpinfo,
-                             struct s_node *filelist)
+restore_all_tarballs_from_CD(struct s_node *filelist)
 {
     int retval = 0;
@@ -2126 +2114 @@
         g_current_media_number = 1;
     }
-    insist_on_this_cd_number(bkpinfo, g_current_media_number);
+    insist_on_this_cd_number(g_current_media_number);
     read_cfg_var(g_mondo_cfg_file, "last-filelist-number", tmp1);
     max_val = atol(tmp1) + 1;
@@ -2140 +2128 @@
                        progress_str, max_val);
     for (;;) {
-        insist_on_this_cd_number(bkpinfo, g_current_media_number);
+        insist_on_this_cd_number(g_current_media_number);
         update_progress_form(progress_str);
         mr_asprintf(&tarball_fname, MNT_CDROM "/archives/%ld.afio.bz2",
@@ -2252 +2240 @@
  */
 int
-restore_all_biggiefiles_from_stream(struct s_bkpinfo *bkpinfo,
-                                    struct s_node *filelist)
+restore_all_biggiefiles_from_stream(struct s_node *filelist)
 {
     long noof_biggiefiles = 0L;
@@ -2306 +2293 @@
     if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) {
         res =
-            read_EXAT_files_from_tape(bkpinfo, &biggie_size, biggie_fname,
+            read_EXAT_files_from_tape(&biggie_size, biggie_fname,
                                       &ctrl_chr, xattr_fname, acl_fname);
     }
@@ -2342 +2329 @@
         mr_free(tmp);
 
-        res = restore_a_biggiefile_from_stream(bkpinfo, biggie_fname,
+        res = restore_a_biggiefile_from_stream(biggie_fname,
                                                current_bigfile_number,
                                                biggie_cksum,
@@ -2428 +2415 @@
  */
 int
-restore_all_tarballs_from_stream(struct s_bkpinfo *bkpinfo,
-                                 struct s_node *filelist)
+restore_all_tarballs_from_stream(struct s_node *filelist)
 {
     int retval = 0;
@@ -2493 +2479 @@
             iamhere("Reading EXAT files from tape");
             res =
-                read_EXAT_files_from_tape(bkpinfo, &tmp_size, tmp_fname,
+                read_EXAT_files_from_tape(&tmp_size, tmp_fname,
                                           &ctrl_chr, xattr_fname,
                                           acl_fname);
@@ -2506 +2492 @@
                 */
         res =
-            restore_a_tarball_from_stream(bkpinfo, tmp_fname,
+            restore_a_tarball_from_stream(tmp_fname,
                                           current_afioball_number,
                                           filelist, tmp_size, xattr_fname,
@@ -2568 +2554 @@
  * @ingroup restoreGroup
  */
-int restore_everything(struct s_bkpinfo *bkpinfo, struct s_node *filelist)
+int restore_everything(struct s_node *filelist)
 {
     int resA;
@@ -2602 +2588 @@
     mvaddstr_and_log_it(g_currentY, 0, _("Preparing to read your archives"));
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-        mount_cdrom(bkpinfo);
+        mount_cdrom();
         mvaddstr_and_log_it(g_currentY++, 0,
                             _("Restoring OS and data from streaming media"));
         if (bkpinfo->backup_media_type == cdstream) {
-            openin_cdstream(bkpinfo);
+            openin_cdstream();
         } else {
-            assert_string_is_neither_NULL_nor_zerolength(bkpinfo->
-                                                         media_device);
-            openin_tape(bkpinfo);
-        }
-        resA = restore_all_tarballs_from_stream(bkpinfo, filelist);
-        resB = restore_all_biggiefiles_from_stream(bkpinfo, filelist);
+            assert_string_is_neither_NULL_nor_zerolength(bkpinfo->media_device);
+            openin_tape();
+        }
+        resA = restore_all_tarballs_from_stream(filelist);
+        resB = restore_all_biggiefiles_from_stream(filelist);
         if (bkpinfo->backup_media_type == cdstream) {
-            closein_cdstream(bkpinfo);
+            closein_cdstream();
         } else {
-            closein_tape(bkpinfo);
+            closein_tape();
         }
     } else {
         mvaddstr_and_log_it(g_currentY++, 0,
                             _("Restoring OS and data from CD       "));
-        mount_cdrom(bkpinfo);
-        resA = restore_all_tarballs_from_CD(bkpinfo, filelist);
-        resB = restore_all_biggiefiles_from_CD(bkpinfo, filelist);
+        mount_cdrom();
+        resA = restore_all_tarballs_from_CD(filelist);
+        resB = restore_all_biggiefiles_from_CD(filelist);
     }
     chdir(cwd);
@@ -2651 +2636 @@
  */
 int
-restore_live_from_monitas_server(struct s_bkpinfo *bkpinfo,
-                                 char *monitas_device,
+restore_live_from_monitas_server(char *monitas_device,
                                  char *restore_this_directory,
                                  char *restore_here)
@@ -2724 +2708 @@
 
     unlink(datadisks_fname);
-    read_cfg_file_into_bkpinfo(g_mondo_cfg_file, bkpinfo);
+    read_cfg_file_into_bkpinfo(g_mondo_cfg_file);
     retval = load_mountlist(&the_mountlist, g_mountlist_fname); // in case read_cfg_file_into_bkpinfo   strcpy(bkpinfo->media_device, monitas_device);
 
@@ -2751 +2735 @@
     run_program_and_log_output(command, FALSE);
 //  filelist = load_filelist(g_filelist_restthese);  // FIXME --- this probably doesn't work because it doesn't include the biggiefiles
-    retval += restore_everything(bkpinfo, filelist);
+    retval += restore_everything(filelist);
     free_filelist(filelist);
     mr_msg(2, "--------End of restore_live_from_monitas_server--------");
@@ -2820 +2804 @@
     struct mountlist_itself *mountlist = NULL;
     struct raidlist_itself *raidlist = NULL;
-    struct s_bkpinfo *bkpinfo = NULL;
     struct s_node *filelist = NULL;
     char *a = NULL, *b = NULL;
@@ -2840 +2823 @@
     mr_conf = mr_malloc(sizeof(struct mr_rs_conf));
     mr_rs_reset_conf(mr_conf);
+    bkpinfo = mr_malloc(sizeof(struct s_bkpinfo));
+    reset_bkpinfo();
 
     mr_conf->log_level = DEFAULT_MR_LOGLEVEL;
@@ -2859 +2844 @@
         g_text_mode = FALSE;
     }                           // newt :-)
-    bkpinfo = mr_malloc(sizeof(struct s_bkpinfo));
     mountlist = mr_malloc(sizeof(struct mountlist_itself));
     raidlist = mr_malloc(sizeof(struct raidlist_itself));
@@ -2873 +2857 @@
     malloc_string(a);
     malloc_string(b);
-    setup_MR_global_filenames(bkpinfo); // malloc() and set globals, using bkpinfo->tmpdir etc.
-    reset_bkpinfo(bkpinfo);
+    setup_MR_global_filenames();    // malloc() and set globals, using bkpinfo->tmpdir etc.
     bkpinfo->backup_media_type = none;  // in case boot disk was made for one backup type but user wants to restore from another backup type
     strcpy(bkpinfo->backup_media_string,"");
@@ -2909 +2892 @@
 
 /* Init directories */
-    make_hole_for_dir(bkpinfo->tmpdir);
-    mr_asprintf(&tmp, "mkdir -p %s", bkpinfo->tmpdir);
-    run_program_and_log_output(tmp, FALSE);
-    mr_free(tmp);
-
     make_hole_for_dir("/var/log");
     make_hole_for_dir("/tmp/tmpfs");    /* just in case... */
@@ -2943 +2921 @@
             strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
         }
-        res = let_user_edit_the_mountlist(bkpinfo, mountlist, raidlist);
+        res = let_user_edit_the_mountlist(mountlist, raidlist);
 #ifdef __FreeBSD__
         system("mv -f /etc/raidtab /tmp/raidconf.txt");
@@ -2977 +2955 @@
 
         malloc_string(tmp);
-        restore_a_biggiefile_from_CD(bkpinfo, 42, NULL, tmp);
+        restore_a_biggiefile_from_CD(42, NULL, tmp);
         mr_free(tmp);
     }
@@ -3077 +3055 @@
         if (argc == 5 && strcmp(argv[1], "--monitas-live") == 0) {
             retval =
-                restore_live_from_monitas_server(bkpinfo,
-                                                 argv[2],
+                restore_live_from_monitas_server(argv[2],
                                                  argv[3], argv[4]);
         } else {
             mr_msg(2, "Calling restore_to_live_filesystem()");
-            retval = restore_to_live_filesystem(bkpinfo);
+            retval = restore_to_live_filesystem();
         }
         mr_msg(2, "Still here. Yay.");
@@ -3103 +3080 @@
         iamhere("About to call load_mountlist and load_raidtab");
         strcpy(bkpinfo->restore_path, MNT_RESTORING);
-        read_cfg_file_into_bkpinfo(g_mondo_cfg_file, bkpinfo);
+        read_cfg_file_into_bkpinfo(g_mondo_cfg_file);
         retval = load_mountlist(mountlist, g_mountlist_fname);
         retval += load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
@@ -3163 +3140 @@
         if (argc == 2 && strcmp(argv[1], "--nuke") == 0) {
             iamhere("nuking");
-            retval += nuke_mode(bkpinfo, mountlist, raidlist);
+            retval += nuke_mode(mountlist, raidlist);
         } else if (argc == 2 && strcmp(argv[1], "--interactive") == 0) {
             iamhere("catchall");
-            retval += catchall_mode(bkpinfo, mountlist, raidlist);
+            retval += catchall_mode(mountlist, raidlist);
         } else if (argc == 2 && strcmp(argv[1], "--compare") == 0) {
             iamhere("compare");
-            retval += compare_mode(bkpinfo, mountlist, raidlist);
+            retval += compare_mode(mountlist, raidlist);
         } else if (argc == 2 && strcmp(argv[1], "--iso") == 0) {
             iamhere("iso");
-            retval = iso_mode(bkpinfo, mountlist, raidlist, FALSE);
+            retval = iso_mode(mountlist, raidlist, FALSE);
         } else if (argc == 2 && strcmp(argv[1], "--mbr") == 0) {
             iamhere("mbr");
@@ -3185 +3162 @@
         } else if (argc == 2 && strcmp(argv[1], "--isonuke") == 0) {
             iamhere("isonuke");
-            retval = iso_mode(bkpinfo, mountlist, raidlist, TRUE);
+            retval = iso_mode(mountlist, raidlist, TRUE);
         } else if (argc != 1) {
             log_to_screen(_("Invalid parameters"));
@@ -3191 +3168 @@
         } else {
             iamhere("catchall (no mode specified in command-line call");
-            retval += catchall_mode(bkpinfo, mountlist, raidlist);
+            retval += catchall_mode(mountlist, raidlist);
         }
     }
@@ -3197 +3174 @@
     /* clean up at the end */
     if (retval) {
-        if (does_file_exist("/tmp/changed.files")) {
+        if (does_file_exist(MINDI_CACHE"/changed.files")) {
             log_to_screen
-                (_("See /tmp/changed.files for list of files that have changed."));
+                (_("See "MINDI_CACHE"/changed.files for list of files that have changed."));
         }
         mvaddstr_and_log_it(g_currentY++,

branches/stable/mondo/src/mondorestore/mondorestore.h

@@ -8 +8 @@
  * Compatibility #define to ease the transition to logfile-in-a-variable.
  */
-char *MONDO_LOGFILE = "/tmp/mondorestore.log";
+char *MONDO_LOGFILE = "/var/log/mondorestore.log";
 
 /* Busybox ps has no option and PID in first pos */

branches/stable/mondo/src/mondorestore/mr-externs.h

@@ -16 +16 @@
 extern bool ask_me_yes_or_no(char *);
 extern char *calc_checksum_of_file(char *);
-extern int closein_tape(struct s_bkpinfo *);
+extern int closein_tape();
 extern void close_evalcall_form(void);
 extern char *call_program_and_get_last_line_of_output(char *);
@@ -51 +51 @@
 extern void open_evalcall_form(char *);
 extern void open_progress_form(char *, char *, char *, char *, long);
-extern int openin_cdstream(struct s_bkpinfo *);
-extern int openin_tape(struct s_bkpinfo *);
+extern int openin_cdstream();
+extern int openin_tape();
 extern int partition_device(char *, int, int, char *, long);
 extern int partition_device_with_fdisk(char *, int, int, char *, long);
@@ -61 +61 @@
 extern bool popup_and_get_string(char *, char *, char *, int);
 extern void setup_newt_stuff(void);
-extern void reset_bkpinfo(struct s_bkpinfo *);
+extern void reset_bkpinfo();
 extern int read_cfg_var(char *, char *, char *);
-extern int read_file_from_stream_to_file(struct s_bkpinfo *, char *,
+extern int read_file_from_stream_to_file(char *,
                                          long long);
-extern int read_file_from_stream_to_stream(struct s_bkpinfo *, FILE *,
+extern int read_file_from_stream_to_stream(FILE *,
                                            long long);
-extern int read_file_from_stream_FULL(struct s_bkpinfo *, char *, FILE *,
+extern int read_file_from_stream_FULL(char *, FILE *,
                                       long long);
 extern int read_header_block_from_stream(long long *, char *, int *);
@@ -78 +78 @@
 extern void update_evalcall_form(int);
 extern void update_progress_form(char *);
-extern int verify_tape_backups(struct s_bkpinfo *);
+extern int verify_tape_backups();
 extern char which_restore_mode(void);
 extern int which_format_command_do_i_need(char *, char *);
@@ -91 +91 @@
                                                                 mountlist_itself
                                                                 *mountlist);
-extern int get_cfg_file_from_archive(struct s_bkpinfo *);
+extern int get_cfg_file_from_archive();