Changeset 3374 in MondoRescue

Timestamp:

Apr 27, 2015, 4:25:29 PM (9 years ago)

Author:

Bruno Cornec

Message:

• Fix compilation warnings and errors

Location:

branches/3.2/mondo

Files:

• src/common/libmondo-devices.c (modified) (1 diff)
• src/common/libmondo-mountlist.c (modified) (1 diff)
• src/include/mr_str.h (modified) (1 diff)
• src/mondorestore/mondorestore.c (modified) (10 diffs)
• test/test-mountlist.c (modified) (2 diffs)
• test/test-mr_stresc.c (modified) (1 diff)
• test/test-truncname.c (modified) (2 diffs)

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

@@ -3284 +3284 @@
 }
 /* @} - end of deviceGroup */
+
+

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

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

branches/3.2/mondo/src/include/mr_str.h

@@ -19 +19 @@
 extern inline char *mr_date(void);
 extern void mr_strip_spaces(char *in_out);
+extern char *mr_str_substitute(const char *in, const char *token, const char *subst);
 /*
 extern void mr_strip_char(char *in_out, char *caracs);

branches/3.2/mondo/src/mondorestore/mondorestore.c

@@ -17 +17 @@
 #include "mondo-rstr-compare-EXT.h"
 #include "mondo-rstr-tools-EXT.h"
+#include <utime.h>
+
+extern void wait_until_software_raids_are_prepped(char *, int);
 
 extern void twenty_seconds_til_yikes(void);
@@ -26 +29 @@
 struct s_bkpinfo *bkpinfo;
 
+char which_restore_mode(void);
 
 /* For use in other programs (ex. XMondo) */
@@ -132 +136 @@
 #define COMPAQ_PROLIANTS_SUCK "Partition and format your disk using Compaq's disaster recovery CD. After you've done that, please reboot with your Mondo media in Interactive Mode."
 
-
-
-
-/**
- * Allow the user to modify the mountlist before we partition & format their drives.
- * @param bkpinfo The backup information structure. @c disaster_recovery is the only field used.
- * @param mountlist The mountlist to let the user modify.
- * @param raidlist The raidlist that goes with @p mountlist.
- * @return 0 for success, nonzero for failure.
- * @ingroup restoreGuiGroup
- */
-int let_user_edit_the_mountlist(struct mountlist_itself *mountlist,
-                                struct raidlist_itself *raidlist)
-{
-    int retval = 0, res = 0;
-
-    log_msg(2, "let_user_edit_the_mountlist() --- starting");
-
-    assert(bkpinfo != NULL);
-    assert(mountlist != NULL);
-    assert(raidlist != NULL);
-    if (!bkpinfo->disaster_recovery) {
-        strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
-        log_msg(2, "I guess you're testing edit_mountlist()");
-    }
-    if (!does_file_exist(g_mountlist_fname)) {
-        log_to_screen(g_mountlist_fname);
-        log_to_screen("does not exist");
-        return (1);
-    }
-
-    retval = load_mountlist(mountlist, g_mountlist_fname);
-    load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
-    if (retval) {
-        log_to_screen
-            ("Warning - load_raidtab_into_raidlist returned an error");
-    }
-    res = edit_mountlist(g_mountlist_fname, mountlist, raidlist);
-    if (res) {
-        return (1);
-    }
-
-    save_mountlist_to_disk(mountlist, g_mountlist_fname);
-    save_raidlist_to_raidtab(raidlist, RAIDTAB_FNAME);
-
-    log_to_screen("I have finished editing the mountlist for you.");
-
-    return (retval);
-}
-
-
-
-
-
 /**
  * Determine whether @p mountlist contains a Compaq diagnostic partition.
@@ -193 +143 @@
  */
 bool
-partition_table_contains_Compaq_diagnostic_partition(struct
-                                                     mountlist_itself *
-                                                     mountlist)
-{
-    int i;
-
-    assert(mountlist != NULL);
-
-    for (i = 0; i < mountlist->entries; i++) {
-        if (strstr(mountlist->el[i].format, "ompaq")) {
-            log_msg(2, "mountlist[%d] (%s) is %s (Compaq alert!)",
-                    i, mountlist->el[i].device, mountlist->el[i].format);
-
-            return (TRUE);
-        }
-    }
-    return (FALSE);
+partition_table_contains_Compaq_diagnostic_partition(struct mountlist_itself * mountlist) {
+
+int i;
+
+assert(mountlist != NULL);
+
+for (i = 0; i < mountlist->entries; i++) {
+    if (strstr(mountlist->el[i].format, "ompaq")) {
+        log_msg(2, "mountlist[%d] (%s) is %s (Compaq alert!)", i, mountlist->el[i].device, mountlist->el[i].format);
+
+        return (TRUE);
+    }
+}
+return (FALSE);
 }
 
@@ -225 +172 @@
 {
     popup_and_OK(COMPAQ_PROLIANTS_SUCK);
-    if (ask_me_yes_or_no
-        ("Would you like to reboot and use your Compaq CD to prep your hard drive?"))
+    if (ask_me_yes_or_no("Would you like to reboot and use your Compaq CD to prep your hard drive?"))
     {
-        fatal_error
-            ("Aborting. Please reboot and prep your hard drive with your Compaq CD.");
+        fatal_error("Aborting. Please reboot and prep your hard drive with your Compaq CD.");
     }
 }
@@ -237 +182 @@
  **************************************************************************/
 
-
-
-/**
- * Call interactive_mode(), nuke_mode(), or compare_mode() depending on the user's choice.
- * @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 to go with @p mountlist.
- * @return The return code from the mode function called.
- * @ingroup restoreGroup
- */
-int
-catchall_mode(struct mountlist_itself *mountlist,
-              struct raidlist_itself *raidlist)
-{
-    char c;
-    char *tmp = NULL;
-    int retval = 0;
-
-    log_it("inside catchall");
-    assert(bkpinfo != NULL);
-    assert(mountlist != NULL);
-    assert(raidlist != NULL);
-    log_it("pre wrm");
-    c = which_restore_mode();
-    log_it("post wrm");
-    if (c == 'I' || c == 'C') {
-        interactively_obtain_media_parameters_from_user(FALSE);
-    } else if (c == 'N') {
-        // Auto mode nothing special to do
-    } else {
-        popup_and_OK("No restoring or comparing will take place today.");
-        if (is_this_device_mounted("/mnt/cdrom")) {
-            run_program_and_log_output("umount -d /mnt/cdrom", FALSE);
-        }
-        if (g_ISO_restore_mode) {
-            mr_asprintf(tmp, "umount -d %s", bkpinfo->isodir);
-            run_program_and_log_output(tmp, FALSE);
-            mr_free(tmp);
-        }
-        paranoid_MR_finish(0);
-    }
-
-    log_it("post int");
-
-    if (bkpinfo->backup_media_type == iso) {
-        if (iso_fiddly_bits((c == 'N') ? TRUE : FALSE)) {
-            log_msg(2,
-                    "catchall_mode --- iso_fiddly_bits returned w/ error");
-            return (1);
-        } else {
-            log_msg(2, "catchall_mode --- iso_fiddly_bits ok");
-        }
-    }
-
-    if (c == 'I') {
-        log_msg(2, "IM selected");
-        retval += interactive_mode(mountlist, raidlist);
-    } else if (c == 'N') {
-        log_msg(2, "NM selected");
-        retval += nuke_mode(mountlist, raidlist);
-    } else if (c == 'C') {
-        log_msg(2, "CM selected");
-        retval += compare_mode(mountlist, raidlist);
-    }
-    return (retval);
-}
-
-/**************************************************************************
- *END_CATCHALL_MODE                                                      *
- **************************************************************************/
-
-/**************************************************************************
- *END_  EXTRACT_CONFIG_FILE_FROM_RAMDISK                                  *
- **************************************************************************/
-
-
-/**
- * Locate an executable in the directory structure rooted at @p restg.
- * @param out_path Where to put the executable.
- * @param fname The basename of the executable.
- * @param restg The directory structure to look in.
- * @note If it could not be found in @p restg then @p fname is put in @p out_path.
- * @ingroup restoreUtilityGroup
- */
-void
-find_pathname_of_executable_preferably_in_RESTORING(char *out_path,
-                                                    char *fname,
-                                                    char *restg)
-{
-    assert(out_path != NULL);
-    assert_string_is_neither_NULL_nor_zerolength(fname);
-
-    sprintf(out_path, "%s/sbin/%s", restg, fname);
-    if (does_file_exist(out_path)) {
-        sprintf(out_path, "%s/usr/sbin/%s", restg, fname);
-        if (does_file_exist(out_path)) {
-            sprintf(out_path, "%s/bin/%s", restg, fname);
-            if (does_file_exist(out_path)) {
-                sprintf(out_path, "%s/usr/bin/%s", restg, fname);
-                if (does_file_exist(out_path)) {
-                    strcpy(out_path, fname);
-                }
-            }
-        }
-    }
-}
-
-/**************************************************************************
- *END_FIND_PATHNAME_OF_EXECUTABLE_PREFERABLY_IN_RESTORING                 *
- **************************************************************************/
 
 static void clean_blkid() {
@@ -402 +237 @@
 
 
+/**
+ * Restore biggiefile @p bigfileno from the currently mounted CD.
+ * @param bkpinfo The backup information structure. Fields used:
+ * - @c bkpinfo->backup_media_type
+ * - @c bkpinfo->restore_path
+ * @param bigfileno The biggiefile number (starting from 0) to restore.
+ * @param filelist The node structure containing the list of files to restore.
+ * If the biggiefile is not in this list, it will be skipped (return value will
+ * still indicate success).
+ * @return 0 for success (or skip), nonzero for failure.
+ */
+int restore_a_biggiefile_from_CD(long bigfileno,
+                             struct s_node *filelist,
+                             char *pathname_of_last_file_restored)
+{
+    FILE *fin;
+    FILE *fout;
+    FILE *fbzip2;
+
+  /** malloc ***/
+    char *checksum = NULL;
+    char *outfile_fname = NULL;
+    char *tmp = NULL;
+    char *bzip2_command = NULL;
+    char *suffix = NULL;
+    char *sz_devfile = NULL;
+    char *bigblk;
+    char *mds = NULL;
+    int retval = 0;
+    int finished = FALSE;
+    long sliceno;
+    long siz;
+    char *ntfsprog_fifo = NULL;
+    char *file_to_openout = NULL;
+    struct s_filename_and_lstat_info biggiestruct;
+    struct utimbuf the_utime_buf, *ubuf;
+    bool use_ntfsprog_hack = FALSE;
+    pid_t pid;
+    int res = 0;
+    int old_loglevel;
+    struct s_node *node;
+
+    old_loglevel = g_loglevel;
+    ubuf = &the_utime_buf;
+    assert(bkpinfo != NULL);
+
+    pathname_of_last_file_restored[0] = '\0';
+    if (!(bigblk = malloc(TAPE_BLOCK_SIZE))) {
+        fatal_error("Cannot malloc bigblk");
+    }
+
+    if (!(fin = fopen(slice_fname(bigfileno, 0, ARCHIVES_PATH, ""), "r"))) {
+        log_to_screen("Cannot even open bigfile's info file");
+        return (1);
+    }
+
+    memset((void *) &biggiestruct, 0, sizeof(biggiestruct));
+    if (fread((void *) &biggiestruct, 1, sizeof(biggiestruct), fin) <
+        sizeof(biggiestruct)) {
+        log_msg(2, "Warning - unable to get biggiestruct of bigfile #%d",
+                bigfileno + 1);
+    }
+    paranoid_fclose(fin);
+
+    mr_asprintf(checksum, "%s", biggiestruct.checksum);
+    if (!checksum[0]) {
+        log_msg(3, "Warning - bigfile %ld does not have a checksum", bigfileno + 1);
+    }
+    mr_free(checksum);
+
+    if (!strncmp(biggiestruct.filename, "/dev/", 5))    // Whether NTFS or not :)
+    {
+        mr_asprintf(outfile_fname, "%s", biggiestruct.filename);
+    } else {
+        mr_asprintf(outfile_fname, "%s/%s", bkpinfo->restore_path, biggiestruct.filename);
+    }
+
+    /* skip file if we have a selective restore subset & it doesn't match */
+    if (filelist != NULL) {
+        node = find_string_at_node(filelist, biggiestruct.filename);
+        if (!node) {
+            log_msg(0, "Skipping %s (name isn't in filelist)", biggiestruct.filename);
+            pathname_of_last_file_restored[0] = '\0';
+            return (0);
+        } else if (!(node->selected)) {
+            log_msg(1, "Skipping %s (name isn't in biggielist subset)", biggiestruct.filename);
+            pathname_of_last_file_restored[0] = '\0';
+            return (0);
+        }
+    }
+
+    /* otherwise, continue */
+    log_msg(1, "DEFINITELY restoring %s", biggiestruct.filename);
+    if (biggiestruct.use_ntfsprog) {
+        if (strncmp(biggiestruct.filename, "/dev/", 5)) {
+            log_msg(1, "I was in error when I set biggiestruct.use_ntfsprog to TRUE.");
+            log_msg(1, "%s isn't even in /dev", biggiestruct.filename);
+            biggiestruct.use_ntfsprog = FALSE;
+        }
+    }
+
+    if (biggiestruct.use_ntfsprog)  // if it's an NTFS device
+    {
+        g_loglevel = 4;
+        use_ntfsprog_hack = TRUE;
+        log_msg(2, "Calling ntfsclone in background because %s is an NTFS /dev entry", outfile_fname);
+        mr_asprintf(sz_devfile, "/tmp/%d.%d.000", (int) (random() % 32768), (int) (random() % 32768));
+        mkfifo(sz_devfile, 0x770);
+        mr_asprintf(ntfsprog_fifo, "%s", sz_devfile);
+        mr_free(sz_devfile);
+        file_to_openout = ntfsprog_fifo;
+        switch (pid = fork()) {
+        case -1:
+            fatal_error("Fork failure");
+        case 0:
+            log_msg(3, "CHILD - fip - calling feed_outfrom_ntfsprog(%s, %s)", biggiestruct.filename, ntfsprog_fifo);
+            res = feed_outfrom_ntfsprog(biggiestruct.filename, ntfsprog_fifo);
+            mr_free(ntfsprog_fifo);
+            exit(res);
+            break;
+        default:
+            log_msg(3, "feed_into_ntfsprog() called in background --- pid=%ld", (long int) (pid));
+        }
+        mr_free(ntfsprog_fifo);
+    } else {
+        use_ntfsprog_hack = FALSE;
+        file_to_openout = outfile_fname;
+        if (!does_file_exist(outfile_fname))    // yes, it looks weird with the '!' but it's correct that way
+        {
+            make_hole_for_file(outfile_fname);
+        }
+    }
+
+    log_msg(2, "Reassembling big file %ld (%s)", bigfileno + 1, outfile_fname);
+
+    /*
+       last slice is zero-length and uncompressed; when we find it, we stop.
+       We DON'T wait until there are no more slices; if we did that,
+       We might stop at end of CD, not at last slice (which is 0-len and uncompd)
+     */
+
+    strncpy(pathname_of_last_file_restored, biggiestruct.filename, MAX_STR_LEN - 1);
+    pathname_of_last_file_restored[MAX_STR_LEN - 1] = '\0';
+
+    log_msg(3, "file_to_openout = %s", file_to_openout);
+    if (!(fout = fopen(file_to_openout, "w"))) {
+        log_to_screen("Cannot openout outfile_fname - hard disk full?");
+        return (1);
+    }
+    log_msg(3, "Opened out to %s", outfile_fname);  // CD/DVD --> mondorestore --> ntfsclone --> hard disk itself
+
+    for (sliceno = 1, finished = FALSE; !finished;) {
+        if (!does_file_exist(slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "")) &&
+            !does_file_exist(slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "lzo")) &&
+            !does_file_exist(slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "gz")) &&
+            !does_file_exist(slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "lzma")) &&
+            !does_file_exist(slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "bz2"))) {
+            log_msg(3, "Cannot find a data slice or terminator slice on CD %d", g_current_media_number);
+            g_current_media_number++;
+            mds = media_descriptor_string(bkpinfo->backup_media_type);
+            log_msg(2, "Asking for %s #%d so that I may read slice #%ld\n", mds, g_current_media_number, sliceno);
+            mr_free(mds);
+
+            log_to_screen("Restoring from %s #%d", mds, g_current_media_number);
+
+            insist_on_this_cd_number(g_current_media_number);
+            log_to_screen("Continuing to restore.");
+        } else {
+            mr_asprintf(tmp, "%s", slice_fname(bigfileno, sliceno, ARCHIVES_PATH, ""));
+            if (does_file_exist(tmp) && length_of_file(tmp) == 0) {
+                log_msg(2, "End of bigfile # %ld (slice %ld is the terminator)", bigfileno + 1, sliceno);
+                finished = TRUE;
+                mr_free(tmp);
+                continue;
+            } else {
+                if (does_file_exist(slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "lzo"))) {
+                    mr_asprintf(bzip2_command, "lzop");
+                    mr_asprintf(suffix, "lzo");
+                } else
+                    if (does_file_exist(slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "gz"))) {
+                    mr_asprintf(bzip2_command, "gzip");
+                    mr_asprintf(suffix, "gz");
+                } else
+                    if (does_file_exist(slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "lzma"))) {
+                    mr_asprintf(bzip2_command, "lzma");
+                    mr_asprintf(suffix, "lzma");
+                } else
+                    if (does_file_exist(slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "bz2"))) {
+                    mr_asprintf(bzip2_command, "bzip2");
+                    mr_asprintf(suffix, "bz2");
+                } else
+                    if (does_file_exist(slice_fname(bigfileno, sliceno, ARCHIVES_PATH, ""))) {
+                    mr_asprintf(bzip2_command, "");
+                    mr_asprintf(suffix, "");
+                } else {
+                    log_to_screen("OK, that's pretty fsck0red...");
+                    mr_free(tmp);
+                    return (1);
+                }
+            }
+            mr_free(tmp);
+            if (bzip2_command != NULL) {
+                mr_strcat(bzip2_command, " -dc %s 2>> %s", slice_fname(bigfileno, sliceno, ARCHIVES_PATH, suffix), MONDO_LOGFILE);
+            } else {
+                mr_asprintf(bzip2_command, "cat %s 2>> %s", slice_fname(bigfileno, sliceno, ARCHIVES_PATH, suffix), MONDO_LOGFILE);
+            }
+            mr_free(suffix);
+
+            mds = media_descriptor_string(bkpinfo->backup_media_type);
+            mr_asprintf(tmp, "Working on %s #%d, file #%ld, slice #%ld    ", mds, g_current_media_number, bigfileno + 1, sliceno);
+            mr_free(mds);
+            log_msg(2, tmp);
+
+            if (!g_text_mode) {
+                newtDrawRootText(0, g_noof_rows - 2, tmp);
+                newtRefresh();
+                strip_spaces(tmp);
+                update_progress_form(tmp);
+            }
+            mr_free(tmp);
+
+            if (!(fbzip2 = popen(bzip2_command, "r"))) {
+                fatal_error("Can't run popen command");
+            }
+            mr_free(bzip2_command);
+
+            while (!feof(fbzip2)) {
+                siz = fread(bigblk, 1, TAPE_BLOCK_SIZE, fbzip2);
+                if (siz > 0) {
+                    siz = fwrite(bigblk, 1, siz, fout);
+                }
+            }
+            paranoid_pclose(fbzip2);
+
+
+            sliceno++;
+            g_current_progress++;
+        }
+    }
+    paranoid_fclose(fout);
+    g_loglevel = old_loglevel;
+
+    if (use_ntfsprog_hack) {
+        log_msg(3, "Waiting for ntfsclone to finish");
+        mr_asprintf(tmp, " ps | grep \" ntfsclone \" | grep -v grep > /dev/null 2> /dev/null");
+        while (system(tmp) == 0) {
+            sleep(1);
+        }
+        mr_free(tmp);
+        log_it("OK, ntfsclone has really finished");
+    }
+
+    if (strcmp(outfile_fname, "/dev/null")) {
+        if (chown(outfile_fname, biggiestruct.properties.st_uid, biggiestruct.properties.st_gid)) {
+            // FIXME
+        }
+        chmod(outfile_fname, biggiestruct.properties.st_mode);
+        ubuf->actime = biggiestruct.properties.st_atime;
+        ubuf->modtime = biggiestruct.properties.st_mtime;
+        utime(outfile_fname, ubuf);
+    }
+    mr_free(outfile_fname);
+    paranoid_free(bigblk);
+
+    return (retval);
+}
+
+/**************************************************************************
+ *END_ RESTORE_A_BIGGIEFILE_FROM_CD                                       *
+ **************************************************************************/
+
+
+/**
+ * Restore all biggiefiles from all media in this CD backup.
+ * The CD with the last afioball should be currently mounted.
+ * @param bkpinfo The backup information structure. @c backup_media_type is the
+ * only field used in this function.
+ * @param filelist The node structure containing the list of files to be
+ * restored. If a prospective biggiefile is not in this list, it will be ignored.
+ * @return 0 for success, nonzero for failure.
+ */
+int restore_all_biggiefiles_from_CD(struct s_node *filelist) {
+
+    int retval = 0;
+    int res = 0;
+    long noof_biggiefiles, bigfileno = 0, total_slices;
+  /** malloc **/
+    char *tmp = NULL;
+    char *tmp1 = NULL;
+    char *mds = NULL;
+    bool just_changed_cds = FALSE;
+    char *xattr_fname = NULL;
+    char *acl_fname = NULL;
+    char *biggies_whose_EXATs_we_should_set = NULL; // EXtended ATtributes
+    char *pathname_of_last_biggie_restored;
+    FILE *fbw = NULL;
+
+    malloc_string(pathname_of_last_biggie_restored);
+    malloc_string(tmp);
+    assert(bkpinfo != NULL);
+
+    mr_asprintf(biggies_whose_EXATs_we_should_set, "%s/biggies-whose-EXATs-we-should-set", bkpinfo->tmpdir);
+    if (!(fbw = fopen(biggies_whose_EXATs_we_should_set, "w"))) {
+        log_msg(1, "Warning - cannot openout %s", biggies_whose_EXATs_we_should_set);
+    }
+
+    read_cfg_var(g_mondo_cfg_file, "total-slices", tmp);
+    total_slices = atol(tmp);
+    mr_free(tmp);
+
+    mr_asprintf(tmp1, "Reassembling large files      ");
+    mvaddstr_and_log_it(g_currentY, 0, tmp1);
+    mr_free(tmp1);
+
+    if (length_of_file(BIGGIELIST) < 6) {
+        log_msg(1, "OK, no biggielist; not restoring biggiefiles");
+        return (0);
+    }
+    noof_biggiefiles = count_lines_in_file(BIGGIELIST);
+    if (noof_biggiefiles <= 0) {
+        log_msg(2, "OK, no biggiefiles in biggielist; not restoring biggiefiles");
+        return (0);
+    }
+    log_msg(2, "OK, there are %ld biggiefiles in the archives", noof_biggiefiles);
+
+    open_progress_form("Reassembling large files",
+                       "I am now reassembling all the large files.",
+                       "Please wait. This may take some time.",
+                       "", total_slices);
+    for (bigfileno = 0 ; bigfileno < noof_biggiefiles ;) {
+        log_msg(2, "Thinking about restoring bigfile %ld", bigfileno + 1);
+        if (!does_file_exist(slice_fname(bigfileno, 0, ARCHIVES_PATH, ""))) {
+            log_msg(3, "...but its first slice isn't on this CD. Perhaps this was a selective restore?");
+            mds = media_descriptor_string(bkpinfo->backup_media_type);
+            log_msg(3, "Cannot find bigfile #%ld 's first slice on %s #%d", bigfileno + 1, mds, g_current_media_number);
+            log_msg(3, "Slicename would have been %s",
+                    slice_fname(bigfileno, 0, ARCHIVES_PATH, ""));
+            // I'm not positive 'just_changed_cds' is even necessary...
+            if (just_changed_cds) {
+                just_changed_cds = FALSE;
+                log_msg(3, "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(++g_current_media_number);
+                log_to_screen("Restoring from %s #%d", mds, g_current_media_number);
+                just_changed_cds = TRUE;
+            } else {
+                /* That big file doesn't exist, but the followings may */
+                /* So we need to continue looping */
+                log_msg(2, "There was no bigfile #%ld. That's OK.", bigfileno + 1);
+                log_msg(2, "I'm going to stop restoring bigfiles now.");
+                retval++;
+                bigfileno++;
+            }
+            mr_free(mds);
+        } else {
+            just_changed_cds = FALSE;
+            mr_asprintf(tmp1, "Restoring big file %ld", bigfileno + 1);
+            update_progress_form(tmp1);
+            mr_free(tmp1);
+            res = restore_a_biggiefile_from_CD(bigfileno, filelist, pathname_of_last_biggie_restored);
+            log_it("%s",pathname_of_last_biggie_restored);
+            if (fbw && pathname_of_last_biggie_restored[0]) {
+                fprintf(fbw, "%s\n", pathname_of_last_biggie_restored);
+            }
+            retval += res;
+            bigfileno++;
+
+        }
+    }
+
+    if (fbw) {
+        fclose(fbw);
+        if (g_getfattr) {
+            mr_asprintf(xattr_fname, XATTR_BIGGLST_FNAME_RAW_SZ, ARCHIVES_PATH);
+            if (length_of_file(xattr_fname) > 0) {
+                set_fattr_list(biggies_whose_EXATs_we_should_set, xattr_fname);
+            }
+            mr_free(xattr_fname);
+        }
+        if (g_getfacl) {
+            mr_asprintf(acl_fname, ACL_BIGGLST_FNAME_RAW_SZ, ARCHIVES_PATH);
+            if (length_of_file(acl_fname) > 0) {
+                set_acl_list(biggies_whose_EXATs_we_should_set, acl_fname);
+            }
+            mr_free(acl_fname);
+        }
+    }
+    mr_free(biggies_whose_EXATs_we_should_set);
+
+    if (does_file_exist("/PAUSE")) {
+        popup_and_OK("Press ENTER to go on. Delete /PAUSE to stop these pauses.");
+    }
+    close_progress_form();
+    if (retval) {
+        mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
+    } else {
+        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+    }
+    paranoid_free(pathname_of_last_biggie_restored);
+    return (retval);
+}
+
+/**************************************************************************
+ *END_RESTORE_ALL_BIGGIFILES_FROM_CD                                      *
+ **************************************************************************/
+
+
+
+/**
+ * Restore @p tarball_fname from CD.
+ * @param tarball_fname The filename of the tarball to restore (in /mnt/cdrom).
+ * This will be used unmodified.
+ * @param current_tarball_number The number (starting from 0) of the fileset
+ * we're restoring now.
+ * @param filelist The node structure containing the list of files to be
+ * restored. If no file in the afioball is in this list, afio will still be
+ * called, but nothing will be written.
+ * @return 0 for success, nonzero for failure.
+ */
+int
+restore_a_tarball_from_CD(char *tarball_fname,
+                          long current_tarball_number,
+                          struct s_node *filelist)
+{
+    int retval = 0;
+    int res;
+    char *p;
+
+  /** malloc **/
+    char *command = NULL;
+    char *tmp = NULL;
+    char *filelist_name = NULL;
+    char *filelist_subset_fname = NULL;
+    char *executable = NULL;
+    char *temp_log = NULL;
+    long matches = 0;
+    bool use_star;
+    char *xattr_fname = NULL;
+    char *acl_fname = NULL;
+
+    assert_string_is_neither_NULL_nor_zerolength(tarball_fname);
+    assert(bkpinfo != NULL);
+
+    log_msg(5, "Entering");
+    use_star = (strstr(tarball_fname, ".star")) ? TRUE : FALSE;
+    mr_asprintf(command, "mkdir -p %s/tmp", MNT_RESTORING);
+    run_program_and_log_output(command, 9);
+    paranoid_free(command);
+
+    mr_asprintf(filelist_name, MNT_CDROM "/archives/filelist.%ld", current_tarball_number);
+    if (length_of_file(filelist_name) <= 2) {
+        log_msg(2, "There are _zero_ files in filelist '%s'", filelist_name);
+        log_msg(2, "This is a bit silly (ask dev-team to fix mondo_makefilelist, please)");
+        log_msg(2, "but it's non-critical. It's cosmetic. Don't worry about it.");
+        retval = 0;
+        mr_free(filelist_name);
+        log_msg(5, "Leaving");
+        return(0);
+    }
+    if (count_lines_in_file(filelist_name) <= 0 || length_of_file(tarball_fname) <= 0) {
+        log_msg(3, "length_of_file(%s) = %llu", tarball_fname, length_of_file(tarball_fname));
+        log_msg(3, "count_lines_in_file(%s) = %llu", tarball_fname, count_lines_in_file(tarball_fname));
+        log_to_screen("Unable to restore fileset #%ld (CD I/O error)", current_tarball_number);
+        mr_free(filelist_name);
+        log_msg(5, "Leaving");
+        return(1);
+    }
+
+    if (filelist) {
+        mr_asprintf(filelist_subset_fname, "/tmp/filelist-subset-%ld.tmp", current_tarball_number);
+        if ((matches =
+             save_filelist_entries_in_common(filelist_name, filelist,
+                                             filelist_subset_fname,
+                                             use_star)) <= 0) {
+            log_msg(1, "Skipping fileset %ld", current_tarball_number);
+        } else {
+            log_msg(3, "Saved fileset %ld's subset to %s", current_tarball_number, filelist_subset_fname);
+        }
+        log_to_screen("Tarball #%ld --- %ld matches", current_tarball_number, matches);
+    }
+    mr_free(filelist_name);
+
+    if (filelist == NULL || matches > 0) {
+        if (g_getfattr) {
+            mr_asprintf(xattr_fname, XATTR_LIST_FNAME_RAW_SZ, MNT_CDROM "/archives", current_tarball_number);
+        }
+        if (g_getfacl) {
+            mr_asprintf(acl_fname, ACL_LIST_FNAME_RAW_SZ, MNT_CDROM "/archives", current_tarball_number);
+        }
+        if (strstr(tarball_fname, ".bz2")) {
+            mr_asprintf(executable, "bzip2");
+        } else if (strstr(tarball_fname, ".lzma")) {
+            mr_asprintf(executable, "lzma");
+        } else if (strstr(tarball_fname, ".gz")) {
+            mr_asprintf(executable, "gzip");
+        } else if (strstr(tarball_fname, ".lzo")) {
+            mr_asprintf(executable, "lzop");
+        }
+        if (bkpinfo->compression_level == 0) {
+            mr_asprintf(executable, "%s", "");
+        } else {
+            if (executable) {
+                mr_asprintf(tmp, "which %s > /dev/null 2> /dev/null", executable);
+                res = run_program_and_log_output(tmp, FALSE);
+                mr_free(tmp);
+    
+                if (res) {
+                    log_to_screen("(compare_a_tarball) Compression program %s not found - oh no!", executable);
+                    paranoid_MR_finish(1);
+                }
+                tmp = executable;
+                mr_asprintf(executable, "-P %s -Z", tmp);
+                mr_free(tmp);
+            }
+        }
+#ifdef __FreeBSD__
+#define BUFSIZE 512
+#else
+#define BUFSIZE (1024L*1024L)/TAPE_BLOCK_SIZE
+#endif
+
+        if (use_star) {
+            mr_asprintf(command, "star -x -force-remove -sparse -U " STAR_ACL_SZ " file=%s", tarball_fname);
+            if (strstr(tarball_fname, ".bz2")) {
+                mr_strcat(command, " -bz");
+            }
+        } else {
+            if (! executable) {
+                log_msg(2, "No executable, this shouldn't happen !");
+            } else {
+                if (filelist_subset_fname != NULL) {
+                    mr_asprintf(command, "afio -i -M 8m -b %ld -c %ld %s -w '%s' %s", TAPE_BLOCK_SIZE, BUFSIZE, executable, filelist_subset_fname, tarball_fname);
+                } else {
+                    mr_asprintf(command, "afio -i -b %ld -c %ld -M 8m %s %s", TAPE_BLOCK_SIZE, BUFSIZE, executable, tarball_fname);
+                }
+            }
+        }
+        mr_free(executable);
+
+#undef BUFSIZE
+        mr_asprintf(temp_log, "/tmp/%d.%d", (int) (random() % 32768), (int) (random() % 32768));
+
+        mr_strcat(command, " 2>> %s >> %s", temp_log, temp_log);
+        log_msg(1, "command = '%s'", command);
+        unlink(temp_log);
+        res = system(command);
+        if (res) {
+            p = strstr(command, "-acl ");
+            if (p) {
+                p[0] = p[1] = p[2] = p[3] = ' ';
+                log_msg(1, "new command = '%s'", command);
+                res = system(command);
+            }
+        }
+        paranoid_free(command);
+
+        if (res && length_of_file(temp_log) < 5) {
+            res = 0;
+        }
+
+        if (! use_star) {
+            if (g_getfattr) {
+                log_msg(1, "Setting fattr list %s", xattr_fname);
+                if (length_of_file(xattr_fname) > 0) {
+                    res = set_fattr_list(filelist_subset_fname, xattr_fname);
+                    if (res) {
+                        log_to_screen("Errors occurred while setting extended attributes");
+                    } else {
+                        log_msg(1, "I set xattr OK");
+                    }
+                    retval += res;
+                }
+            }
+            if (g_getfacl) {
+                log_msg(1, "Setting acl list %s", acl_fname);
+                if (length_of_file(acl_fname) > 0) {
+                    res = set_acl_list(filelist_subset_fname, acl_fname);
+                    if (res) {
+                        log_to_screen("Errors occurred while setting access control lists");
+                    } else {
+                        log_msg(1, "I set ACL OK");
+                    }
+                    retval += res;
+                }
+            }
+        } else {
+            retval = res;
+        }
+        // Be verbose for star
+        if (retval || use_star) {
+            mr_asprintf(command, "cat %s >> %s", temp_log, MONDO_LOGFILE);
+            paranoid_system(command);
+            paranoid_free(command);
+
+            if (retval) {
+                log_msg(2, "Errors occurred while processing fileset #%d", current_tarball_number);
+            }
+        } else {
+            log_msg(2, "Fileset #%d processed OK", current_tarball_number);
+        }
+        unlink(temp_log);
+        mr_free(temp_log);
+    }
+    if (does_file_exist("/PAUSE")) {
+        popup_and_OK
+            ("Press ENTER to go on. Delete /PAUSE to stop these pauses.");
+    }
+    unlink(filelist_subset_fname);
+    mr_free(filelist_subset_fname);
+    if (g_getfattr) {
+        unlink(xattr_fname);
+        mr_free(xattr_fname);
+    }
+    if (g_getfacl) {
+        unlink(acl_fname);
+        mr_free(acl_fname);
+    }
+
+    log_msg(5, "Leaving");
+    return (retval);
+}
+
+/**************************************************************************
+ *END_RESTORE_A_TARBALL_FROM_CD                                           *
+ **************************************************************************/
+
+
+
+/**
+ * Restore all afioballs from all CDs in the backup.
+ * The first CD should be inserted (if not, it will be asked for).
+ * @param bkpinfo The backup information structure. @c backup_media_type is the
+ * only field used in @e this function.
+ * @param filelist The node structure containing the list of files to be
+ * restored. If no file in some particular afioball is in this list, afio will
+ * still be called for that fileset, but nothing will be written.
+ * @return 0 for success, or the number of filesets that failed.
+ */
+int
+restore_all_tarballs_from_CD(struct s_node *filelist)
+{
+    int retval = 0;
+    int res;
+    int attempts;
+    long current_tarball_number = 0L;
+    long max_val;
+  /**malloc ***/
+    char *mds = NULL;
+    char *tmp = NULL;
+    char *tmp1 = NULL;
+    char *tarball_fname = NULL;
+    char *progress_str = NULL;
+
+    assert(bkpinfo != NULL);
+
+    malloc_string(tmp);
+    mvaddstr_and_log_it(g_currentY, 0, "Restoring from archives");
+    log_msg(2, "Insisting on 1st media, so that I can have a look at LAST-FILELIST-NUMBER");
+    if (g_current_media_number != 1) {
+        log_msg(3, "OK, that's jacked up.");
+        g_current_media_number = 1;
+    }
+    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;
+    paranoid_free(tmp);
+
+    mds = media_descriptor_string(bkpinfo->backup_media_type);
+    mr_asprintf(progress_str, "Restoring from %s #%d", mds, g_current_media_number);
+
+    log_to_screen(progress_str);
+    open_progress_form("Restoring from archives",
+                       "Restoring data from the archives.",
+                       "Please wait. This may take some time.",
+                       progress_str, max_val);
+    for (;;) {
+        insist_on_this_cd_number(g_current_media_number);
+        update_progress_form(progress_str);
+        mr_free(progress_str);
+
+        mr_asprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.bz2", current_tarball_number);
+        if (!does_file_exist(tarball_fname)) {
+            mr_free(tarball_fname);
+            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.gz", current_tarball_number);
+        }
+        if (!does_file_exist(tarball_fname)) {
+            mr_free(tarball_fname);
+            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.lzma", current_tarball_number);
+        }
+        if (!does_file_exist(tarball_fname)) {
+            mr_free(tarball_fname);
+            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.lzo", current_tarball_number);
+        }
+        if (!does_file_exist(tarball_fname)) {
+            mr_free(tarball_fname);
+            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.", current_tarball_number);
+        }
+        if (!does_file_exist(tarball_fname)) {
+            mr_free(tarball_fname);
+            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%ld.star.bz2", current_tarball_number);
+        }
+        if (!does_file_exist(tarball_fname)) {
+            mr_free(tarball_fname);
+            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%ld.star.", current_tarball_number);
+        }
+        if (!does_file_exist(tarball_fname)) {
+            if (current_tarball_number == 0) {
+                log_to_screen
+                    ("No tarballs. Strange. Maybe you only backed up freakin' big files?");
+                mr_free(tarball_fname);
+                return (0);
+            }
+            if (!does_file_exist(MNT_CDROM "/archives/NOT-THE-LAST")
+                || system("find " MNT_CDROM
+                          "/archives/slice* > /dev/null 2> /dev/null") ==
+                0) {
+                break;
+            }
+            g_current_media_number++;
+            mr_asprintf(progress_str, "Restoring from %s #%d", media_descriptor_string(bkpinfo->backup_media_type), g_current_media_number);
+            log_to_screen(progress_str);
+        } else {
+            mr_asprintf(progress_str, "Restoring from fileset #%ld on %s #%d", current_tarball_number, mds, g_current_media_number);
+            for (res = 999, attempts = 0; attempts < 3 && res != 0; attempts++) {
+                res = restore_a_tarball_from_CD(tarball_fname, current_tarball_number, filelist);
+            }
+            mr_asprintf(tmp1, "%s #%d, fileset #%ld - restore ", mds, g_current_media_number, current_tarball_number);
+            if (res) {
+                mr_strcat(tmp1, "reported errors");
+            } else if (attempts > 1) {
+                mr_strcat(tmp1, "succeeded");
+            } else {
+                mr_strcat(tmp1, "succeeded");
+            }
+            if (attempts > 1) {
+                mr_strcat(tmp1, " (%d attempts) - review logs", attempts);
+            }
+            if (attempts > 1) {
+                log_to_screen(tmp1);
+            }
+            mr_free(tmp1);
+
+            retval += res;
+            current_tarball_number++;
+            g_current_progress++;
+        }
+        mr_free(tarball_fname);
+
+        /* Now we need to umount the current media to have the next mounted by insist_on_this_cd_number */
+        /*   run_program_and_log_output("umount " MNT_CDROM, FALSE); */
+    }
+    mr_free(mds);
+    mr_free(progress_str);
+
+    close_progress_form();
+    if (retval) {
+        mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
+    } else {
+        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+    }
+
+    return (retval);
+}
+
+/**************************************************************************
+ *END_RESTORE_ALL_TARBALLS_FROM_CD                                        *
+ **************************************************************************/
+
+
+/**
+ * Restore a biggiefile from the currently opened stream.
+ * @param bkpinfo The backup information structure. Fields used:
+ * - @c bkpinfo->restore_path
+ * - @c bkpinfo->zip_exe
+ * @param orig_bf_fname The original filename of the biggiefile.
+ * @param biggiefile_number The number of the biggiefile (starting from 0).
+ * @param orig_checksum Unused.
+ * @param biggiefile_size Unused.
+ * @param filelist The node structure containing the list of files to be restored.
+ * If @p orig_bf_fname is not in the list, it will be ignored.
+ * @return 0 for success (or skip), nonzero for failure.
+ * @bug orig_checksum and biggiefile_size are unused (except to check that they are non-NULL).
+ */
+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,
+                                     int use_ntfsprog,
+                                     char *pathname_of_last_file_restored)
+{
+    FILE *pout;
+    FILE *fin;
+
+  /** mallocs ********/
+    char *tmp = NULL;
+    char *tmp1 = NULL;
+    char *command = NULL;
+    char *outfile_fname = NULL;
+    char *sz_devfile = NULL;
+    char *ntfsprog_fifo = NULL;
+    char *file_to_openout = NULL;
+
+    struct s_node *node;
+
+    int old_loglevel;
+    long current_slice_number = 0;
+    int retval = 0;
+    int res = 0;
+    int ctrl_chr = '\0';
+    long long slice_siz;
+    bool dummy_restore = FALSE;
+    bool use_ntfsprog_hack = FALSE;
+    pid_t pid;
+    struct s_filename_and_lstat_info biggiestruct;
+    struct utimbuf the_utime_buf, *ubuf;
+    ubuf = &the_utime_buf;
+
+    malloc_string(tmp);
+    old_loglevel = g_loglevel;
+    assert(bkpinfo != NULL);
+    assert(orig_bf_fname != NULL);
+    assert(orig_checksum != NULL);
+
+    pathname_of_last_file_restored[0] = '\0';
+    if (use_ntfsprog == BLK_START_A_PIHBIGGIE) {
+        use_ntfsprog = 1;
+        log_msg(1, "%s --- pih=YES", orig_bf_fname);
+    } else if (use_ntfsprog == BLK_START_A_NORMBIGGIE) {
+        use_ntfsprog = 0;
+        log_msg(1, "%s --- pih=NO", orig_bf_fname);
+    } else {
+        use_ntfsprog = 0;
+        log_msg(1, "%s --- pih=NO (weird marker though)", orig_bf_fname);
+    }
+
+    strncpy(pathname_of_last_file_restored, orig_bf_fname,
+            MAX_STR_LEN - 1);
+    pathname_of_last_file_restored[MAX_STR_LEN - 1] = '\0';
+
+    /* open out to biggiefile to be restored (or /dev/null if biggiefile is not to be restored) */
+
+    if (filelist != NULL) {
+        node = find_string_at_node(filelist, orig_bf_fname);
+        if (!node) {
+            dummy_restore = TRUE;
+            log_msg(1,
+                    "Skipping big file %ld (%s) - not in biggielist subset",
+                    biggiefile_number + 1, orig_bf_fname);
+            pathname_of_last_file_restored[0] = '\0';
+        } else if (!(node->selected)) {
+            dummy_restore = TRUE;
+            log_msg(1, "Skipping %s (name isn't in biggielist subset)",
+                    orig_bf_fname);
+            pathname_of_last_file_restored[0] = '\0';
+        }
+    }
+
+    if (use_ntfsprog) {
+        if (strncmp(orig_bf_fname, "/dev/", 5)) {
+            log_msg(1,
+                    "I was in error when I set use_ntfsprog to TRUE.");
+            log_msg(1, "%s isn't even in /dev", orig_bf_fname);
+            use_ntfsprog = FALSE;
+        }
+    }
+
+    if (use_ntfsprog) {
+        g_loglevel = 4;
+        mr_asprintf(outfile_fname, "%s", orig_bf_fname);
+        use_ntfsprog_hack = TRUE;
+        log_msg(2, "Calling ntfsclone in background because %s is a /dev entry", outfile_fname);
+        mr_asprintf(sz_devfile, "%s/%d.%d.000", bkpinfo->tmpdir, (int) (random() % 32768), (int) (random() % 32768));
+        mkfifo(sz_devfile, 0x770);
+        mr_asprintf(ntfsprog_fifo, "%s", sz_devfile);
+        mr_free(sz_devfile);
+
+        file_to_openout = ntfsprog_fifo;
+        switch (pid = fork()) {
+        case -1:
+            fatal_error("Fork failure");
+        case 0:
+            log_msg(3, "CHILD - fip - calling feed_outfrom_ntfsprog(%s, %s)", outfile_fname, ntfsprog_fifo);
+            res = feed_outfrom_ntfsprog(outfile_fname, ntfsprog_fifo);
+            mr_free(ntfsprog_fifo);
+            exit(res);
+            break;
+        default:
+            log_msg(3, "feed_into_ntfsprog() called in background --- pid=%ld", (long int) (pid));
+        }
+        mr_free(ntfsprog_fifo);
+    } else {
+        if (!strncmp(orig_bf_fname, "/dev/", 5))    {
+            // non-NTFS partition
+            mr_asprintf(outfile_fname, "%s", orig_bf_fname);
+        } else {
+            // biggiefile
+            mr_asprintf(outfile_fname, "%s/%s", bkpinfo->restore_path, orig_bf_fname);
+        }
+        use_ntfsprog_hack = FALSE;
+        file_to_openout = outfile_fname;
+        if (!does_file_exist(outfile_fname))    // yes, it looks weird with the '!' but it's correct that way
+        {
+            make_hole_for_file(outfile_fname);
+        }
+        log_msg(2, "Reassembling big file %ld (%s)", biggiefile_number + 1, orig_bf_fname);
+    }
+
+    if (dummy_restore) {
+        mr_free(outfile_fname);
+        mr_asprintf(outfile_fname, "/dev/null");
+    }
+
+    if (!bkpinfo->zip_exe[0]) {
+        mr_asprintf(command, "cat > \"%s\"", file_to_openout);
+    } else {
+        mr_asprintf(command, "%s -dc > \"%s\" 2>> %s", bkpinfo->zip_exe, file_to_openout, MONDO_LOGFILE);
+        if (strcmp(bkpinfo->zip_exe, "gzip") == 0) {
+            /* Ignore SIGPIPE for gzip as it causes errors on big files
+             * Cf: http://trac.mondorescue.org/ticket/244 */
+            signal(SIGPIPE,SIG_IGN);
+        }
+    }
+    log_msg(3, "Pipe command = '%s'", command);
+
+    /* restore biggiefile, one slice at a time */
+    if (!(pout = popen(command, "w"))) {
+        fatal_error("Cannot pipe out");
+    }
+    mr_free(command);
+
+    for (res = read_header_block_from_stream(&slice_siz, tmp, &ctrl_chr);
+         ctrl_chr != BLK_STOP_A_BIGGIE;
+         res = read_header_block_from_stream(&slice_siz, tmp, &ctrl_chr)) {
+        if (ctrl_chr != BLK_START_AN_AFIO_OR_SLICE) {
+            wrong_marker(BLK_START_AN_AFIO_OR_SLICE, ctrl_chr);
+        }
+        log_msg(2, "Working on file #%ld, slice #%ld    ", biggiefile_number + 1, current_slice_number);
+        if (!g_text_mode) {
+            newtDrawRootText(0, g_noof_rows - 2, tmp);
+            newtRefresh();
+        }
+        strip_spaces(tmp);
+        update_progress_form(tmp);
+        if (current_slice_number == 0) {
+            res =
+                read_file_from_stream_to_file("/tmp/biggie-blah.txt",
+                                              slice_siz);
+            if (!(fin = fopen("/tmp/biggie-blah.txt", "r"))) {
+                log_OS_error("blah blah");
+            } else {
+                if (fread
+                    ((void *) &biggiestruct, 1, sizeof(biggiestruct),
+                     fin) < sizeof(biggiestruct)) {
+                    log_msg(2,
+                            "Warning - unable to get biggiestruct of bigfile #%d",
+                            biggiefile_number + 1);
+                }
+                paranoid_fclose(fin);
+            }
+        } else {
+            res =
+                read_file_from_stream_to_stream(pout, slice_siz);
+        }
+        retval += res;
+        res = read_header_block_from_stream(&slice_siz, tmp, &ctrl_chr);
+        if (ctrl_chr != BLK_STOP_AN_AFIO_OR_SLICE) {
+            wrong_marker(BLK_STOP_AN_AFIO_OR_SLICE, ctrl_chr);
+        }
+        current_slice_number++;
+        g_current_progress++;
+    }
+    paranoid_pclose(pout);
+
+    if (bkpinfo->zip_exe[0]) {
+        if (strcmp(bkpinfo->zip_exe, "gzip") == 0) {
+            /* Re-enable SIGPIPE for gzip */
+            signal(SIGPIPE, terminate_daemon);
+        }
+    }
+
+    log_msg(1, "pathname_of_last_file_restored is now %s",
+            pathname_of_last_file_restored);
+
+    if (use_ntfsprog_hack) {
+        log_msg(3, "Waiting for ntfsclone to finish");
+        mr_asprintf(tmp1, " ps | grep \" ntfsclone \" | grep -v grep > /dev/null 2> /dev/null");
+        while (system(tmp1) == 0) {
+            sleep(1);
+        }
+        mr_free(tmp1);
+        log_msg(3, "OK, ntfsclone has really finished");
+    }
+
+    log_msg(3, "biggiestruct.filename = %s", biggiestruct.filename);
+    log_msg(3, "biggiestruct.checksum = %s", biggiestruct.checksum);
+    if (strcmp(outfile_fname, "/dev/null")) {
+        chmod(outfile_fname, biggiestruct.properties.st_mode);
+        if (chown(outfile_fname, biggiestruct.properties.st_uid, biggiestruct.properties.st_gid)) {
+            // FIXME
+        }
+        ubuf->actime = biggiestruct.properties.st_atime;
+        ubuf->modtime = biggiestruct.properties.st_mtime;
+        utime(outfile_fname, ubuf);
+    }
+    mr_free(outfile_fname);
+
+    paranoid_free(tmp);
+    g_loglevel = old_loglevel;
+    return (retval);
+}
+
+/**************************************************************************
+ *END_RESTORE_A_BIGGIEFILE_FROM_STREAM                                    *
+ **************************************************************************/
+
+
+
+/**
+ * Restore all biggiefiles from the currently opened stream.
+ * @param bkpinfo The backup information structure. Passed to other functions.
+ * @param filelist The node structure containing the list of files to be
+ * restored. If a prospective biggiefile is not in the list, it will be ignored.
+ * @return 0 for success, or the number of biggiefiles that failed.
+ */
+int
+restore_all_biggiefiles_from_stream(struct s_node *filelist)
+{
+    long noof_biggiefiles;
+    long current_bigfile_number = 0;
+    long total_slices;
+
+    int retval = 0;
+    int res = 0;
+    int ctrl_chr;
+
+  /** malloc add ****/
+    char *tmp = NULL;
+    char *tmp1 = NULL;
+    char *biggie_fname;
+    char *biggie_cksum;
+    char *xattr_fname = NULL;
+    char *acl_fname = NULL;
+    char *p;
+    char *pathname_of_last_biggie_restored;
+    char *biggies_whose_EXATs_we_should_set = NULL; // EXtended ATtributes
+    long long biggie_size;
+    FILE *fbw = NULL;
+
+    malloc_string(tmp);
+    malloc_string(biggie_fname);
+    malloc_string(biggie_cksum);
+    malloc_string(pathname_of_last_biggie_restored);
+    assert(bkpinfo != NULL);
+
+    read_cfg_var(g_mondo_cfg_file, "total-slices", tmp);
+
+    total_slices = atol(tmp);
+
+    if (g_getfattr) {
+        mr_asprintf(xattr_fname, XATTR_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
+    }
+    if (g_getfacl) {
+        mr_asprintf(acl_fname, ACL_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
+    }
+    mr_asprintf(tmp1, "Reassembling large files      ");
+    mvaddstr_and_log_it(g_currentY, 0, tmp1);
+    mr_free(tmp1);
+
+    mr_asprintf(biggies_whose_EXATs_we_should_set, "%s/biggies-whose-EXATs-we-should-set", bkpinfo->tmpdir);
+    if (!(fbw = fopen(biggies_whose_EXATs_we_should_set, "w"))) {
+        log_msg(1, "Warning - cannot openout %s", biggies_whose_EXATs_we_should_set);
+    }
+
+    // get xattr and acl files if they're there
+    res = read_header_block_from_stream(&biggie_size, biggie_fname, &ctrl_chr);
+    if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) {
+        res = read_EXAT_files_from_tape(&biggie_size, biggie_fname, &ctrl_chr, xattr_fname, acl_fname);
+    }
+
+    noof_biggiefiles = atol(biggie_fname);
+    log_msg(2, "OK, there are %ld biggiefiles in the archives", noof_biggiefiles);
+    open_progress_form("Reassembling large files",
+                       "I am now reassembling all the large files.",
+                       "Please wait. This may take some time.",
+                       "", total_slices);
+
+    for (res =
+         read_header_block_from_stream(&biggie_size, biggie_fname,
+                                       &ctrl_chr);
+         ctrl_chr != BLK_STOP_BIGGIEFILES;
+         res =
+         read_header_block_from_stream(&biggie_size, biggie_fname,
+                                       &ctrl_chr)) {
+        if (ctrl_chr != BLK_START_A_NORMBIGGIE
+            && ctrl_chr != BLK_START_A_PIHBIGGIE) {
+            wrong_marker(BLK_START_A_NORMBIGGIE, ctrl_chr);
+        }
+        p = strrchr(biggie_fname, '/');
+        if (!p) {
+            p = biggie_fname;
+        } else {
+            p++;
+        }
+        mr_asprintf(tmp1, "Restoring big file %ld (%lld K)", current_bigfile_number + 1, biggie_size / 1024);
+        update_progress_form(tmp1);
+        mr_free(tmp1);
+        res = restore_a_biggiefile_from_stream(biggie_fname,
+                                               current_bigfile_number,
+                                               biggie_cksum,
+                                               biggie_size,
+                                               filelist, ctrl_chr,
+                                               pathname_of_last_biggie_restored);
+        log_msg(1, "I believe I have restored %s",
+                pathname_of_last_biggie_restored);
+        if (fbw && pathname_of_last_biggie_restored[0]) {
+            fprintf(fbw, "%s\n", pathname_of_last_biggie_restored);
+        }
+        retval += res;
+        current_bigfile_number++;
+
+    }
+    if (current_bigfile_number != noof_biggiefiles
+        && noof_biggiefiles != 0) {
+        log_msg(1, "Warning - bigfileno=%ld but noof_biggiefiles=%ld\n", current_bigfile_number, noof_biggiefiles);
+    } else {
+        log_msg(1, "%ld biggiefiles in biggielist.txt; %ld biggiefiles processed today.", noof_biggiefiles, current_bigfile_number);
+    }
+
+    if (fbw) {
+        fclose(fbw);
+        if (length_of_file(biggies_whose_EXATs_we_should_set) > 2) {
+            log_it("Setting biggie-EXATs");
+            if (g_getfattr) {
+                if (length_of_file(xattr_fname) > 0) {
+                    log_msg(1, "set_fattr_List(%s,%s)", biggies_whose_EXATs_we_should_set, xattr_fname);
+                    set_fattr_list(biggies_whose_EXATs_we_should_set, xattr_fname);
+                }
+            }
+            if (g_getfacl) {
+                if (length_of_file(acl_fname) > 0) {
+                    log_msg(1, "set_acl_list(%s,%s)", biggies_whose_EXATs_we_should_set, acl_fname);
+                    set_acl_list(biggies_whose_EXATs_we_should_set, acl_fname);
+                }
+            }
+        } else {
+            log_it("No biggiefiles selected. So, no biggie-EXATs to set.");
+        }
+    }
+    mr_free(xattr_fname);
+    mr_free(acl_fname);
+    mr_free(biggies_whose_EXATs_we_should_set);
+
+    if (does_file_exist("/PAUSE")) {
+        popup_and_OK
+            ("Press ENTER to go on. Delete /PAUSE to stop these pauses.");
+    }
+
+    close_progress_form();
+    if (retval) {
+        mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
+    } else {
+        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+    }
+    paranoid_free(pathname_of_last_biggie_restored);
+    paranoid_free(biggie_fname);
+    paranoid_free(biggie_cksum);
+    paranoid_free(tmp);
+    return (retval);
+}
+
+/**************************************************************************
+ *END_RESTORE_ALL_BIGGIEFILES_FROM_STREAM                                 *
+ **************************************************************************/
+
+
+
+
+/**
+ * Restore a tarball from the currently opened stream.
+ * @param bkpinfo The backup information structure. Fields used:
+ * - @c bkpinfo->backup_media_type
+ * - @c bkpinfo->media_device
+ * - @c bkpinfo->zip_exe
+ * @param tarball_fname The filename of the afioball to restore.
+ * @param current_tarball_number The number (starting from 0) of the fileset
+ * we're restoring now.
+ * @param filelist The node structure containing the list of files to be
+ * restored. If no file in the afioball is in this list, afio will still be
+ * called, but nothing will be written.
+ * @param size The size (in @b bytes) of the afioball.
+ * @return 0 for success, nonzero for failure.
+ */
+int
+restore_a_tarball_from_stream(char *tarball_fname,
+                              long current_tarball_number,
+                              struct s_node *filelist,
+                              long long size, char *xattr_fname,
+                              char *acl_fname)
+{
+    int retval = 0;
+    int res = 0;
+
+  /** malloc add ***/
+    char *mds = NULL;
+    char *command = NULL;
+    char *afio_fname = NULL;
+    char *filelist_fname = NULL;
+    char *filelist_subset_fname = NULL;
+    char *executable = NULL;
+    long matches = 0;
+    bool restore_this_fileset = FALSE;
+    bool use_star;
+
+    assert(bkpinfo != NULL);
+    assert_string_is_neither_NULL_nor_zerolength(tarball_fname);
+
+    /* to do it with a file... */
+    use_star = (strstr(tarball_fname, ".star")) ? TRUE : FALSE;
+    mds = media_descriptor_string(bkpinfo->backup_media_type);
+    log_msg(2, "Restoring from fileset #%ld (%ld KB) on %s #%d",
+            current_tarball_number, (long) size >> 10, mds, g_current_media_number);
+    mr_free(mds);
+
+    run_program_and_log_output("mkdir -p " MNT_RESTORING "/tmp", FALSE);
+
+  /****************************************************************************
+   * Use RAMDISK's /tmp; saves time; oh wait, it's too small                  *
+   * Well, pipe from tape to afio, then; oh wait, can't do that either: bug   *
+   * in afio or someting; oh darn.. OK, use tmpfs :-)                         *
+   ****************************************************************************/
+    mr_asprintf(afio_fname, "/tmp/tmpfs/archive.tmp.%ld", current_tarball_number);
+    mr_asprintf(filelist_fname, "%s/filelist.%ld", bkpinfo->tmpdir, current_tarball_number);
+    mr_asprintf(filelist_subset_fname, "%s/filelist-subset-%ld.tmp", bkpinfo->tmpdir, current_tarball_number);
+
+    res = read_file_from_stream_to_file(afio_fname, size);
+    if (strstr(tarball_fname, ".star")) {
+        bkpinfo->use_star = TRUE;
+    }
+    if (res) {
+        log_msg(1, "Warning - error reading afioball from tape");
+    }
+    if (bkpinfo->compression_level == 0) {
+        mr_asprintf(executable, "%s", "");
+    } else {
+        if (bkpinfo->use_star) {
+            mr_asprintf(executable, "%s", " -bz");
+        } else {
+            mr_asprintf(executable, "-P %s -Z", bkpinfo->zip_exe);
+        }
+    }
+
+    if (!filelist)              // if unconditional restore then restore entire fileset
+    {
+        restore_this_fileset = TRUE;
+    } else                      // If restoring selectively then get TOC from tarball
+    {
+        if (strstr(tarball_fname, ".star.")) {
+            use_star = TRUE;
+            mr_asprintf(command, "star -sparse -t file=%s %s", afio_fname, executable);
+        } else {
+            use_star = FALSE;
+            mr_asprintf(command, "afio -t -M 8m -b %ld %s %s", TAPE_BLOCK_SIZE, executable, afio_fname);
+        }
+        mr_strcat(command, " > %s 2>> %s", filelist_fname, MONDO_LOGFILE);
+        log_msg(1, "command = %s", command);
+        if (system(command)) {
+            log_msg(4, "Warning - error occurred while retrieving TOC");
+        }
+        mr_free(command);
+
+        if ((matches =
+             save_filelist_entries_in_common(filelist_fname, filelist,
+                                             filelist_subset_fname,
+                                             use_star))
+            <= 0 || length_of_file(filelist_subset_fname) < 2) {
+            if (length_of_file(filelist_subset_fname) < 2) {
+                log_msg(1, "No matches found in fileset %ld",
+                        current_tarball_number);
+            }
+            log_msg(2, "Skipping fileset %ld", current_tarball_number);
+            restore_this_fileset = FALSE;
+        } else {
+            log_msg(5, "%ld matches. Saved fileset %ld's subset to %s",
+                    matches, current_tarball_number,
+                    filelist_subset_fname);
+            restore_this_fileset = TRUE;
+        }
+    }
+
+// Concoct the call to star/afio to restore files
+    if (strstr(tarball_fname, ".star.")) {
+        // star
+        mr_asprintf(command, "star -sparse -x file=%s %s", afio_fname, executable);
+        if (filelist) {
+            mr_strcat(command, " list=%s", filelist_subset_fname);
+        }
+    } else {
+        // afio
+        mr_asprintf(command, "afio -i -M 8m -b %ld %s", TAPE_BLOCK_SIZE, executable);
+        if (filelist) {
+            mr_strcat(command, " -w %s", filelist_subset_fname);
+        }
+        mr_strcat(command, " %s", afio_fname);
+    }
+    mr_strcat(command, " 2>> %s", MONDO_LOGFILE);
+    mr_free(executable);
+
+// Call if IF there are files to restore (selectively/unconditionally)
+    if (restore_this_fileset) {
+        log_msg(1, "Calling command='%s'", command);
+        paranoid_system(command);
+
+        if (g_getfattr) {
+            log_it("Restoring xattr stuff");
+            res = set_fattr_list(filelist_subset_fname, xattr_fname);
+            if (res) {
+                log_msg(1, "Errors occurred while setting xattr");
+            } else {
+                log_msg(1, "I set xattr OK");
+            }
+            retval += res;
+        }
+
+        if (g_getfacl) {
+            log_it("Restoring acl stuff");
+            res = set_acl_list(filelist_subset_fname, acl_fname);
+            if (res) {
+                log_msg(1, "Errors occurred while setting ACL");
+            } else {
+                log_msg(1, "I set ACL OK");
+            }
+            retval += res;
+        }
+
+    } else {
+        log_msg(1, "NOT CALLING '%s'", command);
+    }
+    mr_free(command);
+
+    if (does_file_exist("/PAUSE") && current_tarball_number >= 50) {
+        log_to_screen("Paused after set %ld", current_tarball_number);
+        popup_and_OK("Pausing. Press ENTER to continue.");
+    }
+
+    unlink(filelist_subset_fname);
+    mr_free(filelist_subset_fname);
+    unlink(filelist_fname);
+    mr_free(filelist_fname);
+    unlink(afio_fname);
+    mr_free(afio_fname);
+
+    return (retval);
+}
+
+/**************************************************************************
+ *END_RESTORE_A_TARBALL_FROM_STREAM                                       *
+ **************************************************************************/
+
+
+
+
+
+/**
+ * Restore all afioballs from the currently opened tape stream.
+ * @param bkpinfo The backup information structure. Fields used:
+ * - @c bkpinfo->backup_media_type
+ * - @c bkpinfo->restore_path
+ * @param filelist The node structure containing the list of files to be
+ * restored. If no file in an afioball is in this list, afio will still be
+ * called for that fileset, but nothing will be written.
+ * @return 0 for success, or the number of filesets that failed.
+ */
+int restore_all_tarballs_from_stream(struct s_node *filelist)
+{
+    int retval = 0;
+    int res;
+    long current_afioball_number = 0;
+    int ctrl_chr;
+    long max_val /*, total_noof_files */ ;
+
+  /** malloc **/
+    char *tmp = NULL;
+    char *mds = NULL;
+    char *progress_str = NULL;
+    char *tmp_fname;
+    char *xattr_fname = NULL;
+    char *acl_fname = NULL;
+
+    long long tmp_size;
+
+    malloc_string(tmp);
+    malloc_string(tmp_fname);
+    assert(bkpinfo != NULL);
+    mvaddstr_and_log_it(g_currentY, 0, "Restoring from archives");
+    read_cfg_var(g_mondo_cfg_file, "last-filelist-number", tmp);
+    max_val = atol(tmp) + 1;
+
+    if (chdir(bkpinfo->restore_path)) { /* I don't know why this is needed _here_ but it seems to be. -HR, 02/04/2002 */
+        //FIXME
+    }
+
+    run_program_and_log_output("pwd", 5);
+
+    mr_asprintf(progress_str, "Restoring from media #%d", g_current_media_number);
+    log_to_screen(progress_str);
+    open_progress_form("Restoring from archives",
+                       "Restoring data from the archives.",
+                       "Please wait. This may take some time.",
+                       progress_str, max_val);
+
+    log_msg(3, "hey");
+
+    res = read_header_block_from_stream(&tmp_size, tmp_fname, &ctrl_chr);
+    if (res) {
+        log_msg(2, "Warning - error reading afioball from tape");
+    }
+    retval += res;
+    if (ctrl_chr != BLK_START_AFIOBALLS) {
+        wrong_marker(BLK_START_AFIOBALLS, ctrl_chr);
+    }
+    log_msg(2, "ho");
+    res = read_header_block_from_stream(&tmp_size, tmp_fname, &ctrl_chr);
+    while (ctrl_chr != BLK_STOP_AFIOBALLS) {
+        update_progress_form(progress_str);
+        if (g_getfattr) {
+            mr_asprintf(xattr_fname, "%s/xattr-subset-%ld.tmp", bkpinfo->tmpdir, current_afioball_number);
+            unlink(xattr_fname);
+        }
+        if (g_getfacl) {
+            mr_asprintf(acl_fname, "%s/acl-subset-%ld.tmp", bkpinfo->tmpdir, current_afioball_number);
+            unlink(acl_fname);
+        }
+        if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) {
+            log_it("Reading EXAT files from tape");
+            res = read_EXAT_files_from_tape(&tmp_size, tmp_fname, &ctrl_chr, xattr_fname, acl_fname);
+        }
+        if (ctrl_chr != BLK_START_AN_AFIO_OR_SLICE) {
+            wrong_marker(BLK_START_AN_AFIO_OR_SLICE, ctrl_chr);
+        }
+        log_msg(4, "Restoring from fileset #%ld (name=%s, size=%ld K)", current_afioball_number, tmp_fname, (long) tmp_size >> 10);
+        res = restore_a_tarball_from_stream(tmp_fname, current_afioball_number, filelist, tmp_size, xattr_fname, acl_fname);
+        retval += res;
+        if (res) {
+            log_to_screen("Fileset %ld - errors occurred", current_afioball_number);
+        }
+        res =
+            read_header_block_from_stream(&tmp_size, tmp_fname, &ctrl_chr);
+        if (ctrl_chr != BLK_STOP_AN_AFIO_OR_SLICE) {
+            wrong_marker(BLK_STOP_AN_AFIO_OR_SLICE, ctrl_chr);
+        }
+
+        current_afioball_number++;
+        g_current_progress++;
+        mds = media_descriptor_string(bkpinfo->backup_media_type),
+
+        mr_free(progress_str);
+        mr_asprintf(progress_str, "Restoring from fileset #%ld on %s #%d", current_afioball_number, mds, g_current_media_number);
+        mr_free(mds);
+        res = read_header_block_from_stream(&tmp_size, tmp_fname, &ctrl_chr);
+        if (g_getfattr) {
+            unlink(xattr_fname);
+        }
+        if (g_getfacl) {
+            unlink(acl_fname);
+        }
+    }                           // next
+    mr_free(progress_str);
+    if (g_getfattr) {
+        mr_free(xattr_fname);
+    }
+    if (g_getfacl) {
+        mr_free(acl_fname);
+    }
+
+    log_msg(1, "All done with afioballs");
+    close_progress_form();
+    if (retval) {
+        mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
+    } else {
+        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+    }
+    paranoid_free(tmp);
+    paranoid_free(tmp_fname);
+    return (retval);
+}
+
+/**************************************************************************
+ *END_ RESTORE_ALL_TARBALLS_FROM_STREAM                                   *
+ **************************************************************************/
+
+/* @} - end of LLrestoreGroup */
+
+
+/**
+ * Restore all files in @p filelist.
+ * @param bkpinfo The backup information structure. Most fields are used.
+ * @param filelist The node structure containing the list of files to be
+ * restored.
+ * @return 0 for success, or the number of afioballs and biggiefiles that failed.
+ * @ingroup restoreGroup
+ */
+int restore_everything(struct s_node *filelist)
+{
+    int resA;
+    int resB;
+
+  /** mallco ***/
+    char *cwd;
+    char *newpath;
+    char *tmp = NULL;
+    assert(bkpinfo != NULL);
+
+    malloc_string(cwd);
+    malloc_string(newpath);
+    log_msg(2, "restore_everything() --- starting");
+    g_current_media_number = 1;
+    if (getcwd(cwd, MAX_STR_LEN - 1)) {
+        // FIXME
+    }
+    mr_asprintf(tmp, "mkdir -p %s", bkpinfo->restore_path);
+    run_program_and_log_output(tmp, FALSE);
+    mr_free(tmp);
+
+    log_msg(1, "Changing dir to %s", bkpinfo->restore_path);
+    if (chdir(bkpinfo->restore_path)) {
+        //FIXME
+    }
+    if (getcwd(newpath, MAX_STR_LEN - 1)) {
+        // FIXME
+    }
+    log_msg(1, "path is now %s", newpath);
+    log_msg(1, "restoring everything");
+    if (!find_home_of_exe("petris") && !g_text_mode) {
+        newtDrawRootText(0, g_noof_rows - 2,
+                         "Press ALT-<left cursor> twice to play Petris :-) ");
+        newtRefresh();
+    }
+    mvaddstr_and_log_it(g_currentY, 0, "Preparing to read your archives");
+    mount_media();
+    if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
+        mvaddstr_and_log_it(g_currentY++, 0,
+                            "Restoring OS and data from streaming media");
+        if (bkpinfo->backup_media_type == cdstream) {
+            openin_cdstream();
+        } else {
+            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();
+        } else {
+            closein_tape();
+        }
+    } else {
+        mvaddstr_and_log_it(g_currentY++, 0,
+                            "Restoring OS and data from CD/USB   ");
+        resA = restore_all_tarballs_from_CD(filelist);
+        resB = restore_all_biggiefiles_from_CD(filelist);
+    }
+    if (chdir(cwd)) {
+        //FIXME
+    }
+    if (resA + resB) {
+        log_to_screen("Errors occurred while data was being restored.");
+    }
+    if (length_of_file("/etc/raidtab") > 0) {
+        log_msg(2, "Copying local raidtab to restored filesystem");
+        run_program_and_log_output("cp -f /etc/raidtab " MNT_RESTORING
+                                   "/etc/raidtab", FALSE);
+    }
+    kill_petris();
+    log_msg(2, "restore_everything() --- leaving");
+    paranoid_free(cwd);
+    paranoid_free(newpath);
+    return (resA + resB);
+}
+
+/**************************************************************************
+ *END_RESTORE_EVERYTHING                                                  *
+ **************************************************************************/
 
 
@@ -661 +2077 @@
 
 /**
- * Run an arbitrary restore mode (prompt the user), but from ISO images
- * instead of real media.
- * @param mountlist The mountlist containing information about the user's partitions.
- * @param raidlist The raidlist that goes with @p mountlist.
- * @param nuke_me_please If TRUE, we plan to run Nuke Mode.
- * @return 0 for success, or the number of errors encountered.
- */
-int
-iso_mode(struct mountlist_itself *mountlist,
-         struct raidlist_itself *raidlist, bool nuke_me_please)
-{
-    char c;
-    int retval = 0;
-
-    assert(mountlist != NULL);
-    assert(raidlist != NULL);
-    if (iso_fiddly_bits(nuke_me_please)) {
-        log_msg(1, "iso_mode --- returning w/ error");
-        return (1);
-    } else {
-        c = which_restore_mode();
-        if (c == 'I' || c == 'N' || c == 'C') {
-            interactively_obtain_media_parameters_from_user(FALSE);
-        }
-        if (c == 'I') {
-            retval += interactive_mode(mountlist, raidlist);
-        } else if (c == 'N') {
-            retval += nuke_mode(mountlist, raidlist);
-        } else if (c == 'C') {
-            retval += compare_mode(mountlist, raidlist);
-        } else {
-            log_to_screen("OK, I shan't restore/compare any files.");
-        }
-    }
-    if (is_this_device_mounted(MNT_CDROM)) {
-        paranoid_system("umount -d " MNT_CDROM);
-    }
-//  if (! already_mounted)
-//    {
-    if (system("umount -d /tmp/isodir 2> /dev/null")) {
-        log_to_screen("WARNING - unable to unmount device where the ISO files are stored.");
-    }
-//    }
-    return (retval);
-}
-
-/**************************************************************************
- *END_ISO_MODE                                                            *
- **************************************************************************/
-
-
-/*            MONDO - saving your systems since Feb 18th, 2000            */
-
-
-
-
-/**
  * Restore the user's data automatically (no prompts), after a twenty-second
  * warning period.
@@ -870 +2229 @@
 
 /**
+ * Allow the user to modify the mountlist before we partition & format their drives.
+ * @param bkpinfo The backup information structure. @c disaster_recovery is the only field used.
+ * @param mountlist The mountlist to let the user modify.
+ * @param raidlist The raidlist that goes with @p mountlist.
+ * @return 0 for success, nonzero for failure.
+ * @ingroup restoreGuiGroup
+ */
+int let_user_edit_the_mountlist(struct mountlist_itself *mountlist,
+                                struct raidlist_itself *raidlist)
+{
+    int retval = 0, res = 0;
+
+    log_msg(2, "let_user_edit_the_mountlist() --- starting");
+
+    assert(bkpinfo != NULL);
+    assert(mountlist != NULL);
+    assert(raidlist != NULL);
+    if (!bkpinfo->disaster_recovery) {
+        strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
+        log_msg(2, "I guess you're testing edit_mountlist()");
+    }
+    if (!does_file_exist(g_mountlist_fname)) {
+        log_to_screen(g_mountlist_fname);
+        log_to_screen("does not exist");
+        return (1);
+    }
+
+    retval = load_mountlist(mountlist, g_mountlist_fname);
+    load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
+    if (retval) {
+        log_to_screen
+            ("Warning - load_raidtab_into_raidlist returned an error");
+    }
+    res = edit_mountlist(g_mountlist_fname, mountlist, raidlist);
+    if (res) {
+        return (1);
+    }
+
+    save_mountlist_to_disk(mountlist, g_mountlist_fname);
+    save_raidlist_to_raidtab(raidlist, RAIDTAB_FNAME);
+
+    log_to_screen("I have finished editing the mountlist for you.");
+
+    return (retval);
+}
+
+
+
+
+
+/**
+ * Call interactive_mode(), nuke_mode(), or compare_mode() depending on the user's choice.
+ * @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 to go with @p mountlist.
+ * @return The return code from the mode function called.
+ * @ingroup restoreGroup
+ */
+int
+catchall_mode(struct mountlist_itself *mountlist,
+              struct raidlist_itself *raidlist)
+{
+    char c;
+    char *tmp = NULL;
+    int retval = 0;
+
+    log_it("inside catchall");
+    assert(bkpinfo != NULL);
+    assert(mountlist != NULL);
+    assert(raidlist != NULL);
+    log_it("pre wrm");
+    c = which_restore_mode();
+    log_it("post wrm");
+    if (c == 'I' || c == 'C') {
+        interactively_obtain_media_parameters_from_user(FALSE);
+    } else if (c == 'N') {
+        // Auto mode nothing special to do
+    } else {
+        popup_and_OK("No restoring or comparing will take place today.");
+        if (is_this_device_mounted("/mnt/cdrom")) {
+            run_program_and_log_output("umount -d /mnt/cdrom", FALSE);
+        }
+        if (g_ISO_restore_mode) {
+            mr_asprintf(tmp, "umount -d %s", bkpinfo->isodir);
+            run_program_and_log_output(tmp, FALSE);
+            mr_free(tmp);
+        }
+        paranoid_MR_finish(0);
+    }
+
+    log_it("post int");
+
+    if (bkpinfo->backup_media_type == iso) {
+        if (iso_fiddly_bits((c == 'N') ? TRUE : FALSE)) {
+            log_msg(2,
+                    "catchall_mode --- iso_fiddly_bits returned w/ error");
+            return (1);
+        } else {
+            log_msg(2, "catchall_mode --- iso_fiddly_bits ok");
+        }
+    }
+
+    if (c == 'I') {
+        log_msg(2, "IM selected");
+        retval += interactive_mode(mountlist, raidlist);
+    } else if (c == 'N') {
+        log_msg(2, "NM selected");
+        retval += nuke_mode(mountlist, raidlist);
+    } else if (c == 'C') {
+        log_msg(2, "CM selected");
+        retval += compare_mode(mountlist, raidlist);
+    }
+    return (retval);
+}
+
+/**************************************************************************
+ *END_CATCHALL_MODE                                                      *
+ **************************************************************************/
+
+/**************************************************************************
+ *END_  EXTRACT_CONFIG_FILE_FROM_RAMDISK                                  *
+ **************************************************************************/
+
+
+/**
+ * Locate an executable in the directory structure rooted at @p restg.
+ * @param out_path Where to put the executable.
+ * @param fname The basename of the executable.
+ * @param restg The directory structure to look in.
+ * @note If it could not be found in @p restg then @p fname is put in @p out_path.
+ * @ingroup restoreUtilityGroup
+ */
+void
+find_pathname_of_executable_preferably_in_RESTORING(char *out_path,
+                                                    char *fname,
+                                                    char *restg)
+{
+    assert(out_path != NULL);
+    assert_string_is_neither_NULL_nor_zerolength(fname);
+
+    sprintf(out_path, "%s/sbin/%s", restg, fname);
+    if (does_file_exist(out_path)) {
+        sprintf(out_path, "%s/usr/sbin/%s", restg, fname);
+        if (does_file_exist(out_path)) {
+            sprintf(out_path, "%s/bin/%s", restg, fname);
+            if (does_file_exist(out_path)) {
+                sprintf(out_path, "%s/usr/bin/%s", restg, fname);
+                if (does_file_exist(out_path)) {
+                    strcpy(out_path, fname);
+                }
+            }
+        }
+    }
+}
+
+/**************************************************************************
+ *END_FIND_PATHNAME_OF_EXECUTABLE_PREFERABLY_IN_RESTORING                 *
+ **************************************************************************/
+
+
+/**
+ * Run an arbitrary restore mode (prompt the user), but from ISO images
+ * instead of real media.
+ * @param mountlist The mountlist containing information about the user's partitions.
+ * @param raidlist The raidlist that goes with @p mountlist.
+ * @param nuke_me_please If TRUE, we plan to run Nuke Mode.
+ * @return 0 for success, or the number of errors encountered.
+ */
+int
+iso_mode(struct mountlist_itself *mountlist,
+         struct raidlist_itself *raidlist, bool nuke_me_please)
+{
+    char c;
+    int retval = 0;
+
+    assert(mountlist != NULL);
+    assert(raidlist != NULL);
+    if (iso_fiddly_bits(nuke_me_please)) {
+        log_msg(1, "iso_mode --- returning w/ error");
+        return (1);
+    } else {
+        c = which_restore_mode();
+        if (c == 'I' || c == 'N' || c == 'C') {
+            interactively_obtain_media_parameters_from_user(FALSE);
+        }
+        if (c == 'I') {
+            retval += interactive_mode(mountlist, raidlist);
+        } else if (c == 'N') {
+            retval += nuke_mode(mountlist, raidlist);
+        } else if (c == 'C') {
+            retval += compare_mode(mountlist, raidlist);
+        } else {
+            log_to_screen("OK, I shan't restore/compare any files.");
+        }
+    }
+    if (is_this_device_mounted(MNT_CDROM)) {
+        paranoid_system("umount -d " MNT_CDROM);
+    }
+//  if (! already_mounted)
+//    {
+    if (system("umount -d /tmp/isodir 2> /dev/null")) {
+        log_to_screen("WARNING - unable to unmount device where the ISO files are stored.");
+    }
+//    }
+    return (retval);
+}
+
+/**************************************************************************
+ *END_ISO_MODE                                                            *
+ **************************************************************************/
+
+
+/*            MONDO - saving your systems since Feb 18th, 2000            */
+
+
+
+/**
  * Restore the user's data (or a subset of it) to the live filesystem.
  * This should not be called if we're booted from CD!
@@ -959 +2535 @@
 
 /* @} - end of restoreGroup */
-
-
-#include <utime.h>
-/**
- * @addtogroup LLrestoreGroup
- * @{
- */
-
-/**
- * Restore biggiefile @p bigfileno from the currently mounted CD.
- * @param bkpinfo The backup information structure. Fields used:
- * - @c bkpinfo->backup_media_type
- * - @c bkpinfo->restore_path
- * @param bigfileno The biggiefile number (starting from 0) to restore.
- * @param filelist The node structure containing the list of files to restore.
- * If the biggiefile is not in this list, it will be skipped (return value will
- * still indicate success).
- * @return 0 for success (or skip), nonzero for failure.
- */
-int restore_a_biggiefile_from_CD(long bigfileno,
-                             struct s_node *filelist,
-                             char *pathname_of_last_file_restored)
-{
-    FILE *fin;
-    FILE *fout;
-    FILE *fbzip2;
-
-  /** malloc ***/
-    char *checksum = NULL;
-    char *outfile_fname = NULL;
-    char *tmp = NULL;
-    char *bzip2_command = NULL;
-    char *suffix = NULL;
-    char *sz_devfile = NULL;
-    char *bigblk;
-    char *mds = NULL;
-    int retval = 0;
-    int finished = FALSE;
-    long sliceno;
-    long siz;
-    char *ntfsprog_fifo = NULL;
-    char *file_to_openout = NULL;
-    struct s_filename_and_lstat_info biggiestruct;
-    struct utimbuf the_utime_buf, *ubuf;
-    bool use_ntfsprog_hack = FALSE;
-    pid_t pid;
-    int res = 0;
-    int old_loglevel;
-    struct s_node *node;
-
-    old_loglevel = g_loglevel;
-    ubuf = &the_utime_buf;
-    assert(bkpinfo != NULL);
-
-    pathname_of_last_file_restored[0] = '\0';
-    if (!(bigblk = malloc(TAPE_BLOCK_SIZE))) {
-        fatal_error("Cannot malloc bigblk");
-    }
-
-    if (!(fin = fopen(slice_fname(bigfileno, 0, ARCHIVES_PATH, ""), "r"))) {
-        log_to_screen("Cannot even open bigfile's info file");
-        return (1);
-    }
-
-    memset((void *) &biggiestruct, 0, sizeof(biggiestruct));
-    if (fread((void *) &biggiestruct, 1, sizeof(biggiestruct), fin) <
-        sizeof(biggiestruct)) {
-        log_msg(2, "Warning - unable to get biggiestruct of bigfile #%d",
-                bigfileno + 1);
-    }
-    paranoid_fclose(fin);
-
-    mr_asprintf(checksum, "%s", biggiestruct.checksum);
-    if (!checksum[0]) {
-        log_msg(3, "Warning - bigfile %ld does not have a checksum", bigfileno + 1);
-    }
-    mr_free(checksum);
-
-    if (!strncmp(biggiestruct.filename, "/dev/", 5))    // Whether NTFS or not :)
-    {
-        mr_asprintf(outfile_fname, "%s", biggiestruct.filename);
-    } else {
-        mr_asprintf(outfile_fname, "%s/%s", bkpinfo->restore_path, biggiestruct.filename);
-    }
-
-    /* skip file if we have a selective restore subset & it doesn't match */
-    if (filelist != NULL) {
-        node = find_string_at_node(filelist, biggiestruct.filename);
-        if (!node) {
-            log_msg(0, "Skipping %s (name isn't in filelist)", biggiestruct.filename);
-            pathname_of_last_file_restored[0] = '\0';
-            return (0);
-        } else if (!(node->selected)) {
-            log_msg(1, "Skipping %s (name isn't in biggielist subset)", biggiestruct.filename);
-            pathname_of_last_file_restored[0] = '\0';
-            return (0);
-        }
-    }
-
-    /* otherwise, continue */
-    log_msg(1, "DEFINITELY restoring %s", biggiestruct.filename);
-    if (biggiestruct.use_ntfsprog) {
-        if (strncmp(biggiestruct.filename, "/dev/", 5)) {
-            log_msg(1, "I was in error when I set biggiestruct.use_ntfsprog to TRUE.");
-            log_msg(1, "%s isn't even in /dev", biggiestruct.filename);
-            biggiestruct.use_ntfsprog = FALSE;
-        }
-    }
-
-    if (biggiestruct.use_ntfsprog)  // if it's an NTFS device
-    {
-        g_loglevel = 4;
-        use_ntfsprog_hack = TRUE;
-        log_msg(2, "Calling ntfsclone in background because %s is an NTFS /dev entry", outfile_fname);
-        mr_asprintf(sz_devfile, "/tmp/%d.%d.000", (int) (random() % 32768), (int) (random() % 32768));
-        mkfifo(sz_devfile, 0x770);
-        mr_asprintf(ntfsprog_fifo, "%s", sz_devfile);
-        mr_free(sz_devfile);
-        file_to_openout = ntfsprog_fifo;
-        switch (pid = fork()) {
-        case -1:
-            fatal_error("Fork failure");
-        case 0:
-            log_msg(3, "CHILD - fip - calling feed_outfrom_ntfsprog(%s, %s)", biggiestruct.filename, ntfsprog_fifo);
-            res = feed_outfrom_ntfsprog(biggiestruct.filename, ntfsprog_fifo);
-            mr_free(ntfsprog_fifo);
-            exit(res);
-            break;
-        default:
-            log_msg(3, "feed_into_ntfsprog() called in background --- pid=%ld", (long int) (pid));
-        }
-        mr_free(ntfsprog_fifo);
-    } else {
-        use_ntfsprog_hack = FALSE;
-        file_to_openout = outfile_fname;
-        if (!does_file_exist(outfile_fname))    // yes, it looks weird with the '!' but it's correct that way
-        {
-            make_hole_for_file(outfile_fname);
-        }
-    }
-
-    log_msg(2, "Reassembling big file %ld (%s)", bigfileno + 1, outfile_fname);
-
-    /*
-       last slice is zero-length and uncompressed; when we find it, we stop.
-       We DON'T wait until there are no more slices; if we did that,
-       We might stop at end of CD, not at last slice (which is 0-len and uncompd)
-     */
-
-    strncpy(pathname_of_last_file_restored, biggiestruct.filename, MAX_STR_LEN - 1);
-    pathname_of_last_file_restored[MAX_STR_LEN - 1] = '\0';
-
-    log_msg(3, "file_to_openout = %s", file_to_openout);
-    if (!(fout = fopen(file_to_openout, "w"))) {
-        log_to_screen("Cannot openout outfile_fname - hard disk full?");
-        return (1);
-    }
-    log_msg(3, "Opened out to %s", outfile_fname);  // CD/DVD --> mondorestore --> ntfsclone --> hard disk itself
-
-    for (sliceno = 1, finished = FALSE; !finished;) {
-        if (!does_file_exist(slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "")) &&
-            !does_file_exist(slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "lzo")) &&
-            !does_file_exist(slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "gz")) &&
-            !does_file_exist(slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "lzma")) &&
-            !does_file_exist(slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "bz2"))) {
-            log_msg(3, "Cannot find a data slice or terminator slice on CD %d", g_current_media_number);
-            g_current_media_number++;
-            mds = media_descriptor_string(bkpinfo->backup_media_type);
-            log_msg(2, "Asking for %s #%d so that I may read slice #%ld\n", mds, g_current_media_number, sliceno);
-            mr_free(mds);
-
-            log_to_screen("Restoring from %s #%d", mds, g_current_media_number);
-
-            insist_on_this_cd_number(g_current_media_number);
-            log_to_screen("Continuing to restore.");
-        } else {
-            mr_asprintf(tmp, "%s", slice_fname(bigfileno, sliceno, ARCHIVES_PATH, ""));
-            if (does_file_exist(tmp) && length_of_file(tmp) == 0) {
-                log_msg(2, "End of bigfile # %ld (slice %ld is the terminator)", bigfileno + 1, sliceno);
-                finished = TRUE;
-                mr_free(tmp);
-                continue;
-            } else {
-                if (does_file_exist(slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "lzo"))) {
-                    mr_asprintf(bzip2_command, "lzop");
-                    mr_asprintf(suffix, "lzo");
-                } else
-                    if (does_file_exist(slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "gz"))) {
-                    mr_asprintf(bzip2_command, "gzip");
-                    mr_asprintf(suffix, "gz");
-                } else
-                    if (does_file_exist(slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "lzma"))) {
-                    mr_asprintf(bzip2_command, "lzma");
-                    mr_asprintf(suffix, "lzma");
-                } else
-                    if (does_file_exist(slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "bz2"))) {
-                    mr_asprintf(bzip2_command, "bzip2");
-                    mr_asprintf(suffix, "bz2");
-                } else
-                    if (does_file_exist(slice_fname(bigfileno, sliceno, ARCHIVES_PATH, ""))) {
-                    mr_asprintf(bzip2_command, "");
-                    mr_asprintf(suffix, "");
-                } else {
-                    log_to_screen("OK, that's pretty fsck0red...");
-                    mr_free(tmp);
-                    return (1);
-                }
-            }
-            mr_free(tmp);
-            if (bzip2_command != NULL) {
-                mr_strcat(bzip2_command, " -dc %s 2>> %s", slice_fname(bigfileno, sliceno, ARCHIVES_PATH, suffix), MONDO_LOGFILE);
-            } else {
-                mr_asprintf(bzip2_command, "cat %s 2>> %s", slice_fname(bigfileno, sliceno, ARCHIVES_PATH, suffix), MONDO_LOGFILE);
-            }
-            mr_free(suffix);
-
-            mds = media_descriptor_string(bkpinfo->backup_media_type);
-            mr_asprintf(tmp, "Working on %s #%d, file #%ld, slice #%ld    ", mds, g_current_media_number, bigfileno + 1, sliceno);
-            mr_free(mds);
-            log_msg(2, tmp);
-
-            if (!g_text_mode) {
-                newtDrawRootText(0, g_noof_rows - 2, tmp);
-                newtRefresh();
-                strip_spaces(tmp);
-                update_progress_form(tmp);
-            }
-            mr_free(tmp);
-
-            if (!(fbzip2 = popen(bzip2_command, "r"))) {
-                fatal_error("Can't run popen command");
-            }
-            mr_free(bzip2_command);
-
-            while (!feof(fbzip2)) {
-                siz = fread(bigblk, 1, TAPE_BLOCK_SIZE, fbzip2);
-                if (siz > 0) {
-                    siz = fwrite(bigblk, 1, siz, fout);
-                }
-            }
-            paranoid_pclose(fbzip2);
-
-
-            sliceno++;
-            g_current_progress++;
-        }
-    }
-    paranoid_fclose(fout);
-    g_loglevel = old_loglevel;
-
-    if (use_ntfsprog_hack) {
-        log_msg(3, "Waiting for ntfsclone to finish");
-        mr_asprintf(tmp, " ps | grep \" ntfsclone \" | grep -v grep > /dev/null 2> /dev/null");
-        while (system(tmp) == 0) {
-            sleep(1);
-        }
-        mr_free(tmp);
-        log_it("OK, ntfsclone has really finished");
-    }
-
-    if (strcmp(outfile_fname, "/dev/null")) {
-        if (chown(outfile_fname, biggiestruct.properties.st_uid, biggiestruct.properties.st_gid)) {
-            // FIXME
-        }
-        chmod(outfile_fname, biggiestruct.properties.st_mode);
-        ubuf->actime = biggiestruct.properties.st_atime;
-        ubuf->modtime = biggiestruct.properties.st_mtime;
-        utime(outfile_fname, ubuf);
-    }
-    mr_free(outfile_fname);
-    paranoid_free(bigblk);
-
-    return (retval);
-}
-
-/**************************************************************************
- *END_ RESTORE_A_BIGGIEFILE_FROM_CD                                       *
- **************************************************************************/
-
-
-
-/**
- * Restore a biggiefile from the currently opened stream.
- * @param bkpinfo The backup information structure. Fields used:
- * - @c bkpinfo->restore_path
- * - @c bkpinfo->zip_exe
- * @param orig_bf_fname The original filename of the biggiefile.
- * @param biggiefile_number The number of the biggiefile (starting from 0).
- * @param orig_checksum Unused.
- * @param biggiefile_size Unused.
- * @param filelist The node structure containing the list of files to be restored.
- * If @p orig_bf_fname is not in the list, it will be ignored.
- * @return 0 for success (or skip), nonzero for failure.
- * @bug orig_checksum and biggiefile_size are unused (except to check that they are non-NULL).
- */
-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,
-                                     int use_ntfsprog,
-                                     char *pathname_of_last_file_restored)
-{
-    FILE *pout;
-    FILE *fin;
-
-  /** mallocs ********/
-    char *tmp = NULL;
-    char *tmp1 = NULL;
-    char *command = NULL;
-    char *outfile_fname = NULL;
-    char *sz_devfile = NULL;
-    char *ntfsprog_fifo = NULL;
-    char *file_to_openout = NULL;
-
-    struct s_node *node;
-
-    int old_loglevel;
-    long current_slice_number = 0;
-    int retval = 0;
-    int res = 0;
-    int ctrl_chr = '\0';
-    long long slice_siz;
-    bool dummy_restore = FALSE;
-    bool use_ntfsprog_hack = FALSE;
-    pid_t pid;
-    struct s_filename_and_lstat_info biggiestruct;
-    struct utimbuf the_utime_buf, *ubuf;
-    ubuf = &the_utime_buf;
-
-    malloc_string(tmp);
-    old_loglevel = g_loglevel;
-    assert(bkpinfo != NULL);
-    assert(orig_bf_fname != NULL);
-    assert(orig_checksum != NULL);
-
-    pathname_of_last_file_restored[0] = '\0';
-    if (use_ntfsprog == BLK_START_A_PIHBIGGIE) {
-        use_ntfsprog = 1;
-        log_msg(1, "%s --- pih=YES", orig_bf_fname);
-    } else if (use_ntfsprog == BLK_START_A_NORMBIGGIE) {
-        use_ntfsprog = 0;
-        log_msg(1, "%s --- pih=NO", orig_bf_fname);
-    } else {
-        use_ntfsprog = 0;
-        log_msg(1, "%s --- pih=NO (weird marker though)", orig_bf_fname);
-    }
-
-    strncpy(pathname_of_last_file_restored, orig_bf_fname,
-            MAX_STR_LEN - 1);
-    pathname_of_last_file_restored[MAX_STR_LEN - 1] = '\0';
-
-    /* open out to biggiefile to be restored (or /dev/null if biggiefile is not to be restored) */
-
-    if (filelist != NULL) {
-        node = find_string_at_node(filelist, orig_bf_fname);
-        if (!node) {
-            dummy_restore = TRUE;
-            log_msg(1,
-                    "Skipping big file %ld (%s) - not in biggielist subset",
-                    biggiefile_number + 1, orig_bf_fname);
-            pathname_of_last_file_restored[0] = '\0';
-        } else if (!(node->selected)) {
-            dummy_restore = TRUE;
-            log_msg(1, "Skipping %s (name isn't in biggielist subset)",
-                    orig_bf_fname);
-            pathname_of_last_file_restored[0] = '\0';
-        }
-    }
-
-    if (use_ntfsprog) {
-        if (strncmp(orig_bf_fname, "/dev/", 5)) {
-            log_msg(1,
-                    "I was in error when I set use_ntfsprog to TRUE.");
-            log_msg(1, "%s isn't even in /dev", orig_bf_fname);
-            use_ntfsprog = FALSE;
-        }
-    }
-
-    if (use_ntfsprog) {
-        g_loglevel = 4;
-        mr_asprintf(outfile_fname, "%s", orig_bf_fname);
-        use_ntfsprog_hack = TRUE;
-        log_msg(2, "Calling ntfsclone in background because %s is a /dev entry", outfile_fname);
-        mr_asprintf(sz_devfile, "%s/%d.%d.000", bkpinfo->tmpdir, (int) (random() % 32768), (int) (random() % 32768));
-        mkfifo(sz_devfile, 0x770);
-        mr_asprintf(ntfsprog_fifo, "%s", sz_devfile);
-        mr_free(sz_devfile);
-
-        file_to_openout = ntfsprog_fifo;
-        switch (pid = fork()) {
-        case -1:
-            fatal_error("Fork failure");
-        case 0:
-            log_msg(3, "CHILD - fip - calling feed_outfrom_ntfsprog(%s, %s)", outfile_fname, ntfsprog_fifo);
-            res = feed_outfrom_ntfsprog(outfile_fname, ntfsprog_fifo);
-            mr_free(ntfsprog_fifo);
-            exit(res);
-            break;
-        default:
-            log_msg(3, "feed_into_ntfsprog() called in background --- pid=%ld", (long int) (pid));
-        }
-        mr_free(ntfsprog_fifo);
-    } else {
-        if (!strncmp(orig_bf_fname, "/dev/", 5))    {
-            // non-NTFS partition
-            mr_asprintf(outfile_fname, "%s", orig_bf_fname);
-        } else {
-            // biggiefile
-            mr_asprintf(outfile_fname, "%s/%s", bkpinfo->restore_path, orig_bf_fname);
-        }
-        use_ntfsprog_hack = FALSE;
-        file_to_openout = outfile_fname;
-        if (!does_file_exist(outfile_fname))    // yes, it looks weird with the '!' but it's correct that way
-        {
-            make_hole_for_file(outfile_fname);
-        }
-        log_msg(2, "Reassembling big file %ld (%s)", biggiefile_number + 1, orig_bf_fname);
-    }
-
-    if (dummy_restore) {
-        mr_free(outfile_fname);
-        mr_asprintf(outfile_fname, "/dev/null");
-    }
-
-    if (!bkpinfo->zip_exe[0]) {
-        mr_asprintf(command, "cat > \"%s\"", file_to_openout);
-    } else {
-        mr_asprintf(command, "%s -dc > \"%s\" 2>> %s", bkpinfo->zip_exe, file_to_openout, MONDO_LOGFILE);
-        if (strcmp(bkpinfo->zip_exe, "gzip") == 0) {
-            /* Ignore SIGPIPE for gzip as it causes errors on big files
-             * Cf: http://trac.mondorescue.org/ticket/244 */
-            signal(SIGPIPE,SIG_IGN);
-        }
-    }
-    log_msg(3, "Pipe command = '%s'", command);
-
-    /* restore biggiefile, one slice at a time */
-    if (!(pout = popen(command, "w"))) {
-        fatal_error("Cannot pipe out");
-    }
-    mr_free(command);
-
-    for (res = read_header_block_from_stream(&slice_siz, tmp, &ctrl_chr);
-         ctrl_chr != BLK_STOP_A_BIGGIE;
-         res = read_header_block_from_stream(&slice_siz, tmp, &ctrl_chr)) {
-        if (ctrl_chr != BLK_START_AN_AFIO_OR_SLICE) {
-            wrong_marker(BLK_START_AN_AFIO_OR_SLICE, ctrl_chr);
-        }
-        log_msg(2, "Working on file #%ld, slice #%ld    ", biggiefile_number + 1, current_slice_number);
-        if (!g_text_mode) {
-            newtDrawRootText(0, g_noof_rows - 2, tmp);
-            newtRefresh();
-        }
-        strip_spaces(tmp);
-        update_progress_form(tmp);
-        if (current_slice_number == 0) {
-            res =
-                read_file_from_stream_to_file("/tmp/biggie-blah.txt",
-                                              slice_siz);
-            if (!(fin = fopen("/tmp/biggie-blah.txt", "r"))) {
-                log_OS_error("blah blah");
-            } else {
-                if (fread
-                    ((void *) &biggiestruct, 1, sizeof(biggiestruct),
-                     fin) < sizeof(biggiestruct)) {
-                    log_msg(2,
-                            "Warning - unable to get biggiestruct of bigfile #%d",
-                            biggiefile_number + 1);
-                }
-                paranoid_fclose(fin);
-            }
-        } else {
-            res =
-                read_file_from_stream_to_stream(pout, slice_siz);
-        }
-        retval += res;
-        res = read_header_block_from_stream(&slice_siz, tmp, &ctrl_chr);
-        if (ctrl_chr != BLK_STOP_AN_AFIO_OR_SLICE) {
-            wrong_marker(BLK_STOP_AN_AFIO_OR_SLICE, ctrl_chr);
-        }
-        current_slice_number++;
-        g_current_progress++;
-    }
-    paranoid_pclose(pout);
-
-    if (bkpinfo->zip_exe[0]) {
-        if (strcmp(bkpinfo->zip_exe, "gzip") == 0) {
-            /* Re-enable SIGPIPE for gzip */
-            signal(SIGPIPE, terminate_daemon);
-        }
-    }
-
-    log_msg(1, "pathname_of_last_file_restored is now %s",
-            pathname_of_last_file_restored);
-
-    if (use_ntfsprog_hack) {
-        log_msg(3, "Waiting for ntfsclone to finish");
-        mr_asprintf(tmp1, " ps | grep \" ntfsclone \" | grep -v grep > /dev/null 2> /dev/null");
-        while (system(tmp1) == 0) {
-            sleep(1);
-        }
-        mr_free(tmp1);
-        log_msg(3, "OK, ntfsclone has really finished");
-    }
-
-    log_msg(3, "biggiestruct.filename = %s", biggiestruct.filename);
-    log_msg(3, "biggiestruct.checksum = %s", biggiestruct.checksum);
-    if (strcmp(outfile_fname, "/dev/null")) {
-        chmod(outfile_fname, biggiestruct.properties.st_mode);
-        if (chown(outfile_fname, biggiestruct.properties.st_uid, biggiestruct.properties.st_gid)) {
-            // FIXME
-        }
-        ubuf->actime = biggiestruct.properties.st_atime;
-        ubuf->modtime = biggiestruct.properties.st_mtime;
-        utime(outfile_fname, ubuf);
-    }
-    mr_free(outfile_fname);
-
-    paranoid_free(tmp);
-    g_loglevel = old_loglevel;
-    return (retval);
-}
-
-/**************************************************************************
- *END_RESTORE_A_BIGGIEFILE_FROM_STREAM                                    *
- **************************************************************************/
-
-
-
-/**
- * Restore @p tarball_fname from CD.
- * @param tarball_fname The filename of the tarball to restore (in /mnt/cdrom).
- * This will be used unmodified.
- * @param current_tarball_number The number (starting from 0) of the fileset
- * we're restoring now.
- * @param filelist The node structure containing the list of files to be
- * restored. If no file in the afioball is in this list, afio will still be
- * called, but nothing will be written.
- * @return 0 for success, nonzero for failure.
- */
-int
-restore_a_tarball_from_CD(char *tarball_fname,
-                          long current_tarball_number,
-                          struct s_node *filelist)
-{
-    int retval = 0;
-    int res;
-    char *p;
-
-  /** malloc **/
-    char *command = NULL;
-    char *tmp = NULL;
-    char *filelist_name = NULL;
-    char *filelist_subset_fname = NULL;
-    char *executable = NULL;
-    char *temp_log = NULL;
-    long matches = 0;
-    bool use_star;
-    char *xattr_fname = NULL;
-    char *acl_fname = NULL;
-
-    assert_string_is_neither_NULL_nor_zerolength(tarball_fname);
-    assert(bkpinfo != NULL);
-
-    log_msg(5, "Entering");
-    use_star = (strstr(tarball_fname, ".star")) ? TRUE : FALSE;
-    mr_asprintf(command, "mkdir -p %s/tmp", MNT_RESTORING);
-    run_program_and_log_output(command, 9);
-    paranoid_free(command);
-
-    mr_asprintf(filelist_name, MNT_CDROM "/archives/filelist.%ld", current_tarball_number);
-    if (length_of_file(filelist_name) <= 2) {
-        log_msg(2, "There are _zero_ files in filelist '%s'", filelist_name);
-        log_msg(2, "This is a bit silly (ask dev-team to fix mondo_makefilelist, please)");
-        log_msg(2, "but it's non-critical. It's cosmetic. Don't worry about it.");
-        retval = 0;
-        mr_free(filelist_name);
-        log_msg(5, "Leaving");
-        return(0);
-    }
-    if (count_lines_in_file(filelist_name) <= 0 || length_of_file(tarball_fname) <= 0) {
-        log_msg(3, "length_of_file(%s) = %llu", tarball_fname, length_of_file(tarball_fname));
-        log_msg(3, "count_lines_in_file(%s) = %llu", tarball_fname, count_lines_in_file(tarball_fname));
-        log_to_screen("Unable to restore fileset #%ld (CD I/O error)", current_tarball_number);
-        mr_free(filelist_name);
-        log_msg(5, "Leaving");
-        return(1);
-    }
-
-    if (filelist) {
-        mr_asprintf(filelist_subset_fname, "/tmp/filelist-subset-%ld.tmp", current_tarball_number);
-        if ((matches =
-             save_filelist_entries_in_common(filelist_name, filelist,
-                                             filelist_subset_fname,
-                                             use_star)) <= 0) {
-            log_msg(1, "Skipping fileset %ld", current_tarball_number);
-        } else {
-            log_msg(3, "Saved fileset %ld's subset to %s", current_tarball_number, filelist_subset_fname);
-        }
-        log_to_screen("Tarball #%ld --- %ld matches", current_tarball_number, matches);
-    }
-    mr_free(filelist_name);
-
-    if (filelist == NULL || matches > 0) {
-        if (g_getfattr) {
-            mr_asprintf(xattr_fname, XATTR_LIST_FNAME_RAW_SZ, MNT_CDROM "/archives", current_tarball_number);
-        }
-        if (g_getfacl) {
-            mr_asprintf(acl_fname, ACL_LIST_FNAME_RAW_SZ, MNT_CDROM "/archives", current_tarball_number);
-        }
-        if (strstr(tarball_fname, ".bz2")) {
-            mr_asprintf(executable, "bzip2");
-        } else if (strstr(tarball_fname, ".lzma")) {
-            mr_asprintf(executable, "lzma");
-        } else if (strstr(tarball_fname, ".gz")) {
-            mr_asprintf(executable, "gzip");
-        } else if (strstr(tarball_fname, ".lzo")) {
-            mr_asprintf(executable, "lzop");
-        }
-        if (bkpinfo->compression_level == 0) {
-            mr_asprintf(executable, "%s", "");
-        } else {
-            if (executable) {
-                mr_asprintf(tmp, "which %s > /dev/null 2> /dev/null", executable);
-                res = run_program_and_log_output(tmp, FALSE);
-                mr_free(tmp);
-    
-                if (res) {
-                    log_to_screen("(compare_a_tarball) Compression program %s not found - oh no!", executable);
-                    paranoid_MR_finish(1);
-                }
-                tmp = executable;
-                mr_asprintf(executable, "-P %s -Z", tmp);
-                mr_free(tmp);
-            }
-        }
-#ifdef __FreeBSD__
-#define BUFSIZE 512
-#else
-#define BUFSIZE (1024L*1024L)/TAPE_BLOCK_SIZE
-#endif
-
-        if (use_star) {
-            mr_asprintf(command, "star -x -force-remove -sparse -U " STAR_ACL_SZ " file=%s", tarball_fname);
-            if (strstr(tarball_fname, ".bz2")) {
-                mr_strcat(command, " -bz");
-            }
-        } else {
-            if (! executable) {
-                log_msg(2, "No executable, this shouldn't happen !");
-            } else {
-                if (filelist_subset_fname != NULL) {
-                    mr_asprintf(command, "afio -i -M 8m -b %ld -c %ld %s -w '%s' %s", TAPE_BLOCK_SIZE, BUFSIZE, executable, filelist_subset_fname, tarball_fname);
-                } else {
-                    mr_asprintf(command, "afio -i -b %ld -c %ld -M 8m %s %s", TAPE_BLOCK_SIZE, BUFSIZE, executable, tarball_fname);
-                }
-            }
-        }
-        mr_free(executable);
-
-#undef BUFSIZE
-        mr_asprintf(temp_log, "/tmp/%d.%d", (int) (random() % 32768), (int) (random() % 32768));
-
-        mr_strcat(command, " 2>> %s >> %s", temp_log, temp_log);
-        log_msg(1, "command = '%s'", command);
-        unlink(temp_log);
-        res = system(command);
-        if (res) {
-            p = strstr(command, "-acl ");
-            if (p) {
-                p[0] = p[1] = p[2] = p[3] = ' ';
-                log_msg(1, "new command = '%s'", command);
-                res = system(command);
-            }
-        }
-        paranoid_free(command);
-
-        if (res && length_of_file(temp_log) < 5) {
-            res = 0;
-        }
-
-        if (! use_star) {
-            if (g_getfattr) {
-                log_msg(1, "Setting fattr list %s", xattr_fname);
-                if (length_of_file(xattr_fname) > 0) {
-                    res = set_fattr_list(filelist_subset_fname, xattr_fname);
-                    if (res) {
-                        log_to_screen("Errors occurred while setting extended attributes");
-                    } else {
-                        log_msg(1, "I set xattr OK");
-                    }
-                    retval += res;
-                }
-            }
-            if (g_getfacl) {
-                log_msg(1, "Setting acl list %s", acl_fname);
-                if (length_of_file(acl_fname) > 0) {
-                    res = set_acl_list(filelist_subset_fname, acl_fname);
-                    if (res) {
-                        log_to_screen("Errors occurred while setting access control lists");
-                    } else {
-                        log_msg(1, "I set ACL OK");
-                    }
-                    retval += res;
-                }
-            }
-        } else {
-            retval = res;
-        }
-        // Be verbose for star
-        if (retval || use_star) {
-            mr_asprintf(command, "cat %s >> %s", temp_log, MONDO_LOGFILE);
-            paranoid_system(command);
-            paranoid_free(command);
-
-            if (retval) {
-                log_msg(2, "Errors occurred while processing fileset #%d", current_tarball_number);
-            }
-        } else {
-            log_msg(2, "Fileset #%d processed OK", current_tarball_number);
-        }
-        unlink(temp_log);
-        mr_free(temp_log);
-    }
-    if (does_file_exist("/PAUSE")) {
-        popup_and_OK
-            ("Press ENTER to go on. Delete /PAUSE to stop these pauses.");
-    }
-    unlink(filelist_subset_fname);
-    mr_free(filelist_subset_fname);
-    if (g_getfattr) {
-        unlink(xattr_fname);
-        mr_free(xattr_fname);
-    }
-    if (g_getfacl) {
-        unlink(acl_fname);
-        mr_free(acl_fname);
-    }
-
-    log_msg(5, "Leaving");
-    return (retval);
-}
-
-/**************************************************************************
- *END_RESTORE_A_TARBALL_FROM_CD                                           *
- **************************************************************************/
-
-
-/**
- * Restore a tarball from the currently opened stream.
- * @param bkpinfo The backup information structure. Fields used:
- * - @c bkpinfo->backup_media_type
- * - @c bkpinfo->media_device
- * - @c bkpinfo->zip_exe
- * @param tarball_fname The filename of the afioball to restore.
- * @param current_tarball_number The number (starting from 0) of the fileset
- * we're restoring now.
- * @param filelist The node structure containing the list of files to be
- * restored. If no file in the afioball is in this list, afio will still be
- * called, but nothing will be written.
- * @param size The size (in @b bytes) of the afioball.
- * @return 0 for success, nonzero for failure.
- */
-int
-restore_a_tarball_from_stream(char *tarball_fname,
-                              long current_tarball_number,
-                              struct s_node *filelist,
-                              long long size, char *xattr_fname,
-                              char *acl_fname)
-{
-    int retval = 0;
-    int res = 0;
-
-  /** malloc add ***/
-    char *mds = NULL;
-    char *command = NULL;
-    char *afio_fname = NULL;
-    char *filelist_fname = NULL;
-    char *filelist_subset_fname = NULL;
-    char *executable = NULL;
-    long matches = 0;
-    bool restore_this_fileset = FALSE;
-    bool use_star;
-
-    assert(bkpinfo != NULL);
-    assert_string_is_neither_NULL_nor_zerolength(tarball_fname);
-
-    /* to do it with a file... */
-    use_star = (strstr(tarball_fname, ".star")) ? TRUE : FALSE;
-    mds = media_descriptor_string(bkpinfo->backup_media_type);
-    log_msg(2, "Restoring from fileset #%ld (%ld KB) on %s #%d",
-            current_tarball_number, (long) size >> 10, mds, g_current_media_number);
-    mr_free(mds);
-
-    run_program_and_log_output("mkdir -p " MNT_RESTORING "/tmp", FALSE);
-
-  /****************************************************************************
-   * Use RAMDISK's /tmp; saves time; oh wait, it's too small                  *
-   * Well, pipe from tape to afio, then; oh wait, can't do that either: bug   *
-   * in afio or someting; oh darn.. OK, use tmpfs :-)                         *
-   ****************************************************************************/
-    mr_asprintf(afio_fname, "/tmp/tmpfs/archive.tmp.%ld", current_tarball_number);
-    mr_asprintf(filelist_fname, "%s/filelist.%ld", bkpinfo->tmpdir, current_tarball_number);
-    mr_asprintf(filelist_subset_fname, "%s/filelist-subset-%ld.tmp", bkpinfo->tmpdir, current_tarball_number);
-
-    res = read_file_from_stream_to_file(afio_fname, size);
-    if (strstr(tarball_fname, ".star")) {
-        bkpinfo->use_star = TRUE;
-    }
-    if (res) {
-        log_msg(1, "Warning - error reading afioball from tape");
-    }
-    if (bkpinfo->compression_level == 0) {
-        mr_asprintf(executable, "%s", "");
-    } else {
-        if (bkpinfo->use_star) {
-            mr_asprintf(executable, "%s", " -bz");
-        } else {
-            mr_asprintf(executable, "-P %s -Z", bkpinfo->zip_exe);
-        }
-    }
-
-    if (!filelist)              // if unconditional restore then restore entire fileset
-    {
-        restore_this_fileset = TRUE;
-    } else                      // If restoring selectively then get TOC from tarball
-    {
-        if (strstr(tarball_fname, ".star.")) {
-            use_star = TRUE;
-            mr_asprintf(command, "star -sparse -t file=%s %s", afio_fname, executable);
-        } else {
-            use_star = FALSE;
-            mr_asprintf(command, "afio -t -M 8m -b %ld %s %s", TAPE_BLOCK_SIZE, executable, afio_fname);
-        }
-        mr_strcat(command, " > %s 2>> %s", filelist_fname, MONDO_LOGFILE);
-        log_msg(1, "command = %s", command);
-        if (system(command)) {
-            log_msg(4, "Warning - error occurred while retrieving TOC");
-        }
-        mr_free(command);
-
-        if ((matches =
-             save_filelist_entries_in_common(filelist_fname, filelist,
-                                             filelist_subset_fname,
-                                             use_star))
-            <= 0 || length_of_file(filelist_subset_fname) < 2) {
-            if (length_of_file(filelist_subset_fname) < 2) {
-                log_msg(1, "No matches found in fileset %ld",
-                        current_tarball_number);
-            }
-            log_msg(2, "Skipping fileset %ld", current_tarball_number);
-            restore_this_fileset = FALSE;
-        } else {
-            log_msg(5, "%ld matches. Saved fileset %ld's subset to %s",
-                    matches, current_tarball_number,
-                    filelist_subset_fname);
-            restore_this_fileset = TRUE;
-        }
-    }
-
-// Concoct the call to star/afio to restore files
-    if (strstr(tarball_fname, ".star.")) {
-        // star
-        mr_asprintf(command, "star -sparse -x file=%s %s", afio_fname, executable);
-        if (filelist) {
-            mr_strcat(command, " list=%s", filelist_subset_fname);
-        }
-    } else {
-        // afio
-        mr_asprintf(command, "afio -i -M 8m -b %ld %s", TAPE_BLOCK_SIZE, executable);
-        if (filelist) {
-            mr_strcat(command, " -w %s", filelist_subset_fname);
-        }
-        mr_strcat(command, " %s", afio_fname);
-    }
-    mr_strcat(command, " 2>> %s", MONDO_LOGFILE);
-    mr_free(executable);
-
-// Call if IF there are files to restore (selectively/unconditionally)
-    if (restore_this_fileset) {
-        log_msg(1, "Calling command='%s'", command);
-        paranoid_system(command);
-
-        if (g_getfattr) {
-            log_it("Restoring xattr stuff");
-            res = set_fattr_list(filelist_subset_fname, xattr_fname);
-            if (res) {
-                log_msg(1, "Errors occurred while setting xattr");
-            } else {
-                log_msg(1, "I set xattr OK");
-            }
-            retval += res;
-        }
-
-        if (g_getfacl) {
-            log_it("Restoring acl stuff");
-            res = set_acl_list(filelist_subset_fname, acl_fname);
-            if (res) {
-                log_msg(1, "Errors occurred while setting ACL");
-            } else {
-                log_msg(1, "I set ACL OK");
-            }
-            retval += res;
-        }
-
-    } else {
-        log_msg(1, "NOT CALLING '%s'", command);
-    }
-    mr_free(command);
-
-    if (does_file_exist("/PAUSE") && current_tarball_number >= 50) {
-        log_to_screen("Paused after set %ld", current_tarball_number);
-        popup_and_OK("Pausing. Press ENTER to continue.");
-    }
-
-    unlink(filelist_subset_fname);
-    mr_free(filelist_subset_fname);
-    unlink(filelist_fname);
-    mr_free(filelist_fname);
-    unlink(afio_fname);
-    mr_free(afio_fname);
-
-    return (retval);
-}
-
-/**************************************************************************
- *END_RESTORE_A_TARBALL_FROM_STREAM                                       *
- **************************************************************************/
-
-
-
-
-/**
- * Restore all biggiefiles from all media in this CD backup.
- * The CD with the last afioball should be currently mounted.
- * @param bkpinfo The backup information structure. @c backup_media_type is the
- * only field used in this function.
- * @param filelist The node structure containing the list of files to be
- * restored. If a prospective biggiefile is not in this list, it will be ignored.
- * @return 0 for success, nonzero for failure.
- */
-int restore_all_biggiefiles_from_CD(struct s_node *filelist) {
-
-    int retval = 0;
-    int res = 0;
-    long noof_biggiefiles, bigfileno = 0, total_slices;
-  /** malloc **/
-    char *tmp = NULL;
-    char *tmp1 = NULL;
-    char *mds = NULL;
-    bool just_changed_cds = FALSE;
-    char *xattr_fname = NULL;
-    char *acl_fname = NULL;
-    char *biggies_whose_EXATs_we_should_set = NULL; // EXtended ATtributes
-    char *pathname_of_last_biggie_restored;
-    FILE *fbw = NULL;
-
-    malloc_string(pathname_of_last_biggie_restored);
-    malloc_string(tmp);
-    assert(bkpinfo != NULL);
-
-    mr_asprintf(biggies_whose_EXATs_we_should_set, "%s/biggies-whose-EXATs-we-should-set", bkpinfo->tmpdir);
-    if (!(fbw = fopen(biggies_whose_EXATs_we_should_set, "w"))) {
-        log_msg(1, "Warning - cannot openout %s", biggies_whose_EXATs_we_should_set);
-    }
-
-    read_cfg_var(g_mondo_cfg_file, "total-slices", tmp);
-    total_slices = atol(tmp);
-    mr_free(tmp);
-
-    mr_asprintf(tmp1, "Reassembling large files      ");
-    mvaddstr_and_log_it(g_currentY, 0, tmp1);
-    mr_free(tmp1);
-
-    if (length_of_file(BIGGIELIST) < 6) {
-        log_msg(1, "OK, no biggielist; not restoring biggiefiles");
-        return (0);
-    }
-    noof_biggiefiles = count_lines_in_file(BIGGIELIST);
-    if (noof_biggiefiles <= 0) {
-        log_msg(2, "OK, no biggiefiles in biggielist; not restoring biggiefiles");
-        return (0);
-    }
-    log_msg(2, "OK, there are %ld biggiefiles in the archives", noof_biggiefiles);
-
-    open_progress_form("Reassembling large files",
-                       "I am now reassembling all the large files.",
-                       "Please wait. This may take some time.",
-                       "", total_slices);
-    for (bigfileno = 0 ; bigfileno < noof_biggiefiles ;) {
-        log_msg(2, "Thinking about restoring bigfile %ld", bigfileno + 1);
-        if (!does_file_exist(slice_fname(bigfileno, 0, ARCHIVES_PATH, ""))) {
-            log_msg(3, "...but its first slice isn't on this CD. Perhaps this was a selective restore?");
-            mds = media_descriptor_string(bkpinfo->backup_media_type);
-            log_msg(3, "Cannot find bigfile #%ld 's first slice on %s #%d", bigfileno + 1, mds, g_current_media_number);
-            log_msg(3, "Slicename would have been %s",
-                    slice_fname(bigfileno, 0, ARCHIVES_PATH, ""));
-            // I'm not positive 'just_changed_cds' is even necessary...
-            if (just_changed_cds) {
-                just_changed_cds = FALSE;
-                log_msg(3, "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(++g_current_media_number);
-                log_to_screen("Restoring from %s #%d", mds, g_current_media_number);
-                just_changed_cds = TRUE;
-            } else {
-                /* That big file doesn't exist, but the followings may */
-                /* So we need to continue looping */
-                log_msg(2, "There was no bigfile #%ld. That's OK.", bigfileno + 1);
-                log_msg(2, "I'm going to stop restoring bigfiles now.");
-                retval++;
-                bigfileno++;
-            }
-            mr_free(mds);
-        } else {
-            just_changed_cds = FALSE;
-            mr_asprintf(tmp1, "Restoring big file %ld", bigfileno + 1);
-            update_progress_form(tmp1);
-            mr_free(tmp1);
-            res = restore_a_biggiefile_from_CD(bigfileno, filelist, pathname_of_last_biggie_restored);
-            log_it("%s",pathname_of_last_biggie_restored);
-            if (fbw && pathname_of_last_biggie_restored[0]) {
-                fprintf(fbw, "%s\n", pathname_of_last_biggie_restored);
-            }
-            retval += res;
-            bigfileno++;
-
-        }
-    }
-
-    if (fbw) {
-        fclose(fbw);
-        if (g_getfattr) {
-            mr_asprintf(xattr_fname, XATTR_BIGGLST_FNAME_RAW_SZ, ARCHIVES_PATH);
-            if (length_of_file(xattr_fname) > 0) {
-                set_fattr_list(biggies_whose_EXATs_we_should_set, xattr_fname);
-            }
-            mr_free(xattr_fname);
-        }
-        if (g_getfacl) {
-            mr_asprintf(acl_fname, ACL_BIGGLST_FNAME_RAW_SZ, ARCHIVES_PATH);
-            if (length_of_file(acl_fname) > 0) {
-                set_acl_list(biggies_whose_EXATs_we_should_set, acl_fname);
-            }
-            mr_free(acl_fname);
-        }
-    }
-    mr_free(biggies_whose_EXATs_we_should_set);
-
-    if (does_file_exist("/PAUSE")) {
-        popup_and_OK("Press ENTER to go on. Delete /PAUSE to stop these pauses.");
-    }
-    close_progress_form();
-    if (retval) {
-        mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
-    } else {
-        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
-    }
-    paranoid_free(pathname_of_last_biggie_restored);
-    return (retval);
-}
-
-/**************************************************************************
- *END_RESTORE_ALL_BIGGIFILES_FROM_CD                                      *
- **************************************************************************/
-
-
-
-/**
- * Restore all afioballs from all CDs in the backup.
- * The first CD should be inserted (if not, it will be asked for).
- * @param bkpinfo The backup information structure. @c backup_media_type is the
- * only field used in @e this function.
- * @param filelist The node structure containing the list of files to be
- * restored. If no file in some particular afioball is in this list, afio will
- * still be called for that fileset, but nothing will be written.
- * @return 0 for success, or the number of filesets that failed.
- */
-int
-restore_all_tarballs_from_CD(struct s_node *filelist)
-{
-    int retval = 0;
-    int res;
-    int attempts;
-    long current_tarball_number = 0L;
-    long max_val;
-  /**malloc ***/
-    char *mds = NULL;
-    char *tmp = NULL;
-    char *tmp1 = NULL;
-    char *tarball_fname = NULL;
-    char *progress_str = NULL;
-
-    assert(bkpinfo != NULL);
-
-    malloc_string(tmp);
-    mvaddstr_and_log_it(g_currentY, 0, "Restoring from archives");
-    log_msg(2, "Insisting on 1st media, so that I can have a look at LAST-FILELIST-NUMBER");
-    if (g_current_media_number != 1) {
-        log_msg(3, "OK, that's jacked up.");
-        g_current_media_number = 1;
-    }
-    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;
-    paranoid_free(tmp);
-
-    mds = media_descriptor_string(bkpinfo->backup_media_type);
-    mr_asprintf(progress_str, "Restoring from %s #%d", mds, g_current_media_number);
-
-    log_to_screen(progress_str);
-    open_progress_form("Restoring from archives",
-                       "Restoring data from the archives.",
-                       "Please wait. This may take some time.",
-                       progress_str, max_val);
-    for (;;) {
-        insist_on_this_cd_number(g_current_media_number);
-        update_progress_form(progress_str);
-        mr_free(progress_str);
-
-        mr_asprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.bz2", current_tarball_number);
-        if (!does_file_exist(tarball_fname)) {
-            mr_free(tarball_fname);
-            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.gz", current_tarball_number);
-        }
-        if (!does_file_exist(tarball_fname)) {
-            mr_free(tarball_fname);
-            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.lzma", current_tarball_number);
-        }
-        if (!does_file_exist(tarball_fname)) {
-            mr_free(tarball_fname);
-            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.lzo", current_tarball_number);
-        }
-        if (!does_file_exist(tarball_fname)) {
-            mr_free(tarball_fname);
-            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.", current_tarball_number);
-        }
-        if (!does_file_exist(tarball_fname)) {
-            mr_free(tarball_fname);
-            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%ld.star.bz2", current_tarball_number);
-        }
-        if (!does_file_exist(tarball_fname)) {
-            mr_free(tarball_fname);
-            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%ld.star.", current_tarball_number);
-        }
-        if (!does_file_exist(tarball_fname)) {
-            if (current_tarball_number == 0) {
-                log_to_screen
-                    ("No tarballs. Strange. Maybe you only backed up freakin' big files?");
-                mr_free(tarball_fname);
-                return (0);
-            }
-            if (!does_file_exist(MNT_CDROM "/archives/NOT-THE-LAST")
-                || system("find " MNT_CDROM
-                          "/archives/slice* > /dev/null 2> /dev/null") ==
-                0) {
-                break;
-            }
-            g_current_media_number++;
-            mr_asprintf(progress_str, "Restoring from %s #%d", media_descriptor_string(bkpinfo->backup_media_type), g_current_media_number);
-            log_to_screen(progress_str);
-        } else {
-            mr_asprintf(progress_str, "Restoring from fileset #%ld on %s #%d", current_tarball_number, mds, g_current_media_number);
-            for (res = 999, attempts = 0; attempts < 3 && res != 0; attempts++) {
-                res = restore_a_tarball_from_CD(tarball_fname, current_tarball_number, filelist);
-            }
-            mr_asprintf(tmp1, "%s #%d, fileset #%ld - restore ", mds, g_current_media_number, current_tarball_number);
-            if (res) {
-                mr_strcat(tmp1, "reported errors");
-            } else if (attempts > 1) {
-                mr_strcat(tmp1, "succeeded");
-            } else {
-                mr_strcat(tmp1, "succeeded");
-            }
-            if (attempts > 1) {
-                mr_strcat(tmp1, " (%d attempts) - review logs", attempts);
-            }
-            if (attempts > 1) {
-                log_to_screen(tmp1);
-            }
-            mr_free(tmp1);
-
-            retval += res;
-            current_tarball_number++;
-            g_current_progress++;
-        }
-        mr_free(tarball_fname);
-
-        /* Now we need to umount the current media to have the next mounted by insist_on_this_cd_number */
-        /*   run_program_and_log_output("umount " MNT_CDROM, FALSE); */
-    }
-    mr_free(mds);
-    mr_free(progress_str);
-
-    close_progress_form();
-    if (retval) {
-        mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
-    } else {
-        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
-    }
-
-    return (retval);
-}
-
-/**************************************************************************
- *END_RESTORE_ALL_TARBALLS_FROM_CD                                        *
- **************************************************************************/
-
-
-
-/**
- * Restore all biggiefiles from the currently opened stream.
- * @param bkpinfo The backup information structure. Passed to other functions.
- * @param filelist The node structure containing the list of files to be
- * restored. If a prospective biggiefile is not in the list, it will be ignored.
- * @return 0 for success, or the number of biggiefiles that failed.
- */
-int
-restore_all_biggiefiles_from_stream(struct s_node *filelist)
-{
-    long noof_biggiefiles;
-    long current_bigfile_number = 0;
-    long total_slices;
-
-    int retval = 0;
-    int res = 0;
-    int ctrl_chr;
-
-  /** malloc add ****/
-    char *tmp = NULL;
-    char *tmp1 = NULL;
-    char *biggie_fname;
-    char *biggie_cksum;
-    char *xattr_fname = NULL;
-    char *acl_fname = NULL;
-    char *p;
-    char *pathname_of_last_biggie_restored;
-    char *biggies_whose_EXATs_we_should_set = NULL; // EXtended ATtributes
-    long long biggie_size;
-    FILE *fbw = NULL;
-
-    malloc_string(tmp);
-    malloc_string(biggie_fname);
-    malloc_string(biggie_cksum);
-    malloc_string(pathname_of_last_biggie_restored);
-    assert(bkpinfo != NULL);
-
-    read_cfg_var(g_mondo_cfg_file, "total-slices", tmp);
-
-    total_slices = atol(tmp);
-
-    if (g_getfattr) {
-        mr_asprintf(xattr_fname, XATTR_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
-    }
-    if (g_getfacl) {
-        mr_asprintf(acl_fname, ACL_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
-    }
-    mr_asprintf(tmp1, "Reassembling large files      ");
-    mvaddstr_and_log_it(g_currentY, 0, tmp1);
-    mr_free(tmp1);
-
-    mr_asprintf(biggies_whose_EXATs_we_should_set, "%s/biggies-whose-EXATs-we-should-set", bkpinfo->tmpdir);
-    if (!(fbw = fopen(biggies_whose_EXATs_we_should_set, "w"))) {
-        log_msg(1, "Warning - cannot openout %s", biggies_whose_EXATs_we_should_set);
-    }
-
-    // get xattr and acl files if they're there
-    res = read_header_block_from_stream(&biggie_size, biggie_fname, &ctrl_chr);
-    if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) {
-        res = read_EXAT_files_from_tape(&biggie_size, biggie_fname, &ctrl_chr, xattr_fname, acl_fname);
-    }
-
-    noof_biggiefiles = atol(biggie_fname);
-    log_msg(2, "OK, there are %ld biggiefiles in the archives", noof_biggiefiles);
-    open_progress_form("Reassembling large files",
-                       "I am now reassembling all the large files.",
-                       "Please wait. This may take some time.",
-                       "", total_slices);
-
-    for (res =
-         read_header_block_from_stream(&biggie_size, biggie_fname,
-                                       &ctrl_chr);
-         ctrl_chr != BLK_STOP_BIGGIEFILES;
-         res =
-         read_header_block_from_stream(&biggie_size, biggie_fname,
-                                       &ctrl_chr)) {
-        if (ctrl_chr != BLK_START_A_NORMBIGGIE
-            && ctrl_chr != BLK_START_A_PIHBIGGIE) {
-            wrong_marker(BLK_START_A_NORMBIGGIE, ctrl_chr);
-        }
-        p = strrchr(biggie_fname, '/');
-        if (!p) {
-            p = biggie_fname;
-        } else {
-            p++;
-        }
-        mr_asprintf(tmp1, "Restoring big file %ld (%lld K)", current_bigfile_number + 1, biggie_size / 1024);
-        update_progress_form(tmp1);
-        mr_free(tmp1);
-        res = restore_a_biggiefile_from_stream(biggie_fname,
-                                               current_bigfile_number,
-                                               biggie_cksum,
-                                               biggie_size,
-                                               filelist, ctrl_chr,
-                                               pathname_of_last_biggie_restored);
-        log_msg(1, "I believe I have restored %s",
-                pathname_of_last_biggie_restored);
-        if (fbw && pathname_of_last_biggie_restored[0]) {
-            fprintf(fbw, "%s\n", pathname_of_last_biggie_restored);
-        }
-        retval += res;
-        current_bigfile_number++;
-
-    }
-    if (current_bigfile_number != noof_biggiefiles
-        && noof_biggiefiles != 0) {
-        log_msg(1, "Warning - bigfileno=%ld but noof_biggiefiles=%ld\n", current_bigfile_number, noof_biggiefiles);
-    } else {
-        log_msg(1, "%ld biggiefiles in biggielist.txt; %ld biggiefiles processed today.", noof_biggiefiles, current_bigfile_number);
-    }
-
-    if (fbw) {
-        fclose(fbw);
-        if (length_of_file(biggies_whose_EXATs_we_should_set) > 2) {
-            log_it("Setting biggie-EXATs");
-            if (g_getfattr) {
-                if (length_of_file(xattr_fname) > 0) {
-                    log_msg(1, "set_fattr_List(%s,%s)", biggies_whose_EXATs_we_should_set, xattr_fname);
-                    set_fattr_list(biggies_whose_EXATs_we_should_set, xattr_fname);
-                }
-            }
-            if (g_getfacl) {
-                if (length_of_file(acl_fname) > 0) {
-                    log_msg(1, "set_acl_list(%s,%s)", biggies_whose_EXATs_we_should_set, acl_fname);
-                    set_acl_list(biggies_whose_EXATs_we_should_set, acl_fname);
-                }
-            }
-        } else {
-            log_it("No biggiefiles selected. So, no biggie-EXATs to set.");
-        }
-    }
-    mr_free(xattr_fname);
-    mr_free(acl_fname);
-    mr_free(biggies_whose_EXATs_we_should_set);
-
-    if (does_file_exist("/PAUSE")) {
-        popup_and_OK
-            ("Press ENTER to go on. Delete /PAUSE to stop these pauses.");
-    }
-
-    close_progress_form();
-    if (retval) {
-        mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
-    } else {
-        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
-    }
-    paranoid_free(pathname_of_last_biggie_restored);
-    paranoid_free(biggie_fname);
-    paranoid_free(biggie_cksum);
-    paranoid_free(tmp);
-    return (retval);
-}
-
-/**************************************************************************
- *END_RESTORE_ALL_BIGGIEFILES_FROM_STREAM                                 *
- **************************************************************************/
-
-
-
-
-
-
-/**
- * Restore all afioballs from the currently opened tape stream.
- * @param bkpinfo The backup information structure. Fields used:
- * - @c bkpinfo->backup_media_type
- * - @c bkpinfo->restore_path
- * @param filelist The node structure containing the list of files to be
- * restored. If no file in an afioball is in this list, afio will still be
- * called for that fileset, but nothing will be written.
- * @return 0 for success, or the number of filesets that failed.
- */
-int restore_all_tarballs_from_stream(struct s_node *filelist)
-{
-    int retval = 0;
-    int res;
-    long current_afioball_number = 0;
-    int ctrl_chr;
-    long max_val /*, total_noof_files */ ;
-
-  /** malloc **/
-    char *tmp = NULL;
-    char *mds = NULL;
-    char *progress_str = NULL;
-    char *tmp_fname;
-    char *xattr_fname = NULL;
-    char *acl_fname = NULL;
-
-    long long tmp_size;
-
-    malloc_string(tmp);
-    malloc_string(tmp_fname);
-    assert(bkpinfo != NULL);
-    mvaddstr_and_log_it(g_currentY, 0, "Restoring from archives");
-    read_cfg_var(g_mondo_cfg_file, "last-filelist-number", tmp);
-    max_val = atol(tmp) + 1;
-
-    if (chdir(bkpinfo->restore_path)) { /* I don't know why this is needed _here_ but it seems to be. -HR, 02/04/2002 */
-        //FIXME
-    }
-
-    run_program_and_log_output("pwd", 5);
-
-    mr_asprintf(progress_str, "Restoring from media #%d", g_current_media_number);
-    log_to_screen(progress_str);
-    open_progress_form("Restoring from archives",
-                       "Restoring data from the archives.",
-                       "Please wait. This may take some time.",
-                       progress_str, max_val);
-
-    log_msg(3, "hey");
-
-    res = read_header_block_from_stream(&tmp_size, tmp_fname, &ctrl_chr);
-    if (res) {
-        log_msg(2, "Warning - error reading afioball from tape");
-    }
-    retval += res;
-    if (ctrl_chr != BLK_START_AFIOBALLS) {
-        wrong_marker(BLK_START_AFIOBALLS, ctrl_chr);
-    }
-    log_msg(2, "ho");
-    res = read_header_block_from_stream(&tmp_size, tmp_fname, &ctrl_chr);
-    while (ctrl_chr != BLK_STOP_AFIOBALLS) {
-        update_progress_form(progress_str);
-        if (g_getfattr) {
-            mr_asprintf(xattr_fname, "%s/xattr-subset-%ld.tmp", bkpinfo->tmpdir, current_afioball_number);
-            unlink(xattr_fname);
-        }
-        if (g_getfacl) {
-            mr_asprintf(acl_fname, "%s/acl-subset-%ld.tmp", bkpinfo->tmpdir, current_afioball_number);
-            unlink(acl_fname);
-        }
-        if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) {
-            log_it("Reading EXAT files from tape");
-            res = read_EXAT_files_from_tape(&tmp_size, tmp_fname, &ctrl_chr, xattr_fname, acl_fname);
-        }
-        if (ctrl_chr != BLK_START_AN_AFIO_OR_SLICE) {
-            wrong_marker(BLK_START_AN_AFIO_OR_SLICE, ctrl_chr);
-        }
-        log_msg(4, "Restoring from fileset #%ld (name=%s, size=%ld K)", current_afioball_number, tmp_fname, (long) tmp_size >> 10);
-        res = restore_a_tarball_from_stream(tmp_fname, current_afioball_number, filelist, tmp_size, xattr_fname, acl_fname);
-        retval += res;
-        if (res) {
-            log_to_screen("Fileset %ld - errors occurred", current_afioball_number);
-        }
-        res =
-            read_header_block_from_stream(&tmp_size, tmp_fname, &ctrl_chr);
-        if (ctrl_chr != BLK_STOP_AN_AFIO_OR_SLICE) {
-            wrong_marker(BLK_STOP_AN_AFIO_OR_SLICE, ctrl_chr);
-        }
-
-        current_afioball_number++;
-        g_current_progress++;
-        mds = media_descriptor_string(bkpinfo->backup_media_type),
-
-        mr_free(progress_str);
-        mr_asprintf(progress_str, "Restoring from fileset #%ld on %s #%d", current_afioball_number, mds, g_current_media_number);
-        mr_free(mds);
-        res = read_header_block_from_stream(&tmp_size, tmp_fname, &ctrl_chr);
-        if (g_getfattr) {
-            unlink(xattr_fname);
-        }
-        if (g_getfacl) {
-            unlink(acl_fname);
-        }
-    }                           // next
-    mr_free(progress_str);
-    if (g_getfattr) {
-        mr_free(xattr_fname);
-    }
-    if (g_getfacl) {
-        mr_free(acl_fname);
-    }
-
-    log_msg(1, "All done with afioballs");
-    close_progress_form();
-    if (retval) {
-        mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
-    } else {
-        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
-    }
-    paranoid_free(tmp);
-    paranoid_free(tmp_fname);
-    return (retval);
-}
-
-/**************************************************************************
- *END_ RESTORE_ALL_TARBALLS_FROM_STREAM                                   *
- **************************************************************************/
-
-/* @} - end of LLrestoreGroup */
-
-
-/**
- * Restore all files in @p filelist.
- * @param bkpinfo The backup information structure. Most fields are used.
- * @param filelist The node structure containing the list of files to be
- * restored.
- * @return 0 for success, or the number of afioballs and biggiefiles that failed.
- * @ingroup restoreGroup
- */
-int restore_everything(struct s_node *filelist)
-{
-    int resA;
-    int resB;
-
-  /** mallco ***/
-    char *cwd;
-    char *newpath;
-    char *tmp = NULL;
-    assert(bkpinfo != NULL);
-
-    malloc_string(cwd);
-    malloc_string(newpath);
-    log_msg(2, "restore_everything() --- starting");
-    g_current_media_number = 1;
-    if (getcwd(cwd, MAX_STR_LEN - 1)) {
-        // FIXME
-    }
-    mr_asprintf(tmp, "mkdir -p %s", bkpinfo->restore_path);
-    run_program_and_log_output(tmp, FALSE);
-    mr_free(tmp);
-
-    log_msg(1, "Changing dir to %s", bkpinfo->restore_path);
-    if (chdir(bkpinfo->restore_path)) {
-        //FIXME
-    }
-    if (getcwd(newpath, MAX_STR_LEN - 1)) {
-        // FIXME
-    }
-    log_msg(1, "path is now %s", newpath);
-    log_msg(1, "restoring everything");
-    if (!find_home_of_exe("petris") && !g_text_mode) {
-        newtDrawRootText(0, g_noof_rows - 2,
-                         "Press ALT-<left cursor> twice to play Petris :-) ");
-        newtRefresh();
-    }
-    mvaddstr_and_log_it(g_currentY, 0, "Preparing to read your archives");
-    mount_media();
-    if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-        mvaddstr_and_log_it(g_currentY++, 0,
-                            "Restoring OS and data from streaming media");
-        if (bkpinfo->backup_media_type == cdstream) {
-            openin_cdstream();
-        } else {
-            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();
-        } else {
-            closein_tape();
-        }
-    } else {
-        mvaddstr_and_log_it(g_currentY++, 0,
-                            "Restoring OS and data from CD/USB   ");
-        resA = restore_all_tarballs_from_CD(filelist);
-        resB = restore_all_biggiefiles_from_CD(filelist);
-    }
-    if (chdir(cwd)) {
-        //FIXME
-    }
-    if (resA + resB) {
-        log_to_screen("Errors occurred while data was being restored.");
-    }
-    if (length_of_file("/etc/raidtab") > 0) {
-        log_msg(2, "Copying local raidtab to restored filesystem");
-        run_program_and_log_output("cp -f /etc/raidtab " MNT_RESTORING
-                                   "/etc/raidtab", FALSE);
-    }
-    kill_petris();
-    log_msg(2, "restore_everything() --- leaving");
-    paranoid_free(cwd);
-    paranoid_free(newpath);
-    return (resA + resB);
-}
-
-/**************************************************************************
- *END_RESTORE_EVERYTHING                                                  *
- **************************************************************************/
-
-
-extern void wait_until_software_raids_are_prepped(char *, int);
-
-
-char which_restore_mode(void);
 
 

branches/3.2/mondo/test/test-mountlist.c

@@ -17 +17 @@
 
 extern void twenty_seconds_til_yikes(void);
-
-/* Reference to global bkpinfo */
-struct s_bkpinfo *bkpinfo;
 
 extern bool g_text_mode;
@@ -47 +44 @@
 extern char *MONDO_LOGFILE;
 extern int copy_from_src_to_dest(FILE * f_orig, FILE * f_archived, char direction);
+extern int create_raid_device_via_mdadm(struct raidlist_itself *raidlist, char *device, bool test);
+
+/* Reference to global bkpinfo */
+struct s_bkpinfo *bkpinfo;
+
 /* We don't have a cleanup function yet */
 void (*mr_cleanup)(void) = NULL;
 
-void main() {
+int main() {
 
 struct mountlist_itself *mountlist = NULL;

branches/3.2/mondo/test/test-mr_stresc.c

@@ -13 +13 @@
 /* Whether we should fail immediately at first error */
 bool g_fail_immediately = FALSE;
+
+/* Reference to global bkpinfo */
+struct s_bkpinfo *bkpinfo;
 
 void (*mr_cleanup)(void) = NULL;

branches/3.2/mondo/test/test-truncname.c

@@ -13 +13 @@
 
 extern void twenty_seconds_til_yikes(void);
-
-/* Reference to global bkpinfo */
-struct s_bkpinfo *bkpinfo;
 
 extern bool g_text_mode;
@@ -40 +37 @@
 char *g_getfacl;
 char *g_getfattr;
+
+/* Reference to global bkpinfo */
+struct s_bkpinfo *bkpinfo;
 
 extern char *MONDO_LOGFILE;