Changeset 45 in MondoRescue for trunk/mondo/mondo/common/libmondo-archive.c

Timestamp:

Oct 5, 2005, 12:51:47 AM (19 years ago)

Author:

bcornec

Message:

asprint and getline now added

File:

• trunk/mondo/mondo/common/libmondo-archive.c (modified) (131 diffs)

trunk/mondo/mondo/common/libmondo-archive.c

@@ -1 @@
-/* libmondo-archive.c
-   $Id$
+/* $Id$
 
 subroutines to handle the archiving of files
 
-
-
-07/14
-- moved all ACL, xattr stuff here from libmondo-filelist.c
-
-07/12
-- when trying to find boot loader, look for /boot's /dev, not just /'s dev
-
-07/10
-- better detection of changed files
-- added ACL, xattr support for afio
-
-06/17
-- backup with partimagehack if NTFS device; dd, if non-NTFS device
-
-06/14
-- use mondorescue.iso instead of mindi.iso
-
-04/28
-- cleaned up if/then architecture-specific stuff re: CD-R(W)s
-
-04/03
-- added star support
-
-03/12
-- modified offer_to_write_floppies() to support dual-disk boot/root thing
-
-01/20/2004
-- reformat dvd twice if necessary
-
-12/01/2003
-- added pause_for_N_seconds(5, "Letting DVD drive settle");
-
-11/23
-- added #define DVDRWFORMAT
-
-11/20
-- use --no-emul-boot -b isolinux.bin instead of -b mindi-boot.2880.img
-
-10/23
-- wipe DVD at start, whether or not disk is DVD-RW; this is
-  just a test, to see why dvd+rw-format followed by growiosfs
-  locks up the drive
-- use the singlethreaded make_afioballs_and_images_OLD()
-  instead of the multithreaded make_afioballs_and_images()
-  if backing up to tape
-
-10/21
-- if backing up to dvd, look for relevant tools;
-  abort if missing
-
-10/15
-- UI tweaks
-
-10/10
-- eject/inject DVD after wiping it
-
-09/27
-- pause_and_ask_for_cdr() will now blank DVD if necessary
-
-09/26
-- proper reporting of media type in displayed strings
-  (i.e. DVD if DVD, CD if CD, etc.)
-  
-09/25
-- add DVD support
-
-09/23
-- malloc/free global strings in new subroutines - malloc_libmondo_global_strings()
-  and free_libmondo_global_strings() - which are in libmondo-tools.c
-
-09/15
-- changed a bunch of char[MAX_STR_LEN]'s to char*; malloc; free;
-
-09/14
-- cosmetic bug re: call to 'which dvdrecord'
-
-09/09
-- copy `locate isolinux.bin | tail -n1` to CD before calling mkisfso
-  if file is missing (in which case, bug in Mindi.pl!)
-- reduced noof_threads from 3 to 2
-- fixed cosmetic bug in make_slices_and_images()
-
-09/02
-- fixed cosmetic bug in verify_data()
-
-05/01 - 08/31
-- added partimagehack hooks
-- make twice as many archives at once as before 
-- fixed syntax error re: system(xxx,FALSE)
-- unmount CD-ROM before burning (necessary for RH8/9)
-- only ask for new media if sensible
-- fixed mondoarchive -Vi multi-CD verify bug (Tom Mortell)
-- use single-threaded make_afioballs_and_images() if FreeBSD
-- fixed bug on line 476 (Joshua Oreman)
-- re-enabled the pause, for people w/ weird CD-ROM drives
-- added Joshua Oreman's FreeBSD patches
-- don't listen to please_dont_eject_when_restoring
-  ...after all, we're not restoring :)
-
-04/01 - 04/30
-- cleaned up archive_this_fileset()
-- decreased ARCH_THREADS from 3 to 2
-- pause_and_ask_for_cd() --- calls retract_CD_tray_and_defeat_autorun()
-- call assert() and log_OS_error() in various places
-- cleaned up code a bit
-- increased ARCH_THREADS from 2 to 3
-- misc clean-up (Tom Mortell)
-
-03/15/2003
-- fixed problem w/ multi-ISO verify cycle (Tom Mortell)
-
-11/01 - 12/31/2002
-- removed references to make_afioballs_and_images_OLD()
-- added some error-checking to make_afioballs_in_background
-- make_iso_and_go_on() now copies Mondo's autorun file to CD
-- set scratchdir dir to 1744 when burning CD
-- cleaned up code a bit
-- in call_mindi_...(), gracefully handle the user's input
-  if they specify the boot loader but not the boot device
-- offer to abort if GRUB is boot loader and /dev/md* is
-  the boot device (bug in grub-install)
-- if boot loader is R then write RAW as bootloader.name
-- multithreaded make_afioballs_and_images()
-- fixed slice_up_file_etc() for 0-compression users
-- line 1198: added call to is_this_file_compressed() to stop
-  slice_up_file_etc() from compressing files which are
-  already compressed
-- other hackery related to the above enhancement
-- afio no longer forcibly compresses all files (i.e. I dropped
-  the -U following suggestions from users); let's see if
-  it works :)
-
-10/01 - 10/31
-- mondoarchive (with no parameters) wasn't working
-  if user said yes when asked if BurnProof drive; FIXED
-- if manual CD tray and writing to ISO's then prompt
-  for each & every new CD
-- moved a lot of subroutines here
-  from mondo-archive.c and mondo-floppies.c
-
-09/01 - 09/30
-- if CD not burned OK then don't try to verify
-- change 64k to TAPE_BLOCK_SIZE
-- run_program_and_log_output() now takes boolean operator to specify
-  whether it will log its activities in the event of _success_
-- orig_vfy_flag_val added to write_iso_and_go_on, to restore bkpinfo->verify_data's
-  value if altered by verify_cd_image()
-
-08/01 - 08/31
-- use data structure to store the fname, checksum, mods & perms of each bigfile
-  ... biggiestruct :)
-- bigger tmp[]'s in a few places
-- cleaned up the (user-friendly) counting of biggiefiles a bit
-- if media_size[N]<=0 then catch it & abort, unless it's tape,
-  in which case, allow it
-- cleaned up a lot of log_it() calls
-- fixed NULL filename-related bug in can_we_fit_these_files_on_media()
-- deleted can_we_fit.....() subroutine because it was causing problems
-  --- moved its code into the one subroutine which called it
-- created [08/01/2002]
 */
 
@@ -352 +190 @@
 int
 archive_this_fileset_with_star(struct s_bkpinfo *bkpinfo, char *filelist,
-                           char *fname, int setno)
+                               char *fname, int setno)
 {
     int retval = 0;
@@ -396 +234 @@
         asprintf(&tmp, "%s", last_line_of_file(MONDO_LOGFILE));
         log_msg(1, "res=%d; tmp='%s'", res, tmp);
-        paranoid_free(tmp);
         if (bkpinfo->use_star && (res == 254 || res == 65024)
             && strstr(tmp, "star: Processed all possible files")
@@ -403 +240 @@
             res = 0;
         }
+        paranoid_free(tmp);
         if (res) {
             log_OS_error(command);
@@ -417 +255 @@
         }
     }
+    paranoid_free(command);
+
     retval += res;
     if (retval) {
@@ -425 +265 @@
     }
 
-    paranoid_free(command);
-    paranoid_free(tmp);
     return (retval);
 }
@@ -475 +313 @@
     if (!does_file_exist(filelist)) {
         asprintf(&tmp,
-             "(archive_this_fileset) - filelist %s does not exist",
-             filelist);
+                 "(archive_this_fileset) - filelist %s does not exist",
+                 filelist);
         log_to_screen(tmp);
         paranoid_free(tmp)
-        return (1);
+            return (1);
     }
     asprintf(&tmp, "echo hi > %s 2> /dev/null", fname);
@@ -488 +326 @@
 
 
-    if (bkpinfo->compression_level > 0) {
+        if (bkpinfo->compression_level > 0) {
         asprintf(&tmp, "%s/do-not-compress-these", g_mondo_home);
         //       -b %ld, TAPE_BLOCK_SIZE
@@ -496 +334 @@
             asprintf(&tmp1, "%s -E %s", zipparams, tmp);
             paranoid_free(zipparams)
-            zipparams = tmp1;
+                zipparams = tmp1;
         } else {
+            asprintf(&zipparams, "%s", "");
             log_msg(3, "%s not found. Cannot exclude zipfiles, etc.", tmp);
         }
@@ -541 +380 @@
         }
     }
+    paranoid_free(command);
+
     retval += res;
     if (retval) {
@@ -564 +405 @@
         }
     }
-    paranoid_free(command);
     return (retval);
 }
-
-
-
-
 
 
@@ -617 +453 @@
         { fatal_error("Failed to count filelist.full"); }
 */
-    asprintf(&tmp, "gzip -9 %s/archives/filelist.full", bkpinfo->scratchdir);
+    asprintf(&tmp, "gzip -9 %s/archives/filelist.full",
+             bkpinfo->scratchdir);
     if (run_program_and_log_output(tmp, 2)) {
         fatal_error("Failed to gzip filelist.full");
@@ -623 +460 @@
     paranoid_free(tmp);
     asprintf(&tmp, "cp -f %s/archives/*list*.gz %s", bkpinfo->scratchdir,
-            bkpinfo->tmpdir);
+             bkpinfo->tmpdir);
     if (run_program_and_log_output(tmp, 2)) {
         fatal_error("Failed to copy to tmpdir");
@@ -659 +496 @@
     return (retval);
 }
-
-
 
 
@@ -724 +559 @@
 
     asprintf(&tmp,
-            "echo \"%s\" | tr -s ' ' '\n' | grep -x \"/dev/.*\" | tr -s '\n' ' ' | awk '{print $0\"\\n\";}'",
-            bkpinfo->exclude_paths);
-    asprintf(&devs_to_exclude, call_program_and_get_last_line_of_output(tmp));
+             "echo \"%s\" | tr -s ' ' '\n' | grep -x \"/dev/.*\" | tr -s '\n' ' ' | awk '{print $0\"\\n\";}'",
+             bkpinfo->exclude_paths);
+    asprintf(&devs_to_exclude,
+             call_program_and_get_last_line_of_output(tmp));
     paranoid_free(tmp);
     asprintf(&tmp, "devs_to_exclude = '%s'", devs_to_exclude);
@@ -732 +568 @@
     paranoid_free(tmp);
     mvaddstr_and_log_it(g_currentY, 0,
-                "Calling MINDI to create boot+data disks");
+                        "Calling MINDI to create boot+data disks");
     asprintf(&tmp, "%s/filelist.full", bkpinfo->tmpdir);
     if (!does_file_exist(tmp)) {
@@ -777 +613 @@
         asprintf(&cd_recovery_sz, "no");
     }
-    /* BCO: shared between LILO/ELILO */
+    /* Field shared between LILO/ELILO */
     if (bkpinfo->make_cd_use_lilo) {
         asprintf(&use_lilo_sz, "yes");
@@ -790 +626 @@
 #ifdef __FreeBSD__
         asprintf(&bootdev, call_program_and_get_last_line_of_output
-               ("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | sed 's/\\([0-9]\\).*/\\1/'"));
+                 ("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | sed 's/\\([0-9]\\).*/\\1/'"));
         if (!bootdev[0]) {
             paranoid_free(bootdev);
             asprintf(&bootdev, call_program_and_get_last_line_of_output
-                   ("mount | grep ' / ' | head -1 | cut -d' ' -f1 | sed 's/\\([0-9]\\).*/\\1/'"));
+                     ("mount | grep ' / ' | head -1 | cut -d' ' -f1 | sed 's/\\([0-9]\\).*/\\1/'"));
         }
 #else
         asprintf(&bootdev, call_program_and_get_last_line_of_output
-               ("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'"));
+                 ("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'"));
         if (strstr(bootdev, "/dev/cciss/")) {
             paranoid_free(bootdev);
             asprintf(&bootdev, call_program_and_get_last_line_of_output
-                   ("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | cut -dp -f1"));
+                     ("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | cut -dp -f1"));
         }
         if (!bootdev[0]) {
             paranoid_free(bootdev);
             asprintf(&bootdev, call_program_and_get_last_line_of_output
-                   ("mount | grep ' / ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'"));
+                     ("mount | grep ' / ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'"));
             if (strstr(bootdev, "/dev/cciss/")) {
                 paranoid_free(bootdev);
                 asprintf(&bootdev, call_program_and_get_last_line_of_output
-                       ("mount | grep ' / ' | head -1 | cut -d' ' -f1 | cut -dp -f1"));
+                         ("mount | grep ' / ' | head -1 | cut -d' ' -f1 | cut -dp -f1"));
             }
         }
@@ -821 +657 @@
         if (bkpinfo->boot_loader != '\0') {
             asprintf(&tmp, "User specified boot loader. It is '%c'.",
-                    bkpinfo->boot_loader);
+                     bkpinfo->boot_loader);
             log_msg(2, tmp);
             paranoid_free(tmp);
@@ -829 +665 @@
         if (bkpinfo->boot_device[0] != '\0') {
             asprintf(&tmp, "User specified boot device. It is '%s'.",
-                    bkpinfo->boot_device);
+                     bkpinfo->boot_device);
             log_msg(2, tmp);
             paranoid_free(tmp);
@@ -849 +685 @@
     {
         fatal_error
-            ("Please specify your boot loader and device, e.g. -l GRUB -f /dev/hda. Type 'man mondoarchive' to read the manual.");
+            ("Please specify your boot loader and device, e.g. -l GRUB -f /dev/hda.\nType 'man mondoarchive' to read the manual.");
     }
     if (bkpinfo->boot_loader == 'L') {
@@ -855 +691 @@
         if (!does_file_exist("/etc/lilo.conf")) {
             fatal_error
-                ("The de facto standard location for your boot loader's config file is /etc/lilo.conf but I cannot find it there. What is wrong with your Linux distribution?");
+                ("The de facto standard location for your boot loader's config file is /etc/lilo.conf.\nBut I cannot find it there. What is wrong with your Linux distribution?");
         }
     } else if (bkpinfo->boot_loader == 'G') {
@@ -872 +708 @@
         if (!does_file_exist("/etc/grub.conf")) {
             fatal_error
-                ("The de facto standard location for your boot loader's config file is /etc/grub.conf but I cannot find it there. What is wrong with your Linux distribution? Try 'ln -s /boot/grub/menu.lst /etc/grub.conf'...");
+                ("The de facto standard location for your boot loader's config file is /etc/grub.conf.\nBut I cannot find it there. What is wrong with your Linux distribution?\nTry 'ln -s /boot/grub/menu.lst /etc/grub.conf'...");
         }
     } else if (bkpinfo->boot_loader == 'E') {
         asprintf(&bootldr_str, "ELILO");
-        /* BCO: fix it for SuSE, Debian, Mandrake, ... */
+        /* BERLIOS: fix it for SuSE, Debian, Mandrake, ... */
         if (!does_file_exist("/etc/elilo.conf")
             && does_file_exist("/boot/efi/efi/redhat/elilo.conf")) {
@@ -885 +721 @@
         if (!does_file_exist("/etc/elilo.conf")) {
             fatal_error
-                ("The de facto mondo standard location for your boot loader's config file is /etc/elilo.conf but I cannot find it there. What is wrong with your Linux distribution? Try finding it under /boot/efi and do 'ln -s /boot/efi/..../elilo.conf /etc/elilo.conf'");
+                ("The de facto mondo standard location for your boot loader's config file is /etc/elilo.conf\nBut I cannot find it there. What is wrong with your Linux distribution?\nTry finding it under /boot/efi and do 'ln -s /boot/efi/..../elilo.conf /etc/elilo.conf'");
         }
     } else if (bkpinfo->boot_loader == 'R') {
@@ -903 +739 @@
     }
     asprintf(&tmp, "Your boot loader is %s and it boots from %s",
-            bootldr_str, bkpinfo->boot_device);
+             bootldr_str, bkpinfo->boot_device);
     log_to_screen(tmp);
     paranoid_free(tmp);
@@ -982 +818 @@
 
     asprintf(&tmp, "BTW, I'm telling Mindi your kernel is '%s'",
-            bkpinfo->kernel_path);
+             bkpinfo->kernel_path);
     log_to_screen(tmp);
     paranoid_free(tmp);
 
     log_msg(1, "lines_in_filelist = %ld", lines_in_filelist);
-    
+
     // Watch it! This next line adds a parameter...
     if (bkpinfo->nonbootable_backup) {
@@ -999 +835 @@
 6=\"%s\" 7=%ld 8=\"%s\" 9=\"%s\" 10=\"%s\" \
 11=\"%s\" 12=%s 13=%ld 14=\"%s\" 15=\"%s\" 16=\"%s\" 17=\"%s\" 18=%ld 19=%d",*/
-            "mindi --custom %s %s/images \"%s\" \"%s\" \
+             "mindi --custom %s %s/images \"%s\" \"%s\" \
 \"%s\" %ld \"%s\" \"%s\" \"%s\" \
-\"%s\" %s %ld \"%s\" \"%s\" \"%s\" \"%s\" %ld %d %s", 
-            bkpinfo->tmpdir,    // parameter #2
-            bkpinfo->scratchdir,    // parameter #3
-            bkpinfo->kernel_path,   // parameter #4
-            tape_device,        // parameter #5
-            tape_size_sz,       // parameter #6
-            lines_in_filelist,  // parameter #7 (INT)
-            use_lzo_sz,         // parameter #8
-            cd_recovery_sz,     // parameter #9
-            bkpinfo->image_devs,    // parameter #10
-            broken_bios_sz,     // parameter #11
-            last_filelist_number,   // parameter #12 (STRING)
-            estimated_total_noof_slices,    // parameter #13 (INT)
-            devs_to_exclude,    // parameter #14
-            use_comp_sz,        // parameter #15
-            use_lilo_sz,        // parameter #16
-            use_star_sz,        // parameter #17
-            bkpinfo->internal_tape_block_size,  // parameter #18 (LONG)
-            bkpinfo->differential,  // parameter #19 (INT)
-            tmp);   
+\"%s\" %s %ld \"%s\" \"%s\" \"%s\" \"%s\" %ld %d %s", bkpinfo->tmpdir,  // parameter #2
+             bkpinfo->scratchdir,   // parameter #3
+             bkpinfo->kernel_path,  // parameter #4
+             tape_device,       // parameter #5
+             tape_size_sz,      // parameter #6
+             lines_in_filelist, // parameter #7 (INT)
+             use_lzo_sz,        // parameter #8
+             cd_recovery_sz,    // parameter #9
+             bkpinfo->image_devs,   // parameter #10
+             broken_bios_sz,    // parameter #11
+             last_filelist_number,  // parameter #12 (STRING)
+             estimated_total_noof_slices,   // parameter #13 (INT)
+             devs_to_exclude,   // parameter #14
+             use_comp_sz,       // parameter #15
+             use_lilo_sz,       // parameter #16
+             use_star_sz,       // parameter #17
+             bkpinfo->internal_tape_block_size, // parameter #18 (LONG)
+             bkpinfo->differential, // parameter #19 (INT)
+             tmp);
     paranoid_free(tmp);
     paranoid_free(tape_size_sz);
@@ -1038 +873 @@
 
     res = run_program_and_log_to_screen(command,
-                      "Generating boot+data disks");
+                                        "Generating boot+data disks");
     paranoid_free(command);
 
@@ -1052 +887 @@
 
         asprintf(&command,
-            "cp -f %s/images/mindi.iso /root/images/mindi/mondorescue.iso",
-                bkpinfo->scratchdir);
+                 "cp -f %s/images/mindi.iso /root/images/mindi/mondorescue.iso",
+                 bkpinfo->scratchdir);
         log_msg(2, command);
         run_program_and_log_output(command, FALSE);
@@ -1060 +895 @@
         if (bkpinfo->nonbootable_backup) {
             asprintf(&command, "cp -f %s/all.tar.gz %s/images",
-                    bkpinfo->tmpdir, bkpinfo->scratchdir);
+                     bkpinfo->tmpdir, bkpinfo->scratchdir);
             if (system(command)) {
                 fatal_error("Unable to create temporary duff tarball");
-            paranoid_free(command);
+                paranoid_free(command);
             }
         }
         asprintf(&command, "cp -f %s/mindi-*oot*.img %s/images",
-                bkpinfo->tmpdir, bkpinfo->scratchdir);
+                 bkpinfo->tmpdir, bkpinfo->scratchdir);
         log_msg(2, command);
         run_program_and_log_output(command, FALSE);
         paranoid_free(command);
 
-        asprintf(&tmp, "cp -f %s/images/all.tar.gz %s", 
-                bkpinfo->scratchdir, bkpinfo->tmpdir);
+        asprintf(&tmp, "cp -f %s/images/all.tar.gz %s",
+                 bkpinfo->scratchdir, bkpinfo->tmpdir);
         if (system(tmp)) {
             fatal_error("Cannot find all.tar.gz in tmpdir");
@@ -1087 +922 @@
         log_to_screen("Mindi failed to create your boot+data disks.");
         asprintf(&command, "cat %s | grep \"Fatal error\"",
-                "/var/log/mindi.log");
+                 "/var/log/mindi.log");
         asprintf(&tmp, call_program_and_get_last_line_of_output(command));
         paranoid_free(command);
@@ -1097 +932 @@
     return (res);
 }
-
 
 
@@ -1160 +994 @@
 
     asprintf(&archiving_filelist_fname, FILELIST_FNAME_RAW_SZ,
-            bkpinfo->tmpdir, 0L);
+             bkpinfo->tmpdir, 0L);
     archiving_set_no = 0;
     while (does_file_exist(archiving_filelist_fname)) {
@@ -1185 +1019 @@
         /* backup this set of files */
         asprintf(&archiving_afioball_fname, AFIOBALL_FNAME_RAW_SZ,
-                bkpinfo->tmpdir, archiving_set_no, bkpinfo->zip_suffix);
+                 bkpinfo->tmpdir, archiving_set_no, bkpinfo->zip_suffix);
         asprintf(&archiving_filelist_fname, FILELIST_FNAME_RAW_SZ,
-                bkpinfo->tmpdir, archiving_set_no);
+                 bkpinfo->tmpdir, archiving_set_no);
         if (!does_file_exist(archiving_filelist_fname)) {
             log_msg(3,
-                "%s[%d:%d] - well, I would archive %d, except that it doesn't exist. I'll stop now.",
-                FORTY_SPACES, getpid(), this_thread_no,
-                archiving_set_no);
+                    "%s[%d:%d] - well, I would archive %d, except that it doesn't exist. I'll stop now.",
+                    FORTY_SPACES, getpid(), this_thread_no,
+                    archiving_set_no);
             paranoid_free(archiving_filelist_fname);
             paranoid_free(archiving_afioball_fname);
@@ -1199 +1033 @@
 
         asprintf(&tmp, AFIOBALL_FNAME_RAW_SZ, bkpinfo->tmpdir,
-                archiving_set_no - ARCH_BUFFER_NUM, bkpinfo->zip_suffix);
+                 archiving_set_no - ARCH_BUFFER_NUM, bkpinfo->zip_suffix);
         if (does_file_exist(tmp)) {
-            log_msg(4, "%s[%d:%d] - waiting for storer", 
+            log_msg(4, "%s[%d:%d] - waiting for storer",
                     FORTY_SPACES, getpid(), this_thread_no);
             while (does_file_exist(tmp)) {
@@ -1213 +1047 @@
                 this_thread_no, archiving_set_no);
         asprintf(&curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ,
-                bkpinfo->tmpdir, archiving_set_no);
+                 bkpinfo->tmpdir, archiving_set_no);
         asprintf(&curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ,
-                bkpinfo->tmpdir, archiving_set_no);
+                 bkpinfo->tmpdir, archiving_set_no);
         get_fattr_list(archiving_filelist_fname, curr_xattr_list_fname);
         paranoid_free(curr_xattr_list_fname);
@@ -1224 +1058 @@
                 this_thread_no, archiving_set_no);
         res = archive_this_fileset(bkpinfo, archiving_filelist_fname,
-                         archiving_afioball_fname,
-                         archiving_set_no);
+                                   archiving_afioball_fname,
+                                   archiving_set_no);
         paranoid_free(archiving_afioball_fname);
         paranoid_free(archiving_filelist_fname);
@@ -1232 +1066 @@
         if (res) {
             asprintf(&tmp,
-                    "Errors occurred while archiving set %ld. Please review logs.",
-                    archiving_set_no);
+                     "Errors occurred while archiving set %ld. Please review logs.",
+                     archiving_set_no);
             log_to_screen(tmp);
             paranoid_free(tmp);
@@ -1268 +1102 @@
     pthread_exit(NULL);
 }
-
-
-
 
 
@@ -1296 +1127 @@
 
     log_msg(1, "Closing tape/CD ... ");
-    if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type))
+    if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
         /* write tape/cdstream */
-    {
         closeout_tape(bkpinfo);
-    } else
+    } else {
         /* write final ISO */
-    {
         res = write_final_iso_if_necessary(bkpinfo);
         retval += res;
@@ -1359 +1188 @@
 hexdump | tr -s ' ' '0' | head -n1"));
     strip_spaces(g_serial_string);
-    asprintf(&tmp, "%s...word.",g_serial_string);
+    asprintf(&tmp, "%s...word.", g_serial_string);
     paranoid_free(g_serial_string);
     g_serial_string = tmp;
@@ -1389 +1218 @@
 
     asprintf(&command, "rm -f %s/%s-[1-9]*.iso", bkpinfo->prefix,
-            bkpinfo->isodir);
+             bkpinfo->isodir);
     paranoid_system(command);
     paranoid_free(command);
@@ -1396 +1225 @@
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
         write_header_block_to_stream(0, "start-of-tape",
-                         BLK_START_OF_TAPE);
+                                     BLK_START_OF_TAPE);
         write_header_block_to_stream(0, "start-of-backup",
-                         BLK_START_OF_BACKUP);
+                                     BLK_START_OF_BACKUP);
     }
     return (retval);
@@ -1434 +1263 @@
     assert_string_is_neither_NULL_nor_zerolength(title);
 
-    malloc_string(command);
 #ifdef __FreeBSD__
 /* Ugh. FreeBSD fdformat prints out this pretty progress indicator that's
@@ -1450 +1278 @@
     }
 /* if not Debian then go ahead & use fdformat */
-    asprintf(&tempfile,"%s",
-           call_program_and_get_last_line_of_output
-           ("mktemp -q /tmp/mondo.XXXXXXXX"));
-    asprintf(&command, "%s >> %s 2>> %s; rm -f %s", cmd, tempfile, tempfile,
-            tempfile);
+    asprintf(&tempfile, "%s",
+             call_program_and_get_last_line_of_output
+             ("mktemp -q /tmp/mondo.XXXXXXXX"));
+    asprintf(&command, "%s >> %s 2>> %s; rm -f %s", cmd, tempfile,
+             tempfile, tempfile);
     log_msg(3, command);
     open_evalcall_form(title);
@@ -1466 +1294 @@
         maxtracks = 80;
     }
+    paranoid_free(command);
+
     for (sleep(1); does_file_exist(tempfile); sleep(1)) {
         trackno = get_trackno_from_logfile(tempfile);
@@ -1487 +1317 @@
     }
     unlink(tempfile);
-    paranoid_free(command);
     paranoid_free(tempfile);
     return (res);
 }
+
 
 /**
@@ -1534 +1364 @@
     return (res);
 }
+
 
 /**
@@ -1632 +1463 @@
     log_msg(5, "Go, Shorty. It's your birthday.");
     open_progress_form("Backing up filesystem",
-               "I am backing up your live filesystem now.",
-               "Please wait. This may take a couple of hours.",
-               "Working...",
-               get_last_filelist_number(bkpinfo) + 1);
+                       "I am backing up your live filesystem now.",
+                       "Please wait. This may take a couple of hours.",
+                       "Working...",
+                       get_last_filelist_number(bkpinfo) + 1);
 
     log_msg(5, "We're gonna party like it's your birthday.");
@@ -1654 +1485 @@
         if ((res =
              pthread_create(&archival_thread[noof_threads], NULL,
-                    create_afio_files_in_background,
-                    (void *) transfer_block))) {
+                            create_afio_files_in_background,
+                            (void *) transfer_block))) {
             fatal_error("Unable to create an archival thread");
         }
     }
+    paranoid_free(transfer_block);
 
     log_msg(8, "About to enter while() loop");
@@ -1668 +1500 @@
             && *p_last_set_archived == storing_set_no - 1) {
             log_msg(2,
-                "No archival threads are running. The last stored set was %d and I'm looking for %d. Take off your make-up; the party's over... :-)",
-                *p_last_set_archived, storing_set_no);
+                    "No archival threads are running. The last stored set was %d and I'm looking for %d. Take off your make-up; the party's over... :-)",
+                    *p_last_set_archived, storing_set_no);
             done_storing = TRUE;
-        } else if (!get_bit_N_of_array(p_list_of_fileset_flags, storing_set_no)) {
+        } else
+            if (!get_bit_N_of_array
+                (p_list_of_fileset_flags, storing_set_no)) {
             misc_counter_that_is_not_important =
                 (misc_counter_that_is_not_important + 1) % 5;
@@ -1677 +1511 @@
             /* maybe : */
             asprintf(&media_usage_comment, "%s",
-                   percent_media_full_comment(bkpinfo));
+                     percent_media_full_comment(bkpinfo));
             if (!misc_counter_that_is_not_important) {
                 update_progress_form(media_usage_comment);
@@ -1686 +1520 @@
             // store set N
             asprintf(&storing_filelist_fname, FILELIST_FNAME_RAW_SZ,
-                    bkpinfo->tmpdir, storing_set_no);
+                     bkpinfo->tmpdir, storing_set_no);
             asprintf(&storing_afioball_fname, AFIOBALL_FNAME_RAW_SZ,
-                    bkpinfo->tmpdir, storing_set_no, bkpinfo->zip_suffix);
+                     bkpinfo->tmpdir, storing_set_no, bkpinfo->zip_suffix);
             asprintf(&curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ,
-                    bkpinfo->tmpdir, storing_set_no);
+                     bkpinfo->tmpdir, storing_set_no);
             asprintf(&curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ,
-                    bkpinfo->tmpdir, storing_set_no);
+                     bkpinfo->tmpdir, storing_set_no);
 
             log_msg(2, "Storing set %d", storing_set_no);
@@ -1703 +1537 @@
             }
             asprintf(&media_usage_comment, "%s",
-                   percent_media_full_comment(bkpinfo));
+                     percent_media_full_comment(bkpinfo));
             /* copy to CD (scratchdir) ... and an actual CD-R if necessary */
             if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
                 register_in_tape_catalog(fileset, storing_set_no, -1,
-                             storing_afioball_fname);
+                                         storing_afioball_fname);
                 maintain_collection_of_recent_archives(bkpinfo->tmpdir,
-                                       storing_afioball_fname);
+                                                       storing_afioball_fname);
                 iamhere("Writing EXAT files");
-                res +=
-                    write_EXAT_files_to_tape(bkpinfo,
-                                 curr_xattr_list_fname,
-                                 curr_acl_list_fname);
+                res += write_EXAT_files_to_tape(bkpinfo,
+                                                curr_xattr_list_fname,
+                                                curr_acl_list_fname);
                 // archives themselves
                 res +=
                     move_files_to_stream(bkpinfo, storing_afioball_fname,
-                                 NULL);
+                                         NULL);
             } else {
-                res =
-                    move_files_to_cd(bkpinfo, storing_filelist_fname,
-                             curr_xattr_list_fname,
-                             curr_acl_list_fname,
-                             storing_afioball_fname, NULL);
+                res = move_files_to_cd(bkpinfo, storing_filelist_fname,
+                                       curr_xattr_list_fname,
+                                       curr_acl_list_fname,
+                                       storing_afioball_fname, NULL);
             }
             paranoid_free(storing_filelist_fname);
@@ -1737 +1569 @@
             if (res) {
                 asprintf(&tmp,
-                        "Failed to add archive %ld's files to CD dir\n",
-                        storing_set_no);
+                         "Failed to add archive %ld's files to CD dir\n",
+                         storing_set_no);
                 log_to_screen(tmp);
                 paranoid_free(tmp);
-                fatal_error("Is your hard disk full? If not, please send the author the logfile.");
+                fatal_error
+                    ("Is your hard disk full? If not, please send the author the logfile.");
             }
             storing_set_no++;
@@ -1757 +1590 @@
     log_msg(2, "Done.");
     if (retval) {
-        asprintf(&tmp, "Your regular files have been archived (with errors).");
+        asprintf(&tmp,
+                 "Your regular files have been archived (with errors).");
     } else {
-        asprintf(&tmp, "Your regular files have been archived successfully");
+        asprintf(&tmp,
+                 "Your regular files have been archived successfully");
     }
     log_to_screen(tmp);
     paranoid_free(tmp);
-    paranoid_free(transfer_block);
     paranoid_free(result_str);
     return (retval);
@@ -1779 +1613 @@
     close_evalcall_form();
 }
-
-
 
 
@@ -1851 +1683 @@
     if (bkpinfo->call_before_iso[0] != '\0') {
         asprintf(&message_to_screen, "Running pre-ISO call for CD#%d",
-                g_current_media_number);
+                 g_current_media_number);
         res = eval_call_to_make_ISO(bkpinfo, bkpinfo->call_before_iso,
-                          destfile, g_current_media_number,
-                          MONDO_LOGFILE, message_to_screen);
+                                    destfile, g_current_media_number,
+                                    MONDO_LOGFILE, message_to_screen);
         if (res) {
             log_to_screen("%s...failed", message_to_screen);
@@ -1868 +1700 @@
         asprintf(&tmp, "%s/archives/NOT-THE-LAST", bkpinfo->scratchdir);
         asprintf(&message_to_screen, "Making an ISO (%s #%d)",
-                media_descriptor_string(bkpinfo->backup_media_type),
-                g_current_media_number);
+                 media_descriptor_string(bkpinfo->backup_media_type),
+                 g_current_media_number);
 
         /* if g_current_media_number >= 2 then pause & ask */
-        pause_and_ask_for_cdr(2, &cd_is_mountable); 
+        pause_and_ask_for_cdr(2, &cd_is_mountable);
         if (retval) {
             log_to_screen
                 ("Serious error(s) occurred already. I shan't try to write to media.");
         } else {
-            res =
-                eval_call_to_make_ISO(bkpinfo, bkpinfo->call_make_iso,
-                              bkpinfo->scratchdir,
-                              g_current_media_number,
-                              MONDO_LOGFILE, message_to_screen);
+            res = eval_call_to_make_ISO(bkpinfo, bkpinfo->call_make_iso,
+                                        bkpinfo->scratchdir,
+                                        g_current_media_number,
+                                        MONDO_LOGFILE, message_to_screen);
             if (res) {
                 log_to_screen("%s...failed to write", message_to_screen);
@@ -1896 +1727 @@
 #ifdef DVDRWFORMAT
             asprintf(&tmp,
-                    "cat %s | tail -n8 | grep \"blank=full.*dvd-compat.*DAO\"",
-                    MONDO_LOGFILE);
+                     "cat %s | tail -n8 | grep \"blank=full.*dvd-compat.*DAO\"",
+                     MONDO_LOGFILE);
             if (g_backup_media_type == dvd
                 && (res || !run_program_and_log_output(tmp, 1))) {
@@ -1913 +1744 @@
                 }
                 pause_for_N_seconds(5, "Letting DVD drive settle");
-                asprintf(&sz_blank_disk, "dvd+rw-format %s", bkpinfo->media_device);
+                asprintf(&sz_blank_disk, "dvd+rw-format %s",
+                         bkpinfo->media_device);
                 log_msg(3, "sz_blank_disk = '%s'", sz_blank_disk);
-                res =
-                    run_external_binary_with_percentage_indicator_NEW
+                res = run_external_binary_with_percentage_indicator_NEW
                     ("Blanking DVD disk", sz_blank_disk);
                 if (res) {
@@ -1923 +1754 @@
                     pause_for_N_seconds(5,
                                         "Letting DVD drive settle... and trying again.");
-                    res =
-                        run_external_binary_with_percentage_indicator_NEW
+                    res = run_external_binary_with_percentage_indicator_NEW
                         ("Blanking DVD disk", sz_blank_disk);
                     if (res) {
@@ -1968 +1798 @@
     } else {
         asprintf(&message_to_screen, "Running mkisofs to make %s #%d",
-                media_descriptor_string(bkpinfo->backup_media_type),
-                g_current_media_number);
+                 media_descriptor_string(bkpinfo->backup_media_type),
+                 g_current_media_number);
         log_msg(1, message_to_screen);
         asprintf(&result_sz, "Call to mkisofs to make ISO (%s #%d) ",
-                media_descriptor_string(bkpinfo->backup_media_type),
-                g_current_media_number);
+                 media_descriptor_string(bkpinfo->backup_media_type),
+                 g_current_media_number);
         if (bkpinfo->nonbootable_backup) {
             log_msg(1, "Making nonbootable backup");
 // FIXME --- change mkisofs string to MONDO_MKISOFS_NONBOOTABLE and add ' .' at end
-            res =
-                eval_call_to_make_ISO(bkpinfo,
-                                      "mkisofs -o _ISO_ -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .",
-                                      destfile, g_current_media_number,
-                                      MONDO_LOGFILE, message_to_screen);
+            res = eval_call_to_make_ISO(bkpinfo,
+                                        "mkisofs -o _ISO_ -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .",
+                                        destfile, g_current_media_number,
+                                        MONDO_LOGFILE, message_to_screen);
         } else {
             log_msg(1, "Making bootable backup");
@@ -2010 +1839 @@
 // and add ' .' at end
                 log_msg(1, "Non-ia64 --> lilo");
-                res =
-                    eval_call_to_make_ISO(bkpinfo,
-                                          "mkisofs -b images/mindi-bootroot.2880.img -c boot.cat -o _ISO_ -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .",
-                                          destfile, g_current_media_number,
-                                          MONDO_LOGFILE,
-                                          message_to_screen);
+                res = eval_call_to_make_ISO(bkpinfo,
+                                            "mkisofs -b images/mindi-bootroot.2880.img -c boot.cat -o _ISO_ -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .",
+                                            destfile,
+                                            g_current_media_number,
+                                            MONDO_LOGFILE,
+                                            message_to_screen);
 #endif
             } else {
@@ -2021 +1850 @@
                 log_msg(1, "Isolinux");
                 res = eval_call_to_make_ISO(bkpinfo,
-                                          "mkisofs -no-emul-boot -b isolinux.bin -boot-load-size 4 -boot-info-table -c boot.cat -o _ISO_ -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .",
-                                          destfile, g_current_media_number,
-                                          MONDO_LOGFILE,
-                                          message_to_screen);
+                                            "mkisofs -no-emul-boot -b isolinux.bin -boot-load-size 4 -boot-info-table -c boot.cat -o _ISO_ -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .",
+                                            destfile,
+                                            g_current_media_number,
+                                            MONDO_LOGFILE,
+                                            message_to_screen);
             }
         }
@@ -2052 +1882 @@
         log_msg(2, "bkpinfo->call_burn_iso = %s", bkpinfo->call_burn_iso);
         asprintf(&message_to_screen, "Burning %s #%d",
-                media_descriptor_string(bkpinfo->backup_media_type),
-                g_current_media_number);
+                 media_descriptor_string(bkpinfo->backup_media_type),
+                 g_current_media_number);
         pause_and_ask_for_cdr(2, &cd_is_mountable);
         res = eval_call_to_make_ISO(bkpinfo, bkpinfo->call_burn_iso,
-                                  destfile, g_current_media_number,
-                                  MONDO_LOGFILE, message_to_screen);
+                                    destfile, g_current_media_number,
+                                    MONDO_LOGFILE, message_to_screen);
         if (res) {
             log_to_screen("%s...failed", message_to_screen);
@@ -2069 +1899 @@
     if (bkpinfo->call_after_iso[0] != '\0') {
         asprintf(&message_to_screen, "Running post-ISO call (%s #%d)",
-                media_descriptor_string(bkpinfo->backup_media_type),
-                g_current_media_number);
+                 media_descriptor_string(bkpinfo->backup_media_type),
+                 g_current_media_number);
         res = eval_call_to_make_ISO(bkpinfo, bkpinfo->call_after_iso,
-                                  destfile, g_current_media_number,
-                                  MONDO_LOGFILE, message_to_screen);
+                                    destfile, g_current_media_number,
+                                    MONDO_LOGFILE, message_to_screen);
         if (res) {
             log_to_screen("%s...failed", message_to_screen);
@@ -2097 +1927 @@
     char *command;
     asprintf(&command,
-            "dd if=%s bs=512 count=1 2> /dev/null | strings | head -n1",
-            bigfile_fname);
+             "dd if=%s bs=512 count=1 2> /dev/null | strings | head -n1",
+             bigfile_fname);
     log_msg(1, "command = '%s'", command);
-    asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));
+    asprintf(&tmp, "%s",
+             call_program_and_get_last_line_of_output(command));
     log_msg(1, "--> tmp = '%s'", tmp);
     paranoid_free(command);
@@ -2139 +1970 @@
     /*@ buffers ******************************************** */
     char *tmp;
-    char *bigfile_fname;
+    char *bigfile_fname = NULL;
     char *sz_devfile;
     char *partimagehack_fifo = NULL;
@@ -2150 +1981 @@
     int retval = 0;
     int res = 0;
+    int n = 0;
     pid_t pid;
     FILE *ftmp = NULL;
@@ -2160 +1992 @@
     assert_string_is_neither_NULL_nor_zerolength(biggielist_fname);
 
-    malloc_string(bigfile_fname);
     estimated_total_noof_slices =
         size_of_all_biggiefiles_K(bkpinfo) / bkpinfo->optimal_set_size + 1;
@@ -2184 +2015 @@
         return (1);
     }
-    for (fgets(bigfile_fname, MAX_STR_LEN, fin); !feof(fin);
-         fgets(bigfile_fname, MAX_STR_LEN, fin), biggie_file_number++) {
+    for (getline(&bigfile_fname, (size_t) & n, fin); !feof(fin);
+         getline(&bigfile_fname, (size_t) & n, fin),
+         biggie_file_number++) {
         use_partimagehack = FALSE;
         if (bigfile_fname[strlen(bigfile_fname) - 1] < 32) {
@@ -2197 +2029 @@
             paranoid_fclose(ftmp);
             asprintf(&tmp, "bigfile %s was deleted - creating a dummy",
-                    bigfile_fname);
+                     bigfile_fname);
             delete_when_done = TRUE;
         } else {
@@ -2210 +2042 @@
                         bigfile_fname);
                 asprintf(&sz_devfile, "/tmp/%d.%d.000",
-                        (int) (random() % 32768),
-                        (int) (random() % 32768));
+                         (int) (random() % 32768),
+                         (int) (random() % 32768));
                 mkfifo(sz_devfile, 0x770);
                 partimagehack_fifo = sz_devfile;
@@ -2229 +2061 @@
                             (long int) (pid));
 
-                paranoid_free(sz_devfile);
+                    paranoid_free(sz_devfile);
                 }
             }
@@ -2248 +2080 @@
             }
             res = slice_up_file_etc(bkpinfo, bigfile_fname,
-                                  partimagehack_fifo, biggie_file_number,
-                                  noof_biggie_files, use_partimagehack);
+                                    partimagehack_fifo, biggie_file_number,
+                                    noof_biggie_files, use_partimagehack);
             if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
                 write_header_block_to_stream(0,
@@ -2283 +2115 @@
     }
     paranoid_free(tmp);
+    paranoid_free(bigfile_fname);
+    paranoid_fclose(fin);
+
     log_msg(1, "Finished backing up bigfiles");
     log_msg(1, "estimated slices = %ld; actual slices = %ld",
             estimated_total_noof_slices, g_current_progress);
     close_progress_form();
-    paranoid_fclose(fin);
-    paranoid_free(bigfile_fname);
     return (retval);
 }
-
-
 
 
@@ -2316 +2147 @@
 
     /* BERLIOS: Useless ?
-    asprintf(&tmp, "%s/archives/filelist.full", bkpinfo->scratchdir);
-    */
+       asprintf(&tmp, "%s/archives/filelist.full", bkpinfo->scratchdir);
+     */
 
     log_to_screen("Archiving regular files");
@@ -2328 +2159 @@
 
     asprintf(&curr_filelist_fname, FILELIST_FNAME_RAW_SZ, bkpinfo->tmpdir,
-            0L);
+             0L);
 
     curr_set_no = 0;
@@ -2334 +2165 @@
         /* backup this set of files */
         asprintf(&curr_afioball_fname, AFIOBALL_FNAME_RAW_SZ,
-                bkpinfo->tmpdir, curr_set_no, bkpinfo->zip_suffix);
+                 bkpinfo->tmpdir, curr_set_no, bkpinfo->zip_suffix);
 
         log_msg(1, "EXAT'g set %ld", curr_set_no);
         asprintf(&curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ,
-                bkpinfo->tmpdir, curr_set_no);
+                 bkpinfo->tmpdir, curr_set_no);
         asprintf(&curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ,
-                bkpinfo->tmpdir, curr_set_no);
+                 bkpinfo->tmpdir, curr_set_no);
         get_fattr_list(curr_filelist_fname, curr_xattr_list_fname);
         get_acl_list(curr_filelist_fname, curr_acl_list_fname);
@@ -2346 +2177 @@
         log_msg(1, "Archiving set %ld", curr_set_no);
         res = archive_this_fileset(bkpinfo, curr_filelist_fname,
-                                 curr_afioball_fname, curr_set_no);
+                                   curr_afioball_fname, curr_set_no);
         retval += res;
         if (res) {
             asprintf(&tmp,
-                    "Errors occurred while archiving set %ld. Perhaps your live filesystem changed?",
-                    curr_set_no);
+                     "Errors occurred while archiving set %ld. Perhaps your live filesystem changed?",
+                     curr_set_no);
             log_to_screen(tmp);
             paranoid_free(tmp);
         }
 
-        asprintf(&media_usage_comment, "%s", percent_media_full_comment(bkpinfo));
+        asprintf(&media_usage_comment, "%s",
+                 percent_media_full_comment(bkpinfo));
 
         /* copy to CD (scratchdir) ... and an actual CD-R if necessary */
@@ -2366 +2198 @@
             iamhere("Writing EXAT files");
             res += write_EXAT_files_to_tape(bkpinfo, curr_xattr_list_fname,
-                                         curr_acl_list_fname);
+                                            curr_acl_list_fname);
             // archives themselves
             res = move_files_to_stream(bkpinfo, curr_afioball_fname, NULL);
         } else {
             res = move_files_to_cd(bkpinfo, curr_filelist_fname,
-                                 curr_xattr_list_fname,
-                                 curr_acl_list_fname, curr_afioball_fname,
-                                 NULL);
+                                   curr_xattr_list_fname,
+                                   curr_acl_list_fname,
+                                   curr_afioball_fname, NULL);
         }
         retval += res;
@@ -2382 +2214 @@
         if (res) {
             asprintf(&tmp, "Failed to add archive %ld's files to CD dir\n",
-                    curr_set_no);
+                     curr_set_no);
             log_to_screen(tmp);
             paranoid_free(tmp);
@@ -2398 +2230 @@
     close_progress_form();
     if (retval) {
-        log_to_screen("Your regular files have been archived (with errors).");
+        log_to_screen
+            ("Your regular files have been archived (with errors).");
     } else {
-        log_to_screen("Your regular files have been archived successfully.");
-    }
-    return(retval);
+        log_to_screen
+            ("Your regular files have been archived successfully.");
+    }
+    return (retval);
 }
 
@@ -2480 +2314 @@
     mvaddstr_and_log_it(g_currentY, 0,
                         "Archiving large files to media           ");
-    asprintf(&biggielist, "%s/archives/biggielist.txt", bkpinfo->scratchdir);
+    asprintf(&biggielist, "%s/archives/biggielist.txt",
+             bkpinfo->scratchdir);
     asprintf(&xattr_fname, XATTR_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
     asprintf(&acl_fname, ACL_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
 
     asprintf(&command, "cp %s/biggielist.txt %s", bkpinfo->tmpdir,
-            biggielist);
+             biggielist);
     paranoid_system(command);
     paranoid_free(command);
+
     asprintf(&blah, "biggielist = %s", biggielist);
     log_msg(2, blah);
@@ -2499 +2335 @@
     get_acl_list(biggielist, acl_fname);
     asprintf(&command, "cp %s %s/archives/", xattr_fname,
-            bkpinfo->scratchdir);
+             bkpinfo->scratchdir);
     paranoid_system(command);
     paranoid_free(command);
-    asprintf(&command, "cp %s %s/archives/", acl_fname, bkpinfo->scratchdir);
+
+    asprintf(&command, "cp %s %s/archives/", acl_fname,
+             bkpinfo->scratchdir);
     paranoid_system(command);
     paranoid_free(command);
@@ -2514 +2352 @@
     paranoid_free(xattr_fname);
     paranoid_free(acl_fname);
+
     res = make_slices_and_images(bkpinfo, biggielist);
     paranoid_free(biggielist);
+
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
         write_header_block_to_stream(0, "end-of-biggiefiles",
@@ -2529 +2369 @@
     return (retval);
 }
-
 
 
@@ -2577 +2416 @@
 
     assert(bkpinfo != NULL);
-    tmp = malloc(1200);
     would_occupy = space_occupied_by_cd(bkpinfo->scratchdir);
     va_start(ap, files_to_add); // initialize the variable arguments
@@ -2602 +2440 @@
     if (would_occupy / 1024 > bkpinfo->media_size[g_current_media_number]) {
         /* FALSE because this is not the last CD we'll write */
-        res = write_iso_and_go_on(bkpinfo, FALSE);  
+        res = write_iso_and_go_on(bkpinfo, FALSE);
         retval += res;
         if (res) {
@@ -2617 +2455 @@
 
         asprintf(&tmp, "mv -f %s %s/archives/", curr_file,
-                bkpinfo->scratchdir);
+                 bkpinfo->scratchdir);
         res = run_program_and_log_output(tmp, 5);
         retval += res;
@@ -2639 +2477 @@
 
 /* @} - end of LLarchiveGroup */
-
-
-
-
-
-
 
 
@@ -2716 +2548 @@
         res += write_image_to_floppy(bootdisk_dev, tmp);
         paranoid_free(tmp);
+
         if (ask_me_OK_or_cancel("About to write 1.44MB mfsroot disk")) {
             log_to_screen("Writing mfsroot floppy");
@@ -2751 +2584 @@
                 format_disk(datadisk_dev);
             }
-            /*
-               asprintf(&tmp, "cat %s > %s", bootdisk_file, datadisk_dev);
-               res += run_external_binary_with_percentage_indicator_NEW("Writing boot floppy", tmp);
-             */
             res += write_image_to_floppy(datadisk_dev, bootdisk_file);
             if (ask_me_OK_or_cancel("About to write root disk")) {
@@ -2806 +2635 @@
 
 
-
-
 /**
  * Wrapper around @c offer_to_write_floppies().
@@ -2839 +2666 @@
             if (does_file_exist("/root/images/mindi/mondorescue.iso")) {
                 popup_and_OK
-                    ("Boot+data floppy creation failed. However, FYI, you may burn /root/images/mindi/mondorescue.iso to a CD and boot from that instead if you wish.");
+                    ("Boot+data floppy creation failed.\nHowever, you may burn /root/images/mindi/mondorescue.iso to a CD\nand boot from that instead if you wish.");
                 res++;
             }
@@ -2853 +2680 @@
     return (res);
 }
-
-
 
 
@@ -2943 +2768 @@
 
 /* @} - end of LLarchiveGroup */
-
 
 
@@ -3000 +2824 @@
 
 
-
 /**
  * Asks the user to put a CD-R(W) in the drive.
@@ -3029 +2852 @@
 
     asprintf(&szmsg, "I am about to burn %s #%d",
-            media_descriptor_string(g_backup_media_type),
-            g_current_media_number);
+             media_descriptor_string(g_backup_media_type),
+             g_current_media_number);
     log_to_screen(szmsg);
     paranoid_free(szmsg);
@@ -3038 +2861 @@
     log_to_screen("Scanning CD-ROM drive...");
     asprintf(&mtpt, "/tmp/cd.mtpt.%ld.%ld", (long int) random(),
-            (long int) random());
+             (long int) random());
     make_hole_for_dir(mtpt);
 
@@ -3056 +2879 @@
         cd_number = -1;
         asprintf(&tmp, "mount %s %s", cdrom_dev, mtpt);
-        if ((attempt_to_mount_returned_this = run_program_and_log_output(tmp, 1))) {
+        if ((attempt_to_mount_returned_this =
+             run_program_and_log_output(tmp, 1))) {
             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.");
@@ -3071 +2895 @@
                }
              */
-        } else if (!does_file_exist(szcdno) || !does_file_exist(szserfname)) {
-            log_to_screen("%s has data on it but it's probably not a Mondo CD.",
+        } else if (!does_file_exist(szcdno)
+                   || !does_file_exist(szserfname)) {
+            log_to_screen
+                ("%s has data on it but it's probably not a Mondo CD.",
                  media_descriptor_string(g_backup_media_type));
             asprintf(&our_serial_str, "%s", "");
@@ -3081 +2907 @@
             asprintf(&tmp1, "cat %s 2> /dev/null", szserfname);
             asprintf(&our_serial_str, "%s",
-                   call_program_and_get_last_line_of_output(tmp1));
+                     call_program_and_get_last_line_of_output(tmp1));
             paranoid_free(tmp1);
             // FIXME - should be able to use last_line_of_file(), surely?
@@ -3135 +2961 @@
         eject_device(cdrom_dev);
         asprintf(&tmp,
-                "I am about to burn %s #%d of the backup set. Please insert %s and press Enter.",
-                media_descriptor_string(g_backup_media_type),
-                g_current_media_number,
-                media_descriptor_string(g_backup_media_type));
+                 "I am about to burn %s #%d of the backup set. Please insert %s and press Enter.",
+                 media_descriptor_string(g_backup_media_type),
+                 g_current_media_number,
+                 media_descriptor_string(g_backup_media_type));
         popup_and_OK(tmp);
         paranoid_free(tmp);
@@ -3165 +2991 @@
 
 
-
 /**
  * Set the <tt>N</tt>th bit of @c array to @c true_or_false.
@@ -3193 +3018 @@
 
 /* @} - end of utilityGroup */
-
 
 
@@ -3251 +3075 @@
     int retval = 0;
     int res = 0;
+    int n = 0;
 
     /*@ structures ************************************************** */
@@ -3258 +3083 @@
     assert(bkpinfo != NULL);
     assert_string_is_neither_NULL_nor_zerolength(biggie_filename);
-
-    malloc_string(checksum_line);
 
     biggiestruct.for_backward_compatibility = '\n';
@@ -3279 +3102 @@
     if (partimagehack_fifo) {
         file_to_openin = partimagehack_fifo;
-        strcpy(checksum_line, "IGNORE");
+        asprintf(&checksum_line, "IGNORE");
         log_msg(2,
                 "Not calculating checksum for %s: it would take too long",
@@ -3292 +3115 @@
         }
         paranoid_free(command);
-        (void) fgets(checksum_line, MAX_STR_LEN, fin);
+        (void) getline(&checksum_line, (size_t) & n, fin);
         pclose(fin);
     }
@@ -3307 +3130 @@
     paranoid_free(checksum_line);
 
-    asprintf(&tmp, "%s", slice_fname(biggie_file_number, 0, bkpinfo->tmpdir, ""));
+    asprintf(&tmp, "%s",
+             slice_fname(biggie_file_number, 0, bkpinfo->tmpdir, ""));
     fout = fopen(tmp, "w");
     paranoid_free(tmp);
@@ -3319 +3143 @@
         log_OS_error("Unable to openin biggie_filename");
         asprintf(&tmp, "Cannot archive bigfile '%s': not found",
-                biggie_filename);
+                 biggie_filename);
         log_to_screen(tmp);
         paranoid_free(tmp);
@@ -3328 +3152 @@
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
         res = move_files_to_stream(bkpinfo,
-                                 slice_fname(biggie_file_number, 0,
-                                             bkpinfo->tmpdir, ""), NULL);
+                                   slice_fname(biggie_file_number, 0,
+                                               bkpinfo->tmpdir, ""), NULL);
     } else {
         res = move_files_to_cd(bkpinfo,
-                             slice_fname(biggie_file_number, 0, bkpinfo->tmpdir, ""), 
-                             NULL);
+                               slice_fname(biggie_file_number, 0,
+                                           bkpinfo->tmpdir, ""), NULL);
     }
     i = bkpinfo->optimal_set_size / 256;
     for (slice_num = 1; !finished; slice_num++) {
         asprintf(&curr_slice_fname_uncompressed, "%s",
-               slice_fname(biggie_file_number, slice_num, bkpinfo->tmpdir, ""));
+                 slice_fname(biggie_file_number, slice_num,
+                             bkpinfo->tmpdir, ""));
         asprintf(&curr_slice_fname_compressed, "%s",
-               slice_fname(biggie_file_number, slice_num, bkpinfo->tmpdir, suffix));
+                 slice_fname(biggie_file_number, slice_num,
+                             bkpinfo->tmpdir, suffix));
 
         asprintf(&tmp, "%s", percent_media_full_comment(bkpinfo));
@@ -3382 +3208 @@
             if (should_I_compress_slices && bkpinfo->compression_level > 0) {
                 asprintf(&command, "%s -%d %s", bkpinfo->zip_exe,
-                        bkpinfo->compression_level,
-                        curr_slice_fname_uncompressed);
+                         bkpinfo->compression_level,
+                         curr_slice_fname_uncompressed);
                 log_msg(2, command);
                 if ((res = system(command))) {
@@ -3391 +3217 @@
             } else {
                 /* BERLIOS: Useless 
-                asprintf(&command, "mv %s %s 2>> %s",
-                        curr_slice_fname_uncompressed,
-                        curr_slice_fname_compressed, MONDO_LOGFILE);
-                */
+                   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;
@@ -3411 +3237 @@
             } else {
                 asprintf(&tmp,
-                        "%s - Bigfile #%ld, slice #%ld compressed OK          ",
-                        biggie_filename, biggie_file_number + 1,
-                        slice_num);
+                         "%s - Bigfile #%ld, slice #%ld compressed OK          ",
+                         biggie_filename, biggie_file_number + 1,
+                         slice_num);
             }
 #ifndef _XWIN
@@ -3431 +3257 @@
 
             finished = TRUE;
-            asprintf(&file_to_archive, "%s", curr_slice_fname_uncompressed);
+            asprintf(&file_to_archive, "%s",
+                     curr_slice_fname_uncompressed);
             if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
                 break;
@@ -3450 +3277 @@
         if (res) {
             asprintf(&tmp,
-                    "Failed to add slice %ld of bigfile %ld to scratchdir",
-                    slice_num, biggie_file_number + 1);
+                     "Failed to add slice %ld of bigfile %ld to scratchdir",
+                     slice_num, biggie_file_number + 1);
             log_to_screen(tmp);
             paranoid_free(tmp);
@@ -3463 +3290 @@
     paranoid_fclose(fin);
     if (retval) {
-        asprintf(&tmp, "Sliced bigfile #%ld...FAILED", biggie_file_number + 1);
+        asprintf(&tmp, "Sliced bigfile #%ld...FAILED",
+                 biggie_file_number + 1);
     } else {
-        asprintf(&tmp, "Sliced bigfile #%ld...OK!", biggie_file_number + 1);
+        asprintf(&tmp, "Sliced bigfile #%ld...OK!",
+                 biggie_file_number + 1);
     }
     log_msg(1, tmp);
@@ -3498 +3327 @@
     paranoid_free(tmp);
 
-    asprintf(&tmp, "find %s -name '*list.[0-9]*' -exec rm -f '{}' \\;", dir);
+    asprintf(&tmp, "find %s -name '*list.[0-9]*' -exec rm -f '{}' \\;",
+             dir);
     run_program_and_log_output(tmp, FALSE);
     paranoid_free(tmp);
@@ -3552 +3382 @@
     log_msg(2, tmp);
     /* BERLIOS: that function seems strange to me
-    center_string(tmp, 80);
-    */
+       center_string(tmp, 80);
+     */
 #ifndef _XWIN
     if (!g_text_mode) {
@@ -3624 +3454 @@
     /* label the ISO with its number */
 
-    asprintf(&cdno_fname, "%s/archives/THIS-CD-NUMBER", bkpinfo->scratchdir);
+    asprintf(&cdno_fname, "%s/archives/THIS-CD-NUMBER",
+             bkpinfo->scratchdir);
     fout = fopen(cdno_fname, "w");
     fprintf(fout, "%d", g_current_media_number);
@@ -3631 +3462 @@
 
     asprintf(&tmp, "cp -f %s/autorun %s/", g_mondo_home,
-            bkpinfo->scratchdir);
+             bkpinfo->scratchdir);
     if (run_program_and_log_output(tmp, FALSE)) {
         log_msg(2, "Warning - unable to copy autorun to scratchdir");
@@ -3638 +3469 @@
 
     /* last CD or not? Label accordingly */
-    asprintf(&lastcd_fname, "%s/archives/NOT-THE-LAST", bkpinfo->scratchdir);
+    asprintf(&lastcd_fname, "%s/archives/NOT-THE-LAST",
+             bkpinfo->scratchdir);
     if (last_cd) {
         unlink(lastcd_fname);
@@ -3654 +3486 @@
         bkpinfo->media_size[g_current_media_number]) {
         asprintf(&tmp,
-                "Warning! CD is too big. It occupies %ld KB, which is more than the %ld KB allowed.",
-                (long) space_occupied_by_cd(bkpinfo->scratchdir),
-                (long) bkpinfo->media_size[g_current_media_number]);
+                 "Warning! CD is too big. It occupies %ld KB, which is more than the %ld KB allowed.",
+                 (long) space_occupied_by_cd(bkpinfo->scratchdir),
+                 (long) bkpinfo->media_size[g_current_media_number]);
         log_to_screen(tmp);
         paranoid_free(tmp);
     }
     asprintf(&isofile, "%s/%s/%s-%d.iso", bkpinfo->isodir,
-            bkpinfo->nfs_remote_dir, bkpinfo->prefix,
-            g_current_media_number);
+             bkpinfo->nfs_remote_dir, bkpinfo->prefix,
+             g_current_media_number);
     for (that_one_was_ok = FALSE; !that_one_was_ok;) {
         res = make_iso_fs(bkpinfo, isofile);
@@ -3689 +3521 @@
         } else {
             asprintf(&tmp, "Failed to burn %s #%d. Retry?",
-                    media_descriptor_string(bkpinfo->backup_media_type),
-                    g_current_media_number);
+                     media_descriptor_string(bkpinfo->backup_media_type),
+                     g_current_media_number);
             res = ask_me_yes_or_no(tmp);
             paranoid_free(tmp);
@@ -3721 +3553 @@
     wipe_archives(bkpinfo->scratchdir);
     asprintf(&tmp, "rm -Rf %s/images/*gz %s/images/*data*img",
-            bkpinfo->scratchdir, bkpinfo->scratchdir);
+             bkpinfo->scratchdir, bkpinfo->scratchdir);
     if (system(tmp)) {
         log_msg(2,
-             "Error occurred when I tried to delete the redundant IMGs and GZs");
+                "Error occurred when I tried to delete the redundant IMGs and GZs");
     }
     paranoid_free(tmp);
@@ -3795 +3627 @@
             if (res) {
                 asprintf(&tmp,
-                        "Warnings/errors were reported while checking %s #%d",
-                        media_descriptor_string(bkpinfo->backup_media_type),
-                        g_current_media_number);
+                         "Warnings/errors were reported while checking %s #%d",
+                         media_descriptor_string(bkpinfo->
+                                                 backup_media_type),
+                         g_current_media_number);
                 log_to_screen(tmp);
                 paranoid_free(tmp);
@@ -3810 +3643 @@
 */
         asprintf(&tmp,
-                "cat %s | grep \"afio: \" | sed 's/afio: //' | grep -vx \"/dev/.*\" >> /tmp/changed.files",
-                MONDO_LOGFILE);
+                 "cat %s | grep \"afio: \" | sed 's/afio: //' | grep -vx \"/dev/.*\" >> /tmp/changed.files",
+                 MONDO_LOGFILE);
         system(tmp);
         paranoid_free(tmp);
 
         asprintf(&tmp,
-                "cat %s | grep \"star: \" | sed 's/star: //' | grep -vx \"/dev/.*\" >> /tmp/changed.files",
-                MONDO_LOGFILE);
+                 "cat %s | grep \"star: \" | sed 's/star: //' | grep -vx \"/dev/.*\" >> /tmp/changed.files",
+                 MONDO_LOGFILE);
         system(tmp);
         paranoid_free(tmp);
@@ -3925 +3758 @@
 
 
-
 /**
  * Wrapper around @c write_image_to_floppy_SUB().