Changeset 45 in MondoRescue

Timestamp:

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

Author:

bcornec

Message:

asprint and getline now added

Location:

trunk/mondo/mondo/common

Files:

• X-specific.c (modified) (2 diffs)
• libmondo-archive.c (modified) (131 diffs)
• libmondo-fifo.c (modified) (1 diff)
• libmondo-gui.c (modified) (1 diff)
• libmondo-raid.c (modified) (14 diffs)
• libmondo-string.c (modified) (10 diffs)
• newt-specific.c (modified) (28 diffs)

trunk/mondo/mondo/common/X-specific.c

@@ -1 @@
-/* X-specific.c
-
+/* $Id$
 
 - subroutines which do display-type things
   and use the Qt library to do them
 
-10/04
-- took out the newt-related subroutines
-
-09/12
-- created
 */
 
@@ -22 +16 @@
 #include "libmondo-gui-EXT.h"
 #include "lib-common-externs.h"
-
-
 
 

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

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

@@ -39 +39 @@
  */
 pid_t g_mastermind_pid = 0;
-
-
 
 /**

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

@@ -1 @@
-/* libmondo-gui.c
- * $Id$
- */
+/* $Id$ */
 
 /**

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

@@ -1 @@
-/* subroutines for handling RAID
-   $Id$
+/* $Id$
+   subroutines for handling RAID
 */
 
@@ -48 +48 @@
 
     if (raidno == -1) {
-        asprintf(&command, "cat /proc/mdstat | grep \"linear\" > /dev/null 2> /dev/null");
+        asprintf(&command,
+                 "cat /proc/mdstat | grep \"linear\" > /dev/null 2> /dev/null");
     } else {
-        asprintf(&command, "cat /proc/mdstat | grep \"raid%d\" > /dev/null 2> /dev/null", raidno);
+        asprintf(&command,
+                 "cat /proc/mdstat | grep \"raid%d\" > /dev/null 2> /dev/null",
+                 raidno);
     }
     log_it("Is raid %d registered? Command = '%s'", raidno, command);
@@ -62 +65 @@
 #endif
 }
+
 
 /**
@@ -378 +382 @@
 int get_next_raidtab_line(FILE * fin, char *label, char *value)
 {
-    char *incoming;
+    char *incoming = NULL;
     char *p;
+    size_t n = 0;
 
     assert(fin != NULL);
@@ -390 +395 @@
     }
 
-    malloc_string(incoming);
-    for (fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin);
-         fgets(incoming, MAX_STR_LEN - 1, fin)) {
+    for (getline(&incoming, &n, fin); !feof(fin);
+         getline(&incoming, &n, fin)) {
         strip_spaces(incoming);
         p = strchr(incoming, ' ');
@@ -555 +559 @@
     int v;
 
-    malloc_string(label);
-    malloc_string(value);
     assert(raidlist != NULL);
     assert_string_is_neither_NULL_nor_zerolength(fname);
@@ -563 +565 @@
         log_it("Raidtab is very small or non-existent. Ignoring it.");
         raidlist->entries = 0;
-        paranoid_free(label);
-        paranoid_free(value);
         return (0);
     }
     if (!(fin = fopen(fname, "r"))) {
         log_it("Cannot open raidtab");
-        paranoid_free(label);
-        paranoid_free(value);
         return (1);
     }
     items = 0;
     log_it("Loading raidtab...");
+    malloc_string(label);
+    malloc_string(value);
     get_next_raidtab_line(fin, label, value);
     while (!feof(fin)) {
@@ -671 +671 @@
         if (!disklist) {
             asprintf(&tmp,
-                    "Ignoring '%s %s' pair of disk %s", labelB, valueB,
-                    label);
+                     "Ignoring '%s %s' pair of disk %s", labelB, valueB,
+                     label);
             log_it(tmp);
             paranoid_free(tmp);
@@ -904 +904 @@
     char *tmp;
     char *stub;
-    char *incoming;
+    char *incoming = NULL;
     char *raid_devname;
     char *p, *q, *r;
     int diskno;
+    size_t n = 0;
 
     malloc_string(incoming);
@@ -915 +916 @@
     }
     mdstat->entries = 0;
-    for (fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin);
-         fgets(incoming, MAX_STR_LEN - 1, fin)) {
+    for (getline(&incoming, &n, fin); !feof(fin);
+         getline(&incoming, &n, fin)) {
         p = incoming;
         if (*p != 'm' && *(p + 1) == 'm') {
@@ -964 +965 @@
             asprintf(&tmp, "/dev/%s", stub);
             paranoid_free(stub);
+
             log_msg(8, "/dev/md%d : disk#%d : %s (%d)",
                     mdstat->el[mdstat->entries].md, diskno, tmp,
                     mdstat->el[mdstat->entries].disks.el[diskno].index);
-            strcpy(mdstat->el[mdstat->entries].disks.el[diskno].device, tmp);
+            strcpy(mdstat->el[mdstat->entries].disks.el[diskno].device,
+                   tmp);
             paranoid_free(tmp);
+
             while (*p != ' ' && *p) {
                 p++;
@@ -979 +983 @@
 // next line --- skip it
         if (!feof(fin)) {
-            fgets(incoming, MAX_STR_LEN - 1, fin);
+            getline(&incoming, &n, fin);
         } else {
             continue;
@@ -985 +989 @@
 // next line --- the 'progress' line
         if (!feof(fin)) {
-            fgets(incoming, MAX_STR_LEN - 1, fin);
+            getline(&incoming, &n, fin);
         } else {
             continue;
@@ -1042 +1046 @@
 
 
-
 /* @} - end of raidGroup */

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

@@ -66 +66 @@
 
 
-
 /**
  * Pad a string on both sides so it appears centered.
@@ -101 +100 @@
 
 
-
-
 inline void turn_wildcard_chars_into_literal_chars(char *sout, char *sin)
 {
@@ -114 +111 @@
     *q = *p;                    // for the final '\0'
 }
-
 
 
@@ -127 +123 @@
     char *pos_w_commas;
     static char output[MAX_STR_LEN];
-    char tmp[MAX_STR_LEN];
+    char *tmp;
     int j;
 
     assert(input != NULL);
 
-    strcpy(tmp, input);
+    asprintf(tmp, "%s", input);
     if (strlen(tmp) > 6) {
         asprintf(&pos_w_commas, "%s", tmp);
@@ -151 +147 @@
     strcpy(output, pos_w_commas);
     paranoid_free(pos_w_commas);
+    paranoid_free(tmp);
     return (output);
 }
@@ -169 +166 @@
 
     /*@ buffers ********************************************************** */
-    static char output[MAX_STR_LEN];
+    char *output;
 
     assert(disklist != NULL);
 
-    sprintf(output, "%-24s %8d", disklist->el[lino].device,
-            disklist->el[lino].index);
+    asprintf(&output, "%-24s %8d", disklist->el[lino].device,
+             disklist->el[lino].index);
     return (output);
 }
-
-
-
 
 
@@ -214 +208 @@
     outval = atol(tmp);
     paranoid_free(tmp);
+
     if (ch == 'g' || ch == 'G') {
         outval = outval * 1024;
@@ -563 +558 @@
 
 
-
-
 /**
  * Wrap @p flaws_str across three lines. The first two are no more than 74 characters wide.
@@ -614 +607 @@
     }
 }
-
 
 
@@ -852 +844 @@
     char *output;
 
-
-
     if (raid_level >= 0) {
         asprintf(&output, " RAID %-2d ", raid_level);

trunk/mondo/mondo/common/newt-specific.c

@@ -1 @@
-/* newt-specific.c
-   $Id: newt-specific.c,v 1.8 2004/06/10 17:13:33 hugo Exp $
+/* $Id$
 
   subroutines which do display-type things
   and use the newt library to do them
-.
-
-10/02
-- tell user not to bother mailing list unless snapshot
-
-07/09
-- finish() calls g_erase_tmpdir_and_scratchdir to erase
-  tmpdir and scratchdir at end
-
-06/25
-- tried to fix newtFinished() segfault
-
-04/13/2004
-- lots of char[]'s are now *char's
-
-10/09/2003
-- allow DVD option for text-mode which_backup_type() too
-
-09/28
-- log_to_screen() now takes printf-like parameters
-
-09/26
-- b5 now means dvd (was udev)
-
-09/16
-- echo fatal error to screen before exiting
-- working on fatal_error()
-- swapped g_blurb2 and g_blurb3 in a few places to fix a GUI problem;
-  it shouldn't have worked! :) I think there's a mem-leak somewhere
-
-09/13
-- changed some '\n' occurrences to '\r\n'
-
-09/09
-- fixed silly bug in log_to_screen()
-
-07/02
-- modified popup_and_get_string()
-
-05/03
-- cleaned up fatal_error()
-
-04/30
-- fixed popup_changelist_*()
-
-04/27
-- replace newtFinished() and newtInit() with
-  newtSuspend() and newtResume()
-
-04/25
-- after comparing, popup the changelist for the user
-- moved the relevant code from compare_to_cds() into
-  compare_mode(), so that tape users may benefit too
-
-04/24
-- added lots of assert()'s and log_OS_error()'s
-- cleaned up a few uninitialized strings (valgrind)
-
-04/22
-- line 1181 - 'read from' (not 'restoring from')
-
-03/15/2003
-- fixed potentially infinite loop in log_to_screen (Tom Mortell)
-
-12/04/2002
-- changed "Pick file" to "Non-matching files"
-
-11/28
-- finish() now unregisters Mondo's pid
-
-10/28
-- unmount tmpfs if fatal_error
-
-10/04
-- more XMondo-related work
-- added some =NULL's in a few places
-
-09/01 - 09/30
-- write log_to_screen()'s string to stdout if in text mode
-- update_progress_form_FULL(), update_evalcall_form(),
-  popup_and_*(), ask_me_yes_or_no() now write
-  XMondo-friendly info to stdout if in text mode
-- if fatal error then popup and say what the fatal error is
-- run_program_and_log_output() now takes boolean operator to specify
-  whether it will log its activities in the event of _success_
-- added popup_changelist_from_file(char*source_file, char*topic, void*call_if_entry_selected(void*));
-
-08/07
-- added some functions to let user choose backup dev + format
-
-07/27
-- created
 */
 
@@ -122 +29 @@
 
 /*@unused@*/
-//static char cvsid[] = "$Id: newt-specific.c,v 1.8 2004/06/10 17:13:33 hugo Exp $";
-
-extern pid_t g_mastermind_pid;
-extern char *g_tmpfs_mountpt;
-extern char *g_boot_mountpt;
-extern char *g_mondo_home;
-
-extern char g_version[];
-
-extern void set_signals(int);
+//static char cvsid[] = "$Id$";
+
+    extern pid_t g_mastermind_pid;
+    extern char *g_tmpfs_mountpt;
+    extern char *g_boot_mountpt;
+    extern char *g_mondo_home;
+
+    extern char g_version[];
+
+    extern void set_signals(int);
 
 /**
@@ -140 +47 @@
  * Whether we are currently in a nested call of fatal_error().
  */
-bool g_exiting=FALSE;
+    bool g_exiting = FALSE;
 
 /**
  * Padding below the Newt components, to overcome bugs in Newt.
  */
-char g_haharrrrr[500];
-
-
-newtComponent g_timeline=NULL, ///< The line of the progress form that shows the time elapsed/remaining
-    g_percentline=NULL, ///< The line of the progress form that shows the percent completed/remaining
-    g_scale=NULL, ///< The progress bar component in the progress form
-    g_progressForm=NULL, ///< The progress form component itself
-    g_blurb1=NULL, ///< The component for line 1 of the blurb in the progress form
-    g_blurb2=NULL, ///< The component for line 2 of the blurb in the progress form
-    g_blurb3=NULL, ///< The component for line 3 (updated continuously) of the blurb in the progress form
-    g_label=NULL; ///< ????? @bug ?????
+    char g_haharrrrr[500];
+
+
+    newtComponent g_timeline = NULL,    ///< The line of the progress form that shows the time elapsed/remaining
+        g_percentline = NULL,   ///< The line of the progress form that shows the percent completed/remaining
+        g_scale = NULL,         ///< The progress bar component in the progress form
+        g_progressForm = NULL,  ///< The progress form component itself
+        g_blurb1 = NULL,        ///< The component for line 1 of the blurb in the progress form
+        g_blurb2 = NULL,        ///< The component for line 2 of the blurb in the progress form
+        g_blurb3 = NULL,        ///< The component for line 3 (updated continuously) of the blurb in the progress form
+        g_label = NULL;         ///< ????? @bug ?????
 
 /**
  * Padding above the Newt components, to overcome bugs in Newt.
  */
-char g_jim_lad_yarr[500];
-char **err_log_lines = NULL, ///< The list of log lines to show on the screen.
-    g_blurb_str_1[MAX_NEWT_COMMENT_LEN] = "", ///< The string for line 1 of the blurb in the progress form
-    g_blurb_str_2[MAX_NEWT_COMMENT_LEN] = "", ///< The string for line 2 of the blurb in the progress form
-    g_blurb_str_3[MAX_NEWT_COMMENT_LEN] = ""; ///< The string for line 3 (updated continuously) of the blurb in the progress form
-newtComponent g_isoform_main = NULL, ///< The evalcall form component itself
-    g_isoform_header=NULL, ///< The component for the evalcall form title
-    g_isoform_scale=NULL, ///< The progress bar component in the evalcall form
-    g_isoform_timeline=NULL, ///< The line of the evalcall form that shows the time elapsed/remaining
-    g_isoform_pcline=NULL; ///< The line of the evalcall form that shows the percent completed/remaining
-long g_isoform_starttime; ///< The time (in seconds since the epoch) that the evalcall form was opened.
-int g_isoform_old_progress = -1; ///< The most recent progress update of the evalcall form (percent).
-char g_isoform_header_str[MAX_STR_LEN]="                                                                                                               "; ///< The string for the evalcall form title.
-int g_mysterious_dot_counter; ///< The counter for the twirling baton (/ | \\ - ...) on percentage less than 3
-int g_noof_log_lines = 6; ///< The number of lines to show in the log at the bottom of the screen.
-int g_noof_rows = 25; ///< The number of rows on the screen.
-
-int g_currentY = 3; ///< The row to write background progress messages to. Incremented each time a message is written.
-extern int g_current_media_number;
-pid_t g_main_pid = 0; ///< The PID of the main Mondo process.
-long g_maximum_progress = 999; ///< The maximum amount of progress (100%) for the currently opened progress form.
-long g_current_progress = -999; ///< The current amount of progress (filelist #, etc.) for the currently opened progress form.
-long g_start_time = 0; ///< The time (in seconds since the epoch) that the progress form was opened.
-bool g_text_mode = TRUE; ///< If FALSE, use a newt interface; if TRUE, use an ugly (but more compatible) dumb terminal interface.
-char g_xmondo_stdin[MAX_NEWT_COMMENT_LEN], ///< ... @bug Unneeded w/current XMondo.
-    g_xmondo_stdout[MAX_NEWT_COMMENT_LEN]; ///< .... @bug Unneeded w/current XMondo.
-bool g_called_by_xmondo=FALSE; ///< @bug Unneeded w/current XMondo.
-char *g_erase_tmpdir_and_scratchdir; ///< The command to run to erase the tmpdir and scratchdir at the end of Mondo.
+    char g_jim_lad_yarr[500];
+    char **err_log_lines = NULL,    ///< The list of log lines to show on the screen.
+        g_blurb_str_1[MAX_NEWT_COMMENT_LEN] = "",   ///< The string for line 1 of the blurb in the progress form
+        g_blurb_str_2[MAX_NEWT_COMMENT_LEN] = "",   ///< The string for line 2 of the blurb in the progress form
+        g_blurb_str_3[MAX_NEWT_COMMENT_LEN] = "";   ///< The string for line 3 (updated continuously) of the blurb in the progress form
+    newtComponent g_isoform_main = NULL,    ///< The evalcall form component itself
+        g_isoform_header = NULL,    ///< The component for the evalcall form title
+        g_isoform_scale = NULL, ///< The progress bar component in the evalcall form
+        g_isoform_timeline = NULL,  ///< The line of the evalcall form that shows the time elapsed/remaining
+        g_isoform_pcline = NULL;    ///< The line of the evalcall form that shows the percent completed/remaining
+    long g_isoform_starttime;   ///< The time (in seconds since the epoch) that the evalcall form was opened.
+    int g_isoform_old_progress = -1;    ///< The most recent progress update of the evalcall form (percent).
+    char g_isoform_header_str[MAX_STR_LEN] = "                                                                                                               "; ///< The string for the evalcall form title.
+    int g_mysterious_dot_counter;   ///< The counter for the twirling baton (/ | \\ - ...) on percentage less than 3
+    int g_noof_log_lines = 6;   ///< The number of lines to show in the log at the bottom of the screen.
+    int g_noof_rows = 25;       ///< The number of rows on the screen.
+
+    int g_currentY = 3;         ///< The row to write background progress messages to. Incremented each time a message is written.
+    extern int g_current_media_number;
+    pid_t g_main_pid = 0;       ///< The PID of the main Mondo process.
+    long g_maximum_progress = 999;  ///< The maximum amount of progress (100%) for the currently opened progress form.
+    long g_current_progress = -999; ///< The current amount of progress (filelist #, etc.) for the currently opened progress form.
+    long g_start_time = 0;      ///< The time (in seconds since the epoch) that the progress form was opened.
+    bool g_text_mode = TRUE;    ///< If FALSE, use a newt interface; if TRUE, use an ugly (but more compatible) dumb terminal interface.
+    char g_xmondo_stdin[MAX_NEWT_COMMENT_LEN],  ///< ... @bug Unneeded w/current XMondo.
+     g_xmondo_stdout[MAX_NEWT_COMMENT_LEN]; ///< .... @bug Unneeded w/current XMondo.
+    bool g_called_by_xmondo = FALSE;    ///< @bug Unneeded w/current XMondo.
+    char *g_erase_tmpdir_and_scratchdir;    ///< The command to run to erase the tmpdir and scratchdir at the end of Mondo.
 
 /* @} - end of globalGroup */
@@ -193 +100 @@
 //int g_fd_in=-1, g_fd_out=-1;
 
-void popup_and_OK(char*);
+    void popup_and_OK(char *);
 
 
@@ -205 +112 @@
  * @return TRUE for yes; FALSE for no.
  */
-bool
-ask_me_yes_or_no (char *prompt)
-{
-
-    /*@ buffers ***********************************************************/
-  char *tmp;
-  int i;
-
-  tmp = malloc(MAX_NEWT_COMMENT_LEN);
-  assert_string_is_neither_NULL_nor_zerolength(prompt);
-
-  if (g_text_mode)
-    {
-      while(1)
-        {
-          system("sync");
-          printf ("---promptdialogYN---1--- %s\r\n---promptdialogYN---Q--- [yes] [no] ---\r\n--> ", prompt);
-      (void) fgets(tmp, MAX_NEWT_COMMENT_LEN, stdin); 
-      if (tmp[strlen (tmp) - 1] == '\n')
-          tmp[strlen (tmp) - 1] = '\0'; 
-
-          i = (int) strlen(tmp);
-          if (i>0 && tmp[i-1]<32) { tmp[i-1]='\0'; }
-          if (strstr ("yesYES", tmp))
-            {
-          paranoid_free(tmp);
-              return (TRUE);
-            }
-          else if (strstr ("NOno", tmp))
-            {
-          paranoid_free(tmp);
-              return (FALSE);
-        }
-          else
-            {
-              system("sync");
-              printf("Please enter either YES or NO (or yes or no, or y or n, or...)\n");
-            }
-        }
-    }
-  else
-    {
-      paranoid_free(tmp);
-      return (popup_with_buttons (prompt, "Yes", "No"));
-    }
-}
+     bool ask_me_yes_or_no(char *prompt) {
+
+        /*@ buffers ********************************************************** */
+        char *tmp = NULL;
+        int i;
+        size_t n = 0;
+
+        assert_string_is_neither_NULL_nor_zerolength(prompt);
+
+        if (g_text_mode) {
+            while (1) {
+                system("sync");
+                printf
+                    ("---promptdialogYN---1--- %s\r\n---promptdialogYN---Q--- [yes] [no] ---\r\n--> ",
+                     prompt);
+                (void) getline(&tmp, &n, stdin);
+                if (tmp[strlen(tmp) - 1] == '\n')
+                    tmp[strlen(tmp) - 1] = '\0';
+
+                i = (int) strlen(tmp);
+                if (i > 0 && tmp[i - 1] < 32) {
+                    tmp[i - 1] = '\0';
+                }
+                if (strstr("yesYES", tmp)) {
+                    paranoid_free(tmp);
+                    return (TRUE);
+                } else if (strstr("NOno", tmp)) {
+                    paranoid_free(tmp);
+                    return (FALSE);
+                } else {
+                    system("sync");
+                    printf
+                        ("Please enter either YES or NO (or yes or no, or y or n, or...)\n");
+                }
+            }
+        } else {
+            return (popup_with_buttons(prompt, "Yes", "No"));
+        }
+    }
 
 
@@ -259 +159 @@
  * @return TRUE for OK, FALSE for Cancel.
  */
-bool
-ask_me_OK_or_cancel (char *prompt)
-{
-
-    /*@ buffer ************************************************************/
-  char *tmp;
-  int i;
-
-  tmp = malloc(MAX_NEWT_COMMENT_LEN);
-  assert_string_is_neither_NULL_nor_zerolength(prompt);
-  if (g_text_mode)
-    {
-      system("sync");
-      printf ("---promptdialogOKC---1--- %s\r\n---promptdialogOKC---Q--- [OK] [Cancel] ---\r\n--> ", prompt);
-      (void) fgets(tmp, MAX_NEWT_COMMENT_LEN, stdin); 
-      if (tmp[strlen (tmp) - 1] == '\n')
-      tmp[strlen (tmp) - 1] = '\0';
-
-      i = (int) strlen(tmp);
-      if (i>0 && tmp[i-1]<32) { tmp[i-1]='\0'; }
-      if (strstr ("okOKOkYESyes", tmp))
-    {
-          paranoid_free(tmp);
-      return (TRUE);
-    }
-      else
-    {
-          paranoid_free(tmp);
-      return (FALSE);
-    }
-    }
-  else
-    {
-      paranoid_free(tmp);
-      return (popup_with_buttons (prompt, " Okay ", "Cancel"));
-    }
+    bool ask_me_OK_or_cancel(char *prompt) {
+
+        /*@ buffer *********************************************************** */
+        char *tmp = NULL;
+        int i;
+        size_t n = 0;
+
+        assert_string_is_neither_NULL_nor_zerolength(prompt);
+        if (g_text_mode) {
+            system("sync");
+            printf
+                ("---promptdialogOKC---1--- %s\r\n---promptdialogOKC---Q--- [OK] [Cancel] ---\r\n--> ",
+                 prompt);
+            (void) getline(&tmp, &n, stdin);
+            if (tmp[strlen(tmp) - 1] == '\n')
+                tmp[strlen(tmp) - 1] = '\0';
+
+            i = (int) strlen(tmp);
+            if (i > 0 && tmp[i - 1] < 32) {
+                tmp[i - 1] = '\0';
+            }
+            if (strstr("okOKOkYESyes", tmp)) {
+                paranoid_free(tmp);
+                return (TRUE);
+            } else {
+                paranoid_free(tmp);
+                return (FALSE);
+            }
+        } else {
+            return (popup_with_buttons(prompt, " Okay ", "Cancel"));
+        }
+    }
+
+
+/**
+ * Close the currently opened evalcall form.
+ */
+    void
+     close_evalcall_form(void) {
+        if (g_text_mode) {
+            return;
+        }
+        if (g_isoform_main == NULL) {
+            return;
+        }
+        update_evalcall_form(100);
+        usleep(500000);
+        if (g_text_mode) {
+            log_msg(2, "Closing evalcall form");
+            return;
+        }
+        newtPopHelpLine();
+        newtFormDestroy(g_isoform_main);
+        newtPopWindow();
+        g_isoform_main = NULL;
+        g_isoform_old_progress = -1;
+    }
+
+
+/**
+ * Close the currently opened progress form.
+ */
+void
+ close_progress_form() {
+    if (g_text_mode) {
+        return;
+    }
+    if (g_current_progress == -999) {
+        log_msg(2,
+                "Trying to close the progress form when it ain't open!");
+        return;
+    }
+    g_current_progress = g_maximum_progress;
+    update_progress_form("Complete");
+    sleep(1);
+    if (g_text_mode) {
+        log_msg(2, "Closing progress form");
+        return;
+    }
+    newtPopHelpLine();
+    newtFormDestroy(g_progressForm);
+    newtPopWindow();
+    g_progressForm = NULL;
+    g_current_progress = -999;
 }
-
-
-
-/**
- * Close the currently opened evalcall form.
- */
-void
-close_evalcall_form (void)
-{
-  if (g_text_mode) {return;}
-  if (g_isoform_main == NULL) {return; }
-  update_evalcall_form (100);
-  usleep (500000);
-  if (g_text_mode)
-    {
-      log_msg (2, "Closing evalcall form");
-      return;
-    }
-  newtPopHelpLine ();
-  newtFormDestroy (g_isoform_main);
-  newtPopWindow ();
-  g_isoform_main = NULL;
-  g_isoform_old_progress = -1;
-}
-
-
-/**
- * Close the currently opened progress form.
- */
-void
-close_progress_form ()
-{
-  if (g_text_mode) {return;}
-  if (g_current_progress == -999)
-    {
-      log_msg (2, "Trying to close the progress form when it ain't open!");
-      return;
-    }
-  g_current_progress = g_maximum_progress;
-  update_progress_form ("Complete");
-  sleep (1);
-  if (g_text_mode)
-    {
-      log_msg (2, "Closing progress form");
-      return;
-    }
-  newtPopHelpLine ();
-  newtFormDestroy (g_progressForm);
-  newtPopWindow ();
-  g_progressForm = NULL;
-  g_current_progress = -999;
-}
-
-
 
 
@@ -357 +251 @@
  * @note This function never returns.
  */
-void
-fatal_error (char *error_string)
-{
-    /*@ buffers ******************************************************/
-  char fatalstr[MAX_NEWT_COMMENT_LEN] = "-------FATAL ERROR---------";
-  char *tmp;
-  static bool already_exiting=FALSE;
-  int i;
-
-    /*@ end vars *****************************************************/
-
-  tmp = malloc(MAX_NEWT_COMMENT_LEN);
-  set_signals(FALSE); // link to external func
-  g_exiting = TRUE;
-  log_msg(1, "Fatal error received - '%s'", error_string);
-  printf("Fatal error... %s\n", error_string);
-  if (getpid() == g_mastermind_pid)
-    {
-      log_msg(2, "mastermind %d is exiting", (int)getpid());
-      kill(g_main_pid, SIGTERM);
-      paranoid_free(tmp);
-      finish(1);
-    }
-
-  if (getpid() != g_main_pid)
-    {
-      if (g_mastermind_pid != 0 && getpid() != g_mastermind_pid)
-    {
-      log_msg(2, "non-m/m %d is exiting", (int)getpid());
-      kill(g_main_pid, SIGTERM);
-      paranoid_free(tmp);
-      finish(1);
-    }
-    }
-
-  log_msg (3, "OK, I think I'm the main PID.");
-  if (already_exiting)
-    {
-      log_msg(3, "...I'm already exiting. Give me time, Julian!");
-      paranoid_free(tmp);
-      finish(1);
-    }
-
-  already_exiting = TRUE;
-  log_msg(2, "I'm going to do some cleaning up now.");
-  paranoid_system("killall mindi 2> /dev/null");
-  kill_anything_like_this("/mondo/do-not");
-  kill_anything_like_this("tmp.mondo");
-  kill_anything_like_this("partimagehack");
-  sync();
-  sprintf(tmp, "umount %s", g_tmpfs_mountpt);
-  chdir("/");
-  for(i=0; i<10 && run_program_and_log_output(tmp, 5); i++)
-    {
-      log_msg(2, "Waiting for child processes to terminate");
-      sleep(1);
-      run_program_and_log_output(tmp, 5);
-    }
-
-  if (g_erase_tmpdir_and_scratchdir[0])
-    { run_program_and_log_output(g_erase_tmpdir_and_scratchdir, 5); }
-
-  if (!g_text_mode)
-    {
-      log_msg (0, fatalstr);
-      log_msg (0, error_string);
-      //      popup_and_OK (error_string);
-      newtFinished ();
-    }
-
-  printf ("---FATALERROR--- %s\n", error_string);
-  system("cat /var/log/mondo-archive.log | gzip -9 > /tmp/MA.log.gz 2> /dev/null");
-  if (!strstr(g_version, "cvs") && !strstr(g_version, "svn"))
-    {
-      printf("Please try the snapshot (the version with 'cvs' and the date in its filename)");
-      printf("to see if that fixes the problem. Please don't bother the mailing list with");
-      printf("your problem UNTIL you've tried the snapshot. The snapshot contains bugfixes");
-      printf("which might help you. Go to http://www.mondorescue.org/download/download.html");
-      printf("For more information.\n");
-      log_msg(0, "Please DON'T contact the mailing list. Try the SNAPSHOTS.");
-    }
-  else
-    {
-      printf("If you require technical support, please contact the mailing list.\n");
-      printf("See http://www.mondorescue.org for details.\n");
-      printf("The list's members can help you, if you attach that file to your e-mail.\n");
-    }
-  printf("Log file: %s\n", MONDO_LOGFILE);
-  //  printf("VERSION=%s\n", g_version);
-  if (does_file_exist("/tmp/MA.log.gz"))
-    {
-      printf("FYI, I have gzipped the log and saved it to /tmp/MA.log.gz\n");
-    }
-  printf ("Mondo has aborted.\n");
-  register_pid(0, "mondo"); // finish() does this too, FYI
-  if (!g_main_pid) { log_msg(3, "FYI - g_main_pid is blank"); }
-  paranoid_free(tmp);
-  finish (254);
-}
+    void
+     fatal_error(char *error_string) {
+        /*@ buffers ***************************************************** */
+        char fatalstr[MAX_NEWT_COMMENT_LEN] =
+            "-------FATAL ERROR---------";
+        char *tmp;
+        static bool already_exiting = FALSE;
+        int i;
+
+        /*@ end vars **************************************************** */
+
+        tmp = malloc(MAX_NEWT_COMMENT_LEN);
+        set_signals(FALSE);     // link to external func
+        g_exiting = TRUE;
+        log_msg(1, "Fatal error received - '%s'", error_string);
+        printf("Fatal error... %s\n", error_string);
+        if (getpid() == g_mastermind_pid) {
+            log_msg(2, "mastermind %d is exiting", (int) getpid());
+            kill(g_main_pid, SIGTERM);
+            paranoid_free(tmp);
+            finish(1);
+        }
+
+        if (getpid() != g_main_pid) {
+            if (g_mastermind_pid != 0 && getpid() != g_mastermind_pid) {
+                log_msg(2, "non-m/m %d is exiting", (int) getpid());
+                kill(g_main_pid, SIGTERM);
+                paranoid_free(tmp);
+                finish(1);
+            }
+        }
+
+        log_msg(3, "OK, I think I'm the main PID.");
+        if (already_exiting) {
+            log_msg(3, "...I'm already exiting. Give me time, Julian!");
+            paranoid_free(tmp);
+            finish(1);
+        }
+
+        already_exiting = TRUE;
+        log_msg(2, "I'm going to do some cleaning up now.");
+        paranoid_system("killall mindi 2> /dev/null");
+        kill_anything_like_this("/mondo/do-not");
+        kill_anything_like_this("tmp.mondo");
+        kill_anything_like_this("partimagehack");
+        sync();
+        sprintf(tmp, "umount %s", g_tmpfs_mountpt);
+        chdir("/");
+        for (i = 0; i < 10 && run_program_and_log_output(tmp, 5); i++) {
+            log_msg(2, "Waiting for child processes to terminate");
+            sleep(1);
+            run_program_and_log_output(tmp, 5);
+        }
+
+        if (g_erase_tmpdir_and_scratchdir[0]) {
+            run_program_and_log_output(g_erase_tmpdir_and_scratchdir, 5);
+        }
+
+        if (!g_text_mode) {
+            log_msg(0, fatalstr);
+            log_msg(0, error_string);
+            //      popup_and_OK (error_string);
+            newtFinished();
+        }
+
+        printf("---FATALERROR--- %s\n", error_string);
+        system
+            ("cat /var/log/mondo-archive.log | gzip -9 > /tmp/MA.log.gz 2> /dev/null");
+        if (!strstr(g_version, "cvs") && !strstr(g_version, "svn")) {
+            printf
+                ("Please try the snapshot (the version with 'cvs' and the date in its filename)");
+            printf
+                ("to see if that fixes the problem. Please don't bother the mailing list with");
+            printf
+                ("your problem UNTIL you've tried the snapshot. The snapshot contains bugfixes");
+            printf
+                ("which might help you. Go to http://www.mondorescue.org/download/download.html");
+            printf("For more information.\n");
+            log_msg(0,
+                    "Please DON'T contact the mailing list. Try the SNAPSHOTS.");
+        } else {
+            printf
+                ("If you require technical support, please contact the mailing list.\n");
+            printf("See http://www.mondorescue.org for details.\n");
+            printf
+                ("The list's members can help you, if you attach that file to your e-mail.\n");
+        }
+        printf("Log file: %s\n", MONDO_LOGFILE);
+        //  printf("VERSION=%s\n", g_version);
+        if (does_file_exist("/tmp/MA.log.gz")) {
+            printf
+                ("FYI, I have gzipped the log and saved it to /tmp/MA.log.gz\n");
+        }
+        printf("Mondo has aborted.\n");
+        register_pid(0, "mondo");   // finish() does this too, FYI
+        if (!g_main_pid) {
+            log_msg(3, "FYI - g_main_pid is blank");
+        }
+        paranoid_free(tmp);
+        finish(254);
+    }
 
 
@@ -465 +361 @@
  * @note This function never returns.
  */
-void
-finish (int signal)
-{
-
-  /*  if (signal==0) { popup_and_OK("Please press <enter> to quit."); } */
-
-  /* newtPopHelpLine(); */
-
-  register_pid(0, "mondo");
-  chdir("/");
-  run_program_and_log_output("umount "MNT_CDROM, FALSE);
-  run_program_and_log_output("rm -Rf /mondo.scratch.* /tmp.mondo.*", FALSE);
-  if (g_erase_tmpdir_and_scratchdir)
-    {
-      run_program_and_log_output(g_erase_tmpdir_and_scratchdir, 1);
-    }
-    
+    void
+     finish(int signal) {
+
+        /*  if (signal==0) { popup_and_OK("Please press <enter> to quit."); } */
+
+        /* newtPopHelpLine(); */
+
+        register_pid(0, "mondo");
+        chdir("/");
+        run_program_and_log_output("umount " MNT_CDROM, FALSE);
+        run_program_and_log_output("rm -Rf /mondo.scratch.* /tmp.mondo.*",
+                                   FALSE);
+        if (g_erase_tmpdir_and_scratchdir) {
+            run_program_and_log_output(g_erase_tmpdir_and_scratchdir, 1);
+        }
 //  iamhere("foo");
-  /* system("clear"); */
+        /* system("clear"); */
 //  iamhere("About to call newtFinished");
-  if (!g_text_mode)
-    {
-      if (does_file_exist("/THIS-IS-A-RAMDISK"))
-        {
-      log_msg(1, "Calling newtFinished()");
-      newtFinished();
-    }
-      else
-        {
-      log_msg(1, "Calling newtSuspend()");
-          newtSuspend();
-    }
-    }
+        if (!g_text_mode) {
+            if (does_file_exist("/THIS-IS-A-RAMDISK")) {
+                log_msg(1, "Calling newtFinished()");
+                newtFinished();
+            } else {
+                log_msg(1, "Calling newtSuspend()");
+                newtSuspend();
+            }
+        }
 //  system("clear");
 //  iamhere("Finished calling newtFinished");
-  printf( "Execution run ended; result=%d\n", signal);
-  printf( "Type 'less %s' to see the output log\n", MONDO_LOGFILE);
-  free_libmondo_global_strings();
-  exit (signal);
-}
+        printf("Execution run ended; result=%d\n", signal);
+        printf("Type 'less %s' to see the output log\n", MONDO_LOGFILE);
+        free_libmondo_global_strings();
+        exit(signal);
+    }
 
 
@@ -516 +406 @@
  * @param grep_for_me If not "", then only give lines in @p filename that match this regular expression.
  */
-void
-log_file_end_to_screen (char *filename, char *grep_for_me)
-{
-
-    /*@ buffers ***********************************************************/
-  char *command;
-    char *tmp;
-
-    /*@ pointers **********************************************************/
-  FILE *fin;
-
-    /*@ int ***************************************************************/
-  int i = 0;
-
-  malloc_string(command);
-  malloc_string(tmp);
-  assert_string_is_neither_NULL_nor_zerolength(filename);
-  assert(grep_for_me!=NULL);
-
-  if (!does_file_exist (filename))
-    {
-      paranoid_free(command);
-      paranoid_free(tmp);
-      return;
-    }
-  if (grep_for_me[0] != '\0')
-    {
-      sprintf (command, "cat %s | grep \"%s\" | tail -n%d", filename,
-           grep_for_me, g_noof_log_lines);
-    }
-  else
-    {
-      sprintf (command, "cat %s | tail -n%d", filename, g_noof_log_lines);
-    }
-  fin = popen (command, "r");
-  if (!fin)
-    {
-      log_OS_error(command);
-    }
-  else
-    {
-      for (i = 0; i < g_noof_log_lines; i++)
-    {
-      for (err_log_lines[i][0] = '\0';
-           strlen (err_log_lines[i]) < 2 && !feof (fin);)
-        {
-          (void) fgets (err_log_lines[i], MAX_NEWT_COMMENT_LEN, fin);
-          strip_spaces (err_log_lines[i]);
-          if (!strncmp (err_log_lines[i], "root:", 5))
-        {
-          strcpy (tmp, err_log_lines[i] + 6);
-          strcpy (err_log_lines[i], tmp);
-        }
-          if (feof (fin))
-        {
-          break;
-        }
-        }
-    }
-      paranoid_pclose (fin);
-    }
-  refresh_log_screen ();
-  paranoid_free(command);
-  paranoid_free(tmp);
-}
+    void
+     log_file_end_to_screen(char *filename, char *grep_for_me) {
+
+        /*@ buffers ********************************************************** */
+        char *command;
+        char *tmp;
+
+        /*@ pointers ********************************************************* */
+        FILE *fin;
+
+        /*@ int ************************************************************** */
+        int i = 0;
+
+        malloc_string(command);
+        malloc_string(tmp);
+        assert_string_is_neither_NULL_nor_zerolength(filename);
+        assert(grep_for_me != NULL);
+
+        if (!does_file_exist(filename)) {
+            paranoid_free(command);
+            paranoid_free(tmp);
+            return;
+        }
+        if (grep_for_me[0] != '\0') {
+            sprintf(command, "cat %s | grep \"%s\" | tail -n%d", filename,
+                    grep_for_me, g_noof_log_lines);
+        } else {
+            sprintf(command, "cat %s | tail -n%d", filename,
+                    g_noof_log_lines);
+        }
+        fin = popen(command, "r");
+        if (!fin) {
+            log_OS_error(command);
+        } else {
+            for (i = 0; i < g_noof_log_lines; i++) {
+                for (err_log_lines[i][0] = '\0';
+                     strlen(err_log_lines[i]) < 2 && !feof(fin);) {
+                    (void) fgets(err_log_lines[i], MAX_NEWT_COMMENT_LEN,
+                                 fin);
+                    strip_spaces(err_log_lines[i]);
+                    if (!strncmp(err_log_lines[i], "root:", 5)) {
+                        strcpy(tmp, err_log_lines[i] + 6);
+                        strcpy(err_log_lines[i], tmp);
+                    }
+                    if (feof(fin)) {
+                        break;
+                    }
+                }
+            }
+            paranoid_pclose(fin);
+        }
+        refresh_log_screen();
+        paranoid_free(command);
+        paranoid_free(tmp);
+    }
 
 
@@ -588 +468 @@
  * @note The message is also written to the logfile.
  */
-void
-log_to_screen (const char *fmt, ...)
-{
-
-    /*@ int ***************************************************************/
-  int i = 0;
-    int j = 0;
-  va_list args;
-
-    /*@ buffers ***********************************************************/
-  char *output;
-
-  malloc_string(output);
-
-  va_start(args, fmt);
-  vsprintf(output, fmt, args);
-  log_msg(0, output);
-  output[80] = '\0';
-  va_end(args);
-  i = (int) strlen (output);
-  if (i>0 && output[i - 1] < 32)
-    {
-      output[i - 1] = '\0';
-    }
-
-  if (err_log_lines) {
-    for (i = 1; i < g_noof_log_lines; i++)
-      {
-    strcpy (err_log_lines[i - 1],
-        "                                                                                ");
-    strcpy (err_log_lines[i - 1], err_log_lines[i]);
-      }
-  }
-  while (strlen(output)>0 && output[strlen (output) - 1] < 32)
-    {
-      output[strlen (output) - 1] = '\0';
-    }
-  for (j = 0; j < (int) strlen (output); j++)
-    {
-      if (output[j] < 32)
-    {
-      output[j] = ' ';
-    }
-    }
-  if (err_log_lines)
-    strcpy (err_log_lines[g_noof_log_lines - 1], output);
-  if (g_text_mode)
-    {
-      printf("%s\n", output);
-    }
-  else
-    {
-      refresh_log_screen ();
-    }
-  paranoid_free(output);
-}
+    void
+     log_to_screen(const char *fmt, ...) {
+
+        /*@ int ************************************************************** */
+        int i = 0;
+        int j = 0;
+        va_list args;
+
+        /*@ buffers ********************************************************** */
+        char *output;
+
+        malloc_string(output);
+
+        va_start(args, fmt);
+        vsprintf(output, fmt, args);
+        log_msg(0, output);
+        output[80] = '\0';
+        va_end(args);
+        i = (int) strlen(output);
+        if (i > 0 && output[i - 1] < 32) {
+            output[i - 1] = '\0';
+        }
+
+        if (err_log_lines) {
+            for (i = 1; i < g_noof_log_lines; i++) {
+                strcpy(err_log_lines[i - 1],
+                       "                                                                                ");
+                strcpy(err_log_lines[i - 1], err_log_lines[i]);
+            }
+        }
+        while (strlen(output) > 0 && output[strlen(output) - 1] < 32) {
+            output[strlen(output) - 1] = '\0';
+        }
+        for (j = 0; j < (int) strlen(output); j++) {
+            if (output[j] < 32) {
+                output[j] = ' ';
+            }
+        }
+        if (err_log_lines)
+            strcpy(err_log_lines[g_noof_log_lines - 1], output);
+        if (g_text_mode) {
+            printf("%s\n", output);
+        } else {
+            refresh_log_screen();
+        }
+        paranoid_free(output);
+    }
 
 
@@ -654 +525 @@
  * @param output The string to write.
  */
-void
-mvaddstr_and_log_it (int y, int x, char *output)
-{
-  assert_string_is_neither_NULL_nor_zerolength(output);
-  log_msg (0, output);
-  if (g_text_mode)
-    {
-      printf ("%s\n", output);
-    }
-  else
-    {
-      newtDrawRootText (x, y, output);
-      newtRefresh ();
-    }
-}
+    void
+     mvaddstr_and_log_it(int y, int x, char *output) {
+        assert_string_is_neither_NULL_nor_zerolength(output);
+        log_msg(0, output);
+        if (g_text_mode) {
+            printf("%s\n", output);
+        } else {
+            newtDrawRootText(x, y, output);
+            newtRefresh();
+        }
+    }
 
 
@@ -677 +544 @@
  * @param ttl The title to use for the evalcall form.
  */
-void
-open_evalcall_form (char *ttl)
-{
-
-    /*@ buffers **********************************************************/
-  char *title;
-  char *tmp;
-
-    /*@ initialize *******************************************************/
-  g_isoform_old_progress = -1;
-  g_mysterious_dot_counter = 0;
-  malloc_string(title);
-  malloc_string(tmp);
-
-  assert(ttl!=NULL);
-  strcpy (title, ttl);
-  strcpy (g_isoform_header_str, title);
+    void
+     open_evalcall_form(char *ttl) {
+
+        /*@ buffers ********************************************************* */
+        char *title;
+        char *tmp;
+
+        /*@ initialize ****************************************************** */
+        g_isoform_old_progress = -1;
+        g_mysterious_dot_counter = 0;
+        malloc_string(title);
+        malloc_string(tmp);
+
+        assert(ttl != NULL);
+        strcpy(title, ttl);
+        strcpy(g_isoform_header_str, title);
 //  center_string (title, 80);
-  if (g_text_mode)
-    {
-      log_msg (0, title);
-    }
-  else
-    {
-      strcpy(tmp, title);
-      center_string(tmp, 80);
-      newtPushHelpLine (tmp);
-    }
-  center_string (g_isoform_header_str, 36);
-  g_isoform_starttime = get_time ();
-  if (g_text_mode)
-    {
-      log_msg (0, g_isoform_header_str);
-    }
-  else
-    {
-      g_isoform_header = newtLabel (1, 1, g_isoform_header_str);
-      g_isoform_scale = newtScale (3, 3, 34, 100);
-      //      newtOpenWindow (20, 6, 40, 7, title);      // "Please Wait");
-      newtCenteredWindow (40, 7, title);
-      g_isoform_main = newtForm (NULL, NULL, 0);
-      g_isoform_timeline = newtLabel (1, 5, "This is the timeline");
-      g_isoform_pcline = newtLabel (1, 6, "This is the pcline");
-      newtFormAddComponents (g_isoform_main, g_isoform_timeline,
-                 g_isoform_pcline, g_isoform_header,
-                 g_isoform_scale, NULL);
-      newtRefresh ();
-    }
-  update_evalcall_form (0);
-  paranoid_free(tmp);
-  paranoid_free(title);
-}
+        if (g_text_mode) {
+            log_msg(0, title);
+        } else {
+            strcpy(tmp, title);
+            center_string(tmp, 80);
+            newtPushHelpLine(tmp);
+        }
+        center_string(g_isoform_header_str, 36);
+        g_isoform_starttime = get_time();
+        if (g_text_mode) {
+            log_msg(0, g_isoform_header_str);
+        } else {
+            g_isoform_header = newtLabel(1, 1, g_isoform_header_str);
+            g_isoform_scale = newtScale(3, 3, 34, 100);
+            //      newtOpenWindow (20, 6, 40, 7, title);      // "Please Wait");
+            newtCenteredWindow(40, 7, title);
+            g_isoform_main = newtForm(NULL, NULL, 0);
+            g_isoform_timeline = newtLabel(1, 5, "This is the timeline");
+            g_isoform_pcline = newtLabel(1, 6, "This is the pcline");
+            newtFormAddComponents(g_isoform_main, g_isoform_timeline,
+                                  g_isoform_pcline, g_isoform_header,
+                                  g_isoform_scale, NULL);
+            newtRefresh();
+        }
+        update_evalcall_form(0);
+        paranoid_free(tmp);
+        paranoid_free(title);
+    }
 
 
@@ -741 +601 @@
  * @param max_val The maximum amount of progress (number of filesets, etc.)
  */
-void
-open_progress_form (char *title, char *b1, char *b2, char *b3, long max_val)
-{
-
-    /*@ buffers **********************************************************/
-  char *b1c;
-    char *blurb1;
-    char *blurb2;
-    char *blurb3;
-
-    /*@ initialize *******************************************************/
-  g_mysterious_dot_counter = 0;
-
-  malloc_string(b1c);
-  malloc_string(blurb1);
-  malloc_string(blurb2);
-  malloc_string(blurb3);
-  
-  assert(title!=NULL);
-  assert(b1!=NULL);
-  assert(b2!=NULL);
-  assert(b3!=NULL);
-
-  strcpy (blurb1, b1);
-  strcpy (blurb2, b2);
-  strcpy (blurb3, b3);
-  strcpy (b1c, b1);
-  center_string (b1c, 80);
-  if (max_val <= 0)
-    {
-      max_val = 1;
-    }
-
-  g_start_time = get_time ();
-  g_maximum_progress = max_val;
-  g_current_progress = 0;
-  strcpy (g_blurb_str_1, blurb1);
-  strcpy (g_blurb_str_2, blurb3);
-  strcpy (g_blurb_str_3, blurb2);
-  if (g_text_mode)
-    {
-      log_msg (0, blurb1);
-      log_msg (0, blurb2);
-      log_msg (0, blurb3);
-    }
-  else
-    {
-      g_blurb1 = newtLabel (2, 1, blurb1);
-      g_blurb2 = newtLabel (2, 2, blurb3);
-      g_blurb3 = newtLabel (2, 4, blurb2);
-      //      newtOpenWindow (10, 4, 60, 11, title);
-      newtCenteredWindow (60, 11, title);
-      g_scale = newtScale (3, 6, 54, g_maximum_progress);
-      g_progressForm = newtForm (NULL, NULL, 0);
-      g_percentline = newtLabel (10, 9, "This is the percentline");
-      g_timeline = newtLabel (10, 8, "This is the timeline");
-      newtFormAddComponents (g_progressForm, g_percentline, g_timeline,
-                 g_scale, g_blurb1, g_blurb3, g_blurb2, NULL);
-      newtPushHelpLine (b1c);
-      newtRefresh ();
-    }
-  update_progress_form_full (blurb1, blurb2, blurb3);
-  paranoid_free(b1c);
-  paranoid_free(blurb1);
-  paranoid_free(blurb2);
-  paranoid_free(blurb3);
-}
+    void
+     open_progress_form(char *title, char *b1, char *b2, char *b3,
+                        long max_val) {
+
+        /*@ buffers ********************************************************* */
+        char *b1c;
+        char *blurb1;
+        char *blurb2;
+        char *blurb3;
+
+        /*@ initialize ****************************************************** */
+        g_mysterious_dot_counter = 0;
+
+        malloc_string(b1c);
+        malloc_string(blurb1);
+        malloc_string(blurb2);
+        malloc_string(blurb3);
+
+        assert(title != NULL);
+        assert(b1 != NULL);
+        assert(b2 != NULL);
+        assert(b3 != NULL);
+
+        strcpy(blurb1, b1);
+        strcpy(blurb2, b2);
+        strcpy(blurb3, b3);
+        strcpy(b1c, b1);
+        center_string(b1c, 80);
+        if (max_val <= 0) {
+            max_val = 1;
+        }
+
+        g_start_time = get_time();
+        g_maximum_progress = max_val;
+        g_current_progress = 0;
+        strcpy(g_blurb_str_1, blurb1);
+        strcpy(g_blurb_str_2, blurb3);
+        strcpy(g_blurb_str_3, blurb2);
+        if (g_text_mode) {
+            log_msg(0, blurb1);
+            log_msg(0, blurb2);
+            log_msg(0, blurb3);
+        } else {
+            g_blurb1 = newtLabel(2, 1, blurb1);
+            g_blurb2 = newtLabel(2, 2, blurb3);
+            g_blurb3 = newtLabel(2, 4, blurb2);
+            //      newtOpenWindow (10, 4, 60, 11, title);
+            newtCenteredWindow(60, 11, title);
+            g_scale = newtScale(3, 6, 54, g_maximum_progress);
+            g_progressForm = newtForm(NULL, NULL, 0);
+            g_percentline = newtLabel(10, 9, "This is the percentline");
+            g_timeline = newtLabel(10, 8, "This is the timeline");
+            newtFormAddComponents(g_progressForm, g_percentline,
+                                  g_timeline, g_scale, g_blurb1, g_blurb3,
+                                  g_blurb2, NULL);
+            newtPushHelpLine(b1c);
+            newtRefresh();
+        }
+        update_progress_form_full(blurb1, blurb2, blurb3);
+        paranoid_free(b1c);
+        paranoid_free(blurb1);
+        paranoid_free(blurb2);
+        paranoid_free(blurb3);
+    }
 
 /**
@@ -813 +670 @@
  * @param prompt The message.
  */
-void
-popup_and_OK (char *prompt)
-{
-    char ch;
-
-  assert_string_is_neither_NULL_nor_zerolength(prompt);
-
-  log_msg (0, prompt);
-  if (g_text_mode)
-    {
-      printf
-    ("---promptpopup---1--- %s\r\n---promptpopup---Q--- [OK] ---\r\n--> ", prompt);
-      while (((ch = getchar()) != '\n') && (ch != EOF))
-      ;
-    }
-  else
-    {
-    (void) popup_with_buttons (prompt, " OK ", "");
-    }
-}
+    void
+     popup_and_OK(char *prompt) {
+        char ch;
+
+        assert_string_is_neither_NULL_nor_zerolength(prompt);
+
+        log_msg(0, prompt);
+        if (g_text_mode) {
+            printf
+                ("---promptpopup---1--- %s\r\n---promptpopup---Q--- [OK] ---\r\n--> ",
+                 prompt);
+            while (((ch = getchar()) != '\n') && (ch != EOF));
+        } else {
+            (void) popup_with_buttons(prompt, " OK ", "");
+        }
+    }
 
 /**
@@ -842 +695 @@
  * @return TRUE if the user pressed OK, FALSE if they pressed Cancel.
  */
-bool
-popup_and_get_string (char *title, char *b, char *output, int maxsize)
-{
-
-    /*@ newt *************************************************************/
-  newtComponent myForm;
-    newtComponent b_1;
-    newtComponent b_2;
-    newtComponent b_res;
-    newtComponent text;
-    newtComponent type_here;
-
-    /*@ pointers **********************************************************/
-  char *entry_value;
-
-    /*@ buffers ***********************************************************/
-    char *blurb;
-    char *original_contents;
-
-  blurb = malloc(MAX_NEWT_COMMENT_LEN);
-  original_contents = malloc(MAX_NEWT_COMMENT_LEN);
-  assert_string_is_neither_NULL_nor_zerolength(title);
-  assert(b!=NULL);
-  assert(output!=NULL);
-
-  if (g_text_mode)
-    {
-      printf ("---promptstring---1--- %s\r\n---promptstring---2--- %s\r\n---promptstring---Q---\r\n-->  ", title, b);
-      (void) fgets(output, maxsize, stdin);
-      if (output[strlen (output) - 1] == '\n')
-      output[strlen (output) - 1] = '\0';
-      paranoid_free(blurb);
-      paranoid_free(original_contents);
-      return (TRUE);
-    }
-  strcpy (blurb, b);
-  text = newtTextboxReflowed (2, 1, blurb, 48, 5, 5, 0);
-  strcpy (original_contents, output);
-  output[0] = '\0';
-  type_here =
-    newtEntry (2, newtTextboxGetNumLines (text) + 2, original_contents, 50,
+    bool popup_and_get_string(char *title, char *b, char *output,
+                              int maxsize) {
+
+        /*@ newt ************************************************************ */
+        newtComponent myForm;
+        newtComponent b_1;
+        newtComponent b_2;
+        newtComponent b_res;
+        newtComponent text;
+        newtComponent type_here;
+
+        /*@ pointers ********************************************************* */
+        char *entry_value;
+
+        /*@ buffers ********************************************************** */
+        char *blurb;
+        char *original_contents;
+
+        blurb = malloc(MAX_NEWT_COMMENT_LEN);
+        original_contents = malloc(MAX_NEWT_COMMENT_LEN);
+        assert_string_is_neither_NULL_nor_zerolength(title);
+        assert(b != NULL);
+        assert(output != NULL);
+
+        if (g_text_mode) {
+            printf
+                ("---promptstring---1--- %s\r\n---promptstring---2--- %s\r\n---promptstring---Q---\r\n-->  ",
+                 title, b);
+            (void) fgets(output, maxsize, stdin);
+            if (output[strlen(output) - 1] == '\n')
+                output[strlen(output) - 1] = '\0';
+            paranoid_free(blurb);
+            paranoid_free(original_contents);
+            return (TRUE);
+        }
+        strcpy(blurb, b);
+        text = newtTextboxReflowed(2, 1, blurb, 48, 5, 5, 0);
+        strcpy(original_contents, output);
+        output[0] = '\0';
+        type_here =
+            newtEntry(2, newtTextboxGetNumLines(text) + 2,
+                      original_contents, 50,
 #ifdef __cplusplus
-           0, NEWT_FLAG_RETURNEXIT
+                      0, NEWT_FLAG_RETURNEXIT
 #else
-           (void*)&entry_value, NEWT_FLAG_RETURNEXIT
+                      (void *) &entry_value, NEWT_FLAG_RETURNEXIT
 #endif
-           );
-  b_1 = newtButton (6, newtTextboxGetNumLines (text) + 4, "  OK  ");
-  b_2 = newtButton (18, newtTextboxGetNumLines (text) + 4, "Cancel");
-  //  newtOpenWindow (8, 5, 54, newtTextboxGetNumLines (text) + 9, title);
-  newtCenteredWindow (54, newtTextboxGetNumLines (text) + 9, title);
-  myForm = newtForm (NULL, NULL, 0);
-  newtFormAddComponents (myForm, text, type_here, b_1, b_2, NULL);
-  center_string (blurb, 80);
-  newtPushHelpLine (blurb);
-  b_res = newtRunForm (myForm);
-  strcpy (output, entry_value);
-  newtPopHelpLine ();
-  newtFormDestroy (myForm);
-  newtPopWindow ();
-  if (b_res == b_2)
-    {
-      strcpy (output, original_contents);
-      paranoid_free(blurb);
-      paranoid_free(original_contents);
-      return (FALSE);
-    }
-  else
-    {
-      paranoid_free(blurb);
-      paranoid_free(original_contents);
-      return (TRUE);
-    }
-}
+            );
+        b_1 = newtButton(6, newtTextboxGetNumLines(text) + 4, "  OK  ");
+        b_2 = newtButton(18, newtTextboxGetNumLines(text) + 4, "Cancel");
+        //  newtOpenWindow (8, 5, 54, newtTextboxGetNumLines (text) + 9, title);
+        newtCenteredWindow(54, newtTextboxGetNumLines(text) + 9, title);
+        myForm = newtForm(NULL, NULL, 0);
+        newtFormAddComponents(myForm, text, type_here, b_1, b_2, NULL);
+        center_string(blurb, 80);
+        newtPushHelpLine(blurb);
+        b_res = newtRunForm(myForm);
+        strcpy(output, entry_value);
+        newtPopHelpLine();
+        newtFormDestroy(myForm);
+        newtPopWindow();
+        if (b_res == b_2) {
+            strcpy(output, original_contents);
+            paranoid_free(blurb);
+            paranoid_free(original_contents);
+            return (FALSE);
+        } else {
+            paranoid_free(blurb);
+            paranoid_free(original_contents);
+            return (TRUE);
+        }
+    }
 
 
@@ -925 +776 @@
  * @return TRUE if @p button1 was pushed, FALSE otherwise.
  */
-bool
-popup_with_buttons (char *p, char *button1, char *button2)
-{
-
-    /*@ buffers ************************************************************/
-  char *prompt, *tmp;
-
-    /*@ newt ***************************************************************/
-  newtComponent myForm;
-    newtComponent b_1;
-    newtComponent b_2;
-    newtComponent b_res;
-    newtComponent text;
-  
-  prompt = malloc(MAX_NEWT_COMMENT_LEN);
-  tmp = malloc(MAX_NEWT_COMMENT_LEN);
-  assert_string_is_neither_NULL_nor_zerolength(p);
-  assert(button1!=NULL);
-  assert(button2!=NULL);
-  if (g_text_mode)
-    {
-      if (strlen(button2)==0)
-        { printf("%s (%s) --> ", p, button1); }
-      else
-        { printf("%s (%s or %s) --> ", p, button1, button2); }
-      for(tmp[0]='\0'; strcmp(tmp, button1) && (strlen(button2)==0 || strcmp(tmp, button2)); )
-        {
-          printf("--> ");
-          (void) fgets(tmp, MAX_NEWT_COMMENT_LEN, stdin);
-        }
-      if (!strcmp(tmp, button1)) { paranoid_free(tmp); paranoid_free(prompt); return(TRUE); }
-      else { paranoid_free(tmp); paranoid_free(prompt); return(FALSE); }
-    }
-
-  strcpy (prompt, p);
-  text = newtTextboxReflowed (1, 1, prompt, 40, 5, 5, 0);
-  b_1 =
-    newtButton (20 -
-        ((button2[0] !=
-          '\0') ? strlen (button1) + 2 : strlen (button1) / 2),
-        newtTextboxGetNumLines (text) + 3, button1);
-  if (button2[0] != '\0')
-    {
-      b_2 = newtButton (24, newtTextboxGetNumLines (text) + 3, button2);
-    }
-  else
-    {
-      b_2 = NULL;
-    }
-  //  newtOpenWindow (25, 5, 46, newtTextboxGetNumLines (text) + 7, "Alert");
-  newtCenteredWindow (46, newtTextboxGetNumLines (text) + 7, "Alert");
-  myForm = newtForm (NULL, NULL, 0);
-  newtFormAddComponents (myForm, text, b_1, b_2, NULL);
-  center_string (prompt, 80);
-  newtPushHelpLine (prompt);
-  b_res = newtRunForm (myForm);
-  newtPopHelpLine ();
-  newtFormDestroy (myForm);
-  newtPopWindow ();
-  if (b_res == b_1)
-    {
-paranoid_free(tmp); paranoid_free(prompt);       return (TRUE);
-    }
-  else
-    {
-paranoid_free(tmp); paranoid_free(prompt);       return (FALSE);
-    }
-}
+    bool popup_with_buttons(char *p, char *button1, char *button2) {
+
+        /*@ buffers *********************************************************** */
+        char *prompt, *tmp;
+
+        /*@ newt ************************************************************** */
+        newtComponent myForm;
+        newtComponent b_1;
+        newtComponent b_2;
+        newtComponent b_res;
+        newtComponent text;
+
+        prompt = malloc(MAX_NEWT_COMMENT_LEN);
+        tmp = malloc(MAX_NEWT_COMMENT_LEN);
+        assert_string_is_neither_NULL_nor_zerolength(p);
+        assert(button1 != NULL);
+        assert(button2 != NULL);
+        if (g_text_mode) {
+            if (strlen(button2) == 0) {
+                printf("%s (%s) --> ", p, button1);
+            } else {
+                printf("%s (%s or %s) --> ", p, button1, button2);
+            }
+            for (tmp[0] = '\0';
+                 strcmp(tmp, button1) && (strlen(button2) == 0
+                                          || strcmp(tmp, button2));) {
+                printf("--> ");
+                (void) fgets(tmp, MAX_NEWT_COMMENT_LEN, stdin);
+            }
+            if (!strcmp(tmp, button1)) {
+                paranoid_free(tmp);
+                paranoid_free(prompt);
+                return (TRUE);
+            } else {
+                paranoid_free(tmp);
+                paranoid_free(prompt);
+                return (FALSE);
+            }
+        }
+
+        strcpy(prompt, p);
+        text = newtTextboxReflowed(1, 1, prompt, 40, 5, 5, 0);
+        b_1 =
+            newtButton(20 -
+                       ((button2[0] !=
+                         '\0') ? strlen(button1) +
+                        2 : strlen(button1) / 2),
+                       newtTextboxGetNumLines(text) + 3, button1);
+        if (button2[0] != '\0') {
+            b_2 =
+                newtButton(24, newtTextboxGetNumLines(text) + 3, button2);
+        } else {
+            b_2 = NULL;
+        }
+        //  newtOpenWindow (25, 5, 46, newtTextboxGetNumLines (text) + 7, "Alert");
+        newtCenteredWindow(46, newtTextboxGetNumLines(text) + 7, "Alert");
+        myForm = newtForm(NULL, NULL, 0);
+        newtFormAddComponents(myForm, text, b_1, b_2, NULL);
+        center_string(prompt, 80);
+        newtPushHelpLine(prompt);
+        b_res = newtRunForm(myForm);
+        newtPopHelpLine();
+        newtFormDestroy(myForm);
+        newtPopWindow();
+        if (b_res == b_1) {
+            paranoid_free(tmp);
+            paranoid_free(prompt);
+            return (TRUE);
+        } else {
+            paranoid_free(tmp);
+            paranoid_free(prompt);
+            return (FALSE);
+        }
+    }
 
 
@@ -1001 +858 @@
  * on the screen.
  */
-void
-refresh_log_screen ()
-{
-
-    /*@ int ************************************************************/
-  int i = 0;
-
-
-  if (g_text_mode || !err_log_lines)
-    {
-      return;
-    }
-  for (i = g_noof_log_lines - 1; i >= 0; i--)
-    {
-      newtDrawRootText (0, i + g_noof_rows - 1 - g_noof_log_lines,
-"                                                                                ");
-    }
-  newtRefresh ();
-  for (i = g_noof_log_lines - 1; i >= 0; i--)
-    {
-      err_log_lines[i][79] = '\0';
-      newtDrawRootText (0, i + g_noof_rows - 1 - g_noof_log_lines, err_log_lines[i]);
-    }
-  newtRefresh ();
-}
+    void
+     refresh_log_screen() {
+
+        /*@ int *********************************************************** */
+        int i = 0;
+
+
+        if (g_text_mode || !err_log_lines) {
+            return;
+        }
+        for (i = g_noof_log_lines - 1; i >= 0; i--) {
+            newtDrawRootText(0, i + g_noof_rows - 1 - g_noof_log_lines,
+                             "                                                                                ");
+        }
+        newtRefresh();
+        for (i = g_noof_log_lines - 1; i >= 0; i--) {
+            err_log_lines[i][79] = '\0';
+            newtDrawRootText(0, i + g_noof_rows - 1 - g_noof_log_lines,
+                             err_log_lines[i]);
+        }
+        newtRefresh();
+    }
 
 
@@ -1032 +886 @@
  * only allocate some memory.
  */
-void
-setup_newt_stuff ()
-{
-
-    /*@ int ************************************************************/
-  int i = 0;
-  int cols;
-
-  if (!g_text_mode)
-    {
-      newtInit();
-      newtCls();
-      newtPushHelpLine
-    ("Welcome to Mondo Rescue, by Hugo Rabson and the Internet. All rights reversed.");
-      /*  newtDrawRootText(28,0,"Welcome to Mondo Rescue"); */
-      newtDrawRootText (18, 0, WELCOME_STRING);
-      newtRefresh();
-      newtGetScreenSize (&cols, &g_noof_rows);
-      g_noof_log_lines = (g_noof_rows / 5) + 1;
-    }
-
-  err_log_lines = (char **) malloc (sizeof (char *) * g_noof_log_lines);
-  if (!err_log_lines) {
-    fatal_error ("Out of memory");
-  }
-
-  for (i = 0; i < g_noof_log_lines; i++) {
-    err_log_lines[i] = (char *) malloc (MAX_NEWT_COMMENT_LEN);
-    if (!err_log_lines[i]) {
-      fatal_error ("Out of memory");
-    }
-  }
-
-  for (i = 0; i < g_noof_log_lines; i++)
-    {
-      err_log_lines[i][0] = '\0';
-    }
-}
+    void
+     setup_newt_stuff() {
+
+        /*@ int *********************************************************** */
+        int i = 0;
+        int cols;
+
+        if (!g_text_mode) {
+            newtInit();
+            newtCls();
+            newtPushHelpLine
+                ("Welcome to Mondo Rescue, by Hugo Rabson and the Internet. All rights reversed.");
+            /*  newtDrawRootText(28,0,"Welcome to Mondo Rescue"); */
+            newtDrawRootText(18, 0, WELCOME_STRING);
+            newtRefresh();
+            newtGetScreenSize(&cols, &g_noof_rows);
+            g_noof_log_lines = (g_noof_rows / 5) + 1;
+        }
+
+        err_log_lines =
+            (char **) malloc(sizeof(char *) * g_noof_log_lines);
+        if (!err_log_lines) {
+            fatal_error("Out of memory");
+        }
+
+        for (i = 0; i < g_noof_log_lines; i++) {
+            err_log_lines[i] = (char *) malloc(MAX_NEWT_COMMENT_LEN);
+            if (!err_log_lines[i]) {
+                fatal_error("Out of memory");
+            }
+        }
+
+        for (i = 0; i < g_noof_log_lines; i++) {
+            err_log_lines[i][0] = '\0';
+        }
+    }
 
 
@@ -1077 +929 @@
  * @param denom The denomenator of the ratio.
  */
-void
-update_evalcall_form_ratio (int num, int denom)
-{
-
-    /*@ long *************************************************************/
-  long current_time = 0;
-    long time_taken = 0;
-    long time_total_est = 0;
-    long time_remaining = 0;
-
-    /*@ buffers ***********************************************************/
-  char *timeline_str;
-    char *pcline_str;
-    char *taskprogress;
-
-    /*@ int ***************************************************************/
-  int percentage = 0;
-    int i = 0;
-    int j = 0;
-
-  malloc_string(timeline_str);
-  malloc_string(pcline_str);
-  malloc_string(taskprogress);
-  timeline_str[0] = '\0';
+    void
+     update_evalcall_form_ratio(int num, int denom) {
+
+        /*@ long ************************************************************ */
+        long current_time = 0;
+        long time_taken = 0;
+        long time_total_est = 0;
+        long time_remaining = 0;
+
+        /*@ buffers ********************************************************** */
+        char *timeline_str;
+        char *pcline_str;
+        char *taskprogress;
+
+        /*@ int ************************************************************** */
+        int percentage = 0;
+        int i = 0;
+        int j = 0;
+
+        malloc_string(timeline_str);
+        malloc_string(pcline_str);
+        malloc_string(taskprogress);
+        timeline_str[0] = '\0';
 //  log_it("update_eval_call_form called");
-  if (num * 100 < denom)
-    {
-      percentage = 1;
-    }
-  else
-    {
-      percentage = (num * 100 + denom / 2) / denom ;
-    }
-    
-  current_time = get_time ();
-  time_taken = current_time - g_isoform_starttime;
-  if (num)
-    {
-      time_total_est = time_taken * denom / num;
-      time_remaining = time_total_est - time_taken;
-    }
-  else
-    {
-      time_remaining = 0;
-    }
-  if (!g_text_mode)
-    {
-      newtLabelSetText (g_isoform_header, g_isoform_header_str);
-    }
-  g_mysterious_dot_counter = (g_mysterious_dot_counter + 1) % 27;
-  if ((percentage < 3 && g_isoform_old_progress < 3)
-      || percentage > g_isoform_old_progress)
-    {
-      g_isoform_old_progress = percentage;
-      sprintf (timeline_str,
-           "%2ld:%02ld taken            %2ld:%02ld remaining",
-           time_taken / 60, time_taken % 60, time_remaining / 60,
-           time_remaining % 60);
-      if (percentage < 3)
-    {
-      sprintf (pcline_str, " Working");
-      for (j = 0; j < g_mysterious_dot_counter; j++)
-        {
-          strcat (pcline_str, ".");
-        }
-      for (; j < 27; j++)
-        {
-          strcat (pcline_str, " ");
-        }
-      sprintf (pcline_str + strlen (pcline_str), " %c",
-           special_dot_char (g_mysterious_dot_counter));
-    }
-      else
-    {
-      sprintf (pcline_str, " %3d%% done              %3d%% to go",
-           percentage, 100 - percentage);
-    }
-      if (g_text_mode)
-    {
-      sprintf (taskprogress, "TASK:  [");
-      for (i = 0; i < percentage; i += 5)
-        {
-          strcat (taskprogress, "*");
-        }
-      for (; i < 100; i += 5)
-        {
-          strcat (taskprogress, ".");
-        }
-      if (percentage >= 3)
-        {
-          sprintf (taskprogress + strlen (taskprogress),
-               "] %3d%% done; %2ld:%02ld to go", percentage,
-               time_remaining / 60, time_remaining % 60);
-              printf ("---evalcall---1--- %s\r\n", g_isoform_header_str);
-          printf ("---evalcall---2--- %s\r\n", taskprogress);
-              printf ("---evalcall---E---\r\n");
-        }
-    }
-      else
-    {
-      newtScaleSet (g_isoform_scale, (unsigned long long) percentage);
-      newtLabelSetText (g_isoform_pcline, pcline_str);
-      if (percentage >= 3)
-        {
-          newtLabelSetText (g_isoform_timeline, timeline_str);
-        }
-    }
-    }
-  if (!g_text_mode)
-    {
+        if (num * 100 < denom) {
+            percentage = 1;
+        } else {
+            percentage = (num * 100 + denom / 2) / denom;
+        }
+
+        current_time = get_time();
+        time_taken = current_time - g_isoform_starttime;
+        if (num) {
+            time_total_est = time_taken * denom / num;
+            time_remaining = time_total_est - time_taken;
+        } else {
+            time_remaining = 0;
+        }
+        if (!g_text_mode) {
+            newtLabelSetText(g_isoform_header, g_isoform_header_str);
+        }
+        g_mysterious_dot_counter = (g_mysterious_dot_counter + 1) % 27;
+        if ((percentage < 3 && g_isoform_old_progress < 3)
+            || percentage > g_isoform_old_progress) {
+            g_isoform_old_progress = percentage;
+            sprintf(timeline_str,
+                    "%2ld:%02ld taken            %2ld:%02ld remaining",
+                    time_taken / 60, time_taken % 60, time_remaining / 60,
+                    time_remaining % 60);
+            if (percentage < 3) {
+                sprintf(pcline_str, " Working");
+                for (j = 0; j < g_mysterious_dot_counter; j++) {
+                    strcat(pcline_str, ".");
+                }
+                for (; j < 27; j++) {
+                    strcat(pcline_str, " ");
+                }
+                sprintf(pcline_str + strlen(pcline_str), " %c",
+                        special_dot_char(g_mysterious_dot_counter));
+            } else {
+                sprintf(pcline_str, " %3d%% done              %3d%% to go",
+                        percentage, 100 - percentage);
+            }
+            if (g_text_mode) {
+                sprintf(taskprogress, "TASK:  [");
+                for (i = 0; i < percentage; i += 5) {
+                    strcat(taskprogress, "*");
+                }
+                for (; i < 100; i += 5) {
+                    strcat(taskprogress, ".");
+                }
+                if (percentage >= 3) {
+                    sprintf(taskprogress + strlen(taskprogress),
+                            "] %3d%% done; %2ld:%02ld to go", percentage,
+                            time_remaining / 60, time_remaining % 60);
+                    printf("---evalcall---1--- %s\r\n",
+                           g_isoform_header_str);
+                    printf("---evalcall---2--- %s\r\n", taskprogress);
+                    printf("---evalcall---E---\r\n");
+                }
+            } else {
+                newtScaleSet(g_isoform_scale,
+                             (unsigned long long) percentage);
+                newtLabelSetText(g_isoform_pcline, pcline_str);
+                if (percentage >= 3) {
+                    newtLabelSetText(g_isoform_timeline, timeline_str);
+                }
+            }
+        }
+        if (!g_text_mode) {
 //      log_it("refreshing");
-      newtRefresh ();
-    }
-  paranoid_free(timeline_str);
-  paranoid_free(pcline_str);
-  paranoid_free(taskprogress);
-}
+            newtRefresh();
+        }
+        paranoid_free(timeline_str);
+        paranoid_free(pcline_str);
+        paranoid_free(taskprogress);
+    }
 
 
@@ -1201 +1033 @@
  * @param curr The current amount of progress (percentage) in the evalcall form.
  */
-void
-update_evalcall_form (int curr)
-{
-  update_evalcall_form_ratio (curr, 100);
-}
+    void
+     update_evalcall_form(int curr) {
+        update_evalcall_form_ratio(curr, 100);
+    }
 
 
@@ -1214 +1045 @@
  * @param blurb3 The new third line of the blurb; use @p g_blurb_str_2 (no, that's not a typo) to keep it the same.
  */
-void
-update_progress_form (char *blurb3)
-{
-  /*  log_it("update_progress_form --- called"); */
-  if (g_current_progress == -999)
-    {
-      /* log_it("You're trying to update progress form when it ain't open. Aww, that's OK. I'll let it go. It's a bit naughty but it's a nonfatal error. No prob, Bob."); */
-      return;
-    }
-  strcpy (g_blurb_str_2, blurb3);
-  update_progress_form_full (g_blurb_str_1, g_blurb_str_2, g_blurb_str_3);
-}
+    void
+     update_progress_form(char *blurb3) {
+        /*  log_it("update_progress_form --- called"); */
+        if (g_current_progress == -999) {
+            /* log_it("You're trying to update progress form when it ain't open. Aww, that's OK. I'll let it go. It's a bit naughty but it's a nonfatal error. No prob, Bob."); */
+            return;
+        }
+        strcpy(g_blurb_str_2, blurb3);
+        update_progress_form_full(g_blurb_str_1, g_blurb_str_2,
+                                  g_blurb_str_3);
+    }
 
 
@@ -1234 +1064 @@
  * @param blurb3 The third line of the blurb. Use @p g_blurb_str_2 (no, that's not a typo either) to keep it the same.
  */
-void
-update_progress_form_full (char *blurb1, char *blurb2, char *blurb3)
-{
-    /*@ long ******************************************************/
-  long current_time = 0;
-    long time_taken = 0;
-    long time_remaining = 0;
-    long time_total_est = 0;
-
-    /*@ int ********************************************************/
-  int percentage = 0;
-    int i = 0;
-
-    /*@ buffers ****************************************************/
-  char *percentline_str;
-    char *timeline_str;
-    char *taskprogress;
-    char *tmp;
+    void
+     update_progress_form_full(char *blurb1, char *blurb2, char *blurb3) {
+        /*@ long ***************************************************** */
+        long current_time = 0;
+        long time_taken = 0;
+        long time_remaining = 0;
+        long time_total_est = 0;
+
+        /*@ int ******************************************************* */
+        int percentage = 0;
+        int i = 0;
+
+        /*@ buffers *************************************************** */
+        char *percentline_str;
+        char *timeline_str;
+        char *taskprogress;
+        char *tmp;
 
 //  log_msg(1, "'%s' '%s' '%s'", blurb1, blurb2, blurb3);
-  percentline_str = malloc(MAX_NEWT_COMMENT_LEN);
-  timeline_str = malloc(MAX_NEWT_COMMENT_LEN);
-  taskprogress = malloc(MAX_NEWT_COMMENT_LEN);
-  malloc_string(tmp);
-  if (!g_text_mode)
-    {
-      assert(blurb1!=NULL);
-      assert(blurb2!=NULL);
-      assert(blurb3!=NULL);
-      assert(g_timeline!=NULL);
-    }
-
-  percentline_str[0] = '\0';
-
-  current_time = get_time ();
-  time_taken = current_time - g_start_time;
-  if (g_maximum_progress == 0)
-    {
-      percentage = 0;
-    }
-  else
-    {
-      if (g_current_progress > g_maximum_progress)
-    {
-      sprintf (tmp,
-           "update_progress_form_full(%s,%s,%s) --- g_current_progress=%ld; g_maximum_progress=%ld",
-           blurb1, blurb2, blurb3, g_current_progress,
-           g_maximum_progress);
-      log_msg (0, tmp);
-      g_current_progress = g_maximum_progress;
-    }
-      percentage = (int) ((g_current_progress * 100L) / g_maximum_progress);
-    }
-  if (percentage < 1)
-    {
-      percentage = 1;
-    }
-  if (percentage > 100)
-    {
-      percentage = 100;
-    }
-  if (g_current_progress)
-    {
-      time_total_est = time_taken * (long) g_maximum_progress / (long) (g_current_progress);
-      time_remaining = time_total_est - time_taken;
-    }
-  else
-    {
-      time_remaining = 0;
-    }
-  g_mysterious_dot_counter = (g_mysterious_dot_counter + 1) % 27;
-  sprintf (timeline_str,
-       "%2ld:%02ld taken               %2ld:%02ld remaining  ",
-       time_taken / 60, time_taken % 60, time_remaining / 60,
-       time_remaining % 60);
-  sprintf (percentline_str, " %3d%% done                 %3d%% to go",
-       percentage, 100 - percentage);
-
-  if (g_text_mode)
-    {
-      printf("---progress-form---1--- %s\r\n", blurb1);
-      printf("---progress-form---2--- %s\r\n", blurb2);
-      printf("---progress-form---3--- %s\r\n", blurb3);
-      printf("---progress-form---E---\n");
-      sprintf (taskprogress, "TASK:  [");
-      for (i = 0; i < percentage; i += 5)
-    {
-      strcat (taskprogress, "*");
-    }
-      for (; i < 100; i += 5)
-    {
-      strcat (taskprogress, ".");
-    }
-      if (percentage>100) { log_msg(2, "percentage = %d", percentage); }
-      sprintf (taskprogress + strlen (taskprogress),
-           "] %3d%c", percentage, '%');
-      sprintf (taskprogress + strlen (taskprogress),
-        " done; %2ld:%02ld to go",
-        time_remaining / 60, time_remaining % 60);
-      printf("---progress-form---4--- %s\r\n", taskprogress);
-    }
-  else
-    {
-      center_string (blurb1, 54);
-      center_string (blurb2, 54);
-      center_string (blurb3, 54);
-      newtLabelSetText (g_blurb1, blurb1);
-      newtLabelSetText (g_blurb2, blurb3);
-      newtLabelSetText (g_blurb3, blurb2);
-          newtScaleSet (g_scale, (unsigned long long) g_current_progress);
-      if (percentage >= 2)
-    {
-      newtLabelSetText (g_timeline, timeline_str);
-    }
-      newtLabelSetText (g_percentline, percentline_str);
-      newtRefresh ();
-    }
-  paranoid_free(percentline_str);
-  paranoid_free(timeline_str);
-  paranoid_free(taskprogress);
-  paranoid_free(tmp);
-}
+        percentline_str = malloc(MAX_NEWT_COMMENT_LEN);
+        timeline_str = malloc(MAX_NEWT_COMMENT_LEN);
+        taskprogress = malloc(MAX_NEWT_COMMENT_LEN);
+        malloc_string(tmp);
+        if (!g_text_mode) {
+            assert(blurb1 != NULL);
+            assert(blurb2 != NULL);
+            assert(blurb3 != NULL);
+            assert(g_timeline != NULL);
+        }
+
+        percentline_str[0] = '\0';
+
+        current_time = get_time();
+        time_taken = current_time - g_start_time;
+        if (g_maximum_progress == 0) {
+            percentage = 0;
+        } else {
+            if (g_current_progress > g_maximum_progress) {
+                sprintf(tmp,
+                        "update_progress_form_full(%s,%s,%s) --- g_current_progress=%ld; g_maximum_progress=%ld",
+                        blurb1, blurb2, blurb3, g_current_progress,
+                        g_maximum_progress);
+                log_msg(0, tmp);
+                g_current_progress = g_maximum_progress;
+            }
+            percentage =
+                (int) ((g_current_progress * 100L) / g_maximum_progress);
+        }
+        if (percentage < 1) {
+            percentage = 1;
+        }
+        if (percentage > 100) {
+            percentage = 100;
+        }
+        if (g_current_progress) {
+            time_total_est =
+                time_taken * (long) g_maximum_progress /
+                (long) (g_current_progress);
+            time_remaining = time_total_est - time_taken;
+        } else {
+            time_remaining = 0;
+        }
+        g_mysterious_dot_counter = (g_mysterious_dot_counter + 1) % 27;
+        sprintf(timeline_str,
+                "%2ld:%02ld taken               %2ld:%02ld remaining  ",
+                time_taken / 60, time_taken % 60, time_remaining / 60,
+                time_remaining % 60);
+        sprintf(percentline_str, " %3d%% done                 %3d%% to go",
+                percentage, 100 - percentage);
+
+        if (g_text_mode) {
+            printf("---progress-form---1--- %s\r\n", blurb1);
+            printf("---progress-form---2--- %s\r\n", blurb2);
+            printf("---progress-form---3--- %s\r\n", blurb3);
+            printf("---progress-form---E---\n");
+            sprintf(taskprogress, "TASK:  [");
+            for (i = 0; i < percentage; i += 5) {
+                strcat(taskprogress, "*");
+            }
+            for (; i < 100; i += 5) {
+                strcat(taskprogress, ".");
+            }
+            if (percentage > 100) {
+                log_msg(2, "percentage = %d", percentage);
+            }
+            sprintf(taskprogress + strlen(taskprogress),
+                    "] %3d%c", percentage, '%');
+            sprintf(taskprogress + strlen(taskprogress),
+                    " done; %2ld:%02ld to go",
+                    time_remaining / 60, time_remaining % 60);
+            printf("---progress-form---4--- %s\r\n", taskprogress);
+        } else {
+            center_string(blurb1, 54);
+            center_string(blurb2, 54);
+            center_string(blurb3, 54);
+            newtLabelSetText(g_blurb1, blurb1);
+            newtLabelSetText(g_blurb2, blurb3);
+            newtLabelSetText(g_blurb3, blurb2);
+            newtScaleSet(g_scale, (unsigned long long) g_current_progress);
+            if (percentage >= 2) {
+                newtLabelSetText(g_timeline, timeline_str);
+            }
+            newtLabelSetText(g_percentline, percentline_str);
+            newtRefresh();
+        }
+        paranoid_free(percentline_str);
+        paranoid_free(timeline_str);
+        paranoid_free(taskprogress);
+        paranoid_free(tmp);
+    }
 
 
@@ -1378 +1196 @@
  * @return The backup type chosen, or @c none if the user chose "Exit to shell".
  */
-t_bkptype 
-which_backup_media_type (bool restoring)
-{
-
-    /*@ char *************************************************************/
-      t_bkptype output;
-
-
-    /*@ newt *************************************************************/
-  char *title_sz;
-  char *minimsg_sz;
-  static t_bkptype possible_bkptypes[] = { none,cdr,cdrw,dvd,tape,cdstream,udev,nfs,iso };
-  static char *possible_responses[] = {"none", "cdr", "cdrw", "dvd", "tape", "cdstream", "udev", "nfs", "iso", NULL };
-  char *outstr;
-  t_bkptype backup_type;
-  int i;
-
-  newtComponent b1;
-    newtComponent b2;
-    newtComponent b3;
-    newtComponent b4;
-    newtComponent b5;
-    newtComponent b6;
-    newtComponent b7;
-    newtComponent b8;
-    newtComponent b_res;
-    newtComponent myForm;
-
-  title_sz = malloc(MAX_NEWT_COMMENT_LEN);
-  minimsg_sz = malloc(MAX_NEWT_COMMENT_LEN);
-  outstr = malloc(MAX_NEWT_COMMENT_LEN);
-  if (g_text_mode)
-    {
-      for(backup_type = none; backup_type == none; )
-        {
-          printf("Backup type (");
-          for(i=0; possible_responses[i]; i++)
-            {
-              printf("%c%s", (i==0)?'\0':' ', possible_responses[i]);
-            }
-          printf(")\n--> ");
-          (void) fgets(outstr, MAX_NEWT_COMMENT_LEN, stdin);
-          strip_spaces(outstr);
-          for(i=0; possible_responses[i]; i++)
-            {
-              if (!strcmp(possible_responses[i], outstr))
-                { backup_type = possible_bkptypes[i]; }
-            }
-        }
-  paranoid_free(title_sz);
-  paranoid_free(minimsg_sz);
-  paranoid_free(outstr);
-      return(backup_type);
-    }
-  newtDrawRootText (18, 0, WELCOME_STRING);
-  if (restoring)
-    {
-      strcpy(title_sz, "Please choose the backup media from which you want to read data.");
-      strcpy(minimsg_sz, "Read from:");
-    }
-  else
-    {
-      strcpy(title_sz, "Please choose the backup media to which you want to archive data.");
-      strcpy(minimsg_sz, "Backup to:");
-    }
-  newtPushHelpLine (title_sz);
-  //  newtOpenWindow (23, 3, 34, 17, minimsg_sz);
-  newtCenteredWindow (34, 17, minimsg_sz);
-  b1 = newtButton ( 1, 1, "CD-R disks ");
-  b2 = newtButton (17, 1, "CD-RW disks");
-  b3 = newtButton ( 1, 9, "Tape drive ");
-  b4 = newtButton (17, 5, "CD streamer");
-  b5 = newtButton ( 1, 5, " DVD disks ");
-  b6 = newtButton (17, 9, " NFS mount ");
-  b7 = newtButton ( 1,13, " Hard disk ");
-  b8 = newtButton (17,13, "    Exit   ");
-  myForm = newtForm (NULL, NULL, 0);
-  newtFormAddComponents (myForm, b1, b5, b3, b7, b2, b4, b6, b8, NULL);
-  b_res = newtRunForm (myForm);
-  newtFormDestroy (myForm);
-  newtPopWindow ();
-  if (b_res == b1)      { output = cdr; }
-  else if (b_res == b2) { output = cdrw; }
-  else if (b_res == b3) { output = tape; }
-  else if (b_res == b4) { output = cdstream; }
-  else if (b_res == b5) { output = dvd; }
-  else if (b_res == b6) { output = nfs; }
-  else if (b_res == b7) { output = iso; }
-  else { output = none; }
-  newtPopHelpLine ();
-  paranoid_free(title_sz);
-  paranoid_free(minimsg_sz);
-  paranoid_free(outstr);
-  return (output);
-}
+    t_bkptype which_backup_media_type(bool restoring) {
+
+        /*@ char ************************************************************ */
+        t_bkptype output;
+
+
+        /*@ newt ************************************************************ */
+        char *title_sz;
+        char *minimsg_sz;
+        static t_bkptype possible_bkptypes[] =
+            { none, cdr, cdrw, dvd, tape, cdstream, udev, nfs, iso };
+        static char *possible_responses[] =
+            { "none", "cdr", "cdrw", "dvd", "tape", "cdstream", "udev",
+"nfs", "iso", NULL };
+        char *outstr;
+        t_bkptype backup_type;
+        int i;
+
+        newtComponent b1;
+        newtComponent b2;
+        newtComponent b3;
+        newtComponent b4;
+        newtComponent b5;
+        newtComponent b6;
+        newtComponent b7;
+        newtComponent b8;
+        newtComponent b_res;
+        newtComponent myForm;
+
+        title_sz = malloc(MAX_NEWT_COMMENT_LEN);
+        minimsg_sz = malloc(MAX_NEWT_COMMENT_LEN);
+        outstr = malloc(MAX_NEWT_COMMENT_LEN);
+        if (g_text_mode) {
+            for (backup_type = none; backup_type == none;) {
+                printf("Backup type (");
+                for (i = 0; possible_responses[i]; i++) {
+                    printf("%c%s", (i == 0) ? '\0' : ' ',
+                           possible_responses[i]);
+                }
+                printf(")\n--> ");
+                (void) fgets(outstr, MAX_NEWT_COMMENT_LEN, stdin);
+                strip_spaces(outstr);
+                for (i = 0; possible_responses[i]; i++) {
+                    if (!strcmp(possible_responses[i], outstr)) {
+                        backup_type = possible_bkptypes[i];
+                    }
+                }
+            }
+            paranoid_free(title_sz);
+            paranoid_free(minimsg_sz);
+            paranoid_free(outstr);
+            return (backup_type);
+        }
+        newtDrawRootText(18, 0, WELCOME_STRING);
+        if (restoring) {
+            strcpy(title_sz,
+                   "Please choose the backup media from which you want to read data.");
+            strcpy(minimsg_sz, "Read from:");
+        } else {
+            strcpy(title_sz,
+                   "Please choose the backup media to which you want to archive data.");
+            strcpy(minimsg_sz, "Backup to:");
+        }
+        newtPushHelpLine(title_sz);
+        //  newtOpenWindow (23, 3, 34, 17, minimsg_sz);
+        newtCenteredWindow(34, 17, minimsg_sz);
+        b1 = newtButton(1, 1, "CD-R disks ");
+        b2 = newtButton(17, 1, "CD-RW disks");
+        b3 = newtButton(1, 9, "Tape drive ");
+        b4 = newtButton(17, 5, "CD streamer");
+        b5 = newtButton(1, 5, " DVD disks ");
+        b6 = newtButton(17, 9, " NFS mount ");
+        b7 = newtButton(1, 13, " Hard disk ");
+        b8 = newtButton(17, 13, "    Exit   ");
+        myForm = newtForm(NULL, NULL, 0);
+        newtFormAddComponents(myForm, b1, b5, b3, b7, b2, b4, b6, b8,
+                              NULL);
+        b_res = newtRunForm(myForm);
+        newtFormDestroy(myForm);
+        newtPopWindow();
+        if (b_res == b1) {
+            output = cdr;
+        } else if (b_res == b2) {
+            output = cdrw;
+        } else if (b_res == b3) {
+            output = tape;
+        } else if (b_res == b4) {
+            output = cdstream;
+        } else if (b_res == b5) {
+            output = dvd;
+        } else if (b_res == b6) {
+            output = nfs;
+        } else if (b_res == b7) {
+            output = iso;
+        } else {
+            output = none;
+        }
+        newtPopHelpLine();
+        paranoid_free(title_sz);
+        paranoid_free(minimsg_sz);
+        paranoid_free(outstr);
+        return (output);
+    }
 
 
@@ -1482 +1308 @@
  * @return The compression level (0-9) chosen, or -1 for "Exit".
  */
-int
-which_compression_level ()
-{
-
-    /*@ char *************************************************************/
-  int output = none;
-
-
-    /*@ newt *************************************************************/
-
-  newtComponent b1;
-    newtComponent b2;
-    newtComponent b3;
-    newtComponent b4;
-    newtComponent b5;
-    newtComponent b_res;
-    newtComponent myForm;
-
-  newtDrawRootText (18, 0, WELCOME_STRING);
-  newtPushHelpLine
-    ("   Please specify the level of compression that you want.");
-  //  newtOpenWindow (23, 3, 34, 13, "How much compression?");
-  newtCenteredWindow (34, 13, "How much compression?");
-  b1 = newtButton ( 4, 1, "Maximum");
-  b2 = newtButton (18, 1, "Average");
-  b3 = newtButton ( 4, 5, "Minumum");
-  b4 = newtButton (18, 5, " None  ");
-  b5 = newtButton ( 4, 9, "         Exit        ");
-  myForm = newtForm (NULL, NULL, 0);
-  newtFormAddComponents (myForm, b1, b3, b2, b4, b5, NULL);
-  b_res = newtRunForm (myForm);
-  newtFormDestroy (myForm);
-  newtPopWindow ();
-  if (b_res == b1)      { output = 9; }
-  else if (b_res == b2) { output = 4; }
-  else if (b_res == b3) { output = 1; }
-  else if (b_res == b4) { output = 0; }
-  else if (b_res == b5) { output = -1; }
-  newtPopHelpLine ();
-  return (output);
-}
+    int
+     which_compression_level() {
+
+        /*@ char ************************************************************ */
+        int output = none;
+
+
+        /*@ newt ************************************************************ */
+
+        newtComponent b1;
+        newtComponent b2;
+        newtComponent b3;
+        newtComponent b4;
+        newtComponent b5;
+        newtComponent b_res;
+        newtComponent myForm;
+
+        newtDrawRootText(18, 0, WELCOME_STRING);
+        newtPushHelpLine
+            ("   Please specify the level of compression that you want.");
+        //  newtOpenWindow (23, 3, 34, 13, "How much compression?");
+        newtCenteredWindow(34, 13, "How much compression?");
+        b1 = newtButton(4, 1, "Maximum");
+        b2 = newtButton(18, 1, "Average");
+        b3 = newtButton(4, 5, "Minumum");
+        b4 = newtButton(18, 5, " None  ");
+        b5 = newtButton(4, 9, "         Exit        ");
+        myForm = newtForm(NULL, NULL, 0);
+        newtFormAddComponents(myForm, b1, b3, b2, b4, b5, NULL);
+        b_res = newtRunForm(myForm);
+        newtFormDestroy(myForm);
+        newtPopWindow();
+        if (b_res == b1) {
+            output = 9;
+        } else if (b_res == b2) {
+            output = 4;
+        } else if (b_res == b3) {
+            output = 1;
+        } else if (b_res == b4) {
+            output = 0;
+        } else if (b_res == b5) {
+            output = -1;
+        }
+        newtPopHelpLine();
+        return (output);
+    }
 
 
@@ -1534 +1365 @@
  * @param source_file The file containing a list of filenames to load into @p filelist.
  */
-int load_filelist_into_array(struct s_filelist *filelist, char *source_file)
-{
-  int i;
-  bool done;
-  char *tmp;
-  FILE*fin;
-  struct s_filelist_entry dummy_fle;
-
-  malloc_string(tmp);
-  assert(filelist!=NULL);
-  assert_string_is_neither_NULL_nor_zerolength(source_file);
-
-  iamhere("entering");
-  if (!(fin=fopen(source_file, "r"))) { log_OS_error(source_file); log_msg(2, "Can't open %s; therefore, cannot popup list", source_file); paranoid_free(tmp); return(1); }
-  log_msg(2, "Loading %s", source_file);
-  for(filelist->entries = 0; filelist->entries <= ARBITRARY_MAXIMUM; filelist->entries++)
-    {
-god_i_hate_gotos:
-      if (feof(fin)) { break; }
-      (void) fgets(tmp, MAX_NEWT_COMMENT_LEN, fin);
-      i = (int) strlen(tmp);
-      if (i<2) { goto god_i_hate_gotos; }
-      if (tmp[i-1]<32) { tmp[--i]='\0'; }
-      if (i<2) { goto god_i_hate_gotos; }
-      if (!does_file_exist(tmp)) { goto god_i_hate_gotos; }
-      filelist->el[filelist->entries].severity = severity_of_difference(tmp, NULL);
-      strcpy(filelist->el[filelist->entries].filename, tmp);
-      if (feof(fin)) { break; }
-    }
-  paranoid_fclose(fin);
-  if (filelist->entries >= ARBITRARY_MAXIMUM)
-    {
-      log_to_screen ("Arbitrary limits suck, man!");
-      paranoid_free(tmp); 
-      return(1);
-    }
-  for(done=FALSE;!done;)
-    {
-      done = TRUE;
-      for(i=0; i<filelist->entries-1; i++)
-        {
+    int load_filelist_into_array(struct s_filelist *filelist,
+                                 char *source_file) {
+        int i;
+        bool done;
+        char *tmp;
+        FILE *fin;
+        struct s_filelist_entry dummy_fle;
+
+        malloc_string(tmp);
+        assert(filelist != NULL);
+        assert_string_is_neither_NULL_nor_zerolength(source_file);
+
+        iamhere("entering");
+        if (!(fin = fopen(source_file, "r"))) {
+            log_OS_error(source_file);
+            log_msg(2, "Can't open %s; therefore, cannot popup list",
+                    source_file);
+            paranoid_free(tmp);
+            return (1);
+        }
+        log_msg(2, "Loading %s", source_file);
+        for (filelist->entries = 0; filelist->entries <= ARBITRARY_MAXIMUM;
+             filelist->entries++) {
+          god_i_hate_gotos:
+            if (feof(fin)) {
+                break;
+            }
+            (void) fgets(tmp, MAX_NEWT_COMMENT_LEN, fin);
+            i = (int) strlen(tmp);
+            if (i < 2) {
+                goto god_i_hate_gotos;
+            }
+            if (tmp[i - 1] < 32) {
+                tmp[--i] = '\0';
+            }
+            if (i < 2) {
+                goto god_i_hate_gotos;
+            }
+            if (!does_file_exist(tmp)) {
+                goto god_i_hate_gotos;
+            }
+            filelist->el[filelist->entries].severity =
+                severity_of_difference(tmp, NULL);
+            strcpy(filelist->el[filelist->entries].filename, tmp);
+            if (feof(fin)) {
+                break;
+            }
+        }
+        paranoid_fclose(fin);
+        if (filelist->entries >= ARBITRARY_MAXIMUM) {
+            log_to_screen("Arbitrary limits suck, man!");
+            paranoid_free(tmp);
+            return (1);
+        }
+        for (done = FALSE; !done;) {
+            done = TRUE;
+            for (i = 0; i < filelist->entries - 1; i++) {
 //          if (strcmp(filelist->el[i].filename, filelist->el[i+1].filename) > 0)
-          if (filelist->el[i].severity < filelist->el[i+1].severity || (filelist->el[i].severity==filelist->el[i+1].severity && strcmp(filelist->el[i].filename, filelist->el[i+1].filename)>0))
-            {
-              memcpy((void*)&dummy_fle, (void*)&(filelist->el[i]), sizeof(struct s_filelist_entry));
-              memcpy((void*)&(filelist->el[i]), (void*)&(filelist->el[i+1]), sizeof(struct s_filelist_entry));
-               memcpy((void*)&(filelist->el[i+1]), (void*)&dummy_fle, sizeof(struct s_filelist_entry));
-              log_msg(2, "Swapping %s and %s", filelist->el[i].filename, filelist->el[i+1].filename);
-              done = FALSE;
-            }
-        }
-    }
-  paranoid_free(tmp); 
-  iamhere("leaving");
-  return(0);
-}
+                if (filelist->el[i].severity < filelist->el[i + 1].severity
+                    || (filelist->el[i].severity ==
+                        filelist->el[i + 1].severity
+                        && strcmp(filelist->el[i].filename,
+                                  filelist->el[i + 1].filename) > 0)) {
+                    memcpy((void *) &dummy_fle,
+                           (void *) &(filelist->el[i]),
+                           sizeof(struct s_filelist_entry));
+                    memcpy((void *) &(filelist->el[i]),
+                           (void *) &(filelist->el[i + 1]),
+                           sizeof(struct s_filelist_entry));
+                    memcpy((void *) &(filelist->el[i + 1]),
+                           (void *) &dummy_fle,
+                           sizeof(struct s_filelist_entry));
+                    log_msg(2, "Swapping %s and %s",
+                            filelist->el[i].filename,
+                            filelist->el[i + 1].filename);
+                    done = FALSE;
+                }
+            }
+        }
+        paranoid_free(tmp);
+        iamhere("leaving");
+        return (0);
+    }
 
 
@@ -1599 +1457 @@
  * @note The returned value points to static storage that will be overwritten with each call.
  */
-char*filelist_entry_to_string(struct s_filelist_entry *flentry)
-{
-  static char comment[100];
-  char *tmp;
-
-  iamhere("entering");  
-  malloc_string(tmp);
-  assert(flentry!=NULL);
-  if (flentry->severity==0) { strcpy(tmp, "0   "); }
-  else if (flentry->severity==1) { strcpy(tmp, "low "); }
-  else if (flentry->severity==2) { strcpy(tmp, "med "); }
-  else { strcpy(tmp, "high"); }
-  strcat(tmp, "  ");
-  strncat(tmp, flentry->filename, 100);
-  tmp[98] = '\0';
-  strcpy(comment, tmp);
-  paranoid_free(tmp);
-  iamhere("leaving");
-  return(comment);
-}
+    char *filelist_entry_to_string(struct s_filelist_entry *flentry) {
+        static char comment[100];
+        char *tmp;
+
+        iamhere("entering");
+        malloc_string(tmp);
+        assert(flentry != NULL);
+        if (flentry->severity == 0) {
+            strcpy(tmp, "0   ");
+        } else if (flentry->severity == 1) {
+            strcpy(tmp, "low ");
+        } else if (flentry->severity == 2) {
+            strcpy(tmp, "med ");
+        } else {
+            strcpy(tmp, "high");
+        }
+        strcat(tmp, "  ");
+        strncat(tmp, flentry->filename, 100);
+        tmp[98] = '\0';
+        strcpy(comment, tmp);
+        paranoid_free(tmp);
+        iamhere("leaving");
+        return (comment);
+    }
 
 
@@ -1629 +1491 @@
  * @param source_file The file containing a list of changed files.
  */
-void popup_changelist_from_file(char*source_file)
-{
-  char *reason;
-  newtComponent myForm;
-    newtComponent bClose;
-    newtComponent bSelect;
-    newtComponent b_res;
-    newtComponent fileListbox;
-    newtComponent headerMsg;
-
-    /*@ ???? *************************************************************/
-  void *curr_choice;
-  void *keylist[ARBITRARY_MAXIMUM];
-
-    /*@ int **************************************************************/
-  int i = 0;
-    int currline = 0;
-    int finished = FALSE;
-  long lng = 0;
-
-    /*@ buffers **********************************************************/
-    char *tmp;
-    char *differ_sz;
-
-  struct s_filelist *filelist;
-  malloc_string(reason);
-  tmp = malloc(5000);
-  malloc_string(differ_sz);
-  assert_string_is_neither_NULL_nor_zerolength(source_file);
-  if (g_text_mode)
-    {
-      log_msg(2, "Text mode. Therefore, no popup list."); 
-      goto free_to_go;
-    }
-  log_msg (2, "Examining file %s", source_file);
-
-  lng = count_lines_in_file(source_file);
-  if (lng < 1) 
-    {
-      log_msg (2, "No lines in file. Therefore, no popup list."); paranoid_free(reason);
-      goto free_to_go;
-     }
-  else if (lng >= ARBITRARY_MAXIMUM)
-     {
-       log_msg(2, "Too many files differ for me to list."); 
-       goto free_to_go;
-     }
-
-  filelist = (struct s_filelist*)malloc(sizeof(struct s_filelist));
-  fileListbox =
-    newtListbox (2, 2, 12, NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
-  newtListboxClear (fileListbox);
-
-  if (load_filelist_into_array(filelist, source_file)) { log_msg (2, "Can't open %s; therefore, cannot popup list", source_file); paranoid_free(reason); return; }
-  log_msg(2, "%d files loaded into filelist array", filelist->entries);
-  for(i=0; i<filelist->entries; i++)
-    {
-      keylist[i] = (void *) i;
-      newtListboxAppendEntry (fileListbox, filelist_entry_to_string(&(filelist->el[i])), keylist[i]);
-    }
-  sprintf(differ_sz, "  %d files differ. Hit 'Select' to pick a file. Hit 'Close' to quit the list.", i);
-  newtPushHelpLine(differ_sz);
-  bClose = newtCompactButton (10, 15, " Close  ");
-  bSelect = newtCompactButton (30, 15, " Select ");
-  sprintf (tmp, "%-10s               %-20s", "Priority", "Filename");
-  headerMsg = newtLabel (2, 1, tmp);
-  newtOpenWindow (5, 4, 70, 16, "Non-matching files");
-  myForm = newtForm (NULL, NULL, 0);
-  newtFormAddComponents (myForm, headerMsg, fileListbox, bClose, bSelect, NULL);
-  while (!finished)
-    {
-      b_res = newtRunForm (myForm);
-      if (b_res == bClose)
-    {
-          finished = TRUE;
-        }
-      else
-        {
-          curr_choice = newtListboxGetCurrent (fileListbox);
-      for (i = 0; i < filelist->entries && keylist[i] != curr_choice;
-           i++);
-      if (i == filelist->entries && filelist->entries > 0)
-        {
-          log_to_screen ("I don't know what that button does!");
-        }
-      else
-        {
-          currline = i;
-          if (filelist->entries > 0)
-            {
-            severity_of_difference(filelist->el[currline].filename, reason);
-            sprintf(tmp, "%s --- %s", filelist->el[currline].filename, reason);
-            popup_and_OK(tmp);
-            }
-        }
-    }
-    }
-  newtFormDestroy (myForm);
-  newtPopWindow ();
-  newtPopHelpLine ();
-free_to_go:
-  paranoid_free(reason);
-  paranoid_free(tmp);
-  paranoid_free(differ_sz);
-  return;
-}
+    void popup_changelist_from_file(char *source_file) {
+        char *reason;
+        newtComponent myForm;
+        newtComponent bClose;
+        newtComponent bSelect;
+        newtComponent b_res;
+        newtComponent fileListbox;
+        newtComponent headerMsg;
+
+        /*@ ???? ************************************************************ */
+        void *curr_choice;
+        void *keylist[ARBITRARY_MAXIMUM];
+
+        /*@ int ************************************************************* */
+        int i = 0;
+        int currline = 0;
+        int finished = FALSE;
+        long lng = 0;
+
+        /*@ buffers ********************************************************* */
+        char *tmp;
+        char *differ_sz;
+
+        struct s_filelist *filelist;
+        malloc_string(reason);
+        tmp = malloc(5000);
+        malloc_string(differ_sz);
+        assert_string_is_neither_NULL_nor_zerolength(source_file);
+        if (g_text_mode) {
+            log_msg(2, "Text mode. Therefore, no popup list.");
+            goto free_to_go;
+        }
+        log_msg(2, "Examining file %s", source_file);
+
+        lng = count_lines_in_file(source_file);
+        if (lng < 1) {
+            log_msg(2, "No lines in file. Therefore, no popup list.");
+            paranoid_free(reason);
+            goto free_to_go;
+        } else if (lng >= ARBITRARY_MAXIMUM) {
+            log_msg(2, "Too many files differ for me to list.");
+            goto free_to_go;
+        }
+
+        filelist = (struct s_filelist *) malloc(sizeof(struct s_filelist));
+        fileListbox =
+            newtListbox(2, 2, 12, NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
+        newtListboxClear(fileListbox);
+
+        if (load_filelist_into_array(filelist, source_file)) {
+            log_msg(2, "Can't open %s; therefore, cannot popup list",
+                    source_file);
+            paranoid_free(reason);
+            return;
+        }
+        log_msg(2, "%d files loaded into filelist array",
+                filelist->entries);
+        for (i = 0; i < filelist->entries; i++) {
+            keylist[i] = (void *) i;
+            newtListboxAppendEntry(fileListbox,
+                                   filelist_entry_to_string(&
+                                                            (filelist->
+                                                             el[i])),
+                                   keylist[i]);
+        }
+        sprintf(differ_sz,
+                "  %d files differ. Hit 'Select' to pick a file. Hit 'Close' to quit the list.",
+                i);
+        newtPushHelpLine(differ_sz);
+        bClose = newtCompactButton(10, 15, " Close  ");
+        bSelect = newtCompactButton(30, 15, " Select ");
+        sprintf(tmp, "%-10s               %-20s", "Priority", "Filename");
+        headerMsg = newtLabel(2, 1, tmp);
+        newtOpenWindow(5, 4, 70, 16, "Non-matching files");
+        myForm = newtForm(NULL, NULL, 0);
+        newtFormAddComponents(myForm, headerMsg, fileListbox, bClose,
+                              bSelect, NULL);
+        while (!finished) {
+            b_res = newtRunForm(myForm);
+            if (b_res == bClose) {
+                finished = TRUE;
+            } else {
+                curr_choice = newtListboxGetCurrent(fileListbox);
+                for (i = 0;
+                     i < filelist->entries && keylist[i] != curr_choice;
+                     i++);
+                if (i == filelist->entries && filelist->entries > 0) {
+                    log_to_screen("I don't know what that button does!");
+                } else {
+                    currline = i;
+                    if (filelist->entries > 0) {
+                        severity_of_difference(filelist->el[currline].
+                                               filename, reason);
+                        sprintf(tmp, "%s --- %s",
+                                filelist->el[currline].filename, reason);
+                        popup_and_OK(tmp);
+                    }
+                }
+            }
+        }
+        newtFormDestroy(myForm);
+        newtPopWindow();
+        newtPopHelpLine();
+      free_to_go:
+        paranoid_free(reason);
+        paranoid_free(tmp);
+        paranoid_free(differ_sz);
+        return;
+    }
 
 /* @} - end of guiGroup */
@@ -1740 +1605 @@
 
 #if __cplusplus
-} /* extern "C" */
+}                               /* extern "C" */
 #endif
 
 
-void wait_until_software_raids_are_prepped(char*mdstat_file, int wait_for_percentage);
-
+void wait_until_software_raids_are_prepped(char *mdstat_file,
+                                           int wait_for_percentage);