Changeset 1663 in MondoRescue for branches/stable

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

Files:

• mindi/aux-tools/usr/share/terminfo/l/linux (modified) ( previous)
• mindi/mindi (modified) (1 diff)
• mindi/rootfs/sbin/init (modified) (1 diff)
• mindi/rootfs/var/log/mondo-archive.log (deleted)
• mondo/configure.in (modified) (1 diff)
• mondo/src/common/libmondo-archive-EXT.h (modified) (2 diffs)
• mondo/src/common/libmondo-archive.c (modified) (62 diffs)
• mondo/src/common/libmondo-archive.h (modified) (1 diff)
• mondo/src/common/libmondo-devices-EXT.h (modified) (4 diffs)
• mondo/src/common/libmondo-devices.c (modified) (18 diffs)
• mondo/src/common/libmondo-devices.h (modified) (4 diffs)
• mondo/src/common/libmondo-fifo.c (modified) (1 diff)
• mondo/src/common/libmondo-filelist-EXT.h (modified) (2 diffs)
• mondo/src/common/libmondo-filelist.c (modified) (7 diffs)
• mondo/src/common/libmondo-filelist.h (modified) (2 diffs)
• mondo/src/common/libmondo-files-EXT.h (modified) (1 diff)
• mondo/src/common/libmondo-files.c (modified) (6 diffs)
• mondo/src/common/libmondo-files.h (modified) (1 diff)
• mondo/src/common/libmondo-fork-EXT.h (modified) (1 diff)
• mondo/src/common/libmondo-fork.c (modified) (9 diffs)
• mondo/src/common/libmondo-fork.h (modified) (1 diff)
• mondo/src/common/libmondo-mountlist.c (modified) (1 diff)
• mondo/src/common/libmondo-stream-EXT.h (modified) (3 diffs)
• mondo/src/common/libmondo-stream.c (modified) (26 diffs)
• mondo/src/common/libmondo-stream.h (modified) (2 diffs)
• mondo/src/common/libmondo-string-EXT.h (modified) (1 diff)
• mondo/src/common/libmondo-string.c (modified) (2 diffs)
• mondo/src/common/libmondo-string.h (modified) (1 diff)
• mondo/src/common/libmondo-tools-EXT.h (modified) (2 diffs)
• mondo/src/common/libmondo-tools.c (modified) (18 diffs)
• mondo/src/common/libmondo-tools.h (modified) (2 diffs)
• mondo/src/common/libmondo-verify-EXT.h (modified) (1 diff)
• mondo/src/common/libmondo-verify.c (modified) (33 diffs)
• mondo/src/common/libmondo-verify.h (modified) (5 diffs)
• mondo/src/common/newt-specific.c (modified) (4 diffs)
• mondo/src/include/my-stuff.h (modified) (2 diffs)
• mondo/src/mondoarchive/mondo-cli-EXT.h (modified) (1 diff)
• mondo/src/mondoarchive/mondo-cli.c (modified) (13 diffs)
• mondo/src/mondoarchive/mondo-cli.h (modified) (1 diff)
• mondo/src/mondoarchive/mondoarchive.c (modified) (14 diffs)
• mondo/src/mondorestore/mondo-restore-EXT.h (modified) (2 diffs)
• mondo/src/mondorestore/mondo-restore.h (modified) (1 diff)
• mondo/src/mondorestore/mondo-rstr-compare-EXT.h (modified) (1 diff)
• mondo/src/mondorestore/mondo-rstr-compare.c (modified) (23 diffs)
• mondo/src/mondorestore/mondo-rstr-compare.h (modified) (1 diff)
• mondo/src/mondorestore/mondo-rstr-newt.c (modified) (1 diff)
• mondo/src/mondorestore/mondo-rstr-newt.h (modified) (1 diff)
• mondo/src/mondorestore/mondo-rstr-tools-EXT.h (modified) (2 diffs)
• mondo/src/mondorestore/mondo-rstr-tools.c (modified) (17 diffs)
• mondo/src/mondorestore/mondo-rstr-tools.h (modified) (3 diffs)
• mondo/src/mondorestore/mondorestore.c (modified) (65 diffs)
• mondo/src/mondorestore/mondorestore.h (modified) (1 diff)
• mondo/src/mondorestore/mr-externs.h (modified) (5 diffs)
• pbconf/mindi/pbfilter/rpm.pbf (modified) (1 diff)
• pbconf/mondo/pbfilter/rpm.pbf (modified) (1 diff)
• pbconf/mondo/rpm/mondo.spec (modified) (1 diff)
• pbconf/mondorescue.pb (modified) (2 diffs)
• tools/qemu-vm.txt (modified) (1 diff)

branches/stable/mindi/mindi

@@ -441 +441 @@
     fi
 
-    sync
     cd /
-
-    # Unmount whtat could remain mounted
+    sync&
+
+    # Unmount what could remain mounted
     my_partitions=`mount | grep -F $$ | cut -f1 -d' '`
     [ "$my_partitions" != "" ] && umount $my_partitions

branches/stable/mindi/rootfs/sbin/init

@@ -435 +435 @@
 MINDI_REV=RRR
 trap CaughtSoftReset SIGTERM
-LOGFILE=/tmp/mondorestore.log
+LOGFILE=/var/log/mondorestore.log
 PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/mondo:/usr/games
 GROOVY=/tmp/groovy-stuff

branches/stable/mondo/configure.in

@@ -117 +117 @@
 AC_TYPE_SIGNAL
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([bzero getcwd memmove memset mkdir mkfifo setenv strcasecmp strchr strerror strrchr strstr strspn getline asprintf trunc vasprintf])
+AC_CHECK_FUNCS([bzero getcwd memmove memset mkdir mkfifo setenv strcasecmp strchr strerror strrchr strstr mkdtemp strspn getline asprintf trunc vasprintf])
 
 AC_OUTPUT([Makefile src/Makefile src/common/Makefile src/lib/Makefile src/mondoarchive/Makefile src/mondorestore/Makefile src/restore-scripts/Makefile src/restore-scripts/mondo/Makefile src/restore-scripts/usr/Makefile src/restore-scripts/usr/bin/Makefile src/post-nuke.sample/Makefile src/post-nuke.sample/usr/Makefile src/post-nuke.sample/usr/bin/Makefile distributions/Makefile distributions/conf/Makefile])

branches/stable/mondo/src/common/libmondo-archive-EXT.h

@@ -2 +2 @@
 
 
-extern int archive_this_fileset(struct s_bkpinfo *bkpinfo, char *filelist,
+extern int archive_this_fileset(char *filelist,
                                 char *fname, int setno);
-extern int backup_data(struct s_bkpinfo *bkpinfo);
-extern int call_mindi_to_supply_boot_disks(struct s_bkpinfo *bkpinfo);
-extern bool can_we_fit_these_files_on_media(struct s_bkpinfo *bkpinfo,
+extern int backup_data();
+extern int call_mindi_to_supply_boot_disks();
+extern bool can_we_fit_these_files_on_media(
                                             char *files_to_add, ...);
-extern int do_that_initial_phase(struct s_bkpinfo *bkpinfo);
-extern int do_that_final_phase(struct s_bkpinfo *bkpinfo);
+extern int do_that_initial_phase();
+extern int do_that_final_phase();
 extern int figure_out_kernel_path_interactively_if_necessary(char *kernel);
-extern int make_those_slices_phase(struct s_bkpinfo *bkpinfo);
-extern int make_those_afios_phase(struct s_bkpinfo *bkpinfo);
-extern int make_slices_and_images(struct s_bkpinfo *bkpinfo,
+extern int make_those_slices_phase();
+extern int make_those_afios_phase();
+extern int make_slices_and_images(
                                   char *biggielist_fname);
-extern int make_iso_fs(struct s_bkpinfo *bkpinfo, char *destfile);
-extern int make_afioballs_and_images(struct s_bkpinfo *bkpinfo);
-extern int (*move_files_to_cd) (struct s_bkpinfo *, char *, ...);
-extern int _move_files_to_cd(struct s_bkpinfo *bkpinfo, char *, ...);
-extern int (*move_files_to_stream) (struct s_bkpinfo *, char *, ...);
-extern int _move_files_to_stream(struct s_bkpinfo *bkpinfo,
+extern int make_iso_fs(char *destfile);
+extern int make_afioballs_and_images();
+extern int (*move_files_to_cd) (char *, ...);
+extern int _move_files_to_cd(char *, ...);
+extern int (*move_files_to_stream) (char *, ...);
+extern int _move_files_to_stream(
                                  char *files_to_add, ...);
 extern void pause_and_ask_for_cdr(int);
-extern int slice_up_file_etc(struct s_bkpinfo *bkpinfo,
+extern int slice_up_file_etc(
                              char *biggie_filename,
                              char *ntfsprog_fifo,
@@ -29 +29 @@
                              long noof_biggie_files,
                              bool use_ntfsprog);
-extern int verify_data(struct s_bkpinfo *bkpinfo);
+extern int verify_data();
 extern void wipe_archives(char *d);
-extern int write_iso_and_go_on(struct s_bkpinfo *bkpinfo, bool last_cd);
-extern int write_final_iso_if_necessary(struct s_bkpinfo *bkpinfo);
-extern int call_growisofs(struct s_bkpinfo *bkpinfo, char *destfile);
-extern int make_afioballs_and_images_SINGLETHREAD(struct s_bkpinfo
-                                                  *bkpinfo);
-extern int archive_this_fileset_with_star(struct s_bkpinfo *bkpinfo,
+extern int write_iso_and_go_on(bool last_cd);
+extern int write_final_iso_if_necessary();
+extern int call_growisofs(char *destfile);
+extern int make_afioballs_and_images_SINGLETHREAD();
+extern int archive_this_fileset_with_star(
                                           char *filelist, char *fname,
                                           int setno);

branches/stable/mondo/src/common/libmondo-archive.c

@@ -79 +79 @@
 extern char *MONDO_LOGFILE;
 
+/* Reference to global bkpinfo */
+extern struct s_bkpinfo *bkpinfo;
+
 
 
@@ -198 +201 @@
 
 int
-archive_this_fileset_with_star(struct s_bkpinfo *bkpinfo, char *filelist,
-                               char *fname, int setno)
+archive_this_fileset_with_star(char *filelist, char *fname, int setno)
 {
     int retval = 0;
@@ -297 +299 @@
  */
 int
-archive_this_fileset(struct s_bkpinfo *bkpinfo, char *filelist,
-                     char *fname, int setno)
+archive_this_fileset(char *filelist, char *fname, int setno)
 {
 
@@ -319 +320 @@
 
     if (bkpinfo->compression_level > 0 && bkpinfo->use_star) {
-        return (archive_this_fileset_with_star
-                (bkpinfo, filelist, fname, setno));
+        return (archive_this_fileset_with_star(filelist, fname, setno));
     }
 
@@ -431 +431 @@
  * @ingroup archiveGroup
  */
-int backup_data(struct s_bkpinfo *bkpinfo)
+int backup_data()
 {
     int retval = 0, res = 0;
@@ -437 +437 @@
 
     assert(bkpinfo != NULL);
-    set_g_cdrom_and_g_dvd_to_bkpinfo_value(bkpinfo);
+    set_g_cdrom_and_g_dvd_to_bkpinfo_value();
 
     if (bkpinfo->backup_media_type == dvd) {
@@ -452 +452 @@
     }
 
-    if ((res = prepare_filelist(bkpinfo))) {    /* generate scratchdir/filelist.full */
+    if ((res = prepare_filelist())) {   /* generate scratchdir/filelist.full */
         fatal_error("Failed to generate filelist catalog");
     }
-    if (call_filelist_chopper(bkpinfo)) {
+    if (call_filelist_chopper()) {
         fatal_error("Failed to run filelist chopper");
     }
@@ -472 +472 @@
     mr_free(tmp);
 
-    copy_mondo_and_mindi_stuff_to_scratchdir(bkpinfo);  // payload, too, if it exists
+    copy_mondo_and_mindi_stuff_to_scratchdir(); // payload, too, if it exists
 #if __FreeBSD__ == 5
     strcpy(bkpinfo->kernel_path, "/boot/kernel/kernel");
@@ -486 +486 @@
 #error "I don't know about this system!"
 #endif
-    if ((res = call_mindi_to_supply_boot_disks(bkpinfo))) {
+    if ((res = call_mindi_to_supply_boot_disks())) {
         fatal_error("Failed to generate boot+data disks");
     }
-    retval += do_that_initial_phase(bkpinfo);   // prepare
+    retval += do_that_initial_phase();  // prepare
     mr_asprintf(&tmp, "rm -f %s/images/*.iso", bkpinfo->scratchdir);
     run_program_and_log_output(tmp, 1);
     mr_free(tmp);
-    retval += make_those_afios_phase(bkpinfo);  // backup regular files
-    retval += make_those_slices_phase(bkpinfo); // backup BIG files
-    retval += do_that_final_phase(bkpinfo); // clean up
+    retval += make_those_afios_phase(); // backup regular files
+    retval += make_those_slices_phase();    // backup BIG files
+    retval += do_that_final_phase();    // clean up
     mr_msg(1, "Creation of archives... complete.");
     if (bkpinfo->verify_data) {
@@ -529 +529 @@
  * @ingroup MLarchiveGroup
  */
-int call_mindi_to_supply_boot_disks(struct s_bkpinfo *bkpinfo)
+int call_mindi_to_supply_boot_disks()
 {
     /*@ buffer ************************************************************ */
@@ -1005 +1005 @@
     char *curr_acl_list_fname;
 
-    struct s_bkpinfo *bkpinfo;
+    struct s_bkpinfo *bkpinfo_bis;
     char *tmp = NULL;
     int res = 0, retval = 0;
@@ -1020 +1020 @@
     p_next_set_to_archive = (int *) (inbuf + 8);
     p_list_of_fileset_flags = (char *) (inbuf + 12);
-    bkpinfo = (struct s_bkpinfo *) (inbuf + BKPINFO_LOC_OFFSET);
+    bkpinfo_bis = (struct s_bkpinfo *) (inbuf + BKPINFO_LOC_OFFSET);
 
     sprintf(archiving_filelist_fname, FILELIST_FNAME_RAW_SZ,
@@ -1088 +1088 @@
         mr_msg(4, "[%d:%d] - archiving %d...", getpid(),
                 this_thread_no, archiving_set_no);
-        res = archive_this_fileset(bkpinfo, archiving_filelist_fname,
+        res =
+            archive_this_fileset(archiving_filelist_fname,
                                  archiving_afioball_fname,
                                  archiving_set_no);
@@ -1141 +1142 @@
  * @ingroup MLarchiveGroup
  */
-int do_that_final_phase(struct s_bkpinfo *bkpinfo)
+int do_that_final_phase()
 {
 
@@ -1157 +1158 @@
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
         /* write tape/cdstream */
-        closeout_tape(bkpinfo);
+        closeout_tape();
     } else {
         /* write final ISO/USB */
-        res = write_final_iso_if_necessary(bkpinfo);
+        res = write_final_iso_if_necessary();
         retval += res;
         if (res) {
@@ -1200 +1201 @@
  * @ingroup MLarchiveGroup
  */
-int do_that_initial_phase(struct s_bkpinfo *bkpinfo)
+int do_that_initial_phase()
 {
     /*@ int *************************************** */
@@ -1309 +1310 @@
  * @return The number of errors encountered (0 for success)
  */
-int make_afioballs_and_images(struct s_bkpinfo *bkpinfo)
+int make_afioballs_and_images()
 {
 
@@ -1367 +1368 @@
                        _("Please wait. This may take a couple of hours."),
                        _("Working..."),
-                       get_last_filelist_number(bkpinfo) + 1);
+                       get_last_filelist_number() + 1);
 
     srand((unsigned int) getpid());
@@ -1433 +1434 @@
                 sleep(5);
             }
-            strcpy(media_usage_comment,
-                   percent_media_full_comment(bkpinfo));
+            strcpy(media_usage_comment, percent_media_full_comment());
             /* copy to CD (scratchdir) ... and an actual CD-R if necessary */
             if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
@@ -1442 +1442 @@
                                                        storing_afioball_fname);
                 iamhere("Writing EXAT files");
-                res += write_EXAT_files_to_tape(bkpinfo,
-                                                curr_xattr_list_fname,
+                res += write_EXAT_files_to_tape(curr_xattr_list_fname,
                                                 curr_acl_list_fname);
                 // archives themselves
                 res +=
-                    move_files_to_stream(bkpinfo, storing_afioball_fname,
+                    move_files_to_stream(storing_afioball_fname,
                                          NULL);
             } else {
                 if (g_getfacl) {
                     if (g_getfattr) {
-                        res = move_files_to_cd(bkpinfo, storing_filelist_fname,
+                        res = move_files_to_cd(storing_filelist_fname,
                                      curr_xattr_list_fname,
                                      curr_acl_list_fname,
                                      storing_afioball_fname, NULL);
                     } else {
-                        res = move_files_to_cd(bkpinfo, storing_filelist_fname,
+                        res = move_files_to_cd(storing_filelist_fname,
                                     curr_acl_list_fname,
                                     storing_afioball_fname, NULL);
@@ -1463 +1462 @@
                 } else {
                     if (g_getfattr) {
-                            res = move_files_to_cd(bkpinfo, storing_filelist_fname,
+                            res = move_files_to_cd(storing_filelist_fname,
                                     curr_xattr_list_fname,
                                     storing_afioball_fname, NULL);
                     } else {
-                            res = move_files_to_cd(bkpinfo, storing_filelist_fname,
+                            res = move_files_to_cd(storing_filelist_fname,
                                     storing_afioball_fname, NULL);
                     }
@@ -1545 +1544 @@
  * @return The number of errors encountered (0 for success)
  */
-int make_iso_fs(struct s_bkpinfo *bkpinfo, char *destfile)
+int make_iso_fs(char *destfile)
 {
     /*@ int ********************************************** */
@@ -1592 +1591 @@
         mr_asprintf(&message_to_screen, "Running pre-ISO call for CD#%d",
                 g_current_media_number);
-        res = eval_call_to_make_ISO(bkpinfo, bkpinfo->call_before_iso,
+        res = eval_call_to_make_ISO(bkpinfo->call_before_iso,
                                 destfile, g_current_media_number,
                                 MONDO_LOGFILE, message_to_screen);
@@ -1618 +1617 @@
                 ("Serious error(s) occurred already. I shan't try to write to media.");
         } else {
-            res = eval_call_to_make_ISO(bkpinfo, bkpinfo->call_make_iso,
+            res = eval_call_to_make_ISO(bkpinfo->call_make_iso,
                                         destfile, g_current_media_number,
                                         MONDO_LOGFILE, message_to_screen);
@@ -1680 +1679 @@
                 pause_for_N_seconds(5, "Letting DVD drive settle");
                 res =
-                    eval_call_to_make_ISO(bkpinfo, bkpinfo->call_make_iso,
+                    eval_call_to_make_ISO(bkpinfo->call_make_iso,
                                           destfile,
                                           g_current_media_number,
@@ -1724 +1723 @@
                  bkpinfo->backup_media_string,
                  g_current_media_number);
-        res = eval_call_to_make_ISO(bkpinfo, bkpinfo->call_after_iso,
+        res = eval_call_to_make_ISO(bkpinfo->call_after_iso,
                                     destfile, g_current_media_number,
                                     MONDO_LOGFILE, message_to_screen);
@@ -1783 +1782 @@
  */
 int
-make_slices_and_images(struct s_bkpinfo *bkpinfo, char *biggielist_fname)
+make_slices_and_images(char *biggielist_fname)
 {
 
@@ -1814 +1813 @@
 
     estimated_total_noof_slices =
-        size_of_all_biggiefiles_K(bkpinfo) / bkpinfo->optimal_set_size + 1;
+        size_of_all_biggiefiles_K() / bkpinfo->optimal_set_size + 1;
 
     mr_msg(1, "size of all biggiefiles = %ld",
-            size_of_all_biggiefiles_K(bkpinfo));
+            size_of_all_biggiefiles_K());
     mr_msg(1, "estimated_total_noof_slices = %ld KB / %ld KB = %ld",
-            size_of_all_biggiefiles_K(bkpinfo), bkpinfo->optimal_set_size,
+            size_of_all_biggiefiles_K(), bkpinfo->optimal_set_size,
             estimated_total_noof_slices);
 
@@ -1909 +1908 @@
             }
             res =
-                slice_up_file_etc(bkpinfo, bigfile_fname,
+                slice_up_file_etc(bigfile_fname,
                                   ntfsprog_fifo, biggie_file_number,
                                   noof_biggie_files, use_ntfsprog);
@@ -1957 +1956 @@
  * @see make_afioballs_and_images
  */
-int make_afioballs_and_images_OLD(struct s_bkpinfo *bkpinfo)
+int make_afioballs_and_images_OLD()
 {
 
@@ -1983 +1982 @@
                        _("Please wait. This may take a couple of hours."),
                        _("Working..."),
-                       get_last_filelist_number(bkpinfo) + 1);
+                       get_last_filelist_number() + 1);
 
     mr_asprintf(&curr_filelist_fname, FILELIST_FNAME_RAW_SZ, bkpinfo->tmpdir,
@@ -2007 +2006 @@
 
         mr_msg(1, "Archiving set %ld", curr_set_no);
-        res = archive_this_fileset(bkpinfo, curr_filelist_fname,
+        res = archive_this_fileset(curr_filelist_fname,
                                  curr_afioball_fname, curr_set_no);
         retval += res;
@@ -2018 +2017 @@
         }
 
-        strcpy(media_usage_comment, percent_media_full_comment(bkpinfo));
+        strcpy(media_usage_comment, percent_media_full_comment());
 
         /* copy to CD (scratchdir) ... and an actual CD-R if necessary */
@@ -2027 +2026 @@
                                                    curr_afioball_fname);
             iamhere("Writing EXAT files");
-            res += write_EXAT_files_to_tape(bkpinfo, curr_xattr_list_fname,
+            res += write_EXAT_files_to_tape(curr_xattr_list_fname,
                                             curr_acl_list_fname);
             // archives themselves
-            res = move_files_to_stream(bkpinfo, curr_afioball_fname, NULL);
+            res = move_files_to_stream(curr_afioball_fname, NULL);
         } else {
                 if (g_getfacl) {
                     if (g_getfattr) {
-                        res = move_files_to_cd(bkpinfo, curr_filelist_fname,
+                        res = move_files_to_cd(curr_filelist_fname,
                                      curr_xattr_list_fname,
                                      curr_acl_list_fname,
                                      curr_afioball_fname, NULL);
                     } else {
-                        res = move_files_to_cd(bkpinfo, curr_filelist_fname,
+                        res = move_files_to_cd(curr_filelist_fname,
                                     curr_acl_list_fname,
                                     curr_afioball_fname, NULL);
@@ -2045 +2044 @@
                 } else {
                     if (g_getfattr) {
-                            res = move_files_to_cd(bkpinfo, curr_filelist_fname,
+                            res = move_files_to_cd(curr_filelist_fname,
                                     curr_xattr_list_fname,
                                     curr_afioball_fname, NULL);
                     } else {
-                            res = move_files_to_cd(bkpinfo, curr_filelist_fname,
+                            res = move_files_to_cd(curr_filelist_fname,
                                     curr_afioball_fname, NULL);
                     }
@@ -2097 +2096 @@
  * @ingroup MLarchiveGroup
  */
-int make_those_afios_phase(struct s_bkpinfo *bkpinfo)
+int make_those_afios_phase()
 {
     /*@ int ******************************************* */
@@ -2114 +2113 @@
         mr_msg(1,
                 "Using single-threaded make_afioballs_and_images() to suit b0rken FreeBSD 5.0");
-        res = make_afioballs_and_images_OLD(bkpinfo);
+        res = make_afioballs_and_images_OLD();
 #else
-        res = make_afioballs_and_images_OLD(bkpinfo);
+        res = make_afioballs_and_images_OLD();
 #endif
         write_header_block_to_stream((off_t)0, "stop-afioballs",
                                      BLK_STOP_AFIOBALLS);
     } else {
-        res = make_afioballs_and_images(bkpinfo);
+        res = make_afioballs_and_images();
     }
 
@@ -2143 +2142 @@
  * @ingroup MLarchiveGroup
  */
-int make_those_slices_phase(struct s_bkpinfo *bkpinfo)
+int make_those_slices_phase()
 {
 
@@ -2195 +2194 @@
 
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-        res += write_EXAT_files_to_tape(bkpinfo, xattr_fname, acl_fname);
+        res += write_EXAT_files_to_tape(xattr_fname, acl_fname);
         mr_asprintf(&blah, "%ld", count_lines_in_file(biggielist));
         write_header_block_to_stream((off_t)0, blah, BLK_START_BIGGIEFILES);
@@ -2207 +2206 @@
     }
 
-    res = make_slices_and_images(bkpinfo, biggielist);
+    res = make_slices_and_images(biggielist);
     mr_free(biggielist);
 
@@ -2234 +2233 @@
  * transfer files over the network) or leave it as is.
  */
-int (*move_files_to_cd) (struct s_bkpinfo *, char *, ...) =
+int (*move_files_to_cd) (char *, ...) =
     _move_files_to_cd;
 
@@ -2255 +2254 @@
  * @return The number of errors encountered (0 for success)
  */
-int _move_files_to_cd(struct s_bkpinfo *bkpinfo, char *files_to_add, ...)
+int _move_files_to_cd(char *files_to_add, ...)
 {
 
@@ -2296 +2295 @@
     if (would_occupy / 1024 > bkpinfo->media_size) {
         /* FALSE because this is not the last CD we'll write */
-        res = write_iso_and_go_on(bkpinfo, FALSE);
+        res = write_iso_and_go_on(FALSE);
         retval += res;
         if (res) {
@@ -2344 +2343 @@
  * transfer files over the network) or leave it as is.
  */
-int (*move_files_to_stream) (struct s_bkpinfo *, char *, ...) =
+int (*move_files_to_stream) (char *, ...) =
     _move_files_to_stream;
 
@@ -2361 +2360 @@
  */
 int
-_move_files_to_stream(struct s_bkpinfo *bkpinfo, char *files_to_add, ...)
+_move_files_to_stream(char *files_to_add, ...)
 {
 
@@ -2405 +2404 @@
             type = other;
         }
-        res = write_file_to_stream_from_file(bkpinfo, curr_file);
+        res = write_file_to_stream_from_file(curr_file);
         retval += res;
         unlink(curr_file);
@@ -2517 +2516 @@
     }
     log_to_screen("Scanning CD-ROM drive...");
-    sprintf(mtpt, "/tmp/cd.mtpt.%ld.%ld", (long int) random(),
-            (long int) random());
+    sprintf(mtpt, "%s/cd.mtpt", bkpinfo->tmpdir);
     make_hole_for_dir(mtpt);
 
@@ -2670 +2668 @@
  */
 int
-slice_up_file_etc(struct s_bkpinfo *bkpinfo, char *biggie_filename,
+slice_up_file_etc(char *biggie_filename,
                   char *ntfsprog_fifo, long biggie_file_number,
                   long noof_biggie_files, bool use_ntfsprog)
@@ -2797 +2795 @@
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
         res =
-            move_files_to_stream(bkpinfo,
-                                 slice_fname(biggie_file_number, 0,
+            move_files_to_stream(slice_fname(biggie_file_number, 0,
                                              bkpinfo->tmpdir, ""), NULL);
     } else {
         res =
-            move_files_to_cd(bkpinfo,
-                             slice_fname(biggie_file_number, 0,
+            move_files_to_cd(slice_fname(biggie_file_number, 0,
                                          bkpinfo->tmpdir, ""), NULL);
     }
@@ -2823 +2819 @@
                            suffix));
 
-        mr_asprintf(&tmp, percent_media_full_comment(bkpinfo));
+        mr_asprintf(&tmp, percent_media_full_comment());
         update_progress_form(tmp);
         mr_free(tmp);
@@ -2917 +2913 @@
             maintain_collection_of_recent_archives(bkpinfo->tmpdir,
                                                    file_to_archive);
-            res = move_files_to_stream(bkpinfo, file_to_archive, NULL);
+            res = move_files_to_stream(file_to_archive, NULL);
         } else {
-            res = move_files_to_cd(bkpinfo, file_to_archive, NULL);
+            res = move_files_to_cd(file_to_archive, NULL);
         }
         mr_free(file_to_archive);
@@ -3014 +3010 @@
  * however, this occurs rarely.
  */
-int write_final_iso_if_necessary(struct s_bkpinfo *bkpinfo)
+int write_final_iso_if_necessary()
 {
     /*@ int ***************************************************** */
@@ -3037 +3033 @@
 #endif
     mr_free(tmp);
-    res = write_iso_and_go_on(bkpinfo, TRUE);
+    res = write_iso_and_go_on(TRUE);
 #ifndef _XWIN
     if (!g_text_mode) {
@@ -3065 +3061 @@
  * @see make_iso_fs
  */
-int write_iso_and_go_on(struct s_bkpinfo *bkpinfo, bool last_cd)
+int write_iso_and_go_on(bool last_cd)
 {
     /*@ pointers **************************************************** */
@@ -3147 +3143 @@
     for (that_one_was_ok = FALSE; !that_one_was_ok;) {
         if (bkpinfo->backup_media_type != usb) {
-            res = make_iso_fs(bkpinfo, isofile);
+            res = make_iso_fs(isofile);
         } else {
         }
@@ -3168 +3164 @@
             chdir("/");
             iamhere("Before calling verify_cd_image()");
-            res += verify_cd_image(bkpinfo);
+            res += verify_cd_image();
             iamhere("After calling verify_cd_image()");
         }
@@ -3227 +3223 @@
  * @ingroup verifyGroup
  */
-int verify_data(struct s_bkpinfo *bkpinfo)
+int verify_data()
 {
     int res = 0, retval = 0, cdno = 0;
@@ -3238 +3234 @@
         mvaddstr_and_log_it(g_currentY, 0,
                             "Verifying archives against live filesystem");
-        verify_tape_backups(bkpinfo);
+        verify_tape_backups();
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     } else if (bkpinfo->backup_data)
@@ -3245 +3241 @@
         mr_msg(2,
                 "Not verifying again. Per-CD/ISO verification already carried out.");
-        paranoid_system
-            ("cat /tmp/changed.files.* > /tmp/changed.files 2> /dev/null");
+        sprintf(tmp, "cat %s/changed.files > %s/changed.files 2> /dev/null",bkpinfo->tmpdir, MINDI_CACHE);
+        paranoid_system(tmp);
     } else {
         g_current_media_number = cdno;
@@ -3258 +3254 @@
             }
             if (bkpinfo->backup_media_type != iso) {
-                insist_on_this_cd_number(bkpinfo, cdno);
-            }
-            res = verify_cd_image(bkpinfo); // sets verify_data to FALSE if it's time to stop verifying
+                insist_on_this_cd_number(cdno);
+            }
+            res = verify_cd_image();    // sets verify_data to FALSE if it's time to stop verifying
             retval += res;
             if (res) {
                 mr_asprintf(&tmp,
-                         "Warnings/errors were reported while checking %s #%d",
-                         bkpinfo->backup_media_string,
-                         g_current_media_number);
+                        "Warnings/errors were reported while checking %s #%d",
+                        media_descriptor_string(bkpinfo->backup_media_type),
+                        g_current_media_number);
                 log_to_screen(tmp);
                 mr_free(tmp);
@@ -3273 +3269 @@
         }
         mr_asprintf(&tmp,
-                 "grep 'afio: ' %s | sed 's/afio: //' | grep -vE '^/dev/.*$' >> /tmp/changed.files",
-                 MONDO_LOGFILE);
+                "grep 'afio: ' %s | sed 's/afio: //' | grep -vE '^/dev/.*$' >> %s/changed.files",
+                MONDO_LOGFILE, MINDI_CACHE);
         system(tmp);
         mr_free(tmp);
 
         mr_asprintf(&tmp,
-                 "grep 'star: ' %s | sed 's/star: //' | grep -vE '^/dev/.*$' >> /tmp/changed.files",
-                 MONDO_LOGFILE);
+                "grep 'star: ' %s | sed 's/star: //' | grep -vE '^/dev/.*$' >> %s/changed.files",
+                MONDO_LOGFILE, MINDI_CACHE);
         system(tmp);
         mr_free(tmp);
@@ -3287 +3283 @@
         eject_device(bkpinfo->media_device);
     }
-    diffs = count_lines_in_file("/tmp/changed.files");
+    sprintf(tmp, "%s/changed.files", MINDI_CACHE);
+    diffs = count_lines_in_file(tmp);
 
     if (diffs > 0) {

branches/stable/mondo/src/common/libmondo-archive.h

@@ -3 +3 @@
  */
 
-int archive_this_fileset(struct s_bkpinfo *bkpinfo, char *filelist,
+int archive_this_fileset(char *filelist,
                          char *fname, int setno);
-int backup_data(struct s_bkpinfo *bkpinfo);
-int call_mindi_to_supply_boot_disks(struct s_bkpinfo *bkpinfo);
-bool can_we_fit_these_files_on_media(struct s_bkpinfo *bkpinfo,
+int backup_data();
+int call_mindi_to_supply_boot_disks();
+bool can_we_fit_these_files_on_media(
                                      char *files_to_add, ...);
-int do_that_initial_phase(struct s_bkpinfo *bkpinfo);
-int do_that_final_phase(struct s_bkpinfo *bkpinfo);
+int do_that_initial_phase();
+int do_that_final_phase();
 int figure_out_kernel_path_interactively_if_necessary(char *kernel);
 bool get_bit_N_of_array(char *array, int N);
-int make_those_slices_phase(struct s_bkpinfo *bkpinfo);
-int make_those_afios_phase(struct s_bkpinfo *bkpinfo);
-int make_slices_and_images(struct s_bkpinfo *bkpinfo,
+int make_those_slices_phase();
+int make_those_afios_phase();
+int make_slices_and_images(
                            char *biggielist_fname);
-int make_iso_fs(struct s_bkpinfo *bkpinfo, char *destfile);
-int make_afioballs_and_images(struct s_bkpinfo *bkpinfo);
-extern int (*move_files_to_cd) (struct s_bkpinfo *, char *, ...);
-int _move_files_to_cd(struct s_bkpinfo *bkpinfo, char *files_to_add, ...);
-extern int (*move_files_to_stream) (struct s_bkpinfo *, char *, ...);
-int _move_files_to_stream(struct s_bkpinfo *bkpinfo, char *files_to_add,
+int make_iso_fs(char *destfile);
+int make_afioballs_and_images();
+extern int (*move_files_to_cd) (char *, ...);
+int _move_files_to_cd(char *files_to_add, ...);
+extern int (*move_files_to_stream) (char *, ...);
+int _move_files_to_stream(char *files_to_add,
                           ...);
 void pause_and_ask_for_cdr(int);
 void set_bit_N_of_array(char *array, int N, bool true_or_false);
-int slice_up_file_etc(struct s_bkpinfo *bkpinfo, char *biggie_filename,
+int slice_up_file_etc(char *biggie_filename,
                       char *ntfsprog_fifo,
                       long biggie_file_number, long noof_biggie_files,
                       bool use_ntfsprog);
-int verify_data(struct s_bkpinfo *bkpinfo);
+int verify_data();
 void wipe_archives(char *d);
-int write_iso_and_go_on(struct s_bkpinfo *bkpinfo, bool last_cd);
-int write_final_iso_if_necessary(struct s_bkpinfo *bkpinfo);
-int call_growisofs(struct s_bkpinfo *bkpinfo, char *destfile);
-int make_afioballs_and_images_SINGLETHREAD(struct s_bkpinfo *bkpinfo);
-int archive_this_fileset_with_star(struct s_bkpinfo *bkpinfo,
+int write_iso_and_go_on(bool last_cd);
+int write_final_iso_if_necessary();
+int call_growisofs(char *destfile);
+int make_afioballs_and_images_SINGLETHREAD();
+int archive_this_fileset_with_star(
                                    char *filelist, char *fname, int setno);
 void setenv_mondo_share(void);

branches/stable/mondo/src/common/libmondo-devices-EXT.h

@@ -7 +7 @@
 extern int does_partition_exist(const char *drive, int partno);
 extern bool does_string_exist_in_boot_block(char *dev, char *str);
-extern int find_and_mount_actual_cd(struct s_bkpinfo *bkpinfo,
+extern int find_and_mount_actual_cd(
                                     char *mountpoint);
 extern int find_cdrom_device(char *output, bool try_to_mount);
@@ -31 +31 @@
 
 
-extern int interactively_obtain_media_parameters_from_user(struct s_bkpinfo
-                                                           *, bool);
-extern void insist_on_this_cd_number(struct s_bkpinfo *bkpinfo,
+extern int interactively_obtain_media_parameters_from_user(bool);
+extern void insist_on_this_cd_number(
                                      int cd_number_i_want);
 
 
-extern int what_number_cd_is_this(struct s_bkpinfo *bkpinfo);
+extern int what_number_cd_is_this();
 
 
@@ -44 +43 @@
 extern char *list_of_NFS_mounts_only(void);
 
-extern void sensibly_set_tmpdir_and_scratchdir(struct s_bkpinfo *bkpinfo);
+extern void sensibly_set_tmpdir_and_scratchdir();
 
 
@@ -59 +58 @@
                                                             *incoming);
 
-extern void set_g_cdrom_and_g_dvd_to_bkpinfo_value(struct s_bkpinfo
-                                                   *bkpinfo);
+extern void set_g_cdrom_and_g_dvd_to_bkpinfo_value();
 
 extern bool is_dev_an_NTFS_dev(char *bigfile_fname);

branches/stable/mondo/src/common/libmondo-devices.c

@@ -50 +50 @@
 extern struct mr_ar_conf *mr_conf;
 
+extern void setup_tmpdir(char *path);
+
 static char g_cdrw_drive_is_here[MAX_STR_LEN / 4] = "";
 static char g_cdrom_drive_is_here[MAX_STR_LEN / 4] = "";
@@ -63 +65 @@
 extern t_bkptype g_backup_media_type;   // set by main()
 
-
-
-
-void set_g_cdrom_and_g_dvd_to_bkpinfo_value(struct s_bkpinfo *bkpinfo)
+/* Reference to global bkpinfo */
+extern struct s_bkpinfo *bkpinfo;
+
+
+
+
+void set_g_cdrom_and_g_dvd_to_bkpinfo_value()
 {
     strcpy(g_cdrom_drive_is_here, bkpinfo->media_device);   // just in case
@@ -502 +507 @@
  * @see mount_CDROM_here
  */
-int find_and_mount_actual_cd(struct s_bkpinfo *bkpinfo, char *mountpoint)
+int find_and_mount_actual_cd(char *mountpoint)
 {
     /*@ buffers ***************************************************** */
@@ -690 +695 @@
     }
 
-    sprintf(mountpoint, "/tmp/cd.%d", (int) (random() % 32767));
+    sprintf(mountpoint, "%s/cd.mnt", bkpinfo->tmpdir);
     make_hole_for_dir(mountpoint);
 
@@ -1321 +1326 @@
  */
 void
-insist_on_this_cd_number(struct s_bkpinfo *bkpinfo, int cd_number_i_want)
+insist_on_this_cd_number(int cd_number_i_want)
 {
 
@@ -1355 +1360 @@
             run_program_and_log_output("umount " MNT_CDROM, 5);
         }
-        system("mkdir -p /tmp/isodir &> /dev/null");
+        sprintf(tmp, "mkdir -p %s/isodir &> /dev/null", bkpinfo->tmpdir);
+        system(tmp);
         mr_asprintf(&tmp, "%s/%s/%s-%d.iso", bkpinfo->isodir,
                 bkpinfo->nfs_remote_dir, bkpinfo->prefix,
@@ -1361 +1367 @@
         if (!does_file_exist(tmp)) {
             mr_free(tmp);
-            mr_asprintf(&tmp, "/tmp/isodir/%s/%s-%d.iso",
+            mr_asprintf(&tmp, "%s/isodir/%s/%s-%d.iso", bkpinfo->tmpdir,
                     bkpinfo->nfs_remote_dir, bkpinfo->prefix,
                     cd_number_i_want);
             if (does_file_exist(tmp)) {
                 mr_msg(1,
-                        "FIXME - hacking bkpinfo->isodir from '%s' to /tmp/isodir",
-                        bkpinfo->isodir);
-                strcpy(bkpinfo->isodir, "/tmp/isodir");
+                        "FIXME - hacking bkpinfo->isodir from '%s' to %s/isodir",
+                        bkpinfo->isodir, bkpinfo->tmpdir);
+                sprintf(bkpinfo->isodir, "%s/isodir", bkpinfo->tmpdir);
             }
         }
@@ -1377 +1383 @@
         mr_free(tmp);
     }
-    if ((res = what_number_cd_is_this(bkpinfo)) != cd_number_i_want) {
+    if ((res = what_number_cd_is_this()) != cd_number_i_want) {
         mr_msg(3, "Currently, we hold %d but we want %d", res,
                 cd_number_i_want);
@@ -1389 +1395 @@
         mr_free(tmp);
 
-        while (what_number_cd_is_this(bkpinfo) != cd_number_i_want) {
+        while (what_number_cd_is_this() != cd_number_i_want) {
             sync();
             if (is_this_device_mounted(MNT_CDROM)) {
@@ -1432 +1438 @@
  * @ingroup archiveGroup
  */
-int interactively_obtain_media_parameters_from_user(struct s_bkpinfo
-                                                    *bkpinfo,
-                                                    bool
-                                                    archiving_to_media)
+int interactively_obtain_media_parameters_from_user(bool archiving_to_media)
 // archiving_to_media is TRUE if I'm being called by mondoarchive
 // archiving_to_media is FALSE if I'm being called by mondorestore
@@ -1465 +1468 @@
             bkptype_to_string(bkpinfo->backup_media_type));
     if (archiving_to_media) {
-        sensibly_set_tmpdir_and_scratchdir(bkpinfo);
+        sensibly_set_tmpdir_and_scratchdir();
     }
     bkpinfo->compression_level =
@@ -1566 +1569 @@
             mr_msg(1, "bkpinfo->media_device = %s", bkpinfo->media_device);
             mr_asprintf(&comment,
-                _("Please specify your %s drive's /dev entry"), bkpinfo->backup_media_string);
+                _("Please specify your %s drive's /dev entry"), media_descriptor_string(bkpinfo->backup_media));
             mr_asprintf(&tmp,"/dev/cdrom");
             if (!popup_and_get_string
@@ -1731 +1734 @@
         }
         if (bkpinfo->disaster_recovery) {
-            system("umount /tmp/isodir 2> /dev/null");
+            sprintf(command ,"umount %s/isodir 2> /dev/null", bkpinfo->tmpdir);
+            system(command);
             if (!popup_and_get_string
                 ("NFS share", "Which remote NFS share should I mount?",
@@ -1740 +1744 @@
         }
         if (!is_this_device_mounted(bkpinfo->nfs_mount)) {
-            sprintf(bkpinfo->isodir, "/tmp/isodir.mondo.%d",
-                    (int) (random() % 32768));
+            sprintf(bkpinfo->isodir, "%s/nfsdir", bkpinfo->tmpdir);
             mr_asprintf(&command, "mkdir -p %s", bkpinfo->isodir);
             run_program_and_log_output(command, 5);
@@ -2070 +2073 @@
  * @ingroup utilityGroup
  */
-void sensibly_set_tmpdir_and_scratchdir(struct s_bkpinfo *bkpinfo)
+void sensibly_set_tmpdir_and_scratchdir()
 {
     char *tmp = NULL;
@@ -2083 +2086 @@
     mr_asprintf(&tmp,
            call_program_and_get_last_line_of_output
-           ("df -m -P -t nonfs,msdosfs,ntfs,smbfs,smb,cifs,afs,ocfs,ocfs2,mvfs | tr -s '\t' ' ' | grep -vE \"none|Filesystem\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
+           ("LANGUAGE=C df -m -P -t nonfs,msdosfs,ntfs,smbfs,smb,cifs,afs,ocfs,ocfs2,mvfs | tr -s '\t' ' ' | grep -vE \"none|Filesystem\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
 #else
     mr_asprintf(&tmp,
            call_program_and_get_last_line_of_output
-           ("df -m -P -x nfs -x vfat -x ntfs -x smbfs -x smb -x cifs -x afs -x ocfs -x ocfs2 -x mvfs | sed 's/                  /devdev/' | tr -s '\t' ' ' | grep -vE \"none|Filesystem|/dev/shm\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
+           ("LANGUAGE=C df -m -P -x nfs -x vfat -x ntfs -x smbfs -x smb -x cifs -x afs -x ocfs -x ocfs2 -x mvfs | sed 's/                  /devdev/' | tr -s '\t' ' ' | grep -vE \"none|Filesystem|/dev/shm\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
 #endif
 
@@ -2098 +2101 @@
         fatal_error("I couldn't figure out the tempdir!");
     }
-    i = (int) (random() % 32768);
-    sprintf(bkpinfo->tmpdir, "%s/tmp.mondo.%d", tmp, i);
+    setup_tmpdir(tmp);
     log_it("bkpinfo->tmpdir is being set to %s", bkpinfo->tmpdir);
 
     sprintf(bkpinfo->scratchdir, "%s/mondo.scratch.%d", tmp, i);
     log_it("bkpinfo->scratchdir is being set to %s", bkpinfo->scratchdir);
-
-    sprintf(g_erase_tmpdir_and_scratchdir, "rm -Rf %s %s", bkpinfo->tmpdir,
-            bkpinfo->scratchdir);
 
     mr_asprintf(&command, "rm -Rf %s/tmp.mondo.* %s/mondo.scratch.*", tmp, tmp);
@@ -2165 +2164 @@
  * (and remain mounted after this function returns).
  */
-int what_number_cd_is_this(struct s_bkpinfo *bkpinfo)
+int what_number_cd_is_this()
 {
     int cd_number = -1;

branches/stable/mondo/src/common/libmondo-devices.h

@@ -10 +10 @@
 int does_partition_exist(const char *drive, int partno);
 bool does_string_exist_in_boot_block(char *dev, char *str);
-int find_and_mount_actual_cd(struct s_bkpinfo *bkpinfo, char *mountpoint);
+int find_and_mount_actual_cd(char *mountpoint);
 int find_cdrom_device(char *output, bool try_to_mount);
 int find_dvd_device(char *output, bool try_to_mount);
@@ -28 +28 @@
 int find_cdrw_device(char *cdrw_device);
 
-int interactively_obtain_media_parameters_from_user(struct s_bkpinfo *,
-                                                    bool);
+int interactively_obtain_media_parameters_from_user(bool);
 
-void insist_on_this_cd_number(struct s_bkpinfo *bkpinfo,
+void insist_on_this_cd_number(
                               int cd_number_i_want);
 
-int what_number_cd_is_this(struct s_bkpinfo *bkpinfo);
+int what_number_cd_is_this();
 
 int eject_device(char *);
@@ -40 +39 @@
 char *list_of_NFS_mounts_only(void);
 
-void sensibly_set_tmpdir_and_scratchdir(struct s_bkpinfo *bkpinfo);
+void sensibly_set_tmpdir_and_scratchdir();
 
 
@@ -53 +52 @@
 bool does_nonMS_partition_exist(void);
 char *resolve_softlinks_to_get_to_actual_device_file(char *incoming);
-void set_g_cdrom_and_g_dvd_to_bkpinfo_value(struct s_bkpinfo *bkpinfo);
+void set_g_cdrom_and_g_dvd_to_bkpinfo_value();
 
 bool is_dev_an_NTFS_dev(char *bigfile_fname);

branches/stable/mondo/src/common/libmondo-fifo.c

@@ -200 +200 @@
 /* BERLIOS: useless ?
 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/common/libmondo-filelist-EXT.h

@@ -2 +2 @@
 
 extern int chop_filelist(char *filelist, char *outdir, long maxsetsizeK);
-extern int call_filelist_chopper(struct s_bkpinfo *bkpinfo);
+extern int call_filelist_chopper();
 extern void free_filelist(struct s_node *filelist);
-extern int get_last_filelist_number(struct s_bkpinfo *bkpinfo);
+extern int get_last_filelist_number();
 extern int add_string_at_node(struct s_node *startnode,
                               char *string_to_add);
@@ -16 +16 @@
                                   bool on_or_off);
 extern void toggle_node_selection(struct s_node *filelist, bool on_or_off);
-extern int prepare_filelist(struct s_bkpinfo *bkpinfo);
+extern int prepare_filelist();
 
 extern long save_filelist_entries_in_common(char *needles_list_fname,

branches/stable/mondo/src/common/libmondo-filelist.c

@@ -40 +40 @@
 extern char *MONDO_LOGFILE;
 
+/* Reference to global bkpinfo */
+extern struct s_bkpinfo *bkpinfo;
+
 int mondo_makefilelist(char *logfile, char *tmpdir, char *scratchdir,
                        char *include_paths, char *excp, bool differential,
@@ -82 +85 @@
  * @see chop_filelist
  */
-int call_filelist_chopper(struct s_bkpinfo *bkpinfo)
+int call_filelist_chopper()
 {
     /*@ buffers *********************** */
@@ -112 +115 @@
     mr_free(filelist);
 
-    estimate_noof_media_required(bkpinfo, noof_sets);   // for cosmetic purposes
+    estimate_noof_media_required(noof_sets);    // for cosmetic purposes
 
     mr_asprintf(&tempfile, "%s/biggielist.txt", bkpinfo->tmpdir);
@@ -155 +158 @@
 
     mr_msg(5, "Sorting file %s", orig_fname);
-    mr_asprintf(&tmp_fname, "/tmp/sort.%d.%d.%d", (int) (random() % 32768),
-             (int) (random() % 32768), (int) (random() % 32768));
+    mr_asprintf(&tmp_fname, "%s/sortfile", bkpinfo->tmpdir);
 
     if (!does_file_exist(orig_fname)) {
@@ -547 +549 @@
         return (0);
     }
-    mr_asprintf(&masklist, "/tmp/%d.%d.mask", (int) (random() % 32768),
-             (int) (random() % 32768));
-
+    mr_asprintf(&masklist, "%s/masklist", bkpinfo->tmpdir);
     mr_asprintf(&command, "cp -f %s %s", orig_msklist, masklist);
     run_program_and_log_output(command, 1);
@@ -693 +693 @@
  * @note This function should only be called at restore-time.
  */
-int get_last_filelist_number(struct s_bkpinfo *bkpinfo)
+int get_last_filelist_number()
 {
     /*@ buffers ***************************************************** */
@@ -1239 +1239 @@
  * @see mondo_makefilelist
  */
-int prepare_filelist(struct s_bkpinfo *bkpinfo)
+int prepare_filelist()
 {
 

branches/stable/mondo/src/common/libmondo-filelist.h

@@ -4 +4 @@
 
 int chop_filelist(char *filelist, char *outdir, long maxsetsizeK);
-int call_filelist_chopper(struct s_bkpinfo *bkpinfo);
+int call_filelist_chopper();
 void free_filelist(struct s_node *filelist);
-int get_last_filelist_number(struct s_bkpinfo *bkpinfo);
+int get_last_filelist_number();
 int add_string_at_node(struct s_node *startnode, char *string_to_add);
 struct s_node *load_filelist(char *filelist_fname);
@@ -17 +17 @@
                            bool on_or_off);
 void toggle_node_selection(struct s_node *filelist, bool on_or_off);
-int prepare_filelist(struct s_bkpinfo *bkpinfo);
+int prepare_filelist();
 
 long save_filelist_entries_in_common(char *needles_list_fname,

branches/stable/mondo/src/common/libmondo-files-EXT.h

@@ -29 +29 @@
 
 
-extern long size_of_all_biggiefiles_K(struct s_bkpinfo *bkpinfo);
-extern void copy_mondo_and_mindi_stuff_to_scratchdir(struct s_bkpinfo
-                                                     *bkpinfo);
-extern void store_nfs_config(struct s_bkpinfo *bkpinfo);
+extern long size_of_all_biggiefiles_K();
+extern void copy_mondo_and_mindi_stuff_to_scratchdir();
+extern void store_nfs_config();
 
 
-extern void estimate_noof_media_required(struct s_bkpinfo *bkpinfo, long);
+extern void estimate_noof_media_required(long);
 
 extern bool is_this_file_compressed(char *);

branches/stable/mondo/src/common/libmondo-files.c

@@ -30 +30 @@
 
 extern int g_currentY;
+
+/* Reference to global bkpinfo */
+extern struct s_bkpinfo *bkpinfo;
 
 /**
@@ -680 +683 @@
  * @return The total size of all biggiefiles in KB.
  */
-long size_of_all_biggiefiles_K(struct s_bkpinfo *bkpinfo)
+long size_of_all_biggiefiles_K()
 {
     char *fname = NULL;
@@ -940 +943 @@
  * - @c bkpinfo->tmpdir
  */
-void copy_mondo_and_mindi_stuff_to_scratchdir(struct s_bkpinfo *bkpinfo)
+void copy_mondo_and_mindi_stuff_to_scratchdir()
 {
     /*@ Char buffers ** */
@@ -1026 +1029 @@
  * - @c tmpdir
  */
-void store_nfs_config(struct s_bkpinfo *bkpinfo)
+void store_nfs_config()
 {
 
@@ -1156 +1159 @@
  */
 void
-estimate_noof_media_required(struct s_bkpinfo *bkpinfo, long noof_sets)
+estimate_noof_media_required(long noof_sets)
 {
     /*@ buffers *************** */
@@ -1172 +1175 @@
     scratchLL =
         (long long) (noof_sets) * (long long) (bkpinfo->optimal_set_size)
-        + (long long) (size_of_all_biggiefiles_K(bkpinfo));
+        + (long long) (size_of_all_biggiefiles_K());
     scratchLL = (scratchLL / 1024) / bkpinfo->media_size;
     scratchLL++;

branches/stable/mondo/src/common/libmondo-files.h

@@ -24 +24 @@
 long noof_lines_that_match_wildcard(char *filelist_fname, char *wildcard);
 void register_pid(pid_t pid, char *name_str);
-long size_of_all_biggiefiles_K(struct s_bkpinfo *bkpinfo);
+long size_of_all_biggiefiles_K();
 long long space_occupied_by_cd(char *mountpt);
 int whine_if_not_found(char *fname);
 int write_one_liner_data_file(char *fname, char *contents);
 
-void copy_mondo_and_mindi_stuff_to_scratchdir(struct s_bkpinfo *bkpinfo);
-void store_nfs_config(struct s_bkpinfo *bkpinfo);
-void estimate_noof_media_required(struct s_bkpinfo *bkpinfo, long);
+void copy_mondo_and_mindi_stuff_to_scratchdir();
+void store_nfs_config();
+void estimate_noof_media_required(long);
 bool is_this_file_compressed(char *);
 

branches/stable/mondo/src/common/libmondo-fork-EXT.h

@@ -5 +5 @@
                                          char *what_i_am_doing);
 extern int run_program_and_log_output(char *program, int);
-extern int eval_call_to_make_ISO(struct s_bkpinfo *bkpinfo,
-                                 char *basic_call, char *isofile,
+extern int eval_call_to_make_ISO(char *basic_call, char *isofile,
                                  int cd_no, char *logstub,
                                  char *what_i_am_doing);

branches/stable/mondo/src/common/libmondo-fork.c

@@ -23 +23 @@
 extern bool g_text_mode;
 extern char *MONDO_LOGFILE;
+
+/* Reference to global bkpinfo */
+extern struct s_bkpinfo *bkpinfo;
 pid_t g_buffer_pid = 0;
 extern struct mr_ar_conf *mr_conf;
@@ -91 +94 @@
  */
 int
-eval_call_to_make_ISO(struct s_bkpinfo *bkpinfo,
-                      char *basic_call, char *isofile,
+eval_call_to_make_ISO(char *basic_call, char *isofile,
                       int cd_no, char *logstub, char *what_i_am_doing)
 {
@@ -211 +213 @@
     }
     mr_asprintf(&callstr,
-            "%s > /tmp/mondo-run-prog-thing.tmp 2> /tmp/mondo-run-prog-thing.err",
-            program);
+            "%s > %s/mondo-run-prog-thing.tmp 2> %s/mondo-run-prog-thing.err",
+             program, bkpinfo->tmpdir, bkpinfo->tmpdir);
     while ((p = strchr(callstr, '\r'))) {
         *p = ' ';
@@ -228 +230 @@
     mr_free(callstr);
 
-    if (log_if_failure
-        &&
-        system
-        ("cat /tmp/mondo-run-prog-thing.err >> /tmp/mondo-run-prog-thing.tmp 2> /dev/null"))
-    {
+    mr_asprintf(&callstr, "cat %s/mondo-run-prog-thing.err >> %s/mondo-run-prog-thing.tmp 2> /dev/null", bkpinfo->tmpdir, bkpinfo->tmpdir);
+    if (log_if_failure && system(callstr)) {
         log_OS_error("Command failed");
     }
-    unlink("/tmp/mondo-run-prog-thing.err");
-    fin = fopen("/tmp/mondo-run-prog-thing.tmp", "r");
+    mr_asprintf(&tmp, "%s/mondo-run-prog-thing.err", bkpinfo->tmpdir);
+    unlink(tmp);
+    mr_free(tmp);
+
+    mr_asprintf(&tmp, "%s/mondo-run-prog-thing.tmp", bkpinfo->tmpdir);
+    fin = fopen(tmp, "r");
     if (fin) {
         for (mr_getline(&incoming, &n, fin); !feof(fin); mr_getline(&incoming, &n, fin)) {
@@ -252 +255 @@
         paranoid_fclose(fin);
     }
-    unlink("/tmp/mondo-run-prog-thing.tmp");
+    unlink(tmp);
+    mr_free(tmp);
+
     if ((res == 0 && log_if_success) || (res != 0 && log_if_failure)) {
         mr_msg(0,
@@ -293 +298 @@
     assert_string_is_neither_NULL_nor_zerolength(basic_call);
 
-    mr_asprintf(&lockfile, "/tmp/mojo-jojo.blah.XXXXXX");
-    mkstemp(lockfile);
+    sprintf(lockfile, "%s/mojo-jojo.bla.bla", bkpinfo->tmpdir);
+
     mr_asprintf(&command,
             "echo hi > %s ; %s >> %s 2>> %s; res=$?; sleep 1; rm -f %s; exit $res",
@@ -363 +368 @@
     char *tmp1 = NULL;
     char *buf = NULL;
+    char filestr[MAX_STR_LEN];
     long int bytes_to_be_read, bytes_read_in, bytes_written_out =
         0, bufcap, subsliceno = 0;
@@ -469 +475 @@
             mr_msg(5, "tmpB is %s", tmp);
             if (!strstr(tmp, PIMP_END_SZ)) {
-                ftmp = fopen("/tmp/out.leftover", "w");
+                sprintf(filestr, "%s/out.leftover", bkpinfo->tmpdir);
+                ftmp = fopen(filestr, "w");
                 bytes_read_in = fread(tmp, 1, 64L, fin);
                 mr_msg(1, "bytes_read_in = %ld", bytes_read_in);
@@ -539 +546 @@
 
     strcpy(title, tt);
-    strcpy(tempfile,
-           call_program_and_get_last_line_of_output
-           ("mktemp -q /tmp/mondo.XXXXXXXX"));
+    sprintf(tempfile, "%s/mondo.binperc", bkpinfo->tmpdir);
     mr_asprintf(&command, "%s >> %s 2>> %s; rm -f %s", cmd, tempfile, tempfile,
             tempfile);

branches/stable/mondo/src/common/libmondo-fork.h

@@ -8 +8 @@
 int run_program_and_log_to_screen(char *basic_call, char *what_i_am_doing);
 int run_program_and_log_output(char *program, int);
-int eval_call_to_make_ISO(struct s_bkpinfo *bkpinfo,
-                          char *basic_call, char *isofile,
+int eval_call_to_make_ISO(char *basic_call, char *isofile,
                           int cd_no, char *logstub, char *what_i_am_doing);
 

branches/stable/mondo/src/common/libmondo-mountlist.c

@@ -24 +24 @@
 /*@unused@*/
 //static char cvsid[] = "$Id$";
+
+/* Reference to global bkpinfo */
+extern struct s_bkpinfo *bkpinfo;
 
 /**

branches/stable/mondo/src/common/libmondo-stream-EXT.h

@@ -3 +3 @@
 
 
-extern int closein_tape(struct s_bkpinfo *bkpinfo);
-extern int closeout_tape(struct s_bkpinfo *bkpinfo);
+extern int closein_tape();
+extern int closeout_tape();
 extern int find_tape_device_and_size(char *dev, char *siz);
 extern void insist_on_this_tape_number(int tapeno);
@@ -10 +10 @@
 extern int maintain_collection_of_recent_archives(char *td,
                                                   char *latest_fname);
-extern int openin_cdstream(struct s_bkpinfo *bkpinfo);
-extern int openin_tape(struct s_bkpinfo *bkpinfo);
+extern int openin_cdstream();
+extern int openin_tape();
 extern int openout_cdstream(char *cddev, int speed);
 extern int openout_tape(char *tapedev, long internal_tape_block_size);
-extern int read_file_from_stream_to_file(struct s_bkpinfo *bkpinfo,
+extern int read_file_from_stream_to_file(
                                          char *outfile, long long size);
-extern int read_file_from_stream_to_stream(struct s_bkpinfo *bkpinfo,
+extern int read_file_from_stream_to_stream(
                                            FILE * fout, long long size);
-extern int read_file_from_stream_FULL(struct s_bkpinfo *bkpinfo,
+extern int read_file_from_stream_FULL(
                                       char *outfname, FILE * foutstream,
                                       long long orig_size);
@@ -30 +30 @@
 extern int skip_incoming_files_until_we_find_this_one(char
                                                       *the_file_I_was_reading);
-extern int start_to_read_from_next_tape(struct s_bkpinfo *bkpinfo);
-extern int start_to_write_to_next_tape(struct s_bkpinfo *bkpinfo);
-extern int write_backcatalog_to_tape(struct s_bkpinfo *bkpinfo);
+extern int start_to_read_from_next_tape();
+extern int start_to_write_to_next_tape();
+extern int write_backcatalog_to_tape();
 extern int write_data_disks_to_stream(char *fname);
-extern int write_file_to_stream_from_file(struct s_bkpinfo *bkpinfo,
+extern int write_file_to_stream_from_file(
                                           char *infile);
 extern int write_header_block_to_stream(off_t length_of_incoming_file,
                                         char *filename, int control_char);
 extern void wrong_marker(int should_be, int it_is);
-extern int closein_cdstream(struct s_bkpinfo *bkpinfo);
-extern int read_EXAT_files_from_tape(struct s_bkpinfo *bkpinfo,
+extern int closein_cdstream();
+extern int read_EXAT_files_from_tape(
                                      long long *ptmp_size, char *tmp_fname,
                                      int *pctrl_chr, char *xattr_fname,
                                      char *acl_fname);
-extern int write_EXAT_files_to_tape(struct s_bkpinfo *bkpinfo,
+extern int write_EXAT_files_to_tape(
                                     char *xattr_fname, char *acl_fname);

branches/stable/mondo/src/common/libmondo-stream.c

@@ -42 +42 @@
 extern struct mr_ar_conf *mr_conf;
 
+/* Reference to global bkpinfo */
+extern struct s_bkpinfo *bkpinfo;
+
 /**
  * @addtogroup globalGroup
@@ -127 +130 @@
  * @note This should be called by restore processes only.
  */
-int closein_cdstream(struct s_bkpinfo *bkpinfo)
-{
-    return (closein_tape(bkpinfo));
+int closein_cdstream()
+{
+    return (closein_tape());
 }
 
@@ -142 +145 @@
  * @bug @p bkpinfo parameter is unused.
  */
-int closein_tape(struct s_bkpinfo *bkpinfo)
+int closein_tape()
 {
     /*@ int's ******************************************************* */
@@ -195 +198 @@
  * @note This should be called by backup processes only.
  */
-int closeout_tape(struct s_bkpinfo *bkpinfo)
+int closeout_tape()
 {
     /*@ int's ******************************************************* */
@@ -224 +227 @@
         if (should_we_write_to_next_tape
             (bkpinfo->media_size, (off_t)256 * 1024)) {
-            start_to_write_to_next_tape(bkpinfo);
+            start_to_write_to_next_tape();
         }
     }
@@ -354 +357 @@
 
 
-int read_EXAT_files_from_tape(struct s_bkpinfo *bkpinfo,
-                              long long *ptmp_size, char *tmp_fname,
+int read_EXAT_files_from_tape(long long *ptmp_size, char *tmp_fname,
                               int *pctrl_chr, char *xattr_fname,
                               char *acl_fname)
@@ -372 +374 @@
             fatal_error("Wrong order, sunshine.");
         }
-        read_file_from_stream_to_file(bkpinfo, xattr_fname, *ptmp_size);
+        read_file_from_stream_to_file(xattr_fname, *ptmp_size);
         res = read_header_block_from_stream(ptmp_size, tmp_fname, pctrl_chr);
         if (*pctrl_chr != BLK_STOP_EXAT_FILE) {
@@ -388 +390 @@
             wrong_marker(BLK_START_EXAT_FILE, *pctrl_chr);
         }
-        read_file_from_stream_to_file(bkpinfo, acl_fname, *ptmp_size);
+        read_file_from_stream_to_file(acl_fname, *ptmp_size);
         res = read_header_block_from_stream(ptmp_size, tmp_fname, pctrl_chr);
         if (*pctrl_chr != BLK_STOP_EXAT_FILE) {
@@ -406 +408 @@
 
 
-int write_EXAT_files_to_tape(struct s_bkpinfo *bkpinfo, char *xattr_fname,
+int write_EXAT_files_to_tape(char *xattr_fname,
                              char *acl_fname)
 {
@@ -416 +418 @@
         write_header_block_to_stream(length_of_file(xattr_fname), xattr_fname,
                              BLK_START_EXAT_FILE);
-        write_file_to_stream_from_file(bkpinfo, xattr_fname);
+        write_file_to_stream_from_file(xattr_fname);
         write_header_block_to_stream((off_t)-1, xattr_fname, BLK_STOP_EXAT_FILE);
     }
@@ -423 +425 @@
         write_header_block_to_stream(length_of_file(acl_fname), acl_fname,
                              BLK_START_EXAT_FILE);
-        write_file_to_stream_from_file(bkpinfo, acl_fname);
+        write_file_to_stream_from_file(acl_fname);
         write_header_block_to_stream((off_t)-1, acl_fname, BLK_STOP_EXAT_FILE);
         write_header_block_to_stream(length_of_file(xattr_fname), xattr_fname,
@@ -570 +572 @@
  * @note Equivalent to openin_tape() for now, but don't count on this behavior.
  */
-int openin_cdstream(struct s_bkpinfo *bkpinfo)
-{
-    return (openin_tape(bkpinfo));
+int openin_cdstream()
+{
+    return (openin_tape());
 }
 
@@ -603 +605 @@
  * @note This will also work with a cdstream for now, but don't count on this behavior.
  */
-int openin_tape(struct s_bkpinfo *bkpinfo)
+int openin_tape()
 {
     /*@ buffer ***************************************************** */
@@ -778 +780 @@
  */
 int
-read_file_from_stream_to_file(struct s_bkpinfo *bkpinfo, char *outfile,
-                              long long size)
+read_file_from_stream_to_file(char *outfile, long long size)
 {
 
@@ -787 +788 @@
     /*@ end vars *************************************************** */
 
-    res = read_file_from_stream_FULL(bkpinfo, outfile, NULL, size);
+    res = read_file_from_stream_FULL(outfile, NULL, size);
 
     return (res);
@@ -802 +803 @@
  */
 int
-read_file_from_stream_to_stream(struct s_bkpinfo *bkpinfo, FILE * fout,
-                                long long size)
+read_file_from_stream_to_stream(FILE * fout, long long size)
 {
 
@@ -811 +811 @@
     /*@ end vars *************************************************** */
 
-    res = read_file_from_stream_FULL(bkpinfo, NULL, fout, size);
+    res = read_file_from_stream_FULL(NULL, fout, size);
     return (res);
 }
@@ -829 +829 @@
  */
 int
-read_file_from_stream_FULL(struct s_bkpinfo *bkpinfo, char *outfname,
-                           FILE * foutstream, long long orig_size)
+read_file_from_stream_FULL(char *outfname, FILE * foutstream, long long orig_size)
 {
     /*@ buffers ***************************************************** */
@@ -915 +914 @@
             mr_msg(4, "where_I_was_... = %lld",
                     where_I_was_before_tape_change);
-            start_to_read_from_next_tape(bkpinfo);
+            start_to_read_from_next_tape();
             mr_msg(4, "Started reading from next tape.");
             skip_incoming_files_until_we_find_this_one(temp_fname);
@@ -1238 +1237 @@
  * @return 0 for success, nonzero for failure.
  */
-int start_to_read_from_next_tape(struct s_bkpinfo *bkpinfo)
+int start_to_read_from_next_tape()
 {
     /*@ int ********************************************************* */
@@ -1284 +1283 @@
  * @return 0 for success, nonzero for failure.
  */
-int start_to_write_to_next_tape(struct s_bkpinfo *bkpinfo)
+int start_to_write_to_next_tape()
 {
     int res = 0;
@@ -1339 +1338 @@
  * @return 0 for success, nonzero for failure.
  */
-int write_backcatalog_to_tape(struct s_bkpinfo *bkpinfo)
+int write_backcatalog_to_tape()
 {
     int res = 0;
@@ -1358 +1357 @@
                                          BLK_START_AN_AFIO_OR_SLICE);
             mr_msg(2, "Writing %s", fname);
-            if (write_file_to_stream_from_file(bkpinfo, fname)) {
+            if (write_file_to_stream_from_file(fname)) {
                 res++;
                 mr_msg(2, "%s failed", fname);
@@ -1443 +1442 @@
  * @return 0 for success, nonzero for failure.
  */
-int write_file_to_stream_from_file(struct s_bkpinfo *bkpinfo, char *infile)
+int write_file_to_stream_from_file(char *infile)
 {
     /*@ buffers **************************************************** */
@@ -1489 +1488 @@
     if (should_we_write_to_next_tape
         (bkpinfo->media_size, filesize)) {
-        start_to_write_to_next_tape(bkpinfo);
-        write_backcatalog_to_tape(bkpinfo);
+        start_to_write_to_next_tape();
+        write_backcatalog_to_tape();
     }
     p = strrchr(infile, '/');
@@ -1528 +1527 @@
             fclose(fin);
             g_sigpipe = FALSE;
-            start_to_write_to_next_tape(bkpinfo);
-            write_backcatalog_to_tape(bkpinfo); // kinda-sorta recursive :)
+            start_to_write_to_next_tape();
+            write_backcatalog_to_tape();    // kinda-sorta recursive :)
             return (0);
         }

branches/stable/mondo/src/common/libmondo-stream.h

@@ -5 +5 @@
 
 
-int closein_tape(struct s_bkpinfo *bkpinfo);
-int closeout_tape(struct s_bkpinfo *bkpinfo);
+int closein_tape();
+int closeout_tape();
 int find_tape_device_and_size(char *dev, char *siz);
 void insist_on_this_tape_number(int tapeno);
 void log_tape_pos(void);
 int maintain_collection_of_recent_archives(char *td, char *latest_fname);
-int openin_cdstream(struct s_bkpinfo *bkpinfo);
-int openin_tape(struct s_bkpinfo *bkpinfo);
+int openin_cdstream();
+int openin_tape();
 int openout_cdstream(char *cddev, int speed);
 int openout_tape(char *tapedev, long internal_tape_block_size);
-int read_file_from_stream_to_file(struct s_bkpinfo *bkpinfo, char *outfile,
+int read_file_from_stream_to_file(char *outfile,
                                   long long size);
-int read_file_from_stream_to_stream(struct s_bkpinfo *bkpinfo, FILE * fout,
+int read_file_from_stream_to_stream(FILE * fout,
                                     long long size);
-int read_file_from_stream_FULL(struct s_bkpinfo *bkpinfo, char *outfname,
+int read_file_from_stream_FULL(char *outfname,
                                FILE * foutstream, long long orig_size);
 int read_header_block_from_stream(long long *plen, char *filename,
@@ -29 +29 @@
 int skip_incoming_files_until_we_find_this_one(char
                                                *the_file_I_was_reading);
-int start_to_read_from_next_tape(struct s_bkpinfo *bkpinfo);
-int start_to_write_to_next_tape(struct s_bkpinfo *bkpinfo);
-int write_backcatalog_to_tape(struct s_bkpinfo *bkpinfo);
+int start_to_read_from_next_tape();
+int start_to_write_to_next_tape();
+int write_backcatalog_to_tape();
 int write_data_disks_to_stream(char *fname);
-int write_file_to_stream_from_file(struct s_bkpinfo *bkpinfo,
+int write_file_to_stream_from_file(
                                    char *infile);
 int write_header_block_to_stream(off_t length_of_incoming_file,
                                  char *filename, int control_char);
 void wrong_marker(int should_be, int it_is);
-int closein_cdstream(struct s_bkpinfo *bkpinfo);
-int read_EXAT_files_from_tape(struct s_bkpinfo *bkpinfo,
+int closein_cdstream();
+int read_EXAT_files_from_tape(
                               long long *ptmp_size, char *tmp_fname,
                               int *pctrl_chr, char *xattr_fname,
                               char *acl_fname);
-int write_EXAT_files_to_tape(struct s_bkpinfo *bkpinfo, char *xattr_fname,
+int write_EXAT_files_to_tape(char *xattr_fname,
                              char *acl_fname);

branches/stable/mondo/src/common/libmondo-string-EXT.h

@@ -35 +35 @@
 extern int severity_of_difference(char *filename, char *out_reason);
 
-extern char *percent_media_full_comment(struct s_bkpinfo *bkpinfo);
+extern char *percent_media_full_comment();
 
 

branches/stable/mondo/src/common/libmondo-string.c

@@ -25 +25 @@
 extern int g_current_media_number;
 extern long long g_tape_posK;
+
+/* Reference to global bkpinfo */
+extern struct s_bkpinfo *bkpinfo;
 
 /**
@@ -865 +868 @@
  * @note The returned string points to static storage that will be overwritten with each call.
  */
-char *percent_media_full_comment(struct s_bkpinfo *bkpinfo)
+char *percent_media_full_comment()
 {
     /*@ int *********************************************** */

branches/stable/mondo/src/common/libmondo-string.h

@@ -30 +30 @@
 int severity_of_difference(char *filename, char *out_reason);
 
-char *percent_media_full_comment(struct s_bkpinfo *bkpinfo);
+char *percent_media_full_comment();
 char *media_descriptor_string(t_bkptype);

branches/stable/mondo/src/common/libmondo-tools-EXT.h

@@ -8 +8 @@
 extern int read_cfg_var(char *config_file, char *label, char *value);
 extern int write_cfg_var(char *config_file, char *label, char *value);
-extern void reset_bkpinfo(struct s_bkpinfo *bkpinfo);
+extern void reset_bkpinfo();
 #ifdef __FreeBSD__
 extern void initialize_raidrec(struct vinum_volume *vv);
@@ -23 +23 @@
 extern void remount_supermounts_if_necessary(void);
 
-extern int post_param_configuration(struct s_bkpinfo *bkpinfo);
+extern int post_param_configuration();
 
 
-extern int pre_param_configuration(struct s_bkpinfo *bkpinfo);
+extern int pre_param_configuration();
 
 

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

@@ -23 +23 @@
 #include <sys/socket.h>
 #include <netdb.h>
+#include <stdlib.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -39 +40 @@
 
 extern struct mr_ar_conf *mr_conf;
+
+/* Reference to global bkpinfo */
+extern struct s_bkpinfo *bkpinfo;
 
 /**
@@ -347 +351 @@
  * do not exist.
  */
-int post_param_configuration(struct s_bkpinfo *bkpinfo)
+int post_param_configuration()
 {
     char *extra_cdrom_params = NULL;
@@ -383 +387 @@
     }
     make_hole_for_dir(bkpinfo->scratchdir);
-    make_hole_for_dir(bkpinfo->tmpdir);
     if (bkpinfo->backup_media_type == iso)
         make_hole_for_dir(bkpinfo->isodir);
@@ -620 +623 @@
             }
         }
-        store_nfs_config(bkpinfo);
+        store_nfs_config();
         mr_free(hostname);
     }
@@ -638 +641 @@
     }
     chmod(bkpinfo->scratchdir, 0700);
-    chmod(bkpinfo->tmpdir, 0700);
     g_backup_media_type = bkpinfo->backup_media_type;
     g_backup_media_string = bkpinfo->backup_media_string;
@@ -652 +654 @@
  * @return number of errors (0 for success)
  */
-int pre_param_configuration(struct s_bkpinfo *bkpinfo)
+int pre_param_configuration()
 {
     int res = 0;
+    char *tmp = NULL;
 
     make_hole_for_dir(MNT_CDROM);
@@ -660 +663 @@
     srandom((unsigned long) (time(NULL)));
     insmod_crucial_modules();
-    reset_bkpinfo(bkpinfo);     // also sets defaults ('/'=backup path, 3=compression level)
     if (bkpinfo->disaster_recovery) {
         if (!does_nonMS_partition_exist()) {
@@ -668 +670 @@
     }
 
-    run_program_and_log_output("rm -Rf /tmp/changed.files*", FALSE);
+    asprintf(&tmp,"rm -Rf %s/changed.files*",MINDI_CACHE);
+    run_program_and_log_output(tmp, FALSE);
+    paranoid_free(tmp);
     res += some_basic_system_sanity_checks();
     if (res) {
@@ -678 +682 @@
 }
 
-
+void setup_tmpdir(char *path) {
+    
+    char *tmp = NULL;
+    char *p = NULL;
+
+    if (bkpinfo->tmpdir != NULL) {
+        /* purging a potential old tmpdir */
+        asprintf(&tmp,"rm -Rf %s",bkpinfo->tmpdir);
+        system(tmp);
+        paranoid_free(tmp);
+    }
+        
+    if (path != NULL) {
+        asprintf(&tmp, "%s/mondo.tmp.XXXXXX", path);
+    } else 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");
+    }
+    p = mkdtemp(tmp);
+    if (p == NULL) {
+        log_it("Failed to create global tmp directory %s for Mondo.",tmp);
+        finish(-1);
+    }
+    strcpy(bkpinfo->tmpdir,p);
+    paranoid_free(tmp);
+
+    //sprintf(bkpinfo->tmpdir, "%s/tmpfs/mondo.tmp.%d", "/tmp", (int) (random() % 32768));  // for mondorestore
+}
 
 
@@ -685 +719 @@
  * @param bkpinfo The @c bkpinfo to reset.
  */
-void reset_bkpinfo(struct s_bkpinfo *bkpinfo)
+void reset_bkpinfo()
 {
     char *tmp = NULL;
@@ -694 +728 @@
     /* BERLIOS : Useless ?? */
     memset((void *) bkpinfo, 0, sizeof(struct s_bkpinfo));
+
+    /* special case for tmpdir as used eveywhere after */
+    setup_tmpdir(NULL);
 
     bkpinfo->manual_tray = mr_conf->manual_tray;
@@ -726 +763 @@
     bkpinfo->scratchdir[0] = '\0';
     bkpinfo->make_filelist = TRUE;  // unless -J supplied to mondoarchive
-    sprintf(bkpinfo->tmpdir, "/tmp/tmpfs/mondo.tmp.%d", (int) (random() % 32768));  // for mondorestore
     bkpinfo->optimal_set_size = 0;
     bkpinfo->backup_media_type = none;
@@ -952 +988 @@
         fatal_error("Please reinstall Mondo and Mindi.");
     }
-    if (run_program_and_log_output
-        ("mindi --makemountlist /tmp/mountlist.txt.test", 5)) {
+    mr_asprintf(&tmp, "mindi --makemountlist %s/mountlist.txt.test", bkpinfo->tmpdir);
+    if (run_program_and_log_output(tmp, 5)) {
+        log_to_screen(tmp);
         log_to_screen
-            (_("Mindi --makemountlist /tmp/mountlist.txt.test failed for some reason."));
+            (_("failed for some reason."));
         log_to_screen
             (_("Please run that command by hand and examine /var/log/mindi.log"));
@@ -964 +1001 @@
         retval++;
     }
+    mr_free(tmp);
 
     if (!run_program_and_log_output("parted2fdisk -l | grep -i raid", 1)
@@ -1156 +1194 @@
         return (1);
     }
-    mr_asprintf(&tempfile,
-           call_program_and_get_last_line_of_output
-           ("mktemp -q /tmp/mojo-jojo.blah.XXXXXX"));
+    mr_asprintf(&tempfile, "%s/mojo-jojo.blah", bkpinfo->tmpdir);
     if (does_file_exist(config_file)) {
         mr_asprintf(&command, "grep -vE '^%s .*$' %s > %s",
@@ -1185 +1221 @@
 {
     if (mal) {
-        iamhere("Malloc'ing globals");
         malloc_string(g_boot_mountpt);
         malloc_string(g_tmpfs_mountpt);
@@ -1192 +1227 @@
         malloc_string(g_magicdev_command);
     } else {
-        iamhere("Freeing globals");
         mr_free(g_boot_mountpt);
         mr_free(g_tmpfs_mountpt);

branches/stable/mondo/src/common/libmondo-tools.h

@@ -11 +11 @@
 int read_cfg_var(char *config_file, char *label, char *value);
 int write_cfg_var(char *config_file, char *label, char *value);
-void reset_bkpinfo(struct s_bkpinfo *bkpinfo);
+void reset_bkpinfo();
 #ifdef __FreeBSD__
 void initialize_raidrec(struct vinum_volume *vv);
@@ -27 +27 @@
 void remount_supermounts_if_necessary(void);
 
-int post_param_configuration(struct s_bkpinfo *bkpinfo);
+int post_param_configuration();
 
 
-int pre_param_configuration(struct s_bkpinfo *bkpinfo);
+int pre_param_configuration();
 
 long free_space_on_given_partition(char *partition);

branches/stable/mondo/src/common/libmondo-verify-EXT.h

@@ -2 +2 @@
 
 
-extern int verify_cd_image(struct s_bkpinfo *);
-extern int verify_a_tarball(struct s_bkpinfo *, char *);
-extern int verify_an_afioball_from_CD(struct s_bkpinfo *, char *);
-extern int verify_an_afioball_from_tape(struct s_bkpinfo *, char *,
+extern int verify_cd_image();
+extern int verify_a_tarball(char *);
+extern int verify_an_afioball_from_CD(char *);
+extern int verify_an_afioball_from_tape(char *,
                                         long long);
-extern int verify_a_biggiefile_from_tape(struct s_bkpinfo *, char *,
+extern int verify_a_biggiefile_from_tape(char *,
                                          long long);
-int verify_afioballs_from_CD(struct s_bkpinfo *);
-extern int verify_afioballs_from_tape(struct s_bkpinfo *);
-extern int verify_biggiefiles_from_tape(struct s_bkpinfo *);
-extern int verify_tape_backups(struct s_bkpinfo *);
-extern char *vfy_tball_fname(struct s_bkpinfo *, char *, int);
+int verify_afioballs_from_CD();
+extern int verify_afioballs_from_tape();
+extern int verify_biggiefiles_from_tape();
+extern int verify_tape_backups();
+extern char *vfy_tball_fname(char *, int);

branches/stable/mondo/src/common/libmondo-verify.c

@@ -25 +25 @@
 //static char cvsid[] = "$Id$";
 
-char *vfy_tball_fname(struct s_bkpinfo *, char *, int);
-
-
 /**
  * The number of the most recently verified afioball.
@@ -37 +34 @@
 extern char *g_getfattr;
 extern char *MONDO_LOGFILE;
+
+/* Reference to global bkpinfo */
+extern struct s_bkpinfo *bkpinfo;
+
+
+/**
+ * Generate the filename of a tarball to verify.
+ * @param bkpinfo The backup information structure. @c bkpinfo->zip_suffix is the only field used.
+ * @param mountpoint The directory where the CD/DVD/ISO is mounted.
+ * @param setno The afioball number to get the location of.
+ * @return The absolute path to the afioball.
+ * @note The returned string points to static data that will be overwritten with each call.
+ * @ingroup stringGroup
+ */
+char *vfy_tball_fname(char *mountpoint, int setno)
+{
+    /*@ buffers ******************************************************* */
+    static char output[MAX_STR_LEN];
+
+    assert(bkpinfo != NULL);
+    assert_string_is_neither_NULL_nor_zerolength(mountpoint);
+    sprintf(output, "%s/archives/%d.star.%s", mountpoint, setno,
+            bkpinfo->zip_suffix);
+    if (!does_file_exist(output)) {
+        sprintf(output, "%s/archives/%d.afio.%s", mountpoint, setno,
+                bkpinfo->zip_suffix);
+    }
+    return (output);
+}
+
 
 /**
@@ -116 +143 @@
  * @return The number of sets containing differences (0 for success).
  */
-int verify_afioballs_on_CD(struct s_bkpinfo *bkpinfo, char *mountpoint)
+int verify_afioballs_on_CD(char *mountpoint)
 {
 
@@ -134 +161 @@
          set_number < 9999
          &&
-         !does_file_exist(vfy_tball_fname
-                          (bkpinfo, mountpoint, set_number));
+         !does_file_exist(vfy_tball_fname(mountpoint, set_number));
          set_number++);
-    if (!does_file_exist(vfy_tball_fname(bkpinfo, mountpoint, set_number))) {
+    if (!does_file_exist(vfy_tball_fname(mountpoint, set_number))) {
         return (0);
     }
@@ -160 +186 @@
 
     for (total_sets = set_number;
-         does_file_exist(vfy_tball_fname(bkpinfo, mountpoint, total_sets));
+         does_file_exist(vfy_tball_fname(mountpoint, total_sets));
          total_sets++) {
         mr_msg(1, "total_sets = %d", total_sets);
     }
     for (;
-         does_file_exist(vfy_tball_fname(bkpinfo, mountpoint, set_number));
+         does_file_exist(vfy_tball_fname(mountpoint, set_number));
          set_number++) {
         percentage =
@@ -173 +199 @@
         mr_msg(1, "set = %d", set_number);
         retval +=
-            verify_an_afioball_from_CD(bkpinfo,
-                                       vfy_tball_fname(bkpinfo, mountpoint,
-                                                       set_number));
+            verify_an_afioball_from_CD(vfy_tball_fname(mountpoint, set_number));
     }
     g_last_afioball_number = set_number - 1;
@@ -192 +216 @@
  * @return The number of differences (0 for perfect biggiefiles).
  */
-int verify_all_slices_on_CD(struct s_bkpinfo *bkpinfo, char *mtpt)
+int verify_all_slices_on_CD(char *mtpt)
 {
 
@@ -291 +315 @@
                             bkpinfo->restore_path,
                             biggiestruct.filename);
-                mr_asprintf(&tmp, "echo \"%s/%s not found\" >> /tmp/biggies.changed",
+                mr_asprintf(&tmp, "echo \"%s/%s not found\" >> %s/biggies.changed",
                             bkpinfo->restore_path,
-                            biggiestruct.filename);
+                            biggiestruct.filename,
+                            bkpinfo->tmpdir);
                 system(tmp);
                 mr_free(tmp);
@@ -396 +421 @@
  * @return 0, always.
  */
-int verify_a_tarball(struct s_bkpinfo *bkpinfo, char *tarball_fname)
+int verify_a_tarball(char *tarball_fname)
 {
     /*@ buffers ********************************************************* */
@@ -522 +547 @@
  */
 int
-verify_an_afioball_from_CD(struct s_bkpinfo *bkpinfo, char *tarball_fname)
+verify_an_afioball_from_CD(char *tarball_fname)
 {
 
@@ -528 +553 @@
     int res = 0;
 
-    assert(bkpinfo != NULL);
     assert_string_is_neither_NULL_nor_zerolength(tarball_fname);
 
@@ -535 +559 @@
         fatal_error("Cannot verify nonexistent afioball");
     }
-    res = verify_a_tarball(bkpinfo, tarball_fname);
+    res = verify_a_tarball(tarball_fname);
     return (res);
 }
@@ -550 +574 @@
  */
 int
-verify_an_afioball_from_stream(struct s_bkpinfo *bkpinfo, char *orig_fname,
-                               long long size)
+verify_an_afioball_from_stream(char *orig_fname, long long size)
 {
 
@@ -579 +602 @@
 
     mr_asprintf(&tarball_fname, "%s/tmpfs/temporary-%s", bkpinfo->tmpdir, p);
-    read_file_from_stream_to_file(bkpinfo, tarball_fname, size);
-    res = verify_a_tarball(bkpinfo, tarball_fname);
+    read_file_from_stream_to_file(tarball_fname, size);
+    res = verify_a_tarball(tarball_fname);
     if (res) {
         mr_msg(0, "Afioball '%s' no longer matches your live filesystem", p);
@@ -599 +622 @@
  */
 int
-verify_a_biggiefile_from_stream(struct s_bkpinfo *bkpinfo,
-                                char *biggie_fname, long long size)
+verify_a_biggiefile_from_stream(char *biggie_fname, long long size)
 {
 
@@ -642 +664 @@
             wrong_marker(BLK_START_AN_AFIO_OR_SLICE, ctrl_chr);
         }
-        res = read_file_from_stream_to_file(bkpinfo, test_file, slice_siz);
+        res = read_file_from_stream_to_file(test_file, slice_siz);
         unlink(test_file);
         res =
@@ -672 +694 @@
             mr_free(tmp);
 
-            mr_asprintf(&tmp, "echo \"%s\" >> /tmp/biggies.changed",
-                     biggie_fname);
+            mr_asprintf(&tmp, "echo \"%s\" >> %s/biggies.changed",
+                    biggie_fname, bkpinfo->tmpdir);
             system(tmp);
             mr_free(tmp);
@@ -692 +714 @@
  * @return 0 for success (even if there are differences); nonzero for a tape error.
  */
-int verify_afioballs_from_stream(struct s_bkpinfo *bkpinfo)
+int verify_afioballs_from_stream()
 {
     /*@ int ********************************************************** */
@@ -722 +744 @@
     }
     log_to_screen(_("Verifying regular archives on tape"));
-    total_afioballs = get_last_filelist_number(bkpinfo) + 1;
+    total_afioballs = get_last_filelist_number() + 1;
     open_progress_form(_("Verifying filesystem"),
                        _("I am verifying archives against your live filesystem now."),
@@ -733 +755 @@
         if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) {
             res =
-                read_EXAT_files_from_tape(bkpinfo, &size, fname, &ctrl_chr,
+                read_EXAT_files_from_tape(&size, fname, &ctrl_chr,
                                           curr_xattr_list_fname,
                                           curr_acl_list_fname);
@@ -758 +780 @@
             iamhere("Reading EXAT files from tape");
             res =
-                read_EXAT_files_from_tape(bkpinfo, &size, fname, &ctrl_chr,
+                read_EXAT_files_from_tape(&size, fname, &ctrl_chr,
                                           curr_xattr_list_fname,
                                           curr_acl_list_fname);
@@ -772 +794 @@
         mr_free(tmp);
 
-        res = verify_an_afioball_from_stream(bkpinfo, fname, size);
+        res = verify_an_afioball_from_stream(fname, size);
         if (res) {
             mr_asprintf(&tmp, _("Afioball %ld differs from live filesystem"),
@@ -801 +823 @@
  * @return 0 for success (even if there are differences); nonzero for a tape error.
  */
-int verify_biggiefiles_from_stream(struct s_bkpinfo *bkpinfo)
+int verify_biggiefiles_from_stream()
 {
 
@@ -843 +865 @@
             iamhere("Grabbing the EXAT biggiefiles");
             res =
-                read_EXAT_files_from_tape(bkpinfo, &size, orig_fname,
+                read_EXAT_files_from_tape(&size, orig_fname,
                                           &ctrl_chr, curr_xattr_list_fname,
                                           curr_acl_list_fname);
@@ -883 +905 @@
                  orig_fname);
         res =
-            verify_a_biggiefile_from_stream(bkpinfo, logical_fname, size);
+            verify_a_biggiefile_from_stream(logical_fname, size);
         mr_free(logical_fname);
         retval += res;
@@ -911 +933 @@
  * @ingroup verifyGroup
  */
-int verify_cd_image(struct s_bkpinfo *bkpinfo)
+int verify_cd_image()
 {
 
@@ -949 +971 @@
             popup_and_OK(_("Please push CD tray closed."));
         }
-        if (find_and_mount_actual_cd(bkpinfo, mountpoint)) {
+        if (find_and_mount_actual_cd(mountpoint)) {
             log_to_screen(_("failed to mount actual CD"));
             return (1);
@@ -998 +1020 @@
     mr_free(tmp);
 
-    verify_afioballs_on_CD(bkpinfo, mountpoint);
+    verify_afioballs_on_CD(mountpoint);
     iamhere("before verify_all_slices");
-    verify_all_slices_on_CD(bkpinfo, mountpoint);
+    verify_all_slices_on_CD(mountpoint);
 
     mr_asprintf(&command, "umount %s", mountpoint);
@@ -1045 +1067 @@
  * @ingroup verifyGroup
  */
-int verify_tape_backups(struct s_bkpinfo *bkpinfo)
+int verify_tape_backups()
 {
 
@@ -1062 +1084 @@
     mr_msg(3, "verify_tape_backups --- starting");
     log_to_screen(_("Verifying backups"));
-    openin_tape(bkpinfo);
+    openin_tape();
 
     /* verify archives themselves */
-    retval += verify_afioballs_from_stream(bkpinfo);
-    retval += verify_biggiefiles_from_stream(bkpinfo);
+    retval += verify_afioballs_from_stream();
+    retval += verify_biggiefiles_from_stream();
 
     /* find the final blocks */
     sync();
     sleep(2);
-    closein_tape(bkpinfo);
+    closein_tape();
 
     /* close tape; exit */
-    paranoid_system
-        ("rm -f /tmp/biggies.changed /tmp/changed.files.[0-9]* 2> /dev/null");
-    mr_asprintf(&changed_files_fname, "/tmp/changed.files.%d",
-             (int) (random() % 32767));
+    mr_asprintf(&tmp,"rm -f %s/biggies.changed %s/changed.files 2> /dev/null", bkpinfo->tmpdir, bkpinfo->tmpdir);
+    paranoid_system(tmp);
+    mr_free(tmp);
+
+    mr_asprintf(&changed_files_fname, "%s/changed.files", bkpinfo->tmpdir);
     mr_asprintf(&tmp,
              "grep -E '^%s:.*$' %s | cut -d'\"' -f2 | sort -u | awk '{print \"/\"$0;};' | tr -s '/' '/' | grep -v \"(total of\" | grep -v \"incheckentry.*xwait\" | grep -vE '^/afio:.*$' | grep -vE '^dev/.*$'  > %s",
@@ -1096 +1119 @@
     mr_free(tmp);
 
-    mr_asprintf(&tmp, "cat /tmp/biggies.changed >> %s", changed_files_fname);
+    mr_asprintf(&tmp, "cat %s/biggies.changed >> %s", bkpinfo->tmpdir, changed_files_fname);
     paranoid_system(tmp);
     mr_free(tmp);
@@ -1102 +1125 @@
     diffs = count_lines_in_file(changed_files_fname);
     if (diffs > 0) {
-        mr_asprintf(&tmp, "cp -f %s %s", changed_files_fname,
-                 "/tmp/changed.files");
+        mr_asprintf(&tmp, "cp -f %s %s/changed.files", changed_files_fname, MINDI_CACHE);
         run_program_and_log_output(tmp, FALSE);
         mr_free(tmp);
 
         mr_asprintf(&tmp,
-                 "%ld files differed from live filesystem; type less %s or less %s to see",
-                 diffs, changed_files_fname, "/tmp/changed.files");
+                 "%ld files differed from live filesystem; type less %s or less %s/changed.files to see",
+                 diffs, changed_files_fname, MINDI_CACHE);
         mr_msg(0, tmp);
         mr_free(tmp);
 
         log_to_screen
-            (_("See /tmp/changed.files for a list of nonmatching files."));
+            (_("See "MINDI_CACHE"/changed.files for a list of nonmatching files."));
         log_to_screen
             (_("The files probably changed on filesystem, not on backup media."));
@@ -1124 +1146 @@
 
 
-/**
- * Generate the filename of a tarball to verify.
- * @param bkpinfo The backup information structure. @c bkpinfo->zip_suffix is the only field used.
- * @param mountpoint The directory where the CD/DVD/ISO is mounted.
- * @param setno The afioball number to get the location of.
- * @return The absolute path to the afioball.
- * @note The returned string points to static data that will be overwritten with each call.
- * @ingroup stringGroup
- */
-char *vfy_tball_fname(struct s_bkpinfo *bkpinfo, char *mountpoint,
-                      int setno)
-{
-    /*@ buffers ******************************************************* */
-    static char output[MAX_STR_LEN];
-
-    assert(bkpinfo != NULL);
-    assert_string_is_neither_NULL_nor_zerolength(mountpoint);
-    sprintf(output, "%s/archives/%d.star.%s", mountpoint, setno,
-            bkpinfo->zip_suffix);
-    if (!does_file_exist(output)) {
-        sprintf(output, "%s/archives/%d.afio.%s", mountpoint, setno,
-                bkpinfo->zip_suffix);
-    }
-    return (output);
-}

branches/stable/mondo/src/common/libmondo-verify.h

@@ -21 +21 @@
 
  /** externals *************************************************************/
-int close_tape(struct s_bkpinfo *);
+int close_tape();
 extern void close_progress_form(void);
 extern long count_lines_in_file(char *);
@@ -27 +27 @@
 extern void exclude_nonexistent_files(char *);
 extern void fatal_error(char *);
-extern int find_and_mount_actual_cd(struct s_bkpinfo *, char *);
+extern int find_and_mount_actual_cd(char *);
 extern int find_cdrom_device(char *, bool);
 extern void finish(int);
-extern int get_last_filelist_number(struct s_bkpinfo *);
+extern int get_last_filelist_number();
 extern long get_time(void);
 extern int grab_percentage_from_last_line_of_file(char *);
@@ -40 +40 @@
 extern void open_evalcall_form(char *);
 extern void open_progress_form(char *, char *, char *, char *, long);
-extern int openin_tape(struct s_bkpinfo *);
+extern int openin_tape();
 extern void popup_and_OK(char *);
 extern bool popup_and_get_string(char *, char *, char *, int);
-extern int read_file_from_tape_to_file(struct s_bkpinfo *, char *,
+extern int read_file_from_tape_to_file(char *,
                                        long long);
 extern int read_header_block_from_tape(long long *, char *, int *);
@@ -62 +62 @@
 
 
-int verify_cd_image(struct s_bkpinfo *);
-int verify_a_tarball(struct s_bkpinfo *, char *);
-int verify_an_afioball_from_CD(struct s_bkpinfo *, char *);
-int verify_an_afioball_from_tape(struct s_bkpinfo *, char *, long long);
-int verify_a_biggiefile_from_tape(struct s_bkpinfo *, char *, long long);
-int verify_afioballs_from_CD(struct s_bkpinfo *);
-int verify_afioballs_from_tape(struct s_bkpinfo *);
-int verify_biggiefiles_from_tape(struct s_bkpinfo *);
-int verify_tape_backups(struct s_bkpinfo *);
-char *vfy_tball_fname(struct s_bkpinfo *, char *, int);
+int verify_cd_image();
+int verify_a_tarball(char *);
+int verify_an_afioball_from_CD(char *);
+int verify_an_afioball_from_tape(char *, long long);
+int verify_a_biggiefile_from_tape(char *, long long);
+int verify_afioballs_from_CD();
+int verify_afioballs_from_tape();
+int verify_biggiefiles_from_tape();
+int verify_tape_backups();
+char *vfy_tball_fname(char *, int);
 
 
@@ -92 +92 @@
 extern void center_string(char *, int);
 extern void close_evalcall_form(void);
-extern int closein_tape(struct s_bkpinfo *);
+extern int closein_tape();

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

@@ -1282 +1282 @@
                                  char *source_file) {
     int i;
+    int j = 0;
     bool done;
     char *tmp = NULL;
+    char *tmp1 = NULL;
     size_t n = 0;
     FILE *fin = NULL;
@@ -1298 +1300 @@
         return (1);
     }
+
+    asprintf(&tmp1,"%s/icantfindthesefiles.txt",bkpinfo->tmpdir);
+    if (!(fout = fopen(tmp1, "a"))) {
+        mr_msg(2, "Can't write to %s", tmp1);
+        return(1);
+    }
+
     mr_msg(2, "Loading %s", source_file);
     for (filelist->entries = 0; filelist->entries <= ARBITRARY_MAXIMUM;
@@ -1316 +1325 @@
             goto god_i_hate_gotos;
         }
-        if (!does_file_exist(tmp)) {
+        if (!does_file_exist(tmp) && !feof(fin)) {
+            fprintf(fout, "%s\n", tmp);
+            j++;
             goto god_i_hate_gotos;
         }
@@ -1329 +1340 @@
 
     paranoid_fclose(fin);
+    paranoid_fclose(fout);
+
+    if (j > 0) {
+        log_to_screen("%d files listed in %s/changed.files have been deleted since backup was made\nand are referenced in %s", j, bkpinfo->tmpdir,tmp1);
+    }
+    mr_free(tmp1);
+
     if (filelist->entries >= ARBITRARY_MAXIMUM) {
         log_to_screen(_("Arbitrary limits suck, man!"));

branches/stable/mondo/src/include/my-stuff.h

@@ -160 +160 @@
  * Log the file, line, Mondo error message, and OS error message (errno).
  */
-#define log_OS_error(x) {mr_msg(1, "%s, line %ld: %s (%s)", __FILE__, __LINE__, x, strerror(errno));}
+#define log_OS_error(x) {mr_msg(1, "%s, (%s)", x, strerror(errno));}
 
 /**
@@ -190 +190 @@
  * Free variables and call finish(@p x).
  */
-#define paranoid_MR_finish(x) {free_MR_global_filenames (); if (bkpinfo) mr_free (bkpinfo); finish(x); }
+#define paranoid_MR_finish(x) {free_MR_global_filenames (); finish(x); }
 
 /**

branches/stable/mondo/src/mondoarchive/mondo-cli-EXT.h

@@ -1 +1 @@
 /* mondo-cli-EXT.h */
 
-extern int handle_incoming_parameters(int argc, char *argv[],
-                                      struct s_bkpinfo *bkpinfo);
-extern int process_the_s_switch(struct s_bkpinfo *bkpinfo, char *value);
-extern int process_switches(struct s_bkpinfo *bkpinfo,
-                            char flag_val[128][MAX_STR_LEN],
+extern int handle_incoming_parameters(int argc, char *argv[]);
+extern int process_the_s_switch(char *value);
+extern int process_switches(char flag_val[128][MAX_STR_LEN],
                             bool flag_set[128]);
 extern int retrieve_switches_from_command_line(int argc, char *argv[],

branches/stable/mondo/src/mondoarchive/mondo-cli.c

@@ -25 +25 @@
 extern bool g_text_mode;
 extern char g_startdir[MAX_STR_LEN];    ///< ????? @bug ?????
-extern char g_erase_tmpdir_and_scratchdir[MAX_STR_LEN];
 extern char g_tmpfs_mountpt[MAX_STR_LEN];
 extern bool g_sigpipe;
@@ -44 +43 @@
 bool g_running_live = FALSE;    ///< ????? @bug ????? @ingroup globalGroup
 extern bool g_cd_recovery;
+
+extern void setup_tmpdir(char *path);
 
 /**
@@ -63 +64 @@
 char *g_getfacl = NULL;
 char *g_getfattr = NULL;
+
+/* Reference to global bkpinfo */
+extern struct s_bkpinfo *bkpinfo;
 
 /**
@@ -76 +80 @@
  */
 int
-handle_incoming_parameters(int argc, char *argv[],
-                           struct s_bkpinfo *bkpinfo)
+handle_incoming_parameters(int argc, char *argv[])
 {
     /*@ int *** */
@@ -89 +92 @@
     bool flag_set[128];
 
-    sensibly_set_tmpdir_and_scratchdir(bkpinfo);
+    sensibly_set_tmpdir_and_scratchdir();
 
     for (i = 0; i < 128; i++) {
@@ -99 +102 @@
     retval += res;
     if (!retval) {
-        res = process_switches(bkpinfo, flag_val, flag_set);
+        res = process_switches(flag_val, flag_set);
         retval += res;
     }
@@ -121 +124 @@
     mr_free(tmp);
 
-    sprintf(bkpinfo->tmpdir + strlen(bkpinfo->tmpdir), "/tmp.mondo.%ld",
-            random() % 32767);
     sprintf(bkpinfo->scratchdir + strlen(bkpinfo->scratchdir),
             "/mondo.scratch.%ld", random() % 32767);
@@ -144 +145 @@
  * @bug Return code not needed.
  */
-int process_the_s_switch(struct s_bkpinfo *bkpinfo, char *value)
+int process_the_s_switch(char *value)
 {
     char *tmp = NULL;
@@ -180 +181 @@
  */
 int
-process_switches(struct s_bkpinfo *bkpinfo,
-                 char flag_val[128][MAX_STR_LEN], bool flag_set[128])
+process_switches(char flag_val[128][MAX_STR_LEN], bool flag_set[128])
 {
 
@@ -425 +425 @@
                         ("For the moment, please don't specify a tape size. Mondo should handle end-of-tape gracefully anyway.");
                 }
-                if (process_the_s_switch(bkpinfo, flag_val['s'])) {
+                if (process_the_s_switch(flag_val['s'])) {
                     fatal_error("Bad -s switch");
                 }
@@ -438 +438 @@
     } else {                    /* CD|USB size */
         if (flag_set['s']) {
-            if (process_the_s_switch(bkpinfo, flag_val['s'])) {
+            if (process_the_s_switch(flag_val['s'])) {
                 fatal_error("Bad -s switch");
             }
@@ -672 +672 @@
     }
     if (flag_set['T']) {
-        sprintf(bkpinfo->tmpdir, "%s/tmp.mondo.%ld", flag_val['T'],
-                random() % 32768);
+        setup_tmpdir(flag_val['T']);
         mr_asprintf(&tmp2, "touch %s/.foo.dat", flag_val['T']);
         if (run_program_and_log_output(tmp2, 1)) {
@@ -683 +682 @@
         mr_free(tmp2);
 
-        mr_asprintf(&tmp2, "ln -sf %s/.foo.dat %s/.bar.dat", flag_val['T'],
-                flag_val['T']);
+        mr_asprintf(&tmp2, "ln -sf %s/.foo.dat %s/.bar.dat", bkpinfo->tmpdir, bkpinfo->tmpdir);
         if (run_program_and_log_output(tmp2, 1)) {
             retval++;

branches/stable/mondo/src/mondoarchive/mondo-cli.h

@@ -3 +3 @@
  */
 
-int handle_incoming_parameters(int argc, char *argv[],
-                               struct s_bkpinfo *bkpinfo);
-int process_the_s_switch(struct s_bkpinfo *bkpinfo, char *value);
-int process_switches(struct s_bkpinfo *bkpinfo,
-                     char flag_val[128][MAX_STR_LEN], bool flag_set[128]);
+int handle_incoming_parameters(int argc, char *argv[]);
+int process_the_s_switch(char *value);
+int process_switches(char flag_val[128][MAX_STR_LEN], bool flag_set[128]);
 int retrieve_switches_from_command_line(int argc, char *argv[],
                                         char flag_val[128][MAX_STR_LEN],

branches/stable/mondo/src/mondoarchive/mondoarchive.c

@@ -62 +62 @@
 /****************** subroutines used only here ******************/
 
+/* Reference to global bkpinfo */
+struct s_bkpinfo *bkpinfo;
+
+/****************** subroutines used only by main.c ******************/
 
 /**
@@ -386 +390 @@
 int main(int argc, char *argv[])
 {
-    struct s_bkpinfo *bkpinfo = NULL;
     struct stat stbuf;
     char *tmp = NULL;
@@ -399 +402 @@
 #endif
     printf(_("Initializing...\n"));
+
+    bkpinfo = mr_malloc(sizeof(struct s_bkpinfo));
+    reset_bkpinfo();
 
     /* Reference a dummy cleanup function for mr_exit temporarily */
@@ -463 +469 @@
     malloc_libmondo_global_strings();
     diffs = 0;
-    bkpinfo = mr_malloc(sizeof(struct s_bkpinfo));
     if (stat(MONDO_CACHE, &stbuf) != 0) {
         mr_mkdir(MONDO_CACHE,0x755);
@@ -580 +585 @@
     }
 
-    if (pre_param_configuration(bkpinfo)) {
+    if (pre_param_configuration()) {
         fatal_error
             ("Pre-param initialization phase failed. Please review the error messages above, make the specified changes, then try again. Exiting...");
@@ -591 +596 @@
         g_text_mode = FALSE;
         setup_newt_stuff();
-        res = interactively_obtain_media_parameters_from_user(bkpinfo, TRUE);   /* yes, archiving */
+        res = interactively_obtain_media_parameters_from_user(TRUE);    /* yes, archiving */
         if (res) {
             fatal_error
@@ -597 +602 @@
         }
     } else {
-        res = handle_incoming_parameters(argc, argv, bkpinfo);
+        res = handle_incoming_parameters(argc, argv);
         if (res) {
             mr_msg(1,
@@ -609 +614 @@
 
 /* Finish configuring global structures */
-    if (post_param_configuration(bkpinfo)) {
+    if (post_param_configuration()) {
         fatal_error
             ("Post-param initialization phase failed. Perhaps bad parameters were supplied to mondoarchive? Please review the documentation, error messages and logs. Exiting...");
@@ -622 +627 @@
     /* If we're meant to backup then backup */
     if (bkpinfo->backup_data) {
-        res = backup_data(bkpinfo);
+        res = backup_data();
         retval += res;
         if (res) {
@@ -634 +639 @@
     /* If we're meant to verify then verify */
     if (bkpinfo->verify_data) {
-        res = verify_data(bkpinfo);
+        res = verify_data();
         if (res < 0) {
             mr_asprintf(&say_at_end2, _("%d difference%c found."), -res,
@@ -657 +662 @@
     }
 
-
-    if (length_of_file("/tmp/changed.files") > 2) {
+    if (length_of_file(MINDI_CACHE"/changed.files") > 2) {
         if (g_text_mode) {
             log_to_screen
-                (_("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"));
         } else {
             mr_msg(1,
-                    _("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()");
         }
     } else {
-        unlink("/tmp/changed.files");
+        unlink(MINDI_CACHE"/changed.files");
     }
     log_to_screen(say_at_end);
@@ -687 +691 @@
 
     system("rm -f /var/cache/mondo-archive/last-backup.aborted");
-    system("rm -Rf /tmp.mondo.* /mondo.scratch.*");
     if (!retval) {
         printf(_("Mondoarchive ran OK.\n"));
@@ -698 +701 @@
     chdir("/tmp");              // just in case there's something wrong with g_erase_tmpdir_and_scratchdir
     system(g_erase_tmpdir_and_scratchdir);
+
+    /* assemble command string for deletion of Mondo's tmp directory */
+    sprintf(tmp, "rm -Rf %s", bkpinfo->tmpdir);
+    
     free_libmondo_global_strings();
     mr_free(bkpinfo);
-
-    unlink("/tmp/filelist.full");
-    unlink("/tmp/filelist.full.gz");
 
     if (!g_cdrom_drive_is_here) {
@@ -714 +718 @@
     mr_msg(1, "Time finished: %s", mr_date());
     mr_msg_close();
+
+    /* remove Mondo's tmp directory */
+    system(tmp); 
+    paranoid_free(tmp);
 
     if (!g_text_mode) {

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

branches/stable/pbconf/mindi/pbfilter/rpm.pbf

@@ -31 +31 @@
 filter PBPKG = $pbpkg
 
-# PBSUF is replaced by the package name ($pbsuf in code)
+# PBSUF is replaced by the suffix name ($pbsuf in code)
 filter PBSUF = $pbsuf
 

branches/stable/pbconf/mondo/pbfilter/rpm.pbf

@@ -31 +31 @@
 filter PBPKG = $pbpkg
 
-# PBSUF is replaced by the package name ($pbsuf in code)
+# PBSUF is replaced by the suffix name ($pbsuf in code)
 filter PBSUF = $pbsuf
 

branches/stable/pbconf/mondo/rpm/mondo.spec

@@ -3 +3 @@
 #
 
-Summary:    A program which a Linux user can utilize to create a rescue/restore CD/tape
-Summary(fr):    Un programme pour les utilisateurs de Linux pour créer un CD/tape de sauvegarde/restauration
+Summary:    A program to create a rescue/restore CD/tape
+Summary(fr):    Un programme pour créer un media de sauvegarde/restauration
 Summary(it):    Un programma per utenti Linux per creare un CD/tape di rescue
-Summary(sp):    Un programa para los usuarios de Linux por crear una CD/cinta de restoracion/rescate
+Summary(sp):    Un programa por crear una CD/cinta de restoracion/rescate
 
 Name:       PBPKG

branches/stable/pbconf/mondorescue.pb

@@ -13 +13 @@
 defpkgdir mindi = mindi
 
-pkgver nil
-pkgtag nil
+pkgver mindi = 1.2.5
+pkgver mindi-busybox = 1.2.2
+pkgtag mindi-busybox = 4
 
 # Hash of additional package/package directory
@@ -26 +27 @@
 # List of additional files on which to apply filters
 # Files are mentioned relatively to pbroot
+filteredfiles mondo = configure.in
 filteredfiles mondo-doc = mondorescue-howto.sgml,mondoarchive.8,mondorestore.8
 filteredfiles mindi = rootfs/sbin/init,mindi,install.sh

branches/stable/tools/qemu-vm.txt

@@ -15 +15 @@
 # gentoo
 #Cf: http://wiki.xensource.com/xenwiki/QEMUGentoo
-emerge neon newt slang autoconf automake subversion libtool gcc wget vim man groff lynx grub afio buffer mindi mondo-rescue sudo jadetex docbook2ps pb # cdrecord mkisofs
+emerge neon newt slang autoconf automake subversion libtool gcc wget vim man groff lynx grub afio buffer mindi mondo-rescue cdrecord mkisofs pb
 
 # Slackware