Changeset 1645 in MondoRescue

Timestamp:

Sep 24, 2007, 3:04:43 AM (17 years ago)

Author:

Bruno Cornec

Message:

Render bkpinfo global (potential issue on thread, but should not be a problem as that structure is indeed static during archive)
Should solve the tmpdir issue from previous rev.
May still not compile

Location:

branches/2.2.5/mondo/src

Files:

• common/libmondo-archive.c (modified) (65 diffs)
• common/libmondo-devices.c (modified) (11 diffs)
• common/libmondo-fifo.c (modified) (1 diff)
• common/libmondo-filelist.c (modified) (5 diffs)
• common/libmondo-files.c (modified) (6 diffs)
• common/libmondo-fork.c (modified) (2 diffs)
• common/libmondo-mountlist.c (modified) (1 diff)
• common/libmondo-stream.c (modified) (28 diffs)
• common/libmondo-string.c (modified) (2 diffs)
• common/libmondo-tools.c (modified) (6 diffs)
• common/libmondo-verify.c (modified) (28 diffs)
• mondoarchive/main.c (modified) (9 diffs)
• mondoarchive/mondo-cli.c (modified) (8 diffs)
• mondorestore/mondo-prep.c (modified) (1 diff)
• mondorestore/mondo-restore.c (modified) (60 diffs)
• mondorestore/mondo-rstr-compare.c (modified) (18 diffs)
• mondorestore/mondo-rstr-newt.c (modified) (1 diff)
• mondorestore/mondo-rstr-tools.c (modified) (17 diffs)

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

@@ -239 +239 @@
 extern char *MONDO_LOGFILE;
 
+/* Reference to global bkpinfo */
+extern struct s_bkpinfo *bkpinfo;
+
 
 
@@ -357 +360 @@
 
 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;
@@ -452 +454 @@
  */
 int
-archive_this_fileset(struct s_bkpinfo *bkpinfo, char *filelist,
-                     char *fname, int setno)
+archive_this_fileset(char *filelist, char *fname, int setno)
 {
 
@@ -473 +474 @@
 
     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));
     }
 
@@ -587 +587 @@
  * @ingroup archiveGroup
  */
-int backup_data(struct s_bkpinfo *bkpinfo)
+int backup_data()
 {
     int retval = 0, res = 0;
@@ -593 +593 @@
 
     assert(bkpinfo != NULL);
-    set_g_cdrom_and_g_dvd_to_bkpinfo_value(bkpinfo);
+    set_g_cdrom_and_g_dvd_to_bkpinfo_value();
     malloc_string(tmp);
     if (bkpinfo->backup_media_type == dvd) {
@@ -608 +608 @@
     }
 
-    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");
     }
@@ -630 +630 @@
     }
 
-    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");
@@ -644 +644 @@
 #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
     sprintf(tmp, "rm -f %s/images/*.iso", bkpinfo->scratchdir);
     run_program_and_log_output(tmp, 1);
-    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
     log_msg(1, "Creation of archives... complete.");
     if (bkpinfo->verify_data) {
@@ -690 +690 @@
  * @ingroup MLarchiveGroup
  */
-int call_mindi_to_supply_boot_disks(struct s_bkpinfo *bkpinfo)
+int call_mindi_to_supply_boot_disks()
 {
     /*@ buffer ************************************************************ */
@@ -1162 +1162 @@
     char *curr_acl_list_fname;
 
-    struct s_bkpinfo *bkpinfo;
+    struct s_bkpinfo *bkpinfo_bis;
     char *tmp;
     int res = 0, retval = 0;
@@ -1180 +1180 @@
     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,
@@ -1246 +1246 @@
                 this_thread_no, archiving_set_no);
         res =
-            archive_this_fileset(bkpinfo, archiving_filelist_fname,
+            archive_this_fileset(archiving_filelist_fname,
                                  archiving_afioball_fname,
                                  archiving_set_no);
@@ -1304 +1304 @@
  * @ingroup MLarchiveGroup
  */
-int do_that_final_phase(struct s_bkpinfo *bkpinfo)
+int do_that_final_phase()
 {
 
@@ -1321 +1321 @@
         /* write tape/cdstream */
     {
-        closeout_tape(bkpinfo);
+        closeout_tape();
     } else
         /* write final ISO */
     {
-        res = write_final_iso_if_necessary(bkpinfo);
+        res = write_final_iso_if_necessary();
         retval += res;
         if (res) {
@@ -1365 +1365 @@
  * @ingroup MLarchiveGroup
  */
-int do_that_initial_phase(struct s_bkpinfo *bkpinfo)
+int do_that_initial_phase()
 {
     /*@ int *************************************** */
@@ -1613 +1613 @@
  * @return The number of errors encountered (0 for success)
  */
-int make_afioballs_and_images(struct s_bkpinfo *bkpinfo)
+int make_afioballs_and_images()
 {
 
@@ -1673 +1673 @@
                        "Please wait. This may take a couple of hours.",
                        "Working...",
-                       get_last_filelist_number(bkpinfo) + 1);
+                       get_last_filelist_number() + 1);
 
     log_msg(5, "We're gonna party like it's your birthday.");
@@ -1742 +1742 @@
                 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)) {
@@ -1752 +1751 @@
                 iamhere("Writing EXAT files");
                 res +=
-                    write_EXAT_files_to_tape(bkpinfo,
-                                             curr_xattr_list_fname,
+                    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);
@@ -1773 +1771 @@
                 } 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);
                     }
@@ -1855 +1853 @@
  * @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 ********************************************** */
@@ -1932 +1930 @@
                 g_current_media_number);
         res =
-            eval_call_to_make_ISO(bkpinfo, bkpinfo->call_before_iso,
+            eval_call_to_make_ISO(bkpinfo->call_before_iso,
                                   destfile, g_current_media_number,
                                   MONDO_LOGFILE, message_to_screen);
@@ -1957 +1955 @@
         } else {
             res =
-                eval_call_to_make_ISO(bkpinfo, bkpinfo->call_make_iso,
+                eval_call_to_make_ISO(bkpinfo->call_make_iso,
                                       bkpinfo->scratchdir,
                                       g_current_media_number,
@@ -2020 +2018 @@
                 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,
                                           bkpinfo->scratchdir,
                                           g_current_media_number,
@@ -2054 +2052 @@
 // FIXME --- change mkisofs string to MONDO_MKISOFS_NONBOOTABLE and add ' .' at end
             res =
-                eval_call_to_make_ISO(bkpinfo,
-                                      "mkisofs -o '_ISO_' -r -p MondoRescue -publisher www.mondorescue.org -A MondoRescue_GPL -V _CD#_ .",
+                eval_call_to_make_ISO("mkisofs -o '_ISO_' -r -p MondoRescue -publisher www.mondorescue.org -A MondoRescue_GPL -V _CD#_ .",
                                       destfile, g_current_media_number,
                                       MONDO_LOGFILE, message_to_screen);
@@ -2074 +2071 @@
 #ifdef __IA64__
                 log_msg(1, "IA64 --> elilo");
-                res = eval_call_to_make_ISO(bkpinfo,
-                                            //-b images/mindi-boot.2880.img
-                                            "mkisofs -no-emul-boot -b images/mindi-bootroot."
+                res = eval_call_to_make_ISO("mkisofs -no-emul-boot -b images/mindi-bootroot."
                                             IA64_BOOT_SIZE
                                             ".img -c boot.cat -o '_ISO_' -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .",
@@ -2088 +2083 @@
                 log_msg(1, "Non-ia64 --> lilo");
                 res =
-                    eval_call_to_make_ISO(bkpinfo,
-                                          "mkisofs -b images/mindi-bootroot.2880.img -c boot.cat -o '_ISO_' -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .",
+                    eval_call_to_make_ISO("mkisofs -b images/mindi-bootroot.2880.img -c boot.cat -o '_ISO_' -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .",
                                           destfile, g_current_media_number,
                                           MONDO_LOGFILE,
@@ -2098 +2092 @@
                 log_msg(1, "Isolinux");
                 res =
-                    eval_call_to_make_ISO(bkpinfo,
-                                          "mkisofs -no-emul-boot -b isolinux.bin -boot-load-size 4 -boot-info-table -c boot.cat -o '_ISO_' -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .",
+                    eval_call_to_make_ISO("mkisofs -no-emul-boot -b isolinux.bin -boot-load-size 4 -boot-info-table -c boot.cat -o '_ISO_' -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .",
                                           destfile, g_current_media_number,
                                           MONDO_LOGFILE,
@@ -2132 +2125 @@
         pause_and_ask_for_cdr(2, &cd_is_mountable);
         res =
-            eval_call_to_make_ISO(bkpinfo, bkpinfo->call_burn_iso,
+            eval_call_to_make_ISO(bkpinfo->call_burn_iso,
                                   destfile, g_current_media_number,
                                   MONDO_LOGFILE, message_to_screen);
@@ -2149 +2142 @@
                 g_current_media_number);
         res =
-            eval_call_to_make_ISO(bkpinfo, bkpinfo->call_after_iso,
+            eval_call_to_make_ISO(bkpinfo->call_after_iso,
                                   destfile, g_current_media_number,
                                   MONDO_LOGFILE, message_to_screen);
@@ -2219 +2212 @@
  */
 int
-make_slices_and_images(struct s_bkpinfo *bkpinfo, char *biggielist_fname)
+make_slices_and_images(char *biggielist_fname)
 {
 
@@ -2252 +2245 @@
     malloc_string(sz_devfile);
     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;
 
     log_msg(1, "size of all biggiefiles = %ld",
-            size_of_all_biggiefiles_K(bkpinfo));
+            size_of_all_biggiefiles_K());
     log_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);
 
@@ -2343 +2336 @@
             }
             res =
-                slice_up_file_etc(bkpinfo, bigfile_fname,
+                slice_up_file_etc(bigfile_fname,
                                   ntfsprog_fifo, biggie_file_number,
                                   noof_biggie_files, use_ntfsprog);
@@ -2395 +2388 @@
  * @see make_afioballs_and_images
  */
-int make_afioballs_and_images_OLD(struct s_bkpinfo *bkpinfo)
+int make_afioballs_and_images_OLD()
 {
 
@@ -2427 +2420 @@
                        "Please wait. This may take a couple of hours.",
                        "Working...",
-                       get_last_filelist_number(bkpinfo) + 1);
+                       get_last_filelist_number() + 1);
 
     sprintf(curr_filelist_fname, FILELIST_FNAME_RAW_SZ, bkpinfo->tmpdir,
@@ -2455 +2448 @@
         log_msg(1, "Archiving set %ld", curr_set_no);
         res =
-            archive_this_fileset(bkpinfo, curr_filelist_fname,
+            archive_this_fileset(curr_filelist_fname,
                                  curr_afioball_fname, curr_set_no);
         retval += res;
@@ -2465 +2458 @@
         }
 
-        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 */
@@ -2475 +2468 @@
             iamhere("Writing EXAT files");
             res +=
-                write_EXAT_files_to_tape(bkpinfo, curr_xattr_list_fname,
+                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);
@@ -2493 +2486 @@
                 } 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);
                     }
@@ -2542 +2535 @@
  * @ingroup MLarchiveGroup
  */
-int make_those_afios_phase(struct s_bkpinfo *bkpinfo)
+int make_those_afios_phase()
 {
     /*@ int ******************************************* */
@@ -2559 +2552 @@
         log_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();
     }
 
@@ -2588 +2581 @@
  * @ingroup MLarchiveGroup
  */
-int make_those_slices_phase(struct s_bkpinfo *bkpinfo)
+int make_those_slices_phase()
 {
 
@@ -2646 +2639 @@
 
     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);
         asprintf(&blah, "%ld", count_lines_in_file(biggielist));
         write_header_block_to_stream((off_t)0, blah, BLK_START_BIGGIEFILES);
         paranoid_free(blah);
     }
-    res = make_slices_and_images(bkpinfo, biggielist);
+    res = make_slices_and_images(biggielist);
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
         write_header_block_to_stream((off_t)0, "end-of-biggiefiles",
@@ -2681 +2674 @@
  * 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;
 
@@ -2702 +2695 @@
  * @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, ...)
 {
 
@@ -2741 +2734 @@
     }
     if (would_occupy / 1024 > bkpinfo->media_size[g_current_media_number]) {
-        res = write_iso_and_go_on(bkpinfo, FALSE);  /* FALSE because this is not the last CD we'll write */
+        res = write_iso_and_go_on(FALSE);   /* FALSE because this is not the last CD we'll write */
         retval += res;
         if (res) {
@@ -2798 +2791 @@
  * @ingroup MLarchiveGroup
  */
-int offer_to_write_floppies(struct s_bkpinfo *bkpinfo, char *imagesdir)
+int offer_to_write_floppies(char *imagesdir)
 {
     /*@ buffer ************************************************************ */
@@ -2958 +2951 @@
  */
 
-int offer_to_write_boot_floppies_to_physical_disks(struct s_bkpinfo
-                                                   *bkpinfo)
+int offer_to_write_boot_floppies_to_physical_disks()
 {
     int res = 0;
@@ -2982 +2974 @@
             }
         } else {
-            offer_to_write_floppies(bkpinfo, MINDI_CACHE);
+            offer_to_write_floppies(MINDI_CACHE);
             mvaddstr_and_log_it(g_currentY++, 74, "Done.");
         }
@@ -3005 +2997 @@
  * 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;
 
@@ -3022 +3014 @@
  */
 int
-_move_files_to_stream(struct s_bkpinfo *bkpinfo, char *files_to_add, ...)
+_move_files_to_stream(char *files_to_add, ...)
 {
 
@@ -3066 +3058 @@
             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);
@@ -3381 +3373 @@
  */
 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)
@@ -3517 +3509 @@
     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);
     }
@@ -3535 +3525 @@
                            suffix));
 
-        strcpy(tmp, percent_media_full_comment(bkpinfo));
+        strcpy(tmp, percent_media_full_comment());
         update_progress_form(tmp);
         if (!(fout = fopen(curr_slice_fname_uncompressed, "w"))) {
@@ -3622 +3612 @@
             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);
         }
         retval += res;
@@ -3716 +3706 @@
  * however, this occurs rarely.
  */
-int write_final_iso_if_necessary(struct s_bkpinfo *bkpinfo)
+int write_final_iso_if_necessary()
 {
     /*@ int ***************************************************** */
@@ -3737 +3727 @@
     }
 #endif
-    res = write_iso_and_go_on(bkpinfo, TRUE);
+    res = write_iso_and_go_on(TRUE);
 #ifndef _XWIN
     if (!g_text_mode) {
@@ -3766 +3756 @@
  * @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 **************************************************** */
@@ -3842 +3832 @@
             g_current_media_number);
     for (that_one_was_ok = FALSE; !that_one_was_ok;) {
-        res = make_iso_fs(bkpinfo, isofile);
+        res = make_iso_fs(isofile);
         if (g_current_media_number == 1 && !res
             && (bkpinfo->backup_media_type == cdr
@@ -3861 +3851 @@
             chdir("/");
             iamhere("Before calling verify_cd_image()");
-            res += verify_cd_image(bkpinfo);
+            res += verify_cd_image();
             iamhere("After calling verify_cd_image()");
         }
@@ -3934 +3924 @@
  * @ingroup verifyGroup
  */
-int verify_data(struct s_bkpinfo *bkpinfo)
+int verify_data()
 {
     int res = 0, retval = 0, cdno = 0;
@@ -3949 +3939 @@
             strcpy(bkpinfo->media_device, "/dev/cdrom");
         }
-        verify_tape_backups(bkpinfo);
+        verify_tape_backups();
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     } else if (bkpinfo->backup_data)
@@ -3972 +3962 @@
             }
             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) {
                 sprintf(tmp,
                         "Warnings/errors were reported while checking %s #%d",
-                        media_descriptor_string(bkpinfo->
-                                                backup_media_type),
+                        media_descriptor_string(bkpinfo->backup_media_type),
                         g_current_media_number);
                 log_to_screen(tmp);

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

@@ -276 +276 @@
 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
@@ -664 +667 @@
  * @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 ***************************************************** */
@@ -1698 +1701 @@
  */
 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)
 {
 
@@ -1755 +1758 @@
 //    return;
     }
-    if ((res = what_number_cd_is_this(bkpinfo)) != cd_number_i_want) {
+    if ((res = what_number_cd_is_this()) != cd_number_i_want) {
         log_msg(3, "Currently, we hold %d but we want %d", res,
                 cd_number_i_want);
@@ -1765 +1768 @@
                 cd_number_i_want);
         log_msg(3, tmp);
-        while (what_number_cd_is_this(bkpinfo) != cd_number_i_want) {
+        while (what_number_cd_is_this() != cd_number_i_want) {
             paranoid_system("sync");
             if (is_this_device_mounted(MNT_CDROM)) {
@@ -1813 +1816 @@
  * @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
@@ -1852 +1852 @@
             bkptype_to_string(bkpinfo->backup_media_type));
     if (archiving_to_media) {
-        sensibly_set_tmpdir_and_scratchdir(bkpinfo);
+        sensibly_set_tmpdir_and_scratchdir();
     }
     bkpinfo->cdrw_speed = (bkpinfo->backup_media_type == cdstream) ? 2 : 4;
@@ -1932 +1932 @@
                 sprintf(comment,
                         "Please specify your %s drive's /dev entry",
-                        media_descriptor_string(bkpinfo->
-                                                backup_media_type));
+                        media_descriptor_string(bkpinfo->backup_media_type));
                 if (!popup_and_get_string
                     ("Device?", comment, bkpinfo->media_device,
@@ -1951 +1950 @@
                 sprintf(tmp,
                         "I think I've found your %s burner at SCSI node %s. Is this correct? (Say no if you have an IDE burner and you are running a 2.6 kernel. You will then be prompted for further details.)",
-                        media_descriptor_string(bkpinfo->
-                                                backup_media_type),
+                        media_descriptor_string(bkpinfo->backup_media_type),
                         bkpinfo->media_device);
                 if (!ask_me_yes_or_no(tmp)) {
@@ -2507 +2505 @@
  * @ingroup utilityGroup
  */
-void sensibly_set_tmpdir_and_scratchdir(struct s_bkpinfo *bkpinfo)
+void sensibly_set_tmpdir_and_scratchdir()
 {
     char *tmp, *command, *sz;
@@ -2609 +2607 @@
  * (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/2.2.5/mondo/src/common/libmondo-fifo.c

@@ -280 +280 @@
 
 int
-extract_config_file_from_ramdisk(struct s_bkpinfo *bkpinfo,
-                                 char *ramdisk_fname,
+extract_config_file_from_ramdisk(char *ramdisk_fname,
                                  char *output_cfg_file,
                                  char *output_mountlist_file);

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

@@ -138 +138 @@
 extern char *MONDO_LOGFILE;
 
+/* Reference to global bkpinfo */
+extern struct s_bkpinfo *bkpinfo;
+
 
 int mondo_makefilelist(char *logfile, char *tmpdir, char *scratchdir,
@@ -183 +186 @@
  * @see chop_filelist
  */
-int call_filelist_chopper(struct s_bkpinfo *bkpinfo)
+int call_filelist_chopper()
 {
     /*@ buffers *********************** */
@@ -219 +222 @@
         chop_filelist(filelist, bkpinfo->tmpdir,
                       bkpinfo->optimal_set_size);
-    estimate_noof_media_required(bkpinfo, noof_sets);   // for cosmetic purposes
+    estimate_noof_media_required(noof_sets);    // for cosmetic purposes
 
     sprintf(tempfile, "%s/biggielist.txt", bkpinfo->tmpdir);
@@ -822 +825 @@
  * @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 ***************************************************** */
@@ -1402 +1405 @@
  * @see mondo_makefilelist
  */
-int prepare_filelist(struct s_bkpinfo *bkpinfo)
+int prepare_filelist()
 {
 

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

@@ -103 +103 @@
 extern int g_currentY;
 extern char *g_mondo_home;
+
+/* Reference to global bkpinfo */
+extern struct s_bkpinfo *bkpinfo;
 
 /**
@@ -871 +874 @@
  * @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()
 {
     /*@ buffers ***************************************************** */
@@ -1137 +1140 @@
  * - @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 ** */
@@ -1217 +1220 @@
  * - @c tmpdir
  */
-void store_nfs_config(struct s_bkpinfo *bkpinfo)
+void store_nfs_config()
 {
 
@@ -1338 +1341 @@
  */
 void
-estimate_noof_media_required(struct s_bkpinfo *bkpinfo, long noof_sets)
+estimate_noof_media_required(long noof_sets)
 {
     /*@ buffers *************** */
@@ -1354 +1357 @@
     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[1];
     scratchLL++;

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

@@ -118 +118 @@
 extern bool g_text_mode;
 extern char *MONDO_LOGFILE;
+
+/* Reference to global bkpinfo */
+extern struct s_bkpinfo *bkpinfo;
 pid_t g_buffer_pid = 0;
 
@@ -185 +188 @@
  */
 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)
 {

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

@@ -68 +68 @@
  */
 struct s_bkpinfo *g_bkpinfo_DONTUSETHIS = NULL;
+
+/* Reference to global bkpinfo */
+extern struct s_bkpinfo *bkpinfo;
 
 /**

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

@@ -120 +120 @@
 extern char *MONDO_LOGFILE;
 
+/* Reference to global bkpinfo */
+extern struct s_bkpinfo *bkpinfo;
+
 /**
  * @addtogroup globalGroup
@@ -150 +153 @@
 /* @} - end of globalGroup */
 
-int write_backcatalog_to_tape(struct s_bkpinfo *bkpinfo);
+int write_backcatalog_to_tape();
 
 
@@ -167 +170 @@
  * @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());
 }
 
@@ -182 +185 @@
  * @bug @p bkpinfo parameter is unused.
  */
-int closein_tape(struct s_bkpinfo *bkpinfo)
+int closein_tape()
 {
     /*@ int's ******************************************************* */
@@ -241 +244 @@
  * @note This should be called by backup processes only.
  */
-int closeout_tape(struct s_bkpinfo *bkpinfo)
+int closeout_tape()
 {
     /*@ int's ******************************************************* */
@@ -274 +277 @@
         if (should_we_write_to_next_tape
             (bkpinfo->media_size[g_current_media_number], (off_t)256 * 1024)) {
-            start_to_write_to_next_tape(bkpinfo);
+            start_to_write_to_next_tape();
         }
     }
@@ -288 +291 @@
         if (should_we_write_to_next_tape (bkpinfo->media_size[g_current_media_number], 256*1024))
           {
-            start_to_write_to_next_tape (bkpinfo);
+            start_to_write_to_next_tape ();
           }
       }
@@ -438 +441 @@
 
 
-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)
@@ -456 +458 @@
             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) {
@@ -472 +474 @@
             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) {
@@ -490 +492 @@
 
 
-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)
 {
@@ -500 +502 @@
         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);
     }
@@ -507 +509 @@
         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,
@@ -655 +657 @@
  * @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());
 }
 
@@ -696 +698 @@
  * @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 ***************************************************** */
@@ -886 +888 @@
  */
 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)
 {
 
@@ -895 +896 @@
     /*@ end vars *************************************************** */
 
-    res = read_file_from_stream_FULL(bkpinfo, outfile, NULL, size);
+    res = read_file_from_stream_FULL(outfile, NULL, size);
 
     return (res);
@@ -911 +912 @@
  */
 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)
 {
 
@@ -920 +920 @@
     /*@ end vars *************************************************** */
 
-    res = read_file_from_stream_FULL(bkpinfo, NULL, fout, size);
+    res = read_file_from_stream_FULL(NULL, fout, size);
 /*  fflush(g_tape_stream);
   fflush(fout);*/
@@ -941 +941 @@
  */
 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 ***************************************************** */
@@ -1029 +1028 @@
             log_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();
             log_msg(4, "Started reading from next tape.");
             skip_incoming_files_until_we_find_this_one(temp_fname);
@@ -1362 +1361 @@
  * @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 ********************************************************* */
@@ -1410 +1409 @@
  * @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;
@@ -1470 +1469 @@
  * @return 0 for success, nonzero for failure.
  */
-int write_backcatalog_to_tape(struct s_bkpinfo *bkpinfo)
+int write_backcatalog_to_tape()
 {
     int i, last, res = 0;
@@ -1488 +1487 @@
                                          BLK_START_AN_AFIO_OR_SLICE);
             log_msg(2, "Writing %s", fname);
-            if (write_file_to_stream_from_file(bkpinfo, fname)) {
+            if (write_file_to_stream_from_file(fname)) {
                 res++;
                 log_msg(2, "%s failed", fname);
@@ -1574 +1573 @@
  * @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 **************************************************** */
@@ -1621 +1620 @@
     if (should_we_write_to_next_tape
         (bkpinfo->media_size[g_current_media_number], 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, '/');
@@ -1659 +1658 @@
             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/2.2.5/mondo/src/common/libmondo-string.c

@@ -20 +20 @@
 extern int g_current_media_number;
 extern long long g_tape_posK;
+
+/* Reference to global bkpinfo */
+extern struct s_bkpinfo *bkpinfo;
 
 
@@ -1062 +1065 @@
  * @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/2.2.5/mondo/src/common/libmondo-tools.c

@@ -196 +196 @@
 extern int g_current_media_number;
 extern char *MONDO_LOGFILE;
+
+/* Reference to global bkpinfo */
+extern struct s_bkpinfo *bkpinfo;
 
 /**
@@ -566 +569 @@
  * do not exist.
  */
-int post_param_configuration(struct s_bkpinfo *bkpinfo)
+int post_param_configuration()
 {
     char *extra_cdrom_params;
@@ -878 +881 @@
             }
         }
-        store_nfs_config(bkpinfo);
+        store_nfs_config();
     }
 
@@ -924 +927 @@
  * @return number of errors (0 for success)
  */
-int pre_param_configuration(struct s_bkpinfo *bkpinfo)
+int pre_param_configuration()
 {
     int res = 0;
@@ -932 +935 @@
     srandom((unsigned long) (time(NULL)));
     insmod_crucial_modules();
-    reset_bkpinfo(bkpinfo);     // also sets defaults ('/'=backup path, 3=compression level)
+    reset_bkpinfo();        // also sets defaults ('/'=backup path, 3=compression level)
     if (bkpinfo->disaster_recovery) {
         if (!does_nonMS_partition_exist()) {
@@ -964 +967 @@
  * @param bkpinfo The @c bkpinfo to reset.
  */
-void reset_bkpinfo(struct s_bkpinfo *bkpinfo)
+void reset_bkpinfo()
 {
     int i;

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

@@ -128 +128 @@
 extern char *MONDO_LOGFILE;
 
+/* Reference to global bkpinfo */
+extern struct s_bkpinfo *bkpinfo;
+
 /**
  * Generate a list of the files that have changed, based on @c afio @c -r
@@ -210 +213 @@
  * @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)
 {
 
@@ -229 +232 @@
          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);
     }
@@ -253 +255 @@
 
     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++) {
         log_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 =
@@ -266 +268 @@
         log_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;
@@ -287 +287 @@
  * @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)
 {
 
@@ -501 +501 @@
  * @return 0, always.
  */
-int verify_a_tarball(struct s_bkpinfo *bkpinfo, char *tarball_fname)
+int verify_a_tarball(char *tarball_fname)
 {
     /*@ buffers ********************************************************* */
@@ -631 +631 @@
  */
 int
-verify_an_afioball_from_CD(struct s_bkpinfo *bkpinfo, char *tarball_fname)
+verify_an_afioball_from_CD(char *tarball_fname)
 {
 
@@ -637 +637 @@
     int res = 0;
 
-    assert(bkpinfo != NULL);
     assert_string_is_neither_NULL_nor_zerolength(tarball_fname);
 
@@ -644 +643 @@
         fatal_error("Cannot verify nonexistent afioball");
     }
-    res = verify_a_tarball(bkpinfo, tarball_fname);
+    res = verify_a_tarball(tarball_fname);
     return (res);
 }
@@ -659 +658 @@
  */
 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)
 {
 
@@ -691 +689 @@
             tarball_fname);
 /*  log_it(tmp); */
-    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) {
         sprintf(tmp,
@@ -714 +712 @@
  */
 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)
 {
 
@@ -765 +762 @@
             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 =
@@ -809 +806 @@
  * @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 ********************************************************** */
@@ -842 +839 @@
     }
     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.",
@@ -853 +850 @@
         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);
@@ -876 +873 @@
             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);
@@ -886 +883 @@
         /*log_it(tmp); */
         update_progress_form(tmp);
-        res = verify_an_afioball_from_stream(bkpinfo, fname, size);
+        res = verify_an_afioball_from_stream(fname, size);
         if (res) {
             sprintf(tmp, "Afioball %ld differs from live filesystem",
@@ -917 +914 @@
  * @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()
 {
 
@@ -966 +963 @@
             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);
@@ -998 +995 @@
         sprintf(logical_fname, "%s/%s", bkpinfo->restore_path, orig_fname);
         res =
-            verify_a_biggiefile_from_stream(bkpinfo, logical_fname, size);
+            verify_a_biggiefile_from_stream(logical_fname, size);
         retval += res;
         current_biggiefile_number++;
@@ -1030 +1027 @@
  * @ingroup verifyGroup
  */
-int verify_cd_image(struct s_bkpinfo *bkpinfo)
+int verify_cd_image()
 {
 
@@ -1071 +1068 @@
             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);
@@ -1112 +1109 @@
 */
     }
-    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);
 
 #ifdef __FreeBSD__
@@ -1155 +1152 @@
  * @ingroup verifyGroup
  */
-int verify_tape_backups(struct s_bkpinfo *bkpinfo)
+int verify_tape_backups()
 {
 
@@ -1172 +1169 @@
     log_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 */
     paranoid_system("sync");
     sleep(2);
-    closein_tape(bkpinfo);
+    closein_tape();
 /* close tape; exit */
 //  fclose(g_tape_stream); <-- not needed; is handled by closein_tape()
@@ -1231 +1228 @@
  * @ingroup stringGroup
  */
-char *vfy_tball_fname(struct s_bkpinfo *bkpinfo, char *mountpoint,
-                      int setno)
+char *vfy_tball_fname(char *mountpoint, int setno)
 {
     /*@ buffers ******************************************************* */

branches/2.2.5/mondo/src/mondoarchive/main.c

@@ -146 +146 @@
 extern int g_loglevel;
 
+/* Reference to global bkpinfo */
+struct s_bkpinfo *bkpinfo;
+
 /****************** subroutines used only by main.c ******************/
 
@@ -261 +264 @@
 int main(int argc, char *argv[])
 {
-    struct s_bkpinfo *bkpinfo;
     char *tmp;
     int res, retval;
@@ -422 +424 @@
     }
 
-    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...");
@@ -431 +433 @@
         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
@@ -437 +439 @@
         }
     } else {
-        res = handle_incoming_parameters(argc, argv, bkpinfo);
+        res = handle_incoming_parameters(argc, argv);
         if (res) {
             printf
@@ -449 +451 @@
 
 /* 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...");
@@ -461 +463 @@
     /* If we're meant to backup then backup */
     if (bkpinfo->backup_data) {
-        res = backup_data(bkpinfo);
+        res = backup_data();
         retval += res;
         if (res) {
@@ -473 +475 @@
 /* If we're meant to verify then verify */
     if (bkpinfo->verify_data) {
-        res = verify_data(bkpinfo);
+        res = verify_data();
         if (res < 0) {
             sprintf(tmp, "%d difference%c found.", -res,
@@ -486 +488 @@
 /* Offer to write floppy disk images to physical disks */
     if (bkpinfo->backup_data && !g_skip_floppies) {
-        res = offer_to_write_boot_floppies_to_physical_disks(bkpinfo);
+        res = offer_to_write_boot_floppies_to_physical_disks();
         retval += res;
-//      res = offer_to_write_boot_ISO_to_physical_CD(bkpinfo);
+//      res = offer_to_write_boot_ISO_to_physical_CD();
 //      retval += res;
     }

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

@@ -210 +210 @@
 char *g_getfacl = NULL;
 char *g_getfattr = NULL;
+
+/* Reference to global bkpinfo */
+extern struct s_bkpinfo *bkpinfo;
 
 /**
@@ -223 +226 @@
  */
 int
-handle_incoming_parameters(int argc, char *argv[],
-                           struct s_bkpinfo *bkpinfo)
+handle_incoming_parameters(int argc, char *argv[])
 {
     /*@ int *** */
@@ -237 +239 @@
 
     malloc_string(tmp);
-    sensibly_set_tmpdir_and_scratchdir(bkpinfo);
+    sensibly_set_tmpdir_and_scratchdir();
     for (i = 0; i < 128; i++) {
         flag_val[i][0] = '\0';
@@ -252 +254 @@
     retval += res;
     if (!retval) {
-        res = process_switches(bkpinfo, flag_val, flag_set);
+        res = process_switches(flag_val, flag_set);
         retval += res;
     }
@@ -293 +295 @@
  * @bug Return code not needed.
  */
-int process_the_s_switch(struct s_bkpinfo *bkpinfo, char *value)
+int process_the_s_switch(char *value)
 {
     int j;
@@ -337 +339 @@
  */
 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])
 {
 
@@ -602 +603 @@
                         ("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");
                 }
@@ -616 +617 @@
     } else {                    /* CD 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");
             }

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

@@ -190 +190 @@
 extern void pause_for_N_seconds(int, char *);
 extern char *MONDO_LOGFILE;
-
 
 FILE *g_fprep = NULL;

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

@@ -24 +24 @@
 extern void twenty_seconds_til_yikes(void);
 
+/* Reference to global bkpinfo */
+struct s_bkpinfo *bkpinfo;
+
 
 /* For use in other programs (ex. XMondo) */
@@ -153 +156 @@
  * @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)
 {
@@ -259 +261 @@
  */
 int
-catchall_mode(struct s_bkpinfo *bkpinfo,
-              struct mountlist_itself *mountlist,
+catchall_mode(struct mountlist_itself *mountlist,
               struct raidlist_itself *raidlist)
 {
@@ -275 +276 @@
     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.");
@@ -302 +303 @@
     if (c == 'I') {
         log_msg(2, "IM selected");
-        retval += interactive_mode(bkpinfo, mountlist, raidlist);
+        retval += interactive_mode(mountlist, raidlist);
     } else if (c == 'N') {
         log_msg(2, "NM selected");
-        retval += nuke_mode(bkpinfo, mountlist, raidlist);
+        retval += nuke_mode(mountlist, raidlist);
     } else if (c == 'C') {
         log_msg(2, "CM selected");
-        retval += compare_mode(bkpinfo, mountlist, raidlist);
+        retval += compare_mode(mountlist, raidlist);
     }
     paranoid_free(tmp);
@@ -358 +359 @@
  **************************************************************************/
 
-static void clean_blkid(struct s_bkpinfo *bkpinfo) {
+static void clean_blkid() {
 
     char *tmp1 = NULL;
@@ -388 +389 @@
  */
 int
-interactive_mode(struct s_bkpinfo *bkpinfo,
-                 struct mountlist_itself *mountlist,
+interactive_mode(struct mountlist_itself *mountlist,
                  struct raidlist_itself *raidlist)
 {
@@ -429 +429 @@
 
     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");
     strcpy(tmp, bkpinfo->prefix);
@@ -551 +551 @@
     {
         log_msg(1, "Restoring all data");
-        retval += restore_everything(bkpinfo, NULL);
+        retval += restore_everything(NULL);
     } else
         if ((restore_all =
@@ -559 +559 @@
         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.
@@ -578 +578 @@
                     strcpy(bkpinfo->restore_path, tmp);
                     log_msg(1, "Restoring subset");
-                    retval += restore_everything(bkpinfo, filelist);
+                    retval += restore_everything(filelist);
                     free_filelist(filelist);
                 } else {
@@ -612 +612 @@
     }
 
-    clean_blkid(bkpinfo);
+    clean_blkid();
     protect_against_braindead_sysadmins();
     retval += unmount_all_devices(mountlist);
@@ -663 +663 @@
  * 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.
@@ -670 +669 @@
  */
 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)
 {
@@ -677 +675 @@
     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)) {
         log_msg(1, "iso_mode --- returning w/ error");
         return (1);
@@ -686 +683 @@
         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.");
@@ -732 +728 @@
  */
 int
-nuke_mode(struct s_bkpinfo *bkpinfo,
-          struct mountlist_itself *mountlist,
+nuke_mode(struct mountlist_itself *mountlist,
           struct raidlist_itself *raidlist)
 {
@@ -749 +744 @@
     log_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__
@@ -770 +765 @@
                 tmpA, tmpB, tmpC);
         if (ask_me_yes_or_no(tmp)) {
-            retval = interactive_mode(bkpinfo, mountlist, raidlist);
+            retval = interactive_mode(mountlist, raidlist);
             goto after_the_nuke;
         } else {
@@ -828 +823 @@
 
         if (ask_me_yes_or_no("Try in interactive mode instead?")) {
-            retval = interactive_mode(bkpinfo, mountlist, raidlist);
+            retval = interactive_mode(mountlist, raidlist);
             goto after_the_nuke;
         } else
@@ -844 +839 @@
     }
     iamhere("Restoring everything");
-    retval += restore_everything(bkpinfo, NULL);
+    retval += restore_everything(NULL);
     if (!run_boot_loader(FALSE)) {
         log_msg(1,
@@ -850 +845 @@
         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;
@@ -937 +932 @@
         sleep(1);
     }
-    interactively_obtain_media_parameters_from_user(bkpinfo, FALSE);
+    interactively_obtain_media_parameters_from_user(FALSE);
     log_msg(2, "bkpinfo->media_device = %s", bkpinfo->media_device);
     if (!bkpinfo->media_device[0]) {
@@ -948 +943 @@
     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 
 
@@ -955 +950 @@
     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");
@@ -963 +958 @@
                                  bkpinfo->restore_path, MAX_STR_LEN / 4)) {
             iamhere("Restoring everything");
-            retval += restore_everything(bkpinfo, filelist);
+            retval += restore_everything(filelist);
             free_filelist(filelist);
             strcpy(bkpinfo->restore_path, old_restpath);
@@ -1014 +1009 @@
  */
 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)
@@ -1204 +1198 @@
                     g_current_media_number);
             log_to_screen(tmp);
-            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 {
@@ -1345 +1339 @@
  * @bug orig_checksum and biggiefile_size are unused (except to check that they are non-NULL).
  */
-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,
@@ -1518 +1512 @@
         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"))) {
@@ -1535 +1528 @@
         } else {
             res =
-                read_file_from_stream_to_stream(bkpinfo, pout, slice_siz);
+                read_file_from_stream_to_stream(pout, slice_siz);
         }
         retval += res;
@@ -1837 +1830 @@
  */
 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,
@@ -1890 +1882 @@
             bkpinfo->tmpdir, current_tarball_number);
 //  sprintf(filelist_fname, "/tmp/tmpfs/temp-filelist.%ld", 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;
@@ -2031 +2023 @@
  */
 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;
@@ -2099 +2090 @@
                         "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);
                 sprintf(tmp, "Restoring from %s #%d",
-                        media_descriptor_string(bkpinfo->
-                                                backup_media_type),
+                        media_descriptor_string(bkpinfo->backup_media_type),
                         g_current_media_number);
                 log_to_screen(tmp);
@@ -2118 +2107 @@
             update_progress_form(tmp);
             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]) {
@@ -2180 +2168 @@
  */
 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;
@@ -2208 +2195 @@
         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", tmp);
     max_val = atol(tmp) + 1;
@@ -2220 +2207 @@
                        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);
         sprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.bz2",
@@ -2326 +2313 @@
  */
 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;
@@ -2381 +2367 @@
     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);
     }
@@ -2414 +2400 @@
                 current_bigfile_number + 1, biggie_size / 1024);
         update_progress_form(tmp);
-        res = restore_a_biggiefile_from_stream(bkpinfo, biggie_fname,
+        res = restore_a_biggiefile_from_stream(biggie_fname,
                                                current_bigfile_number,
                                                biggie_cksum,
@@ -2505 +2491 @@
  */
 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;
@@ -2572 +2557 @@
             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);
@@ -2583 +2568 @@
                 current_afioball_number, tmp_fname, (long) tmp_size >> 10);
         res =
-            restore_a_tarball_from_stream(bkpinfo, tmp_fname,
+            restore_a_tarball_from_stream(tmp_fname,
                                           current_afioball_number,
                                           filelist, tmp_size, xattr_fname,
@@ -2644 +2629 @@
  * @ingroup restoreGroup
  */
-int restore_everything(struct s_bkpinfo *bkpinfo, struct s_node *filelist)
+int restore_everything(struct s_node *filelist)
 {
     int resA;
@@ -2675 +2660 @@
     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);
@@ -2726 +2710 @@
  */
 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)
@@ -2799 +2782 @@
 
     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);
 
@@ -2826 +2809 @@
     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);
     log_msg(2, "--------End of restore_live_from_monitas_server--------");
@@ -2898 +2881 @@
     struct mountlist_itself *mountlist;
     struct raidlist_itself *raidlist;
-    struct s_bkpinfo *bkpinfo;
     struct s_node *filelist;
     char *a, *b;
@@ -2958 +2940 @@
     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.
+    reset_bkpinfo();
     bkpinfo->backup_media_type = none;  // in case boot disk was made for one backup type but user wants to restore from another backup type
     bkpinfo->restore_data = TRUE;   // Well, yeah :-)
@@ -3027 +3009 @@
             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");
@@ -3060 +3042 @@
         system("rm -Rf /tmp/*pih*");
 
-        restore_a_biggiefile_from_CD(bkpinfo, 42, NULL, tmp);
+        restore_a_biggiefile_from_CD(42, NULL, tmp);
     }
 
@@ -3161 +3143 @@
         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 {
             log_msg(2, "Calling restore_to_live_filesystem()");
-            retval = restore_to_live_filesystem(bkpinfo);
+            retval = restore_to_live_filesystem();
         }
         log_msg(2, "Still here. Yay.");
@@ -3186 +3167 @@
         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);
@@ -3245 +3226 @@
         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");
@@ -3267 +3248 @@
         } 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 paremeters");
@@ -3273 +3254 @@
         } else {
             iamhere("catchall (no mode specified in command-line call");
-            retval += catchall_mode(bkpinfo, mountlist, raidlist);
+            retval += catchall_mode(mountlist, raidlist);
         }
     }

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

@@ -67 +67 @@
 extern char *MONDO_LOGFILE;
 
+/* Reference to global bkpinfo */
+extern struct s_bkpinfo *bkpinfo;
+
 //static char cvsid[] = "$Id$";
 
@@ -82 +85 @@
  * @note This function uses an MD5 checksum.
  */
-int compare_a_biggiefile(struct s_bkpinfo *bkpinfo, long bigfileno)
+int compare_a_biggiefile(long bigfileno)
 {
 
@@ -127 +130 @@
     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 {
             sprintf(tmp_ptr,
@@ -230 +233 @@
 /**
  * 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;
@@ -240 +242 @@
     char tmp[MAX_STR_LEN];
 
-    assert(bkpinfo != NULL);
     log_msg(1, "Comparing biggiefiles");
 
@@ -263 +264 @@
         log_msg(1, tmp);
         update_progress_form(tmp);
-        res = compare_a_biggiefile(bkpinfo, bigfileno);
+        res = compare_a_biggiefile(bigfileno);
         retval += res;
         g_current_progress++;
@@ -417 +418 @@
  * @return 0 for success, nonzero for failure.
  */
-int compare_all_tarballs(struct s_bkpinfo *bkpinfo)
+int compare_all_tarballs()
 {
     int retval = 0;
@@ -449 +450 @@
 
     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);
         sprintf(tarball_fname,
@@ -523 +524 @@
  * @return 0 for success, nonzero for failure.
  */
-int compare_to_CD(struct s_bkpinfo *bkpinfo)
+int compare_to_CD()
 {
   /** needs malloc *********/
@@ -541 +542 @@
     chdir(bkpinfo->restore_path);
     getcwd(new, MAX_STR_LEN - 1);
-    insist_on_this_cd_number(bkpinfo, g_current_media_number);
+    insist_on_this_cd_number(g_current_media_number);
     unlink(MINDI_CACHE"/changed.txt");
 
-    resA = compare_all_tarballs(bkpinfo);
-    resB = compare_all_biggiefiles(bkpinfo);
+    resA = compare_all_tarballs();
+    resB = compare_all_biggiefiles();
     chdir(cwd);
     noof_changed_files = count_lines_in_file(MINDI_CACHE"/changed.txt");
@@ -586 +587 @@
  */
 int
-compare_mode(struct s_bkpinfo *bkpinfo,
-             struct mountlist_itself *mountlist,
+compare_mode(struct mountlist_itself *mountlist,
              struct raidlist_itself *raidlist)
 {
@@ -608 +608 @@
     assert(raidlist != NULL);
 
-    while (get_cfg_file_from_archive(bkpinfo)) {
+    while (get_cfg_file_from_archive()) {
         if (!ask_me_yes_or_no
             ("Failed to find config file/archives. Choose another source?"))
@@ -614 +614 @@
             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");
@@ -629 +629 @@
     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) {
@@ -695 +695 @@
  * @return 0 for success, nonzero for failure.
  */
-int compare_to_cdstream(struct s_bkpinfo *bkpinfo)
+int compare_to_cdstream()
 {
     int res;
@@ -721 +721 @@
         find_cdrom_device(bkpinfo->media_device, FALSE);
     }
-    res = verify_tape_backups(bkpinfo);
+    res = verify_tape_backups();
     chdir(dir);
     if (length_of_file(MINDI_CACHE"/changed.txt") > 2
@@ -754 +754 @@
  * returns: int                                                           *
  **************************************************************************/
-int compare_to_tape(struct s_bkpinfo *bkpinfo)
+int compare_to_tape()
 {
     int res;
@@ -770 +770 @@
     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/2.2.5/mondo/src/mondorestore/mondo-rstr-newt.c

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

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

@@ -162 +162 @@
 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;
@@ -285 +288 @@
 */
 int
-extract_config_file_from_ramdisk(struct s_bkpinfo *bkpinfo,
-                         char *ramdisk_fname,
+extract_config_file_from_ramdisk(char *ramdisk_fname,
                          char *output_cfg_file,
                          char *output_mountlist_file)
@@ -354 +356 @@
 /**
 * 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
     ("Failed to find config file/archives. Choose another source?"))
@@ -364 +365 @@
     fatal_error("Could not find config file/archives. Aborting.");
 }
-interactively_obtain_media_parameters_from_user(bkpinfo, FALSE);
+interactively_obtain_media_parameters_from_user(FALSE);
 }
 }
@@ -432 +433 @@
 * @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, *tmp, *command;
@@ -488 +489 @@
 }
 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() */
 sprintf(tmp, "%s #%d has been mounted via loopback mount",
     media_descriptor_string(bkpinfo->backup_media_type), i);
@@ -637 +638 @@
 * @return 0 for success, nonzero for failure.
 */
-int mount_cdrom(struct s_bkpinfo *bkpinfo)
+int mount_cdrom()
 {
 char *mount_cmd;
@@ -906 +907 @@
 * @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)
 {
 /** add mallocs **/
@@ -1188 +1189 @@
             strcpy(bkpinfo->media_device, "/dev/cdrom");    /* superfluous */
             bkpinfo->isodir[0] = iso_mnt[0] = iso_path[0] = '\0';
-            if (mount_cdrom(bkpinfo)) {
+            if (mount_cdrom()) {
                 fatal_error
                     ("Unable to mount isodir. Failed to mount CD-ROM as well.");
@@ -1209 +1210 @@
         log_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();
 /*
       if (media_specified_by_user != cdr && media_specified_by_user == cdrw)
@@ -1250 +1250 @@
 */
 struct
-s_node *process_filelist_and_biggielist(struct s_bkpinfo *bkpinfo)
+s_node *process_filelist_and_biggielist()
 {
 struct s_node *filelist;
@@ -1293 +1293 @@
             "Calling insist_on_this_cd_number; bkpinfo->isodir=%s",
             bkpinfo->isodir);
-    insist_on_this_cd_number(bkpinfo, 1);
+    insist_on_this_cd_number(1);
     log_msg(2, "Back from iotcn");
     run_program_and_log_output("mount", 1);
@@ -1989 +1989 @@
  * - @c bkpinfo->disaster_recovery
  */
-void setup_MR_global_filenames(struct s_bkpinfo *bkpinfo)
+void setup_MR_global_filenames()
 {
     char *temppath;
@@ -2292 +2292 @@
  * @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;
@@ -2379 +2379 @@
                     "Cannot find ramdisk file on mountpoint. Are you sure that's a boot disk in the drive?");
         }
-        if (extract_config_file_from_ramdisk
-            (bkpinfo, ramdisk_fname, cfg_file, mountlist_file)) {
+        if (extract_config_file_from_ramdisk(ramdisk_fname, cfg_file, mountlist_file)) {
             log_msg(2,
                     "Warning - failed to extract config file from ramdisk. I think this boot disk is mangled.");
@@ -2394 +2393 @@
         } else {
             log_msg(2, "gcffa --- calling mount_cdrom now :)");
-            if (!mount_cdrom(bkpinfo)) {
+            if (!mount_cdrom()) {
                 log_msg(2,
                         "gcffa --- managed to mount CD; so, no need for Plan B");
@@ -2401 +2400 @@
                 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));
             }
         }