Changeset 3877 in MondoRescue for branches/3.3/mondo/src/common/libmondo-archive.c

Timestamp:

Mar 8, 2024, 3:59:07 AM (4 months ago)

Author:

Bruno Cornec

Message:

More compiler fixes

File:

• branches/3.3/mondo/src/common/libmondo-archive.c (modified) (10 diffs)

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

@@ -318 +318 @@
 
 
+
+
+/**
+ * Finalize the backup.
+ * For streaming backups, this writes the closing block
+ * to the stream. For CD-based backups, this creates
+ * the final ISO image.
+ * @param bkpinfo The backup information structure, used only
+ * for the @c backup_media_type.
+ * @ingroup MLarchiveGroup
+ */
+int do_that_final_phase()
+{
+
+    /*@ int ************************************** */
+    int res = 0;
+    int retval = 0;
+
+    /*@ buffers ********************************** */
+
+    assert(bkpinfo != NULL);
+    mvaddstr_and_log_it(g_currentY, 0,
+                        "Writing any remaining data to media         ");
+
+    log_msg(1, "Closing tape/CD/USB ... ");
+    if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
+        /* write tape/cdstream */
+        closeout_tape();
+    } else {
+        /* write final ISO/USB */
+        res = write_final_iso_if_necessary();
+        retval += res;
+        if (res) {
+            log_msg(1, "write_final_iso_if_necessary returned an error");
+        }
+    }
+    log_msg(2, "Fork is exiting ... ");
+
+    mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+
+    /* final stuff */
+    if (retval) {
+        mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
+    } else {
+        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+    }
+
+    return (retval);
+}
+
+/**
+ * Wrapper around @c make_slices_and_images().
+ * @param bkpinfo The backup information structure. Fields used:
+ * - @c backup_media_type
+ * - @c scratchdir
+ * - @c tmpdir
+ * @return The number of errors encountered (0 for success)
+ * @ingroup MLarchiveGroup
+ */
+int make_those_slices_phase()
+{
+
+    /*@ int ***************************************************** */
+    int res = 0;
+    int retval = 0;
+
+    /*@ buffers ************************************************** */
+    char *biggielist = NULL;
+    char *command = NULL;
+    char *blah = NULL;
+    char *xattr_fname = NULL;
+    char *acl_fname = NULL;
+
+    assert(bkpinfo != NULL);
+    /* slice big files */
+    mvaddstr_and_log_it(g_currentY, 0, "Archiving large files to media           ");
+    mr_asprintf(biggielist, "%s/archives/biggielist.txt", bkpinfo->scratchdir);
+    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(command, "cp %s/biggielist.txt %s", bkpinfo->tmpdir, biggielist);
+    paranoid_system(command);
+    mr_free(command);
+
+    mr_asprintf(blah, "biggielist = %s", biggielist);
+    log_msg(2, blah);
+    mr_free(blah);
+
+    if (!does_file_exist(biggielist)) {
+        log_msg(1, "BTW, the biggielist does not exist");
+    }
+
+    if (g_getfattr) {
+        get_fattr_list(biggielist, xattr_fname);
+        mr_asprintf(command, "cp %s %s/archives/", xattr_fname, bkpinfo->scratchdir);
+        paranoid_system(command);
+        mr_free(command);
+    }
+    if (g_getfacl) {
+        get_acl_list(biggielist, acl_fname);
+        mr_asprintf(command, "cp %s %s/archives/", acl_fname, bkpinfo->scratchdir);
+        paranoid_system(command);
+        mr_free(command);
+    }
+
+    if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
+        res += write_EXAT_files_to_tape(xattr_fname, acl_fname);
+        mr_asprintf(blah, "%ld", count_lines_in_file(biggielist));
+        write_header_block_to_stream((off_t)0, blah, BLK_START_BIGGIEFILES);
+        mr_free(blah);
+    }
+    res = make_slices_and_images(biggielist);
+    if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
+        write_header_block_to_stream((off_t)0, "end-of-biggiefiles", BLK_STOP_BIGGIEFILES);
+    }
+    retval += res;
+    if (res) {
+        log_msg(1, "make_slices_and_images returned an error");
+        mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
+    } else {
+        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+    }
+    mr_free(biggielist);
+    mr_free(xattr_fname);
+    mr_free(acl_fname);
+    return (retval);
+}
+
+
+
+/**
+ * Wrapper around @c make_afioballs_and_images().
+ * @param bkpinfo the backup information structure. Only the
+ * @c backup_media_type field is used within this function.
+ * @return return code of make_afioballs_and_images
+ * @see make_afioballs_and_images
+ * @ingroup MLarchiveGroup
+ */
+int make_those_afios_phase()
+{
+    /*@ int ******************************************* */
+    int res = 0;
+    int retval = 0;
+
+    assert(bkpinfo != NULL);
+
+    mvaddstr_and_log_it(g_currentY, 0, "Archiving regular files to media          ");
+
+    if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
+        write_header_block_to_stream((off_t)0, "start-of-afioballs", BLK_START_AFIOBALLS);
+#if __FreeBSD__ == 5
+        log_msg(1, "Using single-threaded make_afioballs_and_images() to suit b0rken FreeBSD 5.0");
+        res = make_afioballs_and_images_OLD();
+#else
+        res = make_afioballs_and_images_OLD();
+#endif
+        write_header_block_to_stream((off_t)0, "stop-afioballs", BLK_STOP_AFIOBALLS);
+    } else {
+        res = make_afioballs_and_images();
+    }
+
+    retval += res;
+    if (res) {
+        mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
+        log_msg(1, "make_afioballs_and_images returned an error");
+    } else {
+        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+    }
+    return (retval);
+}
 
 
@@ -890 +1064 @@
 
 
+/**
+ * Set the <tt>N</tt>th bit of @c array to @c true_or_false.
+ * @param array The bit array (as a @c char pointer).
+ * @param N The bit number to set or reset.
+ * @param true_or_false If TRUE then set bit @c N, if FALSE then reset bit @c N.
+ * @see get_bit_N_of_array
+ */
+void set_bit_N_of_array(char *array, int N, bool true_or_false)
+{
+    int bit_number;
+    int mask, orig_val, to_add;
+    int element_number;
+
+    assert(array != NULL);
+
+    element_number = N / 8;
+    bit_number = N % 8;
+    to_add = (1 << bit_number);
+    mask = 255 - to_add;
+    orig_val = array[element_number] & mask;
+    //  log_it("array[%d]=%02x; %02x&%02x = %02x", element_number, array[element_number], mask, orig_val);
+    if (true_or_false) {
+        array[element_number] = orig_val | to_add;
+    }
+}
+
+
 
 /**
@@ -1051 +1252 @@
 
 
-
-
-
-/**
- * Finalize the backup.
- * For streaming backups, this writes the closing block
- * to the stream. For CD-based backups, this creates
- * the final ISO image.
- * @param bkpinfo The backup information structure, used only
- * for the @c backup_media_type.
- * @ingroup MLarchiveGroup
- */
-int do_that_final_phase()
+/**
+ * Write the final ISO image.
+ * @param bkpinfo The backup information structure. Used only
+ * in the call to @c write_iso_and_go_on().
+ * @return The number of errors encountered (0 for success)
+ * @see write_iso_and_go_on
+ * @see make_iso_fs
+ * @bug The final ISO is written even if there are no files on it. In practice,
+ * however, this occurs rarely.
+ */
+int write_final_iso_if_necessary()
 {
-
-    /*@ int ************************************** */
-    int res = 0;
-    int retval = 0;
-
-    /*@ buffers ********************************** */
+    /*@ int ***************************************************** */
+    int res;
+
+    /*@ buffers ************************************************** */
+    char *tmp = NULL;
 
     assert(bkpinfo != NULL);
-    mvaddstr_and_log_it(g_currentY, 0,
-                        "Writing any remaining data to media         ");
-
-    log_msg(1, "Closing tape/CD/USB ... ");
-    if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-        /* write tape/cdstream */
-        closeout_tape();
-    } else {
-        /* write final ISO/USB */
-        res = write_final_iso_if_necessary();
-        retval += res;
-        if (res) {
-            log_msg(1, "write_final_iso_if_necessary returned an error");
-        }
-    }
-    log_msg(2, "Fork is exiting ... ");
-
-    mvaddstr_and_log_it(g_currentY++, 74, "Done.");
-
-    /* final stuff */
-    if (retval) {
-        mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
-    } else {
-        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
-    }
-
-    return (retval);
+    // I should really check if there are any slices or tarballs to be copied to CD-R(W)'s; the odds are approx. 1 in a million that there are no files here, so I'll just go ahead & make one more CD anyway
+
+    tmp = mr_center_string("Writing the final ISO", 80);
+    log_msg(2, tmp);
+    if (!g_text_mode) {
+        newtPushHelpLine(tmp);
+    }
+    mr_free(tmp);
+    res = write_iso_and_go_on(TRUE);
+    if (!g_text_mode) {
+        newtPopHelpLine();
+    }
+    log_msg(2, "Returning from writing final ISO (res=%d)", res);
+    return (res);
+}
+
+
+
+
+/**
+ * Remove the archives in @c d.
+ * This could possibly include any of:
+ * - all afioballs (compressed and not)
+ * - all filelists
+ * - all slices
+ * - all checksums
+ * - a zero filler file
+ *
+ * @param d The directory to wipe the archives from.
+ * @ingroup utilityGroup
+ */
+void wipe_archives(char *d)
+{
+    /*@ buffers ********************************************* */
+    char *tmp = NULL;
+    char *dir = NULL;
+
+    assert_string_is_neither_NULL_nor_zerolength(d);
+
+    mr_asprintf(dir, "%s/archives", d);
+    mr_asprintf(tmp, "rm -f %s/*.afio.* %s/*.star.*", dir, dir);
+    run_program_and_log_output(tmp, FALSE);
+    mr_free(tmp);
+    mr_asprintf(tmp, "rm -f %s/*list.[0-9]* %s/slice*", dir, dir);
+    run_program_and_log_output(tmp, FALSE);
+    mr_free(tmp);
+    mr_asprintf(tmp, "rm -f %s/cklist* %s/zero", dir, dir);
+    run_program_and_log_output(tmp, FALSE);
+    mr_free(tmp);
+    log_msg(1, "Wiped %s's archives", dir);
+    mr_asprintf(tmp, "ls -l %s", dir);
+    mr_free(dir);
+    run_program_and_log_output(tmp, FALSE);
+    mr_free(tmp);
 }
 
@@ -1212 +1437 @@
 
 
-
-
-
-
+/**
+ * @addtogroup LLarchiveGroup
+ * @{
+ */
+/**
+ * Function pointer to an appropriate @c move_files_to_stream routine.
+ * You can set this to your own function (for example, one to
+ * transfer files over the network) or leave it as is.
+ */
+int (*move_files_to_stream) (char *, ...) =
+    _move_files_to_stream;
+
+
+/**
+ * Function pointer to an appropriate @c move_files_to_cd routine.
+ * You can set this to your own function (for example, one to
+ * transfer files over the network) or leave it as is.
+ */
+int (*move_files_to_cd) (char *, ...) =
+    _move_files_to_cd;
 
 
@@ -1535 +1776 @@
 
 /**
+ * Asks the user to put a CD-R(W) in the drive.
+ * @param ask_for_one_if_more_than_this (unused)
+ * @param pmountable If non-NULL, pointed-to value is set to TRUE if the CD is mountable, FALSE otherwise.
+ */
+void pause_and_ask_for_cdr(int ask_for_one_if_more_than_this, bool * pmountable) {
+
+    /*@ buffers ********************************************* */
+    char *tmp = NULL;
+    char *cdrom_dev = NULL;
+    char *cd_dev = NULL;
+    char *our_serial_str = NULL;
+    bool ok_go_ahead_burn_it;
+    int cd_number = -1;
+    int attempt_to_mount_returned_this = 999;
+    char *mtpt = NULL;
+    char *szcdno = NULL;
+    char *szserfname = NULL;
+    char *szunmount = NULL;
+    char *mds = NULL;
+
+    malloc_string(cd_dev);
+
+    mds = media_descriptor_string(g_backup_media_type);
+    log_to_screen("I am about to burn %s #%d", mds, g_current_media_number);
+    mr_free(mds);
+    if (g_current_media_number < ask_for_one_if_more_than_this) {
+        return;
+    }
+    log_to_screen("Scanning CD-ROM drive...");
+    mr_asprintf(mtpt, "%s/cd.mtpt", bkpinfo->tmpdir);
+    make_hole_for_dir(mtpt);
+
+  gotos_make_me_puke:
+    ok_go_ahead_burn_it = TRUE;
+    mr_free(cdrom_dev);
+    if ((cdrom_dev = find_optical_device()) != NULL) {
+        /* When enabled, it made CD eject-and-retract when wrong CD inserted.. Weird
+        log_msg(2, "paafcd: Retracting CD-ROM drive if possible" );
+        retract_CD_tray_and_defeat_autorun();
+        */
+        mr_asprintf(tmp, "umount %s", cdrom_dev);
+        run_program_and_log_output(tmp, 1);
+        mr_asprintf(szcdno, "%s/archives/THIS-CD-NUMBER", mtpt);
+        mr_asprintf(szserfname, "%s/archives/SERIAL-STRING", mtpt);
+        mr_asprintf(szunmount, "umount %s", mtpt);
+        cd_number = -1;
+        mr_asprintf(tmp, "mount %s %s", cdrom_dev, mtpt);
+        mr_asprintf(our_serial_str, "%s", "");
+        attempt_to_mount_returned_this = run_program_and_log_output(tmp, 1);
+        mr_free(tmp);
+
+        if (attempt_to_mount_returned_this) {
+            log_msg(4, "Failed to mount %s at %s", cdrom_dev, mtpt);
+            log_to_screen("If there's a CD/DVD in the drive, it's blank.");
+        } else if (!does_file_exist(szcdno) || !does_file_exist(szserfname)) {
+            mds = media_descriptor_string(g_backup_media_type);
+            log_to_screen("%s has data on it but it's probably not a Mondo CD.", mds);
+            mr_free(mds);
+        } else {
+            mds = media_descriptor_string(g_backup_media_type);
+            log_to_screen("%s found in drive. It's a Mondo disk.", mds);
+            mr_free(mds);
+
+            cd_number = atoi(last_line_of_file(szcdno));
+            mr_asprintf(tmp, "cat %s 2> /dev/null", szserfname);
+            mr_free(our_serial_str);
+            our_serial_str = call_program_and_get_last_line_of_output(tmp);
+            mr_free(tmp);
+            // FIXME - should be able to use last_line_of_file(), surely?
+        }
+        mr_free(szcdno);
+        mr_free(szserfname);
+
+        run_program_and_log_output(szunmount, 1);
+        mr_free(szunmount);
+
+        log_msg(2, "paafcd: cd_number = %d", cd_number);
+        log_msg(2, "our serial str = %s; bkpinfo->serial_string = %s", our_serial_str, bkpinfo->serial_string);
+        if (cd_number > 0 && !strcmp(our_serial_str, bkpinfo->serial_string)) {
+            mds = media_descriptor_string(g_backup_media_type);
+            log_msg(2, "This %s is part of this backup set!", mds);
+            ok_go_ahead_burn_it = FALSE;
+            if (cd_number == g_current_media_number - 1) {
+                log_to_screen("I think you've left the previous %s in the drive.", mds);
+            } else {
+                log_to_screen("Please remove this %s. It is part of the backup set you're making now.", mds);
+            }
+            mr_free(mds);
+
+        } else {
+            log_to_screen("...but not part of _our_ backup set.");
+        }
+        mr_free(our_serial_str);
+    } else {
+        mds = media_descriptor_string(g_backup_media_type);
+        log_msg(2,
+                "paafcd: Can't find CD-ROM drive. Perhaps it has a blank %s in it?", mds);
+        if (interrogate_disk_currently_in_cddrive(cd_dev, FALSE)) {
+            ok_go_ahead_burn_it = FALSE;
+            log_to_screen("There isn't a writable %s in the drive.", mds);
+        }
+        mr_free(mds);
+    }
+
+    if (!ok_go_ahead_burn_it) {
+        if (!bkpinfo->please_dont_eject) {
+            eject_device(cdrom_dev);
+        }
+        mds = media_descriptor_string(g_backup_media_type);
+        mr_asprintf(tmp, "I am about to burn %s #%d of the backup set. Please insert %s and press Enter.", mds, g_current_media_number, mds);
+        mr_free(mds);
+
+        popup_and_OK(tmp);
+        mr_free(tmp);
+        goto gotos_make_me_puke;
+    } else {
+        log_msg(2, "paafcd: OK, going ahead and burning it.");
+    }
+
+    mds = media_descriptor_string(g_backup_media_type);
+    log_msg(2, "paafcd: OK, I assume I have a blank/reusable %s in the drive...", mds);
+
+    log_to_screen("Proceeding w/ %s in drive.", mds);
+    mr_free(mds);
+
+    mr_free(cdrom_dev);
+    paranoid_free(cd_dev);
+    mr_free(mtpt);
+    if (pmountable) {
+        if (attempt_to_mount_returned_this) {
+            *pmountable = FALSE;
+        } else {
+            *pmountable = TRUE;
+        }
+    }
+
+}
+
+
+/**
  * Create an ISO image in @c destfile, from files in @c bkpinfo->scratchdir.
  *
@@ -1847 +2228 @@
 
 /**
+ * Chop up @c filename.
+ * @param bkpinfo The backup information structure. Fields used:
+ * - @c backup_media_type
+ * - @c compression_level
+ * - @c optimal_set_size
+ * - @c tmpdir
+ * - @c use_lzo
+ * - @c zip_exe
+ * - @c zip_suffix
+ *
+ * @param biggie_filename The file to chop up.
+ * @param ntfsprog_fifo The FIFO to ntfsclone if this is an imagedev, NULL otherwise.
+ * @param biggie_file_number The sequence number of this biggie file (starting from 0).
+ * @param noof_biggie_files The number of biggie files there are total.
+ * @return The number of errors encountered (0 for success)
+ * @see make_slices_and_images
+ * @ingroup LLarchiveGroup
+ */
+int slice_up_file_etc(char *biggie_filename, char *ntfsprog_fifo, long biggie_file_number, long noof_biggie_files, bool use_ntfsprog) {
+
+    /*@ buffers ************************************************** */
+    char *tmp = NULL;
+    char *checksum_line = NULL;
+    char *command = NULL;
+    char *tempblock = NULL;
+    char *curr_slice_fname_uncompressed = NULL;
+    char *curr_slice_fname_compressed = NULL;
+    char *file_to_archive = NULL;
+    char *file_to_openin = NULL;
+    /*@ pointers ************************************************** */
+    char *pB = NULL;
+    FILE *fin = NULL;
+    FILE *fout = NULL;
+
+    /*@ bool ****************************************************** */
+    bool finished = FALSE;
+
+    /*@ long ****************************************************** */
+    size_t blksize = (size_t)0;
+    long slice_num = 0L;
+    long i = 0L;
+    bool should_I_compress_slices = TRUE;
+    char *suffix = NULL;                // for compressed slices
+
+    /*@ long long ************************************************** */
+    off_t totalread = (off_t)0;
+    off_t totallength = (off_t)0;
+
+    /*@ int ******************************************************** */
+    int retval = 0;
+    int res = 0;
+
+    /*@ structures ************************************************** */
+    struct s_filename_and_lstat_info biggiestruct;
+
+    assert(bkpinfo != NULL);
+    assert_string_is_neither_NULL_nor_zerolength(biggie_filename);
+
+    biggiestruct.for_backward_compatibility = '\n';
+    biggiestruct.use_ntfsprog = use_ntfsprog;
+    if (is_this_file_compressed(biggie_filename) || bkpinfo->compression_level == 0) {
+        mr_asprintf(suffix, "%s", "");
+        should_I_compress_slices = FALSE;
+    } else {
+        mr_asprintf(suffix, "%s", bkpinfo->zip_suffix);
+        should_I_compress_slices = TRUE;
+    }
+
+    if (bkpinfo->optimal_set_size < 999L) {
+        fatal_error("bkpinfo->optimal_set_size is insanely small");
+    }
+
+    if (ntfsprog_fifo) {
+        file_to_openin = ntfsprog_fifo;
+        mr_asprintf(checksum_line, "IGNORE");
+        log_msg(2, "Not calculating checksum for %s: it would take too long", biggie_filename);
+        if ((tmp = find_home_of_exe("ntfsresize")) == NULL) {
+            fatal_error("ntfsresize not found");
+        }
+        mr_asprintf(command, "%s --force --info %s|grep '^You might resize at '|cut -d' ' -f5", tmp, biggie_filename);
+        mr_free(tmp);
+        log_it("command = %s", command);
+        tmp = call_program_and_get_last_line_of_output(command);
+        mr_free(command);
+        log_it("res of it = %s", tmp); 
+        totallength = (off_t)atoll(tmp);
+        mr_free(tmp);
+    } else {
+        file_to_openin = biggie_filename;
+        if (strchr(biggie_filename,'\'') != NULL) {
+            mr_asprintf(command, "md5sum \"%s\"", biggie_filename);
+        } else {
+            mr_asprintf(command, "md5sum '%s'", biggie_filename);
+        }
+        if (!(fin = popen(command, "r"))) {
+            log_OS_error("Unable to popen-in command");
+            mr_free(suffix);
+            return (1);
+        }
+        mr_free(command);
+        mr_getline(checksum_line, fin);
+        pclose(fin);
+        totallength = length_of_file(biggie_filename);
+    }
+    lstat(biggie_filename, &biggiestruct.properties);
+    strcpy(biggiestruct.filename, biggie_filename);
+    pB = strchr(checksum_line, ' ');
+    if (!pB) {
+        pB = strchr(checksum_line, '\t');
+    }
+    if (pB) {
+        *pB = '\0';
+    }
+    strcpy(biggiestruct.checksum, checksum_line);
+    mr_free(checksum_line);
+
+    mr_asprintf(tmp, "%s", slice_fname(biggie_file_number, 0, bkpinfo->tmpdir, ""));
+    fout = fopen(tmp, "w");
+    if (fout == NULL) {
+        log_msg(1, "Unable to open and write to %s", tmp);
+        mr_free(tmp);
+        mr_free(suffix);
+        return (1);
+    }
+    res = fwrite((void *) &biggiestruct, 1, sizeof(biggiestruct), fout);
+    paranoid_fclose(fout);
+    mr_free(tmp);
+
+    log_msg(1, "Opening in %s; slicing it and writing to CD/tape", file_to_openin);
+    if (!(fin = fopen(file_to_openin, "r"))) {
+        log_OS_error("Unable to openin biggie_filename");
+        log_to_screen("Cannot archive bigfile '%s': not found", biggie_filename);
+
+        mr_free(suffix);
+        return (1);
+    }
+    if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
+        res = move_files_to_stream(slice_fname(biggie_file_number, 0, bkpinfo->tmpdir, ""), NULL);
+    } else {
+        res = move_files_to_cd(slice_fname(biggie_file_number, 0, bkpinfo->tmpdir, ""), NULL);
+    }
+    i = bkpinfo->optimal_set_size / 256L;
+    if (!(tempblock = (char *) malloc(256 * 1024))) {
+        fatal_error("malloc error 256*1024");
+    }
+    for (slice_num = 1; !finished; slice_num++) {
+        mr_asprintf(curr_slice_fname_uncompressed, "%s", slice_fname(biggie_file_number, slice_num, bkpinfo->tmpdir, ""));
+        mr_asprintf(curr_slice_fname_compressed, "%s", slice_fname(biggie_file_number, slice_num, bkpinfo->tmpdir, suffix));
+
+        tmp = percent_media_full_comment();
+        update_progress_form(tmp);
+        mr_free(tmp);
+
+        if (!(fout = fopen(curr_slice_fname_uncompressed, "w"))) {
+            log_OS_error(curr_slice_fname_uncompressed);
+            mr_free(suffix);
+            return (1);
+        }
+        if ((i == bkpinfo->optimal_set_size / 256L) && (totalread < (off_t)1.1 * totallength)) {
+            for (i = 0L; i < (bkpinfo->optimal_set_size / 256L); i++) {
+                blksize = fread(tempblock, 1, 256 * 1024, fin);
+                if (blksize > (size_t)0) {
+                    totalread = totalread + (off_t)blksize;
+                    res = fwrite(tempblock, 1, blksize, fout);
+                } else {
+                    break;
+                }
+            }
+        } else {
+            i = 0L;
+        }
+        paranoid_fclose(fout);
+        if (i > 0L)             // length_of_file (curr_slice_fname_uncompressed)
+        {
+            if (!does_file_exist(curr_slice_fname_uncompressed)) {
+                log_msg(2, "Warning - '%s' doesn't exist. How can I compress slice?", curr_slice_fname_uncompressed);
+            }
+            if (should_I_compress_slices && bkpinfo->compression_level > 0) {
+                mr_asprintf(command, "%s -%d %s", bkpinfo->zip_exe, bkpinfo->compression_level, curr_slice_fname_uncompressed);
+                log_msg(2, command);
+                if ((res = system(command))) {
+                    log_OS_error(command);
+                }
+                //          did_I_compress_slice = TRUE;
+            } else {
+                mr_asprintf(command, "mv %s %s 2>> %s", curr_slice_fname_uncompressed, curr_slice_fname_compressed, MONDO_LOGFILE);
+                res = 0;        // don't do it :)
+                //          did_I_compress_slice = FALSE;
+            }
+            mr_free(command);
+
+            retval += res;
+            if (res) {
+                log_msg(2, "Failed to compress the slice");
+            }
+            if (bkpinfo->use_lzo && strcmp(curr_slice_fname_compressed, curr_slice_fname_uncompressed)) {
+                unlink(curr_slice_fname_uncompressed);
+            }
+            if (res) {
+                mr_asprintf(tmp, "Problem with slice # %ld", slice_num);
+            } else {
+                mr_asprintf(tmp, "%s - Bigfile #%ld, slice #%ld compressed OK          ", biggie_filename, biggie_file_number + 1, slice_num);
+            }
+            if (!g_text_mode) {
+                newtDrawRootText(0, g_noof_rows - 2, tmp);
+                newtRefresh();
+            } else {
+                log_msg(2, tmp);
+            }
+            mr_free(tmp);
+
+            mr_asprintf(file_to_archive, "%s", curr_slice_fname_compressed);
+            g_current_progress++;
+        } else {                /* if i==0 then ... */
+            finished = TRUE;
+            mr_asprintf(file_to_archive, "%s", curr_slice_fname_uncompressed);
+            if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
+                break;
+            }
+        }
+        mr_free(curr_slice_fname_uncompressed);
+        mr_free(curr_slice_fname_compressed);
+
+        if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
+            register_in_tape_catalog(biggieslice, biggie_file_number, slice_num, file_to_archive);
+            maintain_collection_of_recent_archives(bkpinfo->tmpdir, file_to_archive);
+            res = move_files_to_stream(file_to_archive, NULL);
+        } else {
+            res = move_files_to_cd(file_to_archive, NULL);
+        }
+        mr_free(file_to_archive);
+
+        retval += res;
+        if (res) {
+            log_to_screen("Failed to add slice %ld of bigfile %ld to scratchdir", slice_num, biggie_file_number + 1);
+            fatal_error("Hard disk full. You should have bought a bigger one.");
+        }
+    }
+    mr_free(tempblock);
+    mr_free(suffix);
+    paranoid_fclose(fin);
+    mr_asprintf(tmp, "Sliced bigfile #%ld", biggie_file_number + 1);
+    if (retval) {
+        mr_strcat(tmp, "...FAILED");
+    } else {
+        mr_strcat(tmp, "...OK!");
+    }
+    log_msg(1, tmp);
+    mr_free(tmp);
+
+    return (retval);
+}
+
+
+/**
  * Back up big files by chopping them up.
  * This function backs up all "big" files (where "big" depends
@@ -2136 +2772 @@
 /* @} - end of LLarchiveGroup */
 
-
-/**
- * Wrapper around @c make_afioballs_and_images().
- * @param bkpinfo the backup information structure. Only the
- * @c backup_media_type field is used within this function.
- * @return return code of make_afioballs_and_images
- * @see make_afioballs_and_images
- * @ingroup MLarchiveGroup
- */
-int make_those_afios_phase()
-{
-    /*@ int ******************************************* */
-    int res = 0;
-    int retval = 0;
-
-    assert(bkpinfo != NULL);
-
-    mvaddstr_and_log_it(g_currentY, 0, "Archiving regular files to media          ");
-
-    if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-        write_header_block_to_stream((off_t)0, "start-of-afioballs", BLK_START_AFIOBALLS);
-#if __FreeBSD__ == 5
-        log_msg(1, "Using single-threaded make_afioballs_and_images() to suit b0rken FreeBSD 5.0");
-        res = make_afioballs_and_images_OLD();
-#else
-        res = make_afioballs_and_images_OLD();
-#endif
-        write_header_block_to_stream((off_t)0, "stop-afioballs", BLK_STOP_AFIOBALLS);
-    } else {
-        res = make_afioballs_and_images();
-    }
-
-    retval += res;
-    if (res) {
-        mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
-        log_msg(1, "make_afioballs_and_images returned an error");
-    } else {
-        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
-    }
-    return (retval);
-}
-
-/**
- * Wrapper around @c make_slices_and_images().
+/**
+ * Write an ISO image to <tt>[bkpinfo->isodir]/bkpinfo->prefix-[g_current_media_number].iso</tt>.
  * @param bkpinfo The backup information structure. Fields used:
  * - @c backup_media_type
+ * - @c prefix
+ * - @c isodir
+ * - @c manual_cd_tray
+ * - @c media_size
+ * - @c netfs_remote_dir
  * - @c scratchdir
- * - @c tmpdir
+ * - @c verify_data
+ *
+ * @param last_cd If TRUE, this is the last CD to write; if FALSE, it's not.
  * @return The number of errors encountered (0 for success)
- * @ingroup MLarchiveGroup
- */
-int make_those_slices_phase()
+ * @see make_iso_fs
+ */
+int write_iso_and_go_on(bool last_cd)
 {
-
-    /*@ int ***************************************************** */
+    /*@ pointers **************************************************** */
+    FILE *fout;
+
+    /*@ buffers ***************************************************** */
+    char *tmp = NULL;
+    char *tmp1 = NULL;
+    char *cdno_fname = NULL;
+    char *lastcd_fname = NULL;
+    char *isofile = NULL;
+    char *mds = NULL;
+
+    /*@ bool ******************************************************** */
+    bool that_one_was_ok;
+    bool orig_vfy_flag_val;
+
+    /*@ int *********************************************************** */
     int res = 0;
-    int retval = 0;
-
-    /*@ buffers ************************************************** */
-    char *biggielist = NULL;
-    char *command = NULL;
-    char *blah = NULL;
-    char *xattr_fname = NULL;
-    char *acl_fname = NULL;
 
     assert(bkpinfo != NULL);
-    /* slice big files */
-    mvaddstr_and_log_it(g_currentY, 0, "Archiving large files to media           ");
-    mr_asprintf(biggielist, "%s/archives/biggielist.txt", bkpinfo->scratchdir);
-    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(command, "cp %s/biggielist.txt %s", bkpinfo->tmpdir, biggielist);
-    paranoid_system(command);
-    mr_free(command);
-
-    mr_asprintf(blah, "biggielist = %s", biggielist);
-    log_msg(2, blah);
-    mr_free(blah);
-
-    if (!does_file_exist(biggielist)) {
-        log_msg(1, "BTW, the biggielist does not exist");
-    }
-
-    if (g_getfattr) {
-        get_fattr_list(biggielist, xattr_fname);
-        mr_asprintf(command, "cp %s %s/archives/", xattr_fname, bkpinfo->scratchdir);
-        paranoid_system(command);
-        mr_free(command);
-    }
-    if (g_getfacl) {
-        get_acl_list(biggielist, acl_fname);
-        mr_asprintf(command, "cp %s %s/archives/", acl_fname, bkpinfo->scratchdir);
-        paranoid_system(command);
-        mr_free(command);
-    }
-
-    if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-        res += write_EXAT_files_to_tape(xattr_fname, acl_fname);
-        mr_asprintf(blah, "%ld", count_lines_in_file(biggielist));
-        write_header_block_to_stream((off_t)0, blah, BLK_START_BIGGIEFILES);
-        mr_free(blah);
-    }
-    res = make_slices_and_images(biggielist);
-    if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-        write_header_block_to_stream((off_t)0, "end-of-biggiefiles", BLK_STOP_BIGGIEFILES);
-    }
-    retval += res;
-    if (res) {
-        log_msg(1, "make_slices_and_images returned an error");
-        mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
-    } else {
-        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
-    }
-    mr_free(biggielist);
-    mr_free(xattr_fname);
-    mr_free(acl_fname);
-    return (retval);
+    orig_vfy_flag_val = bkpinfo->verify_data;
+    if (bkpinfo->media_size <= 0) {
+        fatal_error("write_iso_and_go_on() - unknown media size");
+    }
+
+    mds = media_descriptor_string(bkpinfo->backup_media_type);
+    log_msg(1, "OK, time to make %s #%d", mds, g_current_media_number);
+    mr_free(mds);
+
+    /* label the ISO with its number */
+
+    mr_asprintf(cdno_fname, "%s/archives/THIS-CD-NUMBER", bkpinfo->scratchdir);
+    fout = fopen(cdno_fname, "w");
+    mr_free(cdno_fname);
+
+    fprintf(fout, "%d", g_current_media_number);
+    paranoid_fclose(fout);
+
+    mr_asprintf(tmp1, "cp -f %s/autorun %s/", g_mondo_home, bkpinfo->scratchdir);
+    if (run_program_and_log_output(tmp1, FALSE)) {
+        log_msg(2, "Warning - unable to copy autorun to scratchdir");
+    }
+    mr_free(tmp1);
+
+    /* last CD or not? Label accordingly */
+    mr_asprintf(lastcd_fname, "%s/archives/NOT-THE-LAST", bkpinfo->scratchdir);
+    if (last_cd) {
+        unlink(lastcd_fname);
+        log_msg(2,
+                "OK, you're telling me this is the last CD. Fair enough.");
+    } else {
+        fout = fopen(lastcd_fname, "w");
+        fprintf(fout,
+                "You're listening to 90.3 WPLN, Nashville Public Radio.\n");
+        paranoid_fclose(fout);
+    }
+    mr_free(lastcd_fname);
+
+    if (space_occupied_by_cd(bkpinfo->scratchdir) / 1024 > bkpinfo->media_size) {
+        log_to_screen("Warning! CD is too big. It occupies %ld KB, which is more than the %ld MB allowed.",(long) space_occupied_by_cd(bkpinfo->scratchdir),(long) bkpinfo->media_size);
+    }
+
+    if (bkpinfo->netfs_remote_dir != NULL) {
+        // NETFS
+        mr_asprintf(isofile, "%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->netfs_remote_dir, bkpinfo->prefix, g_current_media_number);
+    } else {
+        // ISO
+        mr_asprintf(isofile, "%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->prefix, g_current_media_number);
+    }
+    for (that_one_was_ok = FALSE; !that_one_was_ok;) {
+        if (bkpinfo->backup_media_type != usb) {
+            res = make_iso_fs(isofile);
+        } else {
+            res = make_usb_fs();
+        }
+        if (g_current_media_number == 1 && !res
+            && (bkpinfo->backup_media_type == cdr)) {
+            if ((tmp = find_optical_device())   == NULL) {  // make sure find_optical_device() finds, records CD-R's loc
+                log_msg(3, "*Sigh* Mike, I hate your computer.");
+                // if it can't be found then force pausing
+                bkpinfo->manual_cd_tray = TRUE;
+            } else {
+                log_msg(3, "Great. Found Mike's CD-ROM drive.");
+            }
+            mr_free(tmp);
+        }
+        if (bkpinfo->verify_data && !res) {
+            mds = media_descriptor_string(g_backup_media_type);
+            log_to_screen("Please reboot from the 1st %s in Compare Mode, as a precaution.", mds);
+            mr_free(mds);
+            if (chdir("/")) {
+                // FIXME
+            }
+            log_it("Before calling verification of image()");
+            if (bkpinfo->backup_media_type == usb) {
+                res += verify_usb_image();
+            } else {
+                res += verify_cd_image();
+            }
+            log_it("After calling verification of image()");
+        }
+        if (!res) {
+            that_one_was_ok = TRUE;
+        } else {
+            mds = media_descriptor_string(bkpinfo->backup_media_type);
+            mr_asprintf(tmp1, "Failed to create %s #%d. Retry?", mds, g_current_media_number);
+            mr_free(mds);
+            res = ask_me_yes_or_no(tmp1);
+            mr_free(tmp1);
+
+            if (!res) {
+                if (ask_me_yes_or_no("Abort the backup?")) {
+                    fatal_error("FAILED TO BACKUP");
+                } else {
+                    break;
+                }
+            } else {
+                log_msg(2, "Retrying, at user's request...");
+                res = 0;
+            }
+        }
+    }
+    mr_free(isofile);
+
+    g_current_media_number++;
+    wipe_archives(bkpinfo->scratchdir);
+    mr_asprintf(tmp1, "rm -Rf %s/images/*gz %s/images/*data*img", bkpinfo->scratchdir, bkpinfo->scratchdir);
+    if (system(tmp1)) {
+        log_msg(2, "Error occurred when I tried to delete the redundant IMGs and GZs");
+    }
+    mr_free(tmp1);
+
+    if (last_cd) {
+        log_msg(2, "This was your last media.");
+    } else {
+        log_msg(2, "Continuing to backup your data...");
+    }
+
+    bkpinfo->verify_data = orig_vfy_flag_val;
+    return (0);
 }
 
-
-/**
- * @addtogroup LLarchiveGroup
- * @{
- */
-/**
- * Function pointer to an appropriate @c move_files_to_cd routine.
- * You can set this to your own function (for example, one to
- * transfer files over the network) or leave it as is.
- */
-int (*move_files_to_cd) (char *, ...) =
-    _move_files_to_cd;
+/* @} - end of LLarchiveGroup */
 
 /**
@@ -2365 +3025 @@
 /* @} - end of LLarchiveGroup */
 
-
-/**
- * @addtogroup LLarchiveGroup
- * @{
- */
-/**
- * Function pointer to an appropriate @c move_files_to_stream routine.
- * You can set this to your own function (for example, one to
- * transfer files over the network) or leave it as is.
- */
-int (*move_files_to_stream) (char *, ...) =
-    _move_files_to_stream;
-
 /**
  * Copy some files to tape.
@@ -2497 +3144 @@
 }
 
-
-/**
- * Asks the user to put a CD-R(W) in the drive.
- * @param ask_for_one_if_more_than_this (unused)
- * @param pmountable If non-NULL, pointed-to value is set to TRUE if the CD is mountable, FALSE otherwise.
- */
-void
-pause_and_ask_for_cdr(int ask_for_one_if_more_than_this, bool * pmountable)
-{
-
-    /*@ buffers ********************************************* */
-    char *tmp = NULL;
-    char *cdrom_dev = NULL;
-    char *cd_dev = NULL;
-    char *our_serial_str = NULL;
-    bool ok_go_ahead_burn_it;
-    int cd_number = -1;
-    int attempt_to_mount_returned_this = 999;
-    char *mtpt = NULL;
-    char *szcdno = NULL;
-    char *szserfname = NULL;
-    char *szunmount = NULL;
-    char *mds = NULL;
-
-    malloc_string(cd_dev);
-
-    mds = media_descriptor_string(g_backup_media_type);
-    log_to_screen("I am about to burn %s #%d", mds, g_current_media_number);
-    mr_free(mds);
-    if (g_current_media_number < ask_for_one_if_more_than_this) {
-        return;
-    }
-    log_to_screen("Scanning CD-ROM drive...");
-    mr_asprintf(mtpt, "%s/cd.mtpt", bkpinfo->tmpdir);
-    make_hole_for_dir(mtpt);
-
-  gotos_make_me_puke:
-    ok_go_ahead_burn_it = TRUE;
-    mr_free(cdrom_dev);
-    if ((cdrom_dev = find_optical_device()) != NULL) {
-        /* When enabled, it made CD eject-and-retract when wrong CD inserted.. Weird
-        log_msg(2, "paafcd: Retracting CD-ROM drive if possible" );
-        retract_CD_tray_and_defeat_autorun();
-        */
-        mr_asprintf(tmp, "umount %s", cdrom_dev);
-        run_program_and_log_output(tmp, 1);
-        mr_asprintf(szcdno, "%s/archives/THIS-CD-NUMBER", mtpt);
-        mr_asprintf(szserfname, "%s/archives/SERIAL-STRING", mtpt);
-        mr_asprintf(szunmount, "umount %s", mtpt);
-        cd_number = -1;
-        mr_asprintf(tmp, "mount %s %s", cdrom_dev, mtpt);
-        mr_asprintf(our_serial_str, "%s", "");
-        attempt_to_mount_returned_this = run_program_and_log_output(tmp, 1);
-        mr_free(tmp);
-
-        if (attempt_to_mount_returned_this) {
-            log_msg(4, "Failed to mount %s at %s", cdrom_dev, mtpt);
-            log_to_screen("If there's a CD/DVD in the drive, it's blank.");
-        } else if (!does_file_exist(szcdno) || !does_file_exist(szserfname)) {
-            mds = media_descriptor_string(g_backup_media_type);
-            log_to_screen("%s has data on it but it's probably not a Mondo CD.", mds);
-            mr_free(mds);
-        } else {
-            mds = media_descriptor_string(g_backup_media_type);
-            log_to_screen("%s found in drive. It's a Mondo disk.", mds);
-            mr_free(mds);
-
-            cd_number = atoi(last_line_of_file(szcdno));
-            mr_asprintf(tmp, "cat %s 2> /dev/null", szserfname);
-            mr_free(our_serial_str);
-            our_serial_str = call_program_and_get_last_line_of_output(tmp);
-            mr_free(tmp);
-            // FIXME - should be able to use last_line_of_file(), surely?
-        }
-        mr_free(szcdno);
-        mr_free(szserfname);
-
-        run_program_and_log_output(szunmount, 1);
-        mr_free(szunmount);
-
-        log_msg(2, "paafcd: cd_number = %d", cd_number);
-        log_msg(2, "our serial str = %s; bkpinfo->serial_string = %s", our_serial_str, bkpinfo->serial_string);
-        if (cd_number > 0 && !strcmp(our_serial_str, bkpinfo->serial_string)) {
-            mds = media_descriptor_string(g_backup_media_type);
-            log_msg(2, "This %s is part of this backup set!", mds);
-            ok_go_ahead_burn_it = FALSE;
-            if (cd_number == g_current_media_number - 1) {
-                log_to_screen("I think you've left the previous %s in the drive.", mds);
-            } else {
-                log_to_screen("Please remove this %s. It is part of the backup set you're making now.", mds);
-            }
-            mr_free(mds);
-
-        } else {
-            log_to_screen("...but not part of _our_ backup set.");
-        }
-        mr_free(our_serial_str);
-    } else {
-        mds = media_descriptor_string(g_backup_media_type);
-        log_msg(2,
-                "paafcd: Can't find CD-ROM drive. Perhaps it has a blank %s in it?", mds);
-        if (interrogate_disk_currently_in_cddrive(cd_dev, FALSE)) {
-            ok_go_ahead_burn_it = FALSE;
-            log_to_screen("There isn't a writable %s in the drive.", mds);
-        }
-        mr_free(mds);
-    }
-
-    if (!ok_go_ahead_burn_it) {
-        if (!bkpinfo->please_dont_eject) {
-            eject_device(cdrom_dev);
-        }
-        mds = media_descriptor_string(g_backup_media_type);
-        mr_asprintf(tmp, "I am about to burn %s #%d of the backup set. Please insert %s and press Enter.", mds, g_current_media_number, mds);
-        mr_free(mds);
-
-        popup_and_OK(tmp);
-        mr_free(tmp);
-        goto gotos_make_me_puke;
-    } else {
-        log_msg(2, "paafcd: OK, going ahead and burning it.");
-    }
-
-    mds = media_descriptor_string(g_backup_media_type);
-    log_msg(2, "paafcd: OK, I assume I have a blank/reusable %s in the drive...", mds);
-
-    log_to_screen("Proceeding w/ %s in drive.", mds);
-    mr_free(mds);
-
-    mr_free(cdrom_dev);
-    paranoid_free(cd_dev);
-    mr_free(mtpt);
-    if (pmountable) {
-        if (attempt_to_mount_returned_this) {
-            *pmountable = FALSE;
-        } else {
-            *pmountable = TRUE;
-        }
-    }
-
-}
-
-
-/**
- * Set the <tt>N</tt>th bit of @c array to @c true_or_false.
- * @param array The bit array (as a @c char pointer).
- * @param N The bit number to set or reset.
- * @param true_or_false If TRUE then set bit @c N, if FALSE then reset bit @c N.
- * @see get_bit_N_of_array
- */
-void set_bit_N_of_array(char *array, int N, bool true_or_false)
-{
-    int bit_number;
-    int mask, orig_val, to_add;
-    int element_number;
-
-    assert(array != NULL);
-
-    element_number = N / 8;
-    bit_number = N % 8;
-    to_add = (1 << bit_number);
-    mask = 255 - to_add;
-    orig_val = array[element_number] & mask;
-    //  log_it("array[%d]=%02x; %02x&%02x = %02x", element_number, array[element_number], mask, orig_val);
-    if (true_or_false) {
-        array[element_number] = orig_val | to_add;
-    }
-}
-
 /* @} - end of utilityGroup */
-
-
-/**
- * Chop up @c filename.
- * @param bkpinfo The backup information structure. Fields used:
- * - @c backup_media_type
- * - @c compression_level
- * - @c optimal_set_size
- * - @c tmpdir
- * - @c use_lzo
- * - @c zip_exe
- * - @c zip_suffix
- *
- * @param biggie_filename The file to chop up.
- * @param ntfsprog_fifo The FIFO to ntfsclone if this is an imagedev, NULL otherwise.
- * @param biggie_file_number The sequence number of this biggie file (starting from 0).
- * @param noof_biggie_files The number of biggie files there are total.
- * @return The number of errors encountered (0 for success)
- * @see make_slices_and_images
- * @ingroup LLarchiveGroup
- */
-int slice_up_file_etc(char *biggie_filename, char *ntfsprog_fifo, long biggie_file_number, long noof_biggie_files, bool use_ntfsprog) {
-
-    /*@ buffers ************************************************** */
-    char *tmp = NULL;
-    char *checksum_line = NULL;
-    char *command = NULL;
-    char *tempblock = NULL;
-    char *curr_slice_fname_uncompressed = NULL;
-    char *curr_slice_fname_compressed = NULL;
-    char *file_to_archive = NULL;
-    char *file_to_openin = NULL;
-    /*@ pointers ************************************************** */
-    char *pB = NULL;
-    FILE *fin = NULL;
-    FILE *fout = NULL;
-
-    /*@ bool ****************************************************** */
-    bool finished = FALSE;
-
-    /*@ long ****************************************************** */
-    size_t blksize = (size_t)0;
-    long slice_num = 0L;
-    long i = 0L;
-    bool should_I_compress_slices = TRUE;
-    char *suffix = NULL;                // for compressed slices
-
-    /*@ long long ************************************************** */
-    off_t totalread = (off_t)0;
-    off_t totallength = (off_t)0;
-
-    /*@ int ******************************************************** */
-    int retval = 0;
-    int res = 0;
-
-    /*@ structures ************************************************** */
-    struct s_filename_and_lstat_info biggiestruct;
-
-    assert(bkpinfo != NULL);
-    assert_string_is_neither_NULL_nor_zerolength(biggie_filename);
-
-    biggiestruct.for_backward_compatibility = '\n';
-    biggiestruct.use_ntfsprog = use_ntfsprog;
-    if (is_this_file_compressed(biggie_filename) || bkpinfo->compression_level == 0) {
-        mr_asprintf(suffix, "%s", "");
-        should_I_compress_slices = FALSE;
-    } else {
-        mr_asprintf(suffix, "%s", bkpinfo->zip_suffix);
-        should_I_compress_slices = TRUE;
-    }
-
-    if (bkpinfo->optimal_set_size < 999L) {
-        fatal_error("bkpinfo->optimal_set_size is insanely small");
-    }
-
-    if (ntfsprog_fifo) {
-        file_to_openin = ntfsprog_fifo;
-        mr_asprintf(checksum_line, "IGNORE");
-        log_msg(2, "Not calculating checksum for %s: it would take too long", biggie_filename);
-        if ((tmp = find_home_of_exe("ntfsresize")) == NULL) {
-            fatal_error("ntfsresize not found");
-        }
-        mr_asprintf(command, "%s --force --info %s|grep '^You might resize at '|cut -d' ' -f5", tmp, biggie_filename);
-        mr_free(tmp);
-        log_it("command = %s", command);
-        tmp = call_program_and_get_last_line_of_output(command);
-        mr_free(command);
-        log_it("res of it = %s", tmp); 
-        totallength = (off_t)atoll(tmp);
-        mr_free(tmp);
-    } else {
-        file_to_openin = biggie_filename;
-        if (strchr(biggie_filename,'\'') != NULL) {
-            mr_asprintf(command, "md5sum \"%s\"", biggie_filename);
-        } else {
-            mr_asprintf(command, "md5sum '%s'", biggie_filename);
-        }
-        if (!(fin = popen(command, "r"))) {
-            log_OS_error("Unable to popen-in command");
-            mr_free(suffix);
-            return (1);
-        }
-        mr_free(command);
-        mr_getline(checksum_line, fin);
-        pclose(fin);
-        totallength = length_of_file(biggie_filename);
-    }
-    lstat(biggie_filename, &biggiestruct.properties);
-    strcpy(biggiestruct.filename, biggie_filename);
-    pB = strchr(checksum_line, ' ');
-    if (!pB) {
-        pB = strchr(checksum_line, '\t');
-    }
-    if (pB) {
-        *pB = '\0';
-    }
-    strcpy(biggiestruct.checksum, checksum_line);
-    mr_free(checksum_line);
-
-    mr_asprintf(tmp, "%s", slice_fname(biggie_file_number, 0, bkpinfo->tmpdir, ""));
-    fout = fopen(tmp, "w");
-    if (fout == NULL) {
-        log_msg(1, "Unable to open and write to %s", tmp);
-        mr_free(tmp);
-        mr_free(suffix);
-        return (1);
-    }
-    res = fwrite((void *) &biggiestruct, 1, sizeof(biggiestruct), fout);
-    paranoid_fclose(fout);
-    mr_free(tmp);
-
-    log_msg(1, "Opening in %s; slicing it and writing to CD/tape", file_to_openin);
-    if (!(fin = fopen(file_to_openin, "r"))) {
-        log_OS_error("Unable to openin biggie_filename");
-        log_to_screen("Cannot archive bigfile '%s': not found", biggie_filename);
-
-        mr_free(suffix);
-        return (1);
-    }
-    if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-        res = move_files_to_stream(slice_fname(biggie_file_number, 0, bkpinfo->tmpdir, ""), NULL);
-    } else {
-        res = move_files_to_cd(slice_fname(biggie_file_number, 0, bkpinfo->tmpdir, ""), NULL);
-    }
-    i = bkpinfo->optimal_set_size / 256L;
-    if (!(tempblock = (char *) malloc(256 * 1024))) {
-        fatal_error("malloc error 256*1024");
-    }
-    for (slice_num = 1; !finished; slice_num++) {
-        mr_asprintf(curr_slice_fname_uncompressed, "%s", slice_fname(biggie_file_number, slice_num, bkpinfo->tmpdir, ""));
-        mr_asprintf(curr_slice_fname_compressed, "%s", slice_fname(biggie_file_number, slice_num, bkpinfo->tmpdir, suffix));
-
-        tmp = percent_media_full_comment();
-        update_progress_form(tmp);
-        mr_free(tmp);
-
-        if (!(fout = fopen(curr_slice_fname_uncompressed, "w"))) {
-            log_OS_error(curr_slice_fname_uncompressed);
-            mr_free(suffix);
-            return (1);
-        }
-        if ((i == bkpinfo->optimal_set_size / 256L) && (totalread < (off_t)1.1 * totallength)) {
-            for (i = 0L; i < (bkpinfo->optimal_set_size / 256L); i++) {
-                blksize = fread(tempblock, 1, 256 * 1024, fin);
-                if (blksize > (size_t)0) {
-                    totalread = totalread + (off_t)blksize;
-                    res = fwrite(tempblock, 1, blksize, fout);
-                } else {
-                    break;
-                }
-            }
-        } else {
-            i = 0L;
-        }
-        paranoid_fclose(fout);
-        if (i > 0L)             // length_of_file (curr_slice_fname_uncompressed)
-        {
-            if (!does_file_exist(curr_slice_fname_uncompressed)) {
-                log_msg(2, "Warning - '%s' doesn't exist. How can I compress slice?", curr_slice_fname_uncompressed);
-            }
-            if (should_I_compress_slices && bkpinfo->compression_level > 0) {
-                mr_asprintf(command, "%s -%d %s", bkpinfo->zip_exe, bkpinfo->compression_level, curr_slice_fname_uncompressed);
-                log_msg(2, command);
-                if ((res = system(command))) {
-                    log_OS_error(command);
-                }
-                //          did_I_compress_slice = TRUE;
-            } else {
-                mr_asprintf(command, "mv %s %s 2>> %s", curr_slice_fname_uncompressed, curr_slice_fname_compressed, MONDO_LOGFILE);
-                res = 0;        // don't do it :)
-                //          did_I_compress_slice = FALSE;
-            }
-            mr_free(command);
-
-            retval += res;
-            if (res) {
-                log_msg(2, "Failed to compress the slice");
-            }
-            if (bkpinfo->use_lzo && strcmp(curr_slice_fname_compressed, curr_slice_fname_uncompressed)) {
-                unlink(curr_slice_fname_uncompressed);
-            }
-            if (res) {
-                mr_asprintf(tmp, "Problem with slice # %ld", slice_num);
-            } else {
-                mr_asprintf(tmp, "%s - Bigfile #%ld, slice #%ld compressed OK          ", biggie_filename, biggie_file_number + 1, slice_num);
-            }
-            if (!g_text_mode) {
-                newtDrawRootText(0, g_noof_rows - 2, tmp);
-                newtRefresh();
-            } else {
-                log_msg(2, tmp);
-            }
-            mr_free(tmp);
-
-            mr_asprintf(file_to_archive, "%s", curr_slice_fname_compressed);
-            g_current_progress++;
-        } else {                /* if i==0 then ... */
-            finished = TRUE;
-            mr_asprintf(file_to_archive, "%s", curr_slice_fname_uncompressed);
-            if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-                break;
-            }
-        }
-        mr_free(curr_slice_fname_uncompressed);
-        mr_free(curr_slice_fname_compressed);
-
-        if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-            register_in_tape_catalog(biggieslice, biggie_file_number, slice_num, file_to_archive);
-            maintain_collection_of_recent_archives(bkpinfo->tmpdir, file_to_archive);
-            res = move_files_to_stream(file_to_archive, NULL);
-        } else {
-            res = move_files_to_cd(file_to_archive, NULL);
-        }
-        mr_free(file_to_archive);
-
-        retval += res;
-        if (res) {
-            log_to_screen("Failed to add slice %ld of bigfile %ld to scratchdir", slice_num, biggie_file_number + 1);
-            fatal_error("Hard disk full. You should have bought a bigger one.");
-        }
-    }
-    mr_free(tempblock);
-    mr_free(suffix);
-    paranoid_fclose(fin);
-    mr_asprintf(tmp, "Sliced bigfile #%ld", biggie_file_number + 1);
-    if (retval) {
-        mr_strcat(tmp, "...FAILED");
-    } else {
-        mr_strcat(tmp, "...OK!");
-    }
-    log_msg(1, tmp);
-    mr_free(tmp);
-
-    return (retval);
-}
-
-
-/**
- * Remove the archives in @c d.
- * This could possibly include any of:
- * - all afioballs (compressed and not)
- * - all filelists
- * - all slices
- * - all checksums
- * - a zero filler file
- *
- * @param d The directory to wipe the archives from.
- * @ingroup utilityGroup
- */
-void wipe_archives(char *d)
-{
-    /*@ buffers ********************************************* */
-    char *tmp = NULL;
-    char *dir = NULL;
-
-    assert_string_is_neither_NULL_nor_zerolength(d);
-
-    mr_asprintf(dir, "%s/archives", d);
-    mr_asprintf(tmp, "rm -f %s/*.afio.* %s/*.star.*", dir, dir);
-    run_program_and_log_output(tmp, FALSE);
-    mr_free(tmp);
-    mr_asprintf(tmp, "rm -f %s/*list.[0-9]* %s/slice*", dir, dir);
-    run_program_and_log_output(tmp, FALSE);
-    mr_free(tmp);
-    mr_asprintf(tmp, "rm -f %s/cklist* %s/zero", dir, dir);
-    run_program_and_log_output(tmp, FALSE);
-    mr_free(tmp);
-    log_msg(1, "Wiped %s's archives", dir);
-    mr_asprintf(tmp, "ls -l %s", dir);
-    mr_free(dir);
-    run_program_and_log_output(tmp, FALSE);
-    mr_free(tmp);
-}
 
 
@@ -2966 +3151 @@
  * @{
  */
-/**
- * Write the final ISO image.
- * @param bkpinfo The backup information structure. Used only
- * in the call to @c write_iso_and_go_on().
- * @return The number of errors encountered (0 for success)
- * @see write_iso_and_go_on
- * @see make_iso_fs
- * @bug The final ISO is written even if there are no files on it. In practice,
- * however, this occurs rarely.
- */
-int write_final_iso_if_necessary()
-{
-    /*@ int ***************************************************** */
-    int res;
-
-    /*@ buffers ************************************************** */
-    char *tmp = NULL;
-
-    assert(bkpinfo != NULL);
-    // I should really check if there are any slices or tarballs to be copied to CD-R(W)'s; the odds are approx. 1 in a million that there are no files here, so I'll just go ahead & make one more CD anyway
-
-    tmp = mr_center_string("Writing the final ISO", 80);
-    log_msg(2, tmp);
-    if (!g_text_mode) {
-        newtPushHelpLine(tmp);
-    }
-    mr_free(tmp);
-    res = write_iso_and_go_on(TRUE);
-    if (!g_text_mode) {
-        newtPopHelpLine();
-    }
-    log_msg(2, "Returning from writing final ISO (res=%d)", res);
-    return (res);
-}
-
-
-/**
- * Write an ISO image to <tt>[bkpinfo->isodir]/bkpinfo->prefix-[g_current_media_number].iso</tt>.
- * @param bkpinfo The backup information structure. Fields used:
- * - @c backup_media_type
- * - @c prefix
- * - @c isodir
- * - @c manual_cd_tray
- * - @c media_size
- * - @c netfs_remote_dir
- * - @c scratchdir
- * - @c verify_data
- *
- * @param last_cd If TRUE, this is the last CD to write; if FALSE, it's not.
- * @return The number of errors encountered (0 for success)
- * @see make_iso_fs
- */
-int write_iso_and_go_on(bool last_cd)
-{
-    /*@ pointers **************************************************** */
-    FILE *fout;
-
-    /*@ buffers ***************************************************** */
-    char *tmp = NULL;
-    char *tmp1 = NULL;
-    char *cdno_fname = NULL;
-    char *lastcd_fname = NULL;
-    char *isofile = NULL;
-    char *mds = NULL;
-
-    /*@ bool ******************************************************** */
-    bool that_one_was_ok;
-    bool orig_vfy_flag_val;
-
-    /*@ int *********************************************************** */
-    int res = 0;
-
-    assert(bkpinfo != NULL);
-    orig_vfy_flag_val = bkpinfo->verify_data;
-    if (bkpinfo->media_size <= 0) {
-        fatal_error("write_iso_and_go_on() - unknown media size");
-    }
-
-    mds = media_descriptor_string(bkpinfo->backup_media_type);
-    log_msg(1, "OK, time to make %s #%d", mds, g_current_media_number);
-    mr_free(mds);
-
-    /* label the ISO with its number */
-
-    mr_asprintf(cdno_fname, "%s/archives/THIS-CD-NUMBER", bkpinfo->scratchdir);
-    fout = fopen(cdno_fname, "w");
-    mr_free(cdno_fname);
-
-    fprintf(fout, "%d", g_current_media_number);
-    paranoid_fclose(fout);
-
-    mr_asprintf(tmp1, "cp -f %s/autorun %s/", g_mondo_home, bkpinfo->scratchdir);
-    if (run_program_and_log_output(tmp1, FALSE)) {
-        log_msg(2, "Warning - unable to copy autorun to scratchdir");
-    }
-    mr_free(tmp1);
-
-    /* last CD or not? Label accordingly */
-    mr_asprintf(lastcd_fname, "%s/archives/NOT-THE-LAST", bkpinfo->scratchdir);
-    if (last_cd) {
-        unlink(lastcd_fname);
-        log_msg(2,
-                "OK, you're telling me this is the last CD. Fair enough.");
-    } else {
-        fout = fopen(lastcd_fname, "w");
-        fprintf(fout,
-                "You're listening to 90.3 WPLN, Nashville Public Radio.\n");
-        paranoid_fclose(fout);
-    }
-    mr_free(lastcd_fname);
-
-    if (space_occupied_by_cd(bkpinfo->scratchdir) / 1024 > bkpinfo->media_size) {
-        log_to_screen("Warning! CD is too big. It occupies %ld KB, which is more than the %ld MB allowed.",(long) space_occupied_by_cd(bkpinfo->scratchdir),(long) bkpinfo->media_size);
-    }
-
-    if (bkpinfo->netfs_remote_dir != NULL) {
-        // NETFS
-        mr_asprintf(isofile, "%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->netfs_remote_dir, bkpinfo->prefix, g_current_media_number);
-    } else {
-        // ISO
-        mr_asprintf(isofile, "%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->prefix, g_current_media_number);
-    }
-    for (that_one_was_ok = FALSE; !that_one_was_ok;) {
-        if (bkpinfo->backup_media_type != usb) {
-            res = make_iso_fs(isofile);
-        } else {
-            res = make_usb_fs();
-        }
-        if (g_current_media_number == 1 && !res
-            && (bkpinfo->backup_media_type == cdr)) {
-            if ((tmp = find_optical_device())   == NULL) {  // make sure find_optical_device() finds, records CD-R's loc
-                log_msg(3, "*Sigh* Mike, I hate your computer.");
-                // if it can't be found then force pausing
-                bkpinfo->manual_cd_tray = TRUE;
-            } else {
-                log_msg(3, "Great. Found Mike's CD-ROM drive.");
-            }
-            mr_free(tmp);
-        }
-        if (bkpinfo->verify_data && !res) {
-            mds = media_descriptor_string(g_backup_media_type);
-            log_to_screen("Please reboot from the 1st %s in Compare Mode, as a precaution.", mds);
-            mr_free(mds);
-            if (chdir("/")) {
-                // FIXME
-            }
-            log_it("Before calling verification of image()");
-            if (bkpinfo->backup_media_type == usb) {
-                res += verify_usb_image();
-            } else {
-                res += verify_cd_image();
-            }
-            log_it("After calling verification of image()");
-        }
-        if (!res) {
-            that_one_was_ok = TRUE;
-        } else {
-            mds = media_descriptor_string(bkpinfo->backup_media_type);
-            mr_asprintf(tmp1, "Failed to create %s #%d. Retry?", mds, g_current_media_number);
-            mr_free(mds);
-            res = ask_me_yes_or_no(tmp1);
-            mr_free(tmp1);
-
-            if (!res) {
-                if (ask_me_yes_or_no("Abort the backup?")) {
-                    fatal_error("FAILED TO BACKUP");
-                } else {
-                    break;
-                }
-            } else {
-                log_msg(2, "Retrying, at user's request...");
-                res = 0;
-            }
-        }
-    }
-    mr_free(isofile);
-
-    g_current_media_number++;
-    wipe_archives(bkpinfo->scratchdir);
-    mr_asprintf(tmp1, "rm -Rf %s/images/*gz %s/images/*data*img", bkpinfo->scratchdir, bkpinfo->scratchdir);
-    if (system(tmp1)) {
-        log_msg(2, "Error occurred when I tried to delete the redundant IMGs and GZs");
-    }
-    mr_free(tmp1);
-
-    if (last_cd) {
-        log_msg(2, "This was your last media.");
-    } else {
-        log_msg(2, "Continuing to backup your data...");
-    }
-
-    bkpinfo->verify_data = orig_vfy_flag_val;
-    return (0);
-}
-
-/* @} - end of LLarchiveGroup */
-
-