Changeset 3192 in MondoRescue for branches/3.0/mondo/src/common/libmondo-archive.c

Timestamp:

Sep 25, 2013, 9:03:25 AM (11 years ago)

Author:

Bruno Cornec

Message:

• revert r3188 & r3189 as I started to work on branch 3.0 before deciding it was much better to do it in 3.2. This will allow some small maintenance work on 3.0 if needed, while pushing all the rest to 3.2 and providing early access to it.

File:

• branches/3.0/mondo/src/common/libmondo-archive.c (modified) (127 diffs)

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

@@ -64 +64 @@
 extern bool g_cd_recovery;
 extern char *g_mondo_home;
-
-/**
- * The serial string (used to differentiate between backups) of the current backup.
- */
-char *g_serial_string = NULL;
-
+/*
+extern char *g_tmpfs_mountpt;
+*/
+extern char *g_serial_string;
 extern char *g_getfacl;
 extern char *g_getfattr;
@@ -202 +200 @@
 
     if (!does_file_exist(filelist)) {
-        log_to_screen("(archive_this_fileset) - filelist %s does not exist", filelist);
+        mr_asprintf(tmp, "(archive_this_fileset) - filelist %s does not exist", filelist);
+        log_to_screen(tmp);
+        paranoid_free(tmp);
         return (1);
     }
@@ -208 +208 @@
     mr_asprintf(tmp, "echo hi > %s 2> /dev/null", fname);
     if (system(tmp)) {
-        mr_free(tmp);
+        paranoid_free(tmp);
         fatal_error("Unable to write tarball to scratchdir");
     }
     paranoid_free(tmp);
 
-    mr_asprintf(command, "star H=exustar list=%s -c -sparse " STAR_ACL_SZ " file=%s", filelist, fname);
+    mr_asprintf(command, "star H=exustar list=%s -c -sparse " STAR_ACL_SZ " file=%s",
+            filelist, fname);
     if (bkpinfo->use_lzo) {
-        mr_free(command);
         fatal_error("Can't use lzop");
     }
@@ -235 +235 @@
             res = 0;
         }
-        mr_free(tmp);
+        paranoid_free(tmp);
 
         if (res) {
@@ -251 +251 @@
         }
     }
-    mr_free(command);
+    paranoid_free(command);
 
     retval += res;
@@ -307 +307 @@
 
     if (!does_file_exist(filelist)) {
-        log_to_screen("(archive_this_fileset) - filelist %s does not exist", filelist);
+        mr_asprintf(tmp, "(archive_this_fileset) - filelist %s does not exist",
+                filelist);
+        log_to_screen(tmp);
+        paranoid_free(tmp);
         return (1);
     }
     mr_asprintf(tmp, "echo hi > %s 2> /dev/null", fname);
     if (system(tmp)) {
-        mr_free(tmp);
+        paranoid_free(tmp);
         fatal_error("Unable to write tarball to scratchdir");
     }
-    mr_free(tmp);
+    paranoid_free(tmp);
 
 
@@ -321 +324 @@
         mr_asprintf(tmp, "%s/do-not-compress-these", g_mondo_home);
         //       -b %ld, TAPE_BLOCK_SIZE
-        mr_asprintf(zipparams, "-Z -P %s -G %d -T 3k", bkpinfo->zip_exe, bkpinfo->compression_level);
+        mr_asprintf(zipparams, "-Z -P %s -G %d -T 3k", bkpinfo->zip_exe,
+                bkpinfo->compression_level);
         if (does_file_exist(tmp)) {
             mr_strcat(zipparams, " -E %s",tmp);
@@ -327 +331 @@
             log_msg(3, "%s not found. Cannot exclude zipfiles, etc.", tmp);
         }
-        mr_free(tmp);
+        paranoid_free(tmp);
     } else {
         mr_asprintf(zipparams, "");
     }
+
+//  make_hole_for_file(fname);
 
     if (!does_file_exist(bkpinfo->tmpdir)) {
@@ -340 +346 @@
         fatal_error("scratchdir not found");
     }
-    mr_asprintf(command, "rm -f %s %s. %s.gz %s.%s", fname, fname, fname, fname, bkpinfo->zip_suffix);
+    mr_asprintf(command, "rm -f %s %s. %s.gz %s.%s", fname, fname, fname,
+            fname, bkpinfo->zip_suffix);
     paranoid_system(command);
-    mr_free(command);
-
-    mr_asprintf(command, "afio -o -b %ld -M 16m %s %s < %s 2>> %s", TAPE_BLOCK_SIZE, zipparams, fname, filelist, MONDO_LOGFILE);
-    mr_free(zipparams);
+    paranoid_free(command);
+
+    mr_asprintf(command, "afio -o -b %ld -M 16m %s %s < %s 2>> %s",
+            TAPE_BLOCK_SIZE, zipparams, fname, filelist, MONDO_LOGFILE);
+    paranoid_free(zipparams);
 
     mr_asprintf(tmp, "echo hi > %s 2> /dev/null", fname);
     if (system(tmp)) {
-        mr_free(tmp);
+        paranoid_free(tmp);
         fatal_error("Unable to write tarball to scratchdir");
     }
-    mr_free(tmp);
+    paranoid_free(tmp);
 
     for (res = 99, tries = 0; tries < 3 && res != 0; tries++) {
@@ -398 +406 @@
 {
     int retval = 0, res = 0;
-    char *tmp = NULL;
+    char *tmp;
 
     assert(bkpinfo != NULL);
     set_g_cdrom_and_g_dvd_to_bkpinfo_value();
+    malloc_string(tmp);
     if (bkpinfo->backup_media_type == dvd) {
 #ifdef DVDRWFORMAT
@@ -422 +431 @@
     }
 
-    mr_asprintf(tmp, "gzip -9 %s/archives/filelist.full", bkpinfo->scratchdir);
+/*
+      sprintf(tmp, "wc -l %s/archives/filelist.full > %s/archives/filelist.count",bkpinfo->scratchdir, bkpinfo->scratchdir);
+      if (run_program_and_log_output(tmp, 2))
+        { fatal_error("Failed to count filelist.full"); }
+*/
+    sprintf(tmp, "gzip -9 %s/archives/filelist.full", bkpinfo->scratchdir);
     if (run_program_and_log_output(tmp, 2)) {
-        mr_free(tmp);
         fatal_error("Failed to gzip filelist.full");
     }
-    mr_free(tmp);
-
-    mr_asprintf(tmp, "cp -f %s/archives/*list*.gz %s", bkpinfo->scratchdir, bkpinfo->tmpdir);
+    sprintf(tmp, "cp -f %s/archives/*list*.gz %s", bkpinfo->scratchdir,
+            bkpinfo->tmpdir);
     if (run_program_and_log_output(tmp, 2)) {
-        mr_free(tmp);
         fatal_error("Failed to copy to tmpdir");
     }
-    mr_free(tmp);
 
     copy_mondo_and_mindi_stuff_to_scratchdir(); // payload, too, if it exists
@@ -454 +464 @@
     }
     retval += do_that_initial_phase();  // prepare
-    mr_asprintf(tmp, "rm -f %s/images/*.iso", bkpinfo->scratchdir);
+    sprintf(tmp, "rm -f %s/images/*.iso", bkpinfo->scratchdir);
     run_program_and_log_output(tmp, 1);
-    mr_free(tmp);
-
     retval += make_those_afios_phase(); // backup regular files
     retval += make_those_slices_phase();    // backup BIG files
@@ -465 +473 @@
         sleep(2);
     }
+    paranoid_free(tmp);
     return (retval);
 }
@@ -505 +514 @@
     char *use_lzo_sz = NULL;
     char *use_gzip_sz = NULL;
-    char *use_lzma_sz = NULL;
     char *use_comp_sz = NULL;
     char *use_star_sz = NULL;
@@ -534 +542 @@
     assert(bkpinfo != NULL);
 
-    mvaddstr_and_log_it(g_currentY, 0, "Calling MINDI to create boot+data disks");
+    mvaddstr_and_log_it(g_currentY, 0,
+                        "Calling MINDI to create boot+data disks");
     open_evalcall_form("Calling MINDI to create boot+data disks");
     mr_asprintf(tmp, "%s/filelist.full", bkpinfo->tmpdir);
@@ -541 +550 @@
         mr_asprintf(tmp, "%s/tmpfs/filelist.full", bkpinfo->tmpdir);
         if (!does_file_exist(tmp)) {
-            mr_free(tmp);
-            fatal_error ("Cannot find filelist.full, so I cannot count its lines");
+            fatal_error
+                ("Cannot find filelist.full, so I cannot count its lines");
         }
     }
@@ -562 +571 @@
             }
         }
-        mr_free(ntapedev);
+        paranoid_free(ntapedev);
         mr_asprintf(tape_device, "%s", bkpinfo->media_device);
     } else {
@@ -577 +586 @@
     } else {
         mr_asprintf(use_gzip_sz, "no");
-    }
-    if (bkpinfo->use_lzma) {
-        mr_asprintf(use_lzma_sz, "yes");
-    } else {
-        mr_asprintf(use_lzma_sz, "no");
     }
     if (bkpinfo->use_star) {
@@ -656 +660 @@
             ch = 'U';
         if (bkpinfo->boot_loader != '\0') {
-            log_msg(2, "User specified boot loader. It is '%c'.", bkpinfo->boot_loader);
+            mr_asprintf(tmp, "User specified boot loader. It is '%c'.", bkpinfo->boot_loader);
+            log_msg(2, tmp);
+            mr_free(tmp);
         } else {
             bkpinfo->boot_loader = ch;
         }
         if (bkpinfo->boot_device[0] != '\0') {
-            log_msg(2, "User specified boot device. It is '%s'.", bkpinfo->boot_device);
+            mr_asprintf(tmp, "User specified boot device. It is '%s'.", bkpinfo->boot_device);
+            log_msg(2, tmp);
+            mr_free(tmp);
         } else {
             strcpy(bkpinfo->boot_device, bootdev);
@@ -684 +692 @@
         mr_asprintf(bootldr_str, "LILO");
         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?");
+            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?");
         }
     } else if (bkpinfo->boot_loader == 'G') {
         mr_asprintf(bootldr_str, "GRUB");
-        if (!does_file_exist("/boot/grub/menu.lst") && does_file_exist("/boot/grub/grub.conf")) {
-            run_program_and_log_output("ln -sf /boot/grub/grub.conf /boot/grub/menu.lst", 5);
+        if (!does_file_exist("/boot/grub/menu.lst")
+            && does_file_exist("/boot/grub/grub.conf")) {
+            run_program_and_log_output
+                ("ln -sf /boot/grub/grub.conf /boot/grub/menu.lst", 5);
         }
         if ((!does_file_exist("/boot/grub/menu.lst")) && (!does_file_exist("/boot/grub/grub.cfg")) && (!does_file_exist("/boot/grub2/grub.cfg"))) {
-            fatal_error("The de facto standard location for your boot loader's config file is /boot/grub/menu.lst, /boot/grub/grub.cfg, or /boot/grub2/grub.cfg but I cannot find it there. What is wrong with your Linux distribution?");
+            fatal_error
+                ("The de facto standard location for your boot loader's config file is /boot/grub/menu.lst, /boot/grub/grub.cfg, or /boot/grub2/grub.cfg but I cannot find it there. What is wrong with your Linux distribution?");
         }
         mr_asprintf(bootldr_ver, "%s", call_program_and_get_last_line_of_output("grub --version"));
@@ -698 +710 @@
         mr_asprintf(bootldr_str, "ELILO");
         /* BCO: fix it for Debian, Mandrake, ... */
-        if (!does_file_exist("/etc/elilo.conf") && does_file_exist("/boot/efi/efi/redhat/elilo.conf")) {
-            run_program_and_log_output("ln -sf /boot/efi/efi/redhat/elilo.conf /etc/elilo.conf", 5);
-        }
-        if (!does_file_exist("/etc/elilo.conf") && does_file_exist("/boot/efi/efi/SuSE/elilo.conf")) {
-            run_program_and_log_output("ln -sf /boot/efi/efi/SuSE/elilo.conf /etc/elilo.conf", 5);
-        }
-        if (!does_file_exist("/etc/elilo.conf") && does_file_exist("/boot/efi/efi/debian/elilo.conf")) {
-            run_program_and_log_output ("ln -sf /boot/efi/efi/debian/elilo.conf /etc/elilo.conf", 5);
-        }
-        if (!does_file_exist("/etc/elilo.conf") && does_file_exist("/boot/efi/debian/elilo.conf")) {
-            run_program_and_log_output ("ln -sf /boot/efi/debian/elilo.conf /etc/elilo.conf", 5);
+        if (!does_file_exist("/etc/elilo.conf")
+            && does_file_exist("/boot/efi/efi/redhat/elilo.conf")) {
+            run_program_and_log_output
+                ("ln -sf /boot/efi/efi/redhat/elilo.conf /etc/elilo.conf",
+                 5);
+        }
+        if (!does_file_exist("/etc/elilo.conf")
+            && does_file_exist("/boot/efi/efi/SuSE/elilo.conf")) {
+            run_program_and_log_output
+                ("ln -sf /boot/efi/efi/SuSE/elilo.conf /etc/elilo.conf",
+                 5);
+        }
+        if (!does_file_exist("/etc/elilo.conf")
+            && does_file_exist("/boot/efi/efi/debian/elilo.conf")) {
+            run_program_and_log_output
+                ("ln -sf /boot/efi/efi/debian/elilo.conf /etc/elilo.conf",
+                 5);
+        }
+        if (!does_file_exist("/etc/elilo.conf")
+            && does_file_exist("/boot/efi/debian/elilo.conf")) {
+            run_program_and_log_output
+                ("ln -sf /boot/efi/debian/elilo.conf /etc/elilo.conf",
+                 5);
         }
         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'");
+            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'");
         }
     } else if (bkpinfo->boot_loader == 'R') {
@@ -728 +753 @@
         mr_asprintf(bootldr_str, "unknown");
     }
-    log_to_screen("Your boot loader is %s and it boots from %s", bootldr_str, bkpinfo->boot_device);
-
+    mr_asprintf(tmp, "Your boot loader is %s and it boots from %s", bootldr_str, bkpinfo->boot_device);
+    log_to_screen(tmp);
+    mr_free(tmp);
     if (bootldr_ver != NULL) {
-        log_to_screen("Boot loader version string: %s", bootldr_ver);
+        mr_asprintf(tmp, "Boot loader version string: %s", bootldr_ver);
+        log_to_screen(tmp);
+        mr_free(tmp);
     }
 
@@ -771 +799 @@
         fatal_error("Unknown backup_media_type");
     }
-
-    if ((bkpinfo->backup_media_type == usb) && (bkpinfo->media_device)) {
+    if (bkpinfo->backup_media_type == usb) {
         mr_asprintf(tmp2, "--usb %s", bkpinfo->media_device);
     } else {
@@ -781 +808 @@
     if (write_one_liner_data_file(tmp, value)) {
         res++;
-        log_msg(1, "%ld: Unable to write one-liner backup-media-type", __LINE__);
+        log_msg(1, "%ld: Unable to write one-liner backup-media-type",
+                __LINE__);
     }
     mr_free(value);
@@ -789 +817 @@
     if (write_one_liner_data_file(tmp, bootldr_str)) {
         res++;
-        log_msg(1, "%ld: Unable to write one-liner bootloader.name", __LINE__);
+        log_msg(1, "%ld: Unable to write one-liner bootloader.name",
+                __LINE__);
     }
     mr_free(bootldr_str);
@@ -836 +865 @@
     }
 
-    estimated_total_noof_slices = size_of_all_biggiefiles_K(bkpinfo) / bkpinfo->optimal_set_size + 1;
-
-    /* TODO: add netfs stuff here? */
+    estimated_total_noof_slices =
+        size_of_all_biggiefiles_K(bkpinfo) / bkpinfo->optimal_set_size + 1;
+    /* add netfs stuff here? */
     mr_asprintf(command, "mkdir -p %s/images", bkpinfo->scratchdir);
     if (system(command)) {
@@ -844 +873 @@
         log_OS_error("Unable to make images directory");
     }
-    mr_free(command);
+    paranoid_free(command);
     log_msg(1, "lines_in_filelist = %ld", lines_in_filelist);
     update_evalcall_form(3);
@@ -861 +890 @@
             use_lzo_sz,         // parameter #8
             cd_recovery_sz,     // parameter #9
-            (bkpinfo->image_devs == NULL) ? "\"\"" : bkpinfo->image_devs,   // parameter #10
+            bkpinfo->image_devs,    // parameter #10
             broken_bios_sz,     // parameter #11
             last_filelist_number,   // parameter #12 (STRING)
@@ -871 +900 @@
             bkpinfo->internal_tape_block_size,  // parameter #18 (LONG)
             bkpinfo->differential,  // parameter #19 (INT)
-            use_gzip_sz,        // parameter #19 (STRING)
-            use_lzma_sz,        // parameter #20 (STRING)
-            value,              // parameter #21 (STRING)
-            MONDO_LOGFILE);
+            use_gzip_sz);       // parameter #20 (STRING)
 
     mr_free(last_filelist_number);
@@ -880 +906 @@
     mr_free(use_lzo_sz);
     mr_free(use_gzip_sz);
-    mr_free(use_lzma_sz);
     mr_free(use_star_sz);
     mr_free(use_comp_sz);
@@ -888 +913 @@
     mr_free(tape_size_sz);
 
-    /* This parameter is always the last one and optional */
     if (bkpinfo->nonbootable_backup) {
         mr_strcat(command, " NONBOOTABLE");
@@ -905 +929 @@
     if (!res) {
         log_to_screen("Boot+data disks were created OK");
-        mr_asprintf(command, "cp -f %s/images/mindi.iso %s/mondorescue.iso", bkpinfo->scratchdir, MINDI_CACHE);
+        mr_asprintf(command, "cp -f %s/images/mindi.iso %s/mondorescue.iso",
+                bkpinfo->scratchdir, MINDI_CACHE);
         log_msg(2, command);
         run_program_and_log_output(command, FALSE);
-        mr_free(command);
+        paranoid_free(command);
 
         if (bkpinfo->nonbootable_backup) {
-            mr_asprintf(command, "cp -f %s/all.tar.gz %s/images", bkpinfo->tmpdir, bkpinfo->scratchdir);
+            mr_asprintf(command, "cp -f %s/all.tar.gz %s/images",
+                    bkpinfo->tmpdir, bkpinfo->scratchdir);
             if (system(command)) {
-                mr_free(command);
+                paranoid_free(command);
                 fatal_error("Unable to create temporary all tarball");
             }
-            mr_free(command);
+            paranoid_free(command);
         }
         /* For USB we already have everything on the key */
@@ -922 +948 @@
             mr_asprintf(command, "rm -rf %s/images", bkpinfo->scratchdir);
             run_program_and_log_output(command, FALSE);
-            mr_free(command);
+            paranoid_free(command);
         } else {
-            mr_asprintf(tmp, "cp -f %s/images/all.tar.gz %s", bkpinfo->scratchdir, bkpinfo->tmpdir);
+            mr_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");
@@ -939 +966 @@
         mr_asprintf(command, "grep 'Fatal error' /var/log/mindi.log");
         mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
-        mr_free(command);
+        paranoid_free(command);
 
         if (strlen(tmp) > 1) {
@@ -990 +1017 @@
 void *create_afio_files_in_background(void *inbuf)
 {
-    long int archiving_set_no = 0L;
-    char *archiving_filelist_fname = NULL;
-    char *archiving_afioball_fname = NULL;
+    long int archiving_set_no;
+    char *archiving_filelist_fname;
+    char *archiving_afioball_fname;
     char *curr_xattr_list_fname = NULL;
-    char *curr_acl_list_fname = NULL;
-
-    char *tmp = NULL;
+    char *curr_acl_list_fname;
+
+    char *tmp;
     int res = 0, retval = 0;
     int *p_archival_threads_running;
@@ -1004 +1031 @@
     int this_thread_no = g_current_thread_no++;
 
+    malloc_string(curr_xattr_list_fname);
+    malloc_string(curr_acl_list_fname);
+    malloc_string(archiving_filelist_fname);
+    malloc_string(archiving_afioball_fname);
+    malloc_string(tmp);
     p_last_set_archived = (int *) inbuf;
     p_archival_threads_running = (int *) (inbuf + 4);
@@ -1009 +1041 @@
     p_list_of_fileset_flags = (char *) (inbuf + 12);
 
-    mr_asprintf(archiving_filelist_fname, FILELIST_FNAME_RAW_SZ, bkpinfo->tmpdir, 0L);
-
-    while (does_file_exist(archiving_filelist_fname)) {
+    sprintf(archiving_filelist_fname, FILELIST_FNAME_RAW_SZ,
+            bkpinfo->tmpdir, 0L);
+    for (archiving_set_no = 0L; does_file_exist(archiving_filelist_fname);
+         sprintf(archiving_filelist_fname, FILELIST_FNAME_RAW_SZ,
+                 bkpinfo->tmpdir, archiving_set_no)) {
         if (g_exiting) {
-            mr_free(archiving_filelist_fname);
             fatal_error("Execution run aborted (pthread)");
         }
         if (archiving_set_no >= MAX_NOOF_SETS_HERE) {
-            mr_free(archiving_filelist_fname);
-            fatal_error("Maximum number of filesets exceeded. Adjust MAX_NOOF_SETS_HERE, please.");
+            fatal_error
+                ("Maximum number of filesets exceeded. Adjust MAX_NOOF_SETS_HERE, please.");
         }
         if (!semaphore_p()) {
             log_msg(3, "P sem failed (pid=%d)", (int) getpid());
-            mr_free(archiving_filelist_fname);
             fatal_error("Cannot get semaphore P");
         }
@@ -1030 +1062 @@
         *p_next_set_to_archive = *p_next_set_to_archive + 1;
         if (!semaphore_v()) {
-            mr_free(archiving_filelist_fname);
             fatal_error("Cannot get semaphore V");
         }
 
         /* backup this set of files */
-        mr_asprintf(archiving_afioball_fname, AFIOBALL_FNAME_RAW_SZ, bkpinfo->tmpdir, archiving_set_no, bkpinfo->zip_suffix);
-        mr_free(archiving_filelist_fname);
-        mr_asprintf(archiving_filelist_fname, FILELIST_FNAME_RAW_SZ, bkpinfo->tmpdir, archiving_set_no);
+        sprintf(archiving_afioball_fname, AFIOBALL_FNAME_RAW_SZ,
+                bkpinfo->tmpdir, archiving_set_no, bkpinfo->zip_suffix);
+        sprintf(archiving_filelist_fname, FILELIST_FNAME_RAW_SZ,
+                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);
-            mr_free(archiving_afioball_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);
             break;
         }
 
-        mr_asprintf(tmp, AFIOBALL_FNAME_RAW_SZ, bkpinfo->tmpdir, archiving_set_no - ARCH_BUFFER_NUM, bkpinfo->zip_suffix);
+        sprintf(tmp, AFIOBALL_FNAME_RAW_SZ, bkpinfo->tmpdir,
+                archiving_set_no - ARCH_BUFFER_NUM, bkpinfo->zip_suffix);
         if (does_file_exist(tmp)) {
-            log_msg(4, "%s[%d:%d] - waiting for storer", FORTY_SPACES, getpid(), this_thread_no);
+            log_msg(4, "%s[%d:%d] - waiting for storer", FORTY_SPACES,
+                    getpid(), this_thread_no);
             while (does_file_exist(tmp)) {
                 sleep(1);
@@ -1052 +1088 @@
             log_msg(4, "[%d] - continuing", getpid());
         }
-        mr_free(tmp);
-
-        log_msg(4, "%s[%d:%d] - EXATing %d...", FORTY_SPACES, getpid(), this_thread_no, archiving_set_no);
-
+
+        log_msg(4, "%s[%d:%d] - EXATing %d...", FORTY_SPACES, getpid(),
+                this_thread_no, archiving_set_no);
         if (g_getfattr) {
-            mr_asprintf(curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ, bkpinfo->tmpdir, archiving_set_no);
+            sprintf(curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ,
+                bkpinfo->tmpdir, archiving_set_no);
             get_fattr_list(archiving_filelist_fname, curr_xattr_list_fname);
-            mr_free(curr_xattr_list_fname);
         }
         if (g_getfacl) {
-            mr_asprintf(curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ, bkpinfo->tmpdir, archiving_set_no);
+            sprintf(curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ,
+                bkpinfo->tmpdir, archiving_set_no);
             get_acl_list(archiving_filelist_fname, curr_acl_list_fname);
-            mr_free(curr_acl_list_fname);
-        }
-
-        log_msg(4, "%s[%d:%d] - archiving %d...", FORTY_SPACES, getpid(), this_thread_no, archiving_set_no);
-        res = archive_this_fileset(archiving_filelist_fname, archiving_afioball_fname, archiving_set_no);
-        mr_free(archiving_afioball_fname);
-
+        }
+
+        log_msg(4, "%s[%d:%d] - archiving %d...", FORTY_SPACES, getpid(),
+                this_thread_no, archiving_set_no);
+        res =
+            archive_this_fileset(archiving_filelist_fname,
+                                 archiving_afioball_fname,
+                                 archiving_set_no);
         retval += res;
 
         if (res) {
-            log_to_screen("Errors occurred while archiving set %ld. Please review logs.", archiving_set_no);
-        }
-
+            sprintf(tmp,
+                    "Errors occurred while archiving set %ld. Please review logs.",
+                    archiving_set_no);
+            log_to_screen(tmp);
+        }
         if (!semaphore_p()) {
-            mr_free(archiving_filelist_fname);
             fatal_error("Cannot get semaphore P");
         }
@@ -1089 +1127 @@
 
         if (!semaphore_v()) {
-            mr_free(archiving_filelist_fname);
             fatal_error("Cannot get semaphore V");
         }
-        log_msg(4, "%s[%d:%d] - archived %d OK", FORTY_SPACES, getpid(), this_thread_no, archiving_set_no);
+        log_msg(4, "%s[%d:%d] - archived %d OK", FORTY_SPACES, getpid(),
+                this_thread_no, archiving_set_no);
         archiving_set_no++;
-
-        mr_free(archiving_filelist_fname);
-        mr_asprintf(archiving_filelist_fname, FILELIST_FNAME_RAW_SZ, bkpinfo->tmpdir, archiving_set_no);
-    }
-    mr_free(archiving_filelist_fname);
-
+    }
     if (!semaphore_p()) {
         fatal_error("Cannot get semaphore P");
@@ -1107 +1140 @@
         fatal_error("Cannot get semaphore V");
     }
-    log_msg(3, "%s[%d:%d] - exiting", FORTY_SPACES, getpid(), this_thread_no);
+    log_msg(3, "%s[%d:%d] - exiting", FORTY_SPACES, getpid(),
+            this_thread_no);
+    paranoid_free(archiving_filelist_fname);
+    paranoid_free(archiving_afioball_fname);
+    paranoid_free(curr_xattr_list_fname);
+    paranoid_free(curr_acl_list_fname);
+    paranoid_free(tmp);
     pthread_exit(NULL);
 }
@@ -1189 +1228 @@
 
     /*@ buffers *********************************** */
-    char *command = NULL;
-    char *tmpfile = NULL;
-    char *data_disks_file = NULL;
+    char *command, *tmpfile, *data_disks_file;
 
     assert(bkpinfo != NULL);
-    mr_asprintf(data_disks_file, "%s/all.tar.gz", bkpinfo->tmpdir);
-
-    snprintf(g_serial_string, MAX_STR_LEN - 8, "%s", call_program_and_get_last_line_of_output("dd if=/dev/urandom bs=16 count=1 2> /dev/null | hexdump | tr -s ' ' '0' | head -n1"));
+    malloc_string(command);
+    malloc_string(tmpfile);
+    malloc_string(data_disks_file);
+    sprintf(data_disks_file, "%s/all.tar.gz", bkpinfo->tmpdir);
+
+    snprintf(g_serial_string, MAX_STR_LEN - 8, "%s",
+             call_program_and_get_last_line_of_output("dd \
+if=/dev/urandom bs=16 count=1 2> /dev/null | \
+hexdump | tr -s ' ' '0' | head -n1"));
     strip_spaces(g_serial_string);
     strcat(g_serial_string, "...word.");
@@ -1202 +1245 @@
     assert(strlen(g_serial_string) < MAX_STR_LEN);
 
-    mr_asprintf(tmpfile, "%s/archives/SERIAL-STRING", bkpinfo->scratchdir);
+    sprintf(tmpfile, "%s/archives/SERIAL-STRING", bkpinfo->scratchdir);
     if (write_one_liner_data_file(tmpfile, g_serial_string)) {
         log_msg(1, "%ld: Failed to write serial string", __LINE__);
     }
-    mr_free(tmpfile);
 
     mvaddstr_and_log_it(g_currentY, 0, "Preparing to archive your data");
@@ -1227 +1269 @@
         }
     }
-    mr_free(data_disks_file);
-
-    mr_asprintf(command, "rm -f %s/%s/%s-[1-9]*.iso", bkpinfo->isodir, bkpinfo->netfs_remote_dir, bkpinfo->prefix);
+
+    sprintf(command, "rm -f %s/%s/%s-[1-9]*.iso", bkpinfo->isodir,
+            bkpinfo->netfs_remote_dir, bkpinfo->prefix);
     paranoid_system(command);
-    mr_free(command);
-
     wipe_archives(bkpinfo->scratchdir);
     mvaddstr_and_log_it(g_currentY++, 74, "Done.");
@@ -1241 +1281 @@
                                      BLK_START_OF_BACKUP);
     }
+    paranoid_free(command);
+    paranoid_free(tmpfile);
+    paranoid_free(data_disks_file);
     return (retval);
 }
@@ -1313 +1356 @@
 
     /*@ buffers ********************************************** */
-    char *storing_filelist_fname = NULL;
-    char *storing_afioball_fname = NULL;
+    char *storing_filelist_fname;
+    char *storing_afioball_fname;
     char *tmp = NULL;
     char *media_usage_comment = NULL;
@@ -1331 +1374 @@
     assert(bkpinfo != NULL);
     malloc_string(result_str);
-    transfer_block = malloc(sizeof(struct s_bkpinfo) + BKPINFO_LOC_OFFSET + 64);
-    memset((void *) transfer_block, 0, sizeof(struct s_bkpinfo) + BKPINFO_LOC_OFFSET + 64);
+    malloc_string(curr_xattr_list_fname);
+    malloc_string(curr_acl_list_fname);
+    malloc_string(storing_filelist_fname);
+    malloc_string(storing_afioball_fname);
+    transfer_block =
+        malloc(sizeof(struct s_bkpinfo) + BKPINFO_LOC_OFFSET + 64);
+    memset((void *) transfer_block, 0,
+           sizeof(struct s_bkpinfo) + BKPINFO_LOC_OFFSET + 64);
     p_last_set_archived = (int *) transfer_block;
     p_archival_threads_running = (int *) (transfer_block + 4);
     p_next_set_to_archive = (int *) (transfer_block + 8);
     p_list_of_fileset_flags = (char *) (transfer_block + 12);
-    memcpy((void *) (transfer_block + BKPINFO_LOC_OFFSET), (void *) bkpinfo, sizeof(struct s_bkpinfo));
+    memcpy((void *) (transfer_block + BKPINFO_LOC_OFFSET),
+           (void *) bkpinfo, sizeof(struct s_bkpinfo));
     pvp = &vp;
     vp = (void *) result_str;
@@ -1349 +1399 @@
                        "Please wait. This may take a couple of hours.",
                        "Working...",
-                       (long)get_last_filelist_number() + 1L);
+                       get_last_filelist_number() + 1);
 
     log_msg(5, "We're gonna party like it's your birthday.");
@@ -1388 +1438 @@
             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;
+            misc_counter_that_is_not_important =
+                (misc_counter_that_is_not_important + 1) % 5;
             /* BCO the media_usage_comment is not really initialized there !
             if (!misc_counter_that_is_not_important) {
@@ -1395 +1446 @@
             */
             sleep(1);
-            } else {
+            } else
                 // store set N
-                mr_asprintf(storing_filelist_fname, FILELIST_FNAME_RAW_SZ, bkpinfo->tmpdir, storing_set_no);
-                mr_asprintf(storing_afioball_fname, AFIOBALL_FNAME_RAW_SZ, bkpinfo->tmpdir, storing_set_no, bkpinfo->zip_suffix);
+            {
+                sprintf(storing_filelist_fname, FILELIST_FNAME_RAW_SZ,
+                        bkpinfo->tmpdir, storing_set_no);
+                sprintf(storing_afioball_fname, AFIOBALL_FNAME_RAW_SZ,
+                        bkpinfo->tmpdir, storing_set_no, bkpinfo->zip_suffix);
                 if (g_getfattr) {
-                    mr_asprintf(curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ, bkpinfo->tmpdir, storing_set_no);
+                    sprintf(curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ,
+                        bkpinfo->tmpdir, storing_set_no);
                 }
                 if (g_getfacl) {
-                    mr_asprintf(curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ, bkpinfo->tmpdir, storing_set_no);
+                    sprintf(curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ,
+                        bkpinfo->tmpdir, storing_set_no);
                 }
 
@@ -1414 +1470 @@
                     sleep(5);
                 }
+                mr_asprintf(media_usage_comment, "%s", percent_media_full_comment());
                 /* copy to CD (scratchdir) ... and an actual CD-R if necessary */
                 if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
                     register_in_tape_catalog(fileset, storing_set_no, -1,
                                          storing_afioball_fname);
-                    maintain_collection_of_recent_archives(bkpinfo->tmpdir, storing_afioball_fname);
+                    maintain_collection_of_recent_archives(bkpinfo->tmpdir,
+                                                       storing_afioball_fname);
                     log_it("Writing EXAT files");
                     res +=
@@ -1452 +1510 @@
                 retval += res;
                 g_current_progress++;
-                mr_asprintf(media_usage_comment, "%s", percent_media_full_comment());
                 update_progress_form(media_usage_comment);
                 mr_free(media_usage_comment);
                 if (res) {
-                    log_to_screen("Failed to add archive %ld's files to CD dir\n", storing_set_no);
-                    fatal_error("Is your hard disk full? If not, please send the author the logfile.");
+                    mr_asprintf(tmp, "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.");
                 }
                 storing_set_no++;
                 //      sleep(2);
-                if (g_getfacl) {
-                    mr_free(curr_acl_list_fname);
-                }
-                if (g_getfattr) {
-                    mr_free(curr_xattr_list_fname);
-                }
-                mr_free(storing_filelist_fname);
-                mr_free(storing_afioball_fname);
         }
     }
@@ -1487 +1540 @@
     }
     log_to_screen(tmp);
-    mr_free(tmp);
+    paranoid_free(tmp);
 
     paranoid_free(transfer_block);
     paranoid_free(result_str);
+    paranoid_free(storing_filelist_fname);
+    paranoid_free(storing_afioball_fname);
+    paranoid_free(curr_xattr_list_fname);
+    paranoid_free(curr_acl_list_fname);
     return (retval);
 }
@@ -1541 +1598 @@
     mr_asprintf(tmp, "chmod 700 %s", bkpinfo->scratchdir);
     run_program_and_log_output(tmp, FALSE);
-    mr_free(tmp);
+    paranoid_free(tmp);
     if (chdir(bkpinfo->scratchdir)) {
         // FIXME
@@ -1551 +1608 @@
     log_msg(1, message_to_screen);
 
-    if (bkpinfo->media_device) {
-        mr_asprintf(tmp1, "%s1", bkpinfo->media_device);
-    } else {
-        mr_asprintf(tmp1, "");
-    }
+    mr_asprintf(tmp1, "%s1", bkpinfo->media_device);
     if (is_this_device_mounted(tmp1)) {
         log_msg(1, "USB device mounted. Remounting it at the right place");
         mr_asprintf(tmp, "umount %s", tmp1);
         run_program_and_log_output(tmp, FALSE);
-        mr_free(tmp);
-    }
-    mr_free(tmp1);
+        paranoid_free(tmp);
+    }
+    paranoid_free(tmp1);
 
     log_msg(1, "Mounting USB device.");
@@ -1568 +1621 @@
     mr_asprintf(tmp, "mkdir -p %s", tmp1);
     run_program_and_log_output(tmp, FALSE);
-    mr_free(tmp);
-
+    paranoid_free(tmp);
 
     /* Mindi always create one single parition on the USB dev */
     mr_asprintf(tmp, "mount %s1 %s", bkpinfo->media_device, tmp1);
     run_program_and_log_output(tmp, FALSE);
-    mr_free(tmp);
+    paranoid_free(tmp);
 
     if (bkpinfo->nonbootable_backup) {
@@ -1590 +1642 @@
         }
         log_to_screen(result_sz);
-        mr_free(result_sz);
-        mr_free(tmp);
+        paranoid_free(result_sz);
+        paranoid_free(tmp);
         retval += res;
 
@@ -1597 +1649 @@
         mr_asprintf(tmp,"mkdir %s/archive", bkpinfo->scratchdir); 
         run_program_and_log_output(tmp, FALSE);
-        mr_free(tmp);
+        paranoid_free(tmp);
     }
     paranoid_free(message_to_screen);
@@ -1605 +1657 @@
         mr_asprintf(tmp, "umount %s1", bkpinfo->media_device);
         run_program_and_log_output(tmp, FALSE);
-        mr_free(tmp);
+        paranoid_free(tmp);
     }
 
@@ -1643 +1695 @@
 
     /*@ buffers ****************************************** */
-    char *tmp = NULL;
-    char *tmp2 = NULL;
+    char *tmp;
     char *old_pwd;
     char *result_sz = NULL;
     char *message_to_screen = NULL;
     char *sz_blank_disk = NULL;
-    char *fnam = NULL;
-    char *tmp3 = NULL;
+    char *fnam;
+    char *tmp2;
+    char *tmp3;
     char *isofs_cmd = NULL;
     char *full_isofs_cmd = NULL;
@@ -1658 +1710 @@
     malloc_string(old_pwd);
     malloc_string(fnam);
+    tmp = malloc(1200);
+    tmp2 = malloc(1200);
+    tmp3 = malloc(1200);
     assert(bkpinfo != NULL);
     assert_string_is_neither_NULL_nor_zerolength(destfile);
 
-    /* Copy the files needed by isolinux in the right dir */
-    mr_asprintf(tmp, "%s/isolinux.bin", bkpinfo->scratchdir);
-    mr_asprintf(tmp2, "%s/isolinux.bin", bkpinfo->tmpdir);
+    sprintf(tmp, "%s/isolinux.bin", bkpinfo->scratchdir);
+    sprintf(tmp2, "%s/isolinux.bin", bkpinfo->tmpdir);
     if (does_file_exist(tmp)) {
-        mr_asprintf(tmp3, "cp -f %s %s", tmp, tmp2);
+        sprintf(tmp3, "cp -f %s %s", tmp, tmp2);
         paranoid_system(tmp3);
-        mr_free(tmp3);
     }
     if (!does_file_exist(tmp) && does_file_exist(tmp2)) {
-        mr_asprintf(tmp3, "cp -f %s %s", tmp2, tmp);
+        sprintf(tmp3, "cp -f %s %s", tmp2, tmp);
         paranoid_system(tmp3);
-        mr_free(tmp3);
-    }
-    mr_free(tmp2);
-    mr_free(tmp3);
+    }
+    free(tmp2);
+    free(tmp3);
+    tmp2 = NULL;
+    tmp3 = NULL;
     if (bkpinfo->backup_media_type == iso && bkpinfo->manual_cd_tray) {
         popup_and_OK("Please insert new media and press Enter.");
     }
 
-    log_msg(2, "make_iso_fs --- scratchdir=%s --- destfile=%s", bkpinfo->scratchdir, destfile);
+    log_msg(2, "make_iso_fs --- scratchdir=%s --- destfile=%s",
+            bkpinfo->scratchdir, destfile);
     tmp2 = getcwd(old_pwd, MAX_STR_LEN - 1);
-    if (! tmp2) {
-        //FIXME
-    }
-    mr_asprintf(tmp, "chmod 700 %s", bkpinfo->scratchdir);
+    sprintf(tmp, "chmod 700 %s", bkpinfo->scratchdir);
     run_program_and_log_output(tmp, FALSE);
-    mr_free(tmp);
-
     if (chdir(bkpinfo->scratchdir)) {
         // FIXME
@@ -1694 +1744 @@
 
     if (bkpinfo->call_before_iso[0] != '\0') {
-        mr_asprintf(message_to_screen, "Running pre-ISO call for CD#%d", g_current_media_number);
-        res = eval_call_to_make_ISO(bkpinfo->call_before_iso, destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);
+        mr_asprintf(message_to_screen, "Running pre-ISO call for CD#%d",
+                g_current_media_number);
+        res =
+            eval_call_to_make_ISO(bkpinfo->call_before_iso,
+                                  destfile, g_current_media_number,
+                                  MONDO_LOGFILE, message_to_screen);
         if (res) {
             mr_strcat(message_to_screen, "...failed");
@@ -1709 +1763 @@
     if (bkpinfo->call_make_iso[0] != '\0') {
         log_msg(2, "bkpinfo->call_make_iso = %s", bkpinfo->call_make_iso);
+        sprintf(tmp, "%s/archives/NOT-THE-LAST", bkpinfo->scratchdir);
         mds = media_descriptor_string(bkpinfo->backup_media_type);
         mr_asprintf(message_to_screen, "Making an ISO (%s #%d)", mds, g_current_media_number);
@@ -1719 +1774 @@
         } else {
             res =
-                eval_call_to_make_ISO(bkpinfo->call_make_iso, bkpinfo->scratchdir, g_current_media_number, MONDO_LOGFILE, message_to_screen);
+                eval_call_to_make_ISO(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);
             } else {
                 log_to_screen("%s...OK", message_to_screen);
-                mr_asprintf(tmp, "tail -n10 %s | grep -F ':-('", MONDO_LOGFILE);
+                sprintf(tmp, "tail -n10 %s | grep -F ':-('", MONDO_LOGFILE);
                 if (!run_program_and_log_output(tmp, 1)) {
                     log_to_screen
                         ("Despite nonfatal errors, growisofs confirms the write was successful.");
                 }
-                mr_free(tmp);
             }
             retval += res;
 #ifdef DVDRWFORMAT
-            mr_asprintf(tmp, "tail -n8 %s | grep 'blank=full.*dvd-compat.*DAO'", MONDO_LOGFILE);
+            sprintf(tmp,
+                    "tail -n8 %s | grep 'blank=full.*dvd-compat.*DAO'",
+                    MONDO_LOGFILE);
             if (g_backup_media_type == dvd
                 && (res || !run_program_and_log_output(tmp, 1))) {
@@ -1741 +1800 @@
                 /* reset error counter before trying to blank DVD */
                 retval -= res;
-                sync();
+                paranoid_system("sync");
                 pause_for_N_seconds(5, "Letting DVD drive settle");
 
@@ -1751 +1810 @@
                 }
                 pause_for_N_seconds(5, "Letting DVD drive settle");
-                if (bkpinfo->media_device) {
-                    mr_asprintf(sz_blank_disk, "dvd+rw-format -force %s", bkpinfo->media_device);
-                } else {
-                    mr_asprintf(sz_blank_disk, "dvd+rw-format");
-                }
+                mr_asprintf(sz_blank_disk, "dvd+rw-format -force %s", bkpinfo->media_device);
                 log_msg(3, "sz_blank_disk = '%s'", sz_blank_disk);
-                res = run_external_binary_with_percentage_indicator_NEW("Blanking DVD disk", sz_blank_disk);
+                res =
+                    run_external_binary_with_percentage_indicator_NEW
+                    ("Blanking DVD disk", sz_blank_disk);
                 if (res) {
-                    log_to_screen("Warning - format failed. (Was it a DVD-R?) Sleeping for 5 seconds to take a breath...");
-                    pause_for_N_seconds(5, "Letting DVD drive settle... and trying again.");
-                    res = run_external_binary_with_percentage_indicator_NEW("Blanking DVD disk", sz_blank_disk);
+                    log_to_screen
+                        ("Warning - format failed. (Was it a DVD-R?) Sleeping for 5 seconds to take a breath...");
+                    pause_for_N_seconds(5,
+                                        "Letting DVD drive settle... and trying again.");
+                    res =
+                        run_external_binary_with_percentage_indicator_NEW
+                        ("Blanking DVD disk", sz_blank_disk);
                     if (res) {
                         log_to_screen("Format failed a second time.");
@@ -1777 +1838 @@
                 }
                 pause_for_N_seconds(5, "Letting DVD drive settle");
-                res = eval_call_to_make_ISO(bkpinfo->call_make_iso, bkpinfo->scratchdir, g_current_media_number, MONDO_LOGFILE, message_to_screen);
+                res =
+                    eval_call_to_make_ISO(bkpinfo->call_make_iso,
+                                          bkpinfo->scratchdir,
+                                          g_current_media_number,
+                                          MONDO_LOGFILE,
+                                          message_to_screen);
                 retval += res;
                 if (!bkpinfo->please_dont_eject) {
@@ -1790 +1856 @@
                 }
             }
-            mr_free(tmp);
 #endif
             if (g_backup_media_type == dvd && !bkpinfo->please_dont_eject) {
@@ -1811 +1876 @@
             log_msg(1, "Making nonbootable backup");
             mr_asprintf(full_isofs_cmd, "%s%s-o '_ISO_' -V _CD#_ .",isofs_cmd,MONDO_MKISOFS);
-            res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);
+            res = eval_call_to_make_ISO(full_isofs_cmd,
+                                      destfile, g_current_media_number,
+                                      MONDO_LOGFILE, message_to_screen);
             mr_free(full_isofs_cmd);
         } else {
@@ -1821 +1888 @@
 
 
-            log_msg(1, "make_cd_use_lilo is actually %d", bkpinfo->make_cd_use_lilo);
+            log_msg(1, "make_cd_use_lilo is actually %d",
+                    bkpinfo->make_cd_use_lilo);
             if (bkpinfo->make_cd_use_lilo) {
                 log_msg(1, "make_cd_use_lilo = TRUE");
@@ -1827 +1895 @@
                 log_msg(1, "IA64 --> elilo");
                 mr_asprintf(full_isofs_cmd, "%s%s-o '_ISO_' -V _CD#_ .",isofs_cmd,MONDO_MKISOFS_REGULAR_ELILO);
-                res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);
+                res = eval_call_to_make_ISO(full_isofs_cmd,
+                                            destfile,
+                                            g_current_media_number,
+                                            MONDO_LOGFILE,
+                                            message_to_screen);
                 mr_free(full_isofs_cmd);
 #else
                 log_msg(1, "Non-ia64 --> lilo");
                 mr_asprintf(full_isofs_cmd, "%s%s-b images/mindi-bootroot.2880.img -c boot.cat -o '_ISO_' -J -V _CD#_ .",isofs_cmd,MONDO_MKISOFS);
-                // FIXME: fixed boot size probably wrong. lilo to be removed
-                res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);
+                res =
+                    // FIXME: fixed boot size probably wrong. lilo to be removed
+                    eval_call_to_make_ISO(full_isofs_cmd,
+                                          destfile, g_current_media_number,
+                                          MONDO_LOGFILE,
+                                          message_to_screen);
                 mr_free(full_isofs_cmd);
 #endif
@@ -1840 +1916 @@
                 log_msg(1, "Isolinux");
                 mr_asprintf(full_isofs_cmd, "%s%s-o '_ISO_' -V _CD#_ .",isofs_cmd,MONDO_MKISOFS_REGULAR_SYSLINUX);
-                res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);
+                res =
+                    eval_call_to_make_ISO(full_isofs_cmd,
+                                          destfile, g_current_media_number,
+                                          MONDO_LOGFILE,
+                                          message_to_screen);
                 mr_free(full_isofs_cmd);
             }
@@ -1860 +1940 @@
         || bkpinfo->backup_media_type == cdrw) {
         if (is_this_device_mounted(bkpinfo->media_device)) {
-            log_msg(2, "Warning - %s mounted. I'm unmounting it before I burn to it.", bkpinfo->media_device);
-            mr_asprintf(tmp, "umount %s", bkpinfo->media_device);
+            log_msg(2,
+                    "Warning - %s mounted. I'm unmounting it before I burn to it.",
+                    bkpinfo->media_device);
+            sprintf(tmp, "umount %s", bkpinfo->media_device);
             run_program_and_log_output(tmp, FALSE);
-            mr_free(tmp);
         }
     }
@@ -1873 +1954 @@
         mr_free(mds);
         pause_and_ask_for_cdr(2, &cd_is_mountable);
-        res = eval_call_to_make_ISO(bkpinfo->call_burn_iso, destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);
+        res =
+            eval_call_to_make_ISO(bkpinfo->call_burn_iso,
+                                  destfile, g_current_media_number,
+                                  MONDO_LOGFILE, message_to_screen);
         if (res) {
             mr_strcat(message_to_screen, "...failed");
@@ -1889 +1973 @@
         mr_asprintf(message_to_screen, "Running post-ISO call (%s #%d)", mds, g_current_media_number);
         mr_free(mds);
-        res = eval_call_to_make_ISO(bkpinfo->call_after_iso, destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);
+        res =
+            eval_call_to_make_ISO(bkpinfo->call_after_iso,
+                                  destfile, g_current_media_number,
+                                  MONDO_LOGFILE, message_to_screen);
         if (res) {
             mr_strcat(message_to_screen, "...failed");
@@ -1957 +2044 @@
 
     /*@ pointers ******************************************* */
-    FILE *fin = NULL;
+    FILE *fin;
     char *p;
     char *q;
@@ -1963 +2050 @@
     /*@ buffers ******************************************** */
     char *tmp = NULL;
-    char *bigfile_fname = NULL;
+    char *bigfile_fname;
     char *sz_devfile = NULL;
     char *ntfsprog_fifo = NULL;
@@ -1999 +2086 @@
     log_to_screen(tmp);
     noof_biggie_files = count_lines_in_file(biggielist_fname);
-    open_progress_form("Backing up big files", tmp, "Please wait. This may take some time.", "", estimated_total_noof_slices);
-    mr_free(tmp);
+    open_progress_form("Backing up big files", tmp,
+                       "Please wait. This may take some time.", "",
+                       estimated_total_noof_slices);
+    paranoid_free(tmp);
 
     if (!(fin = fopen(biggielist_fname, "r"))) {
@@ -2032 +2121 @@
             log_msg(2, "bigfile_fname = %s", bigfile_fname);
             use_ntfsprog = FALSE;
-            if (!strncmp(bigfile_fname, "/dev/", 5) && is_dev_an_NTFS_dev(bigfile_fname)) {
+            if (!strncmp(bigfile_fname, "/dev/", 5)
+                && is_dev_an_NTFS_dev(bigfile_fname)) {
                 use_ntfsprog = TRUE;
-                log_msg(2, "Calling ntfsclone in background because %s is an NTFS partition", bigfile_fname);
-                mr_asprintf(sz_devfile, "%s/%d.%d.000", bkpinfo->tmpdir, (int) (random() % 32768), (int) (random() % 32768));
+                log_msg(2,
+                        "Calling ntfsclone in background because %s is an NTFS partition",
+                        bigfile_fname);
+                mr_asprintf(sz_devfile, "%s/%d.%d.000", bkpinfo->tmpdir,
+                        (int) (random() % 32768),
+                        (int) (random() % 32768));
                 mkfifo(sz_devfile, 0x770);
                 ntfsprog_fifo = sz_devfile;
@@ -2043 +2137 @@
                     fatal_error("Fork failure");
                 case 0:
-                    log_msg(2, "CHILD - fip - calling feed_into_ntfsprog(%s, %s)", bigfile_fname, sz_devfile);
+                    log_msg(2,
+                            "CHILD - fip - calling feed_into_ntfsprog(%s, %s)",
+                            bigfile_fname, sz_devfile);
                     res = feed_into_ntfsprog(bigfile_fname, sz_devfile);
                     /* BCO/BERLIOS Does the child need to unalocate memory as well ?
-                    mr_free(bigfile_fname);
+                    paranoid_free(bigfile_fname);
                     mr_free(sz_devfile);
                     */
@@ -2052 +2148 @@
                     break;
                 default:
-                    log_msg(2, "feed_into_ntfsprog() called in background --- pid=%ld", (long int) (pid));
+                    log_msg(2,
+                            "feed_into_ntfsprog() called in background --- pid=%ld",
+                            (long int) (pid));
                 }
             }
@@ -2062 +2160 @@
             // Whether partition or biggiefile, just do your thang :-)
             if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-                write_header_block_to_stream(biggie_fsize, bigfile_fname, use_ntfsprog ?  BLK_START_A_PIHBIGGIE : BLK_START_A_NORMBIGGIE);
+                write_header_block_to_stream(biggie_fsize, bigfile_fname,
+                                             use_ntfsprog ?
+                                             BLK_START_A_PIHBIGGIE :
+                                             BLK_START_A_NORMBIGGIE);
             }
-            res = slice_up_file_etc(bigfile_fname, ntfsprog_fifo, biggie_file_number, noof_biggie_files, use_ntfsprog);
+            res =
+                slice_up_file_etc(bigfile_fname,
+                                  ntfsprog_fifo, biggie_file_number,
+                                  noof_biggie_files, use_ntfsprog);
 
             /* Free it here as ntfsprog_fifo is not used anymore */
@@ -2093 +2197 @@
             }
         }
+#ifndef _XWIN
         if (!g_text_mode) {
             newtDrawRootText(0, g_noof_rows - 2, tmp);
             newtRefresh();
         }
-        mr_free(tmp);
-    }
-    mr_free(bigfile_fname);
-
+#endif
+        paranoid_free(tmp);
+    }
     log_msg(1, "Finished backing up bigfiles");
     log_msg(1, "estimated slices = %ld; actual slices = %ld",
@@ -2106 +2210 @@
     close_progress_form();
     paranoid_fclose(fin);
+    paranoid_free(bigfile_fname);
     return (retval);
 }
@@ -2166 +2271 @@
         retval += res;
         if (res) {
-            log_to_screen("Errors occurred while archiving set %ld. Perhaps your live filesystem changed?", curr_set_no);
-        }
+            mr_asprintf(tmp, "Errors occurred while archiving set %ld. Perhaps your live filesystem changed?", curr_set_no);
+            log_to_screen(tmp);
+            mr_free(tmp);
+        }
+
+        mr_asprintf(media_usage_comment, "%s", percent_media_full_comment());
 
         /* copy to CD (scratchdir) ... and an actual CD-R if necessary */
@@ -2210 +2319 @@
         retval += res;
         g_current_progress++;
-
-        mr_asprintf(media_usage_comment, "%s", percent_media_full_comment());
         update_progress_form(media_usage_comment);
         mr_free(media_usage_comment);
 
         if (res) {
-            log_to_screen("Failed to add archive %ld's files to CD dir\n", curr_set_no);
-            fatal_error("Is your hard disk is full? If not, please send the author the logfile.");
+            mr_asprintf(tmp, "Failed to add archive %ld's files to CD dir\n", curr_set_no);
+            log_to_screen(tmp);
+            mr_free(tmp);
+            fatal_error
+                ("Is your hard disk is full? If not, please send the author the logfile.");
         }
         mr_free(curr_filelist_fname);
@@ -2318 +2428 @@
     }
 
-    mr_asprintf(command, "cp %s/biggielist.txt %s", bkpinfo->tmpdir, biggielist);
+    mr_asprintf(command, "cp %s/biggielist.txt %s", bkpinfo->tmpdir,
+            biggielist);
     paranoid_system(command);
     mr_free(command);
@@ -2332 +2443 @@
     if (g_getfattr) {
         get_fattr_list(biggielist, xattr_fname);
-        mr_asprintf(command, "cp %s %s/archives/", xattr_fname, bkpinfo->scratchdir);
+        mr_asprintf(command, "cp %s %s/archives/", xattr_fname,
+            bkpinfo->scratchdir);
         paranoid_system(command);
         mr_free(command);
@@ -2621 +2733 @@
     /*@ buffers ********************************************* */
     char *tmp = NULL;
-    char *cdrom_dev = NULL;
-    char *cdrw_dev = NULL;
+    char *cdrom_dev;
+    char *cdrw_dev;
     char *our_serial_str = NULL;
     bool ok_go_ahead_burn_it;
@@ -2628 +2740 @@
     int attempt_to_mount_returned_this = 999;
     char *mtpt = NULL;
-    char *szcdno = NULL;
-    char *szserfname = NULL;
-    char *szunmount = NULL;
+    char *szcdno;
+    char *szserfname;
+    char *szunmount;
     char *mds = NULL;
 
     malloc_string(cdrom_dev);
     malloc_string(cdrw_dev);
+    malloc_string(szcdno);
+    malloc_string(szserfname);
+    malloc_string(szunmount);
+    malloc_string(mtpt);
 
     mds = media_descriptor_string(g_backup_media_type);
-    log_to_screen("I am about to burn %s #%d", mds, g_current_media_number);
+    mr_asprintf(tmp, "I am about to burn %s #%d", mds, g_current_media_number);
     mr_free(mds);
+    log_to_screen(tmp);
+    mr_free(tmp);
     if (g_current_media_number < ask_for_one_if_more_than_this) {
         return;
     }
     log_to_screen("Scanning CD-ROM drive...");
-    mr_asprintf(mtpt, "%s/cd.mtpt", bkpinfo->tmpdir);
+    sprintf(mtpt, "%s/cd.mtpt", bkpinfo->tmpdir);
     make_hole_for_dir(mtpt);
 
@@ -2649 +2767 @@
     ok_go_ahead_burn_it = TRUE;
     if (!find_cdrom_device(cdrom_dev, FALSE)) {
-        /* When enabled, it made CD eject-and-retract when wrong CD inserted.. Weird
-        log_msg(2, "paafcd: Retracting CD-ROM drive if possible" );
-        retract_CD_tray_and_defeat_autorun();
-        */
+/* When enabled, it made CD eject-and-retract when wrong CD inserted.. Weird
+      log_msg(2, "paafcd: Retracting CD-ROM drive if possible" );
+      retract_CD_tray_and_defeat_autorun();
+*/
         mr_asprintf(tmp, "umount %s", cdrom_dev);
         run_program_and_log_output(tmp, 1);
-        mr_asprintf(szcdno, "%s/archives/THIS-CD-NUMBER", mtpt);
-        mr_asprintf(szserfname, "%s/archives/SERIAL-STRING", mtpt);
-        mr_asprintf(szunmount, "umount %s", mtpt);
+        sprintf(szcdno, "%s/archives/THIS-CD-NUMBER", mtpt);
+        sprintf(szserfname, "%s/archives/SERIAL-STRING", mtpt);
+        sprintf(szunmount, "umount %s", mtpt);
         cd_number = -1;
         mr_asprintf(tmp, "mount %s %s", cdrom_dev, mtpt);
@@ -2663 +2781 @@
         attempt_to_mount_returned_this = run_program_and_log_output(tmp, 1);
         mr_free(tmp);
-
         if (attempt_to_mount_returned_this) {
             log_msg(4, "Failed to mount %s at %s", cdrom_dev, mtpt);
             log_to_screen("If there's a CD/DVD in the drive, it's blank.");
-        } else if (!does_file_exist(szcdno) || !does_file_exist(szserfname)) {
+            /*
+               if (interrogate_disk_currently_in_cdrw_drive(cdrw_dev, FALSE))
+               {
+               ok_go_ahead_burn_it = FALSE;
+               log_to_screen("There isn't a writable CD/DVD in the drive.");
+               }
+               else
+               {
+               log_to_screen("Confirmed. There is a blank CD/DVD in the drive.");
+               }
+             */
+        } else if (!does_file_exist(szcdno)
+                   || !does_file_exist(szserfname)) {
             mds = media_descriptor_string(g_backup_media_type);
-            log_to_screen("%s has data on it but it's probably not a Mondo CD.", mds);
+            log_to_screen
+                ("%s has data on it but it's probably not a Mondo CD.", mds);
             mr_free(mds);
         } else {
@@ -2679 +2809 @@
             mr_asprintf(tmp, "cat %s 2> /dev/null", szserfname);
             mr_free(our_serial_str);
-            mr_asprintf(our_serial_str, "%s", call_program_and_get_last_line_of_output(tmp));
+            mr_asprintf(our_serial_str, "%s",
+                   call_program_and_get_last_line_of_output(tmp));
             mr_free(tmp);
             // FIXME - should be able to use last_line_of_file(), surely?
         }
-        mr_free(szcdno);
-        mr_free(szserfname);
-
         run_program_and_log_output(szunmount, 1);
-        mr_free(szunmount);
-
         log_msg(2, "paafcd: cd_number = %d", cd_number);
-        log_msg(2, "our serial str = %s; g_serial_string = %s", our_serial_str, g_serial_string);
+        log_msg(2, "our serial str = %s; g_serial_string = %s",
+                our_serial_str, g_serial_string);
         if (cd_number > 0 && !strcmp(our_serial_str, g_serial_string)) {
             mds = media_descriptor_string(g_backup_media_type);
@@ -2722 +2849 @@
         }
         mds = media_descriptor_string(g_backup_media_type);
-        mr_asprintf(tmp, "I am about to burn %s #%d of the backup set. Please insert %s and press Enter.", mds, g_current_media_number, mds);
+        mr_asprintf(tmp, "I am about to burn %s #%d of the backup set. Please insert %s and press Enter.", 
+                mds, g_current_media_number, mds);
         mr_free(mds);
 
@@ -2733 +2861 @@
 
     mds = media_descriptor_string(g_backup_media_type);
-    log_msg(2, "paafcd: OK, I assume I have a blank/reusable %s in the drive...", mds);
+    log_msg(2,
+            "paafcd: OK, I assume I have a blank/reusable %s in the drive...", mds);
 
     log_to_screen("Proceeding w/ %s in drive.", mds);
@@ -2740 +2869 @@
     paranoid_free(cdrom_dev);
     paranoid_free(cdrw_dev);
-    mr_free(mtpt);
+    paranoid_free(mtpt);
+    paranoid_free(szcdno);
+    paranoid_free(szserfname);
+    paranoid_free(szunmount);
     if (pmountable) {
         if (attempt_to_mount_returned_this) {
@@ -2750 +2882 @@
 
 }
+
+
+
+
+
+
 
 
@@ -2779 +2917 @@
 
 /* @} - end of utilityGroup */
+
+
+
+
+
+
 
 
@@ -2801 +2945 @@
  */
 int
-slice_up_file_etc(char *biggie_filename, char *ntfsprog_fifo, long biggie_file_number, long noof_biggie_files, bool use_ntfsprog) {
+slice_up_file_etc(char *biggie_filename,
+                  char *ntfsprog_fifo, long biggie_file_number,
+                  long noof_biggie_files, bool use_ntfsprog)
+{
 
     /*@ buffers ************************************************** */
     char *tmp = NULL;
-    char *checksum_line = NULL;
-    char *command = NULL;
-    char *tempblock = NULL;
+    char *checksum_line, *command;
+    char *tempblock;
     char *curr_slice_fname_uncompressed = NULL;
     char *curr_slice_fname_compressed = NULL;
     char *file_to_archive = NULL;
-    char *file_to_openin = NULL;
+    char *file_to_openin;
     /*@ pointers ************************************************** */
-    char *pB = NULL;
-    FILE *fin = NULL;
-    FILE *fout = NULL;
+    char *pB;
+    FILE *fin = NULL, *fout = NULL;
 
     /*@ bool ****************************************************** */
@@ -2821 +2966 @@
 
     /*@ long ****************************************************** */
-    size_t blksize = (size_t)0;
-    long slice_num = 0L;
-    long i = 0L;
-    bool should_I_compress_slices = TRUE;
+    size_t blksize = 0;
+    long slice_num = 0;
+    long i;
+    long optimal_set_size;
+    bool should_I_compress_slices;
     char *suffix = NULL;                // for compressed slices
 
@@ -2837 +2983 @@
     /*@ structures ************************************************** */
     struct s_filename_and_lstat_info biggiestruct;
+//  struct stat statbuf;
 
     assert(bkpinfo != NULL);
     assert_string_is_neither_NULL_nor_zerolength(biggie_filename);
+    malloc_string(checksum_line);
 
     biggiestruct.for_backward_compatibility = '\n';
     biggiestruct.use_ntfsprog = use_ntfsprog;
-    if (is_this_file_compressed(biggie_filename) || bkpinfo->compression_level == 0) {
+    optimal_set_size = bkpinfo->optimal_set_size;
+    if (is_this_file_compressed(biggie_filename)
+        || bkpinfo->compression_level == 0) {
         mr_asprintf(suffix, "%s", "");
+        //      log_it("%s is indeed compressed :-)", filename);
         should_I_compress_slices = FALSE;
     } else {
@@ -2851 +3002 @@
     }
 
-    if (bkpinfo->optimal_set_size < 999L) {
+    if (optimal_set_size < 999) {
         fatal_error("bkpinfo->optimal_set_size is insanely small");
     }
-
     if (ntfsprog_fifo) {
         file_to_openin = ntfsprog_fifo;
-        mr_asprintf(checksum_line, "IGNORE");
-        log_msg(2, "Not calculating checksum for %s: it would take too long", biggie_filename);
+        strcpy(checksum_line, "IGNORE");
+        log_msg(2,
+                "Not calculating checksum for %s: it would take too long",
+                biggie_filename);
         if ( !find_home_of_exe("ntfsresize")) {
             fatal_error("ntfsresize not found");
@@ -2868 +3020 @@
         log_it("res of it = %s", tmp); 
         totallength = (off_t)atoll(tmp);
-        mr_free(tmp);
+        paranoid_free(tmp);
     } else {
         file_to_openin = biggie_filename;
@@ -2882 +3034 @@
         }
         mr_free(command);
-        mr_getline(checksum_line, fin);
+        tmp = fgets(checksum_line, MAX_STR_LEN, fin);
         pclose(fin);
         totallength = length_of_file (biggie_filename);
@@ -2896 +3048 @@
     }
     strcpy(biggiestruct.checksum, checksum_line);
-    mr_free(checksum_line);
 
     mr_asprintf(tmp, "%s", slice_fname(biggie_file_number, 0, bkpinfo->tmpdir, ""));
@@ -2902 +3053 @@
     if (fout == NULL) {
         log_msg(1, "Unable to open and write to %s\n", tmp);
-        mr_free(tmp);
+        paranoid_free(tmp);
         mr_free(suffix);
         return (1);
     }
-    mr_free(tmp);
+    paranoid_free(tmp);
 
     res = fwrite((void *) &biggiestruct, 1, sizeof(biggiestruct), fout);
@@ -2912 +3063 @@
         paranoid_fclose(fout);
     }
-    log_msg(1, "Opening in %s; slicing it and writing to CD/tape", file_to_openin);
+    log_msg(1, "Opening in %s; slicing it and writing to CD/tape",
+            file_to_openin);
     if (!(fin = fopen(file_to_openin, "r"))) {
         log_OS_error("Unable to openin biggie_filename");
-        log_to_screen("Cannot archive bigfile '%s': not found", biggie_filename);
-
+        mr_asprintf(tmp, "Cannot archive bigfile '%s': not found", biggie_filename);
+        log_to_screen(tmp);
+        paranoid_free(tmp);
+
+        paranoid_free(checksum_line);
         mr_free(suffix);
         return (1);
@@ -2939 +3094 @@
         mr_asprintf(tmp, "%s", percent_media_full_comment());
         update_progress_form(tmp);
-        mr_free(tmp);
+        paranoid_free(tmp);
 
         if (!(fout = fopen(curr_slice_fname_uncompressed, "w"))) {
@@ -2946 +3101 @@
             return (1);
         }
-        if ((i == bkpinfo->optimal_set_size / 256) && (totalread < 1.1 * totallength)) {
-            for (i = 0L; i < bkpinfo->optimal_set_size / 256; i++) {
+        if ((i == bkpinfo->optimal_set_size / 256)
+            && (totalread < 1.1 * totallength)) {
+            for (i = 0; i < bkpinfo->optimal_set_size / 256; i++) {
                 blksize = fread(tempblock, 1, 256 * 1024, fin);
                 if (blksize > 0) {
@@ -2956 +3112 @@
                 }
             }
-            mr_free(tempblock);
         } else {
-            i = 0L;
+            i = 0;
         }
         paranoid_fclose(fout);
-        if (i > 0L)             // length_of_file (curr_slice_fname_uncompressed)
+        if (i > 0)              // length_of_file (curr_slice_fname_uncompressed)
         {
             if (!does_file_exist(curr_slice_fname_uncompressed)) {
-                log_msg(2, "Warning - '%s' doesn't exist. How can I compress slice?", curr_slice_fname_uncompressed);
+                log_msg(2,
+                        "Warning - '%s' doesn't exist. How can I compress slice?",
+                        curr_slice_fname_uncompressed);
             }
             if (should_I_compress_slices && bkpinfo->compression_level > 0) {
@@ -2984 +3141 @@
                 log_msg(2, "Failed to compress the slice");
             }
-            if (bkpinfo->use_lzo && strcmp(curr_slice_fname_compressed, curr_slice_fname_uncompressed)) {
+            if (bkpinfo->use_lzo
+                && strcmp(curr_slice_fname_compressed,
+                          curr_slice_fname_uncompressed)) {
                 unlink(curr_slice_fname_uncompressed);
             }
@@ -2990 +3149 @@
                 mr_asprintf(tmp, "Problem with slice # %ld", slice_num);
             } else {
-                mr_asprintf(tmp, "%s - Bigfile #%ld, slice #%ld compressed OK          ", biggie_filename, biggie_file_number + 1, slice_num);
+                mr_asprintf(tmp, "%s - Bigfile #%ld, slice #%ld compressed OK          ", biggie_filename, biggie_file_number + 1,
+                        slice_num);
             }
+#ifndef _XWIN
             if (!g_text_mode) {
                 newtDrawRootText(0, g_noof_rows - 2, tmp);
@@ -2998 +3159 @@
                 log_msg(2, tmp);
             }
-            mr_free(tmp);
+#else
+            log_msg(2, tmp);
+#endif
+            paranoid_free(tmp);
 
             mr_asprintf(file_to_archive, "%s", curr_slice_fname_compressed);
@@ -3014 +3178 @@
 
         if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-            register_in_tape_catalog(biggieslice, biggie_file_number, slice_num, file_to_archive);
-            maintain_collection_of_recent_archives(bkpinfo->tmpdir, file_to_archive);
+            register_in_tape_catalog(biggieslice, biggie_file_number,
+                                     slice_num, file_to_archive);
+            maintain_collection_of_recent_archives(bkpinfo->tmpdir,
+                                                   file_to_archive);
             res = move_files_to_stream(file_to_archive, NULL);
         } else {
@@ -3024 +3190 @@
         retval += res;
         if (res) {
-            log_to_screen("Failed to add slice %ld of bigfile %ld to scratchdir", slice_num, biggie_file_number + 1);
-            fatal_error("Hard disk full. You should have bought a bigger one.");
-        }
-    }
+            mr_asprintf(tmp, "Failed to add slice %ld of bigfile %ld to scratchdir", slice_num, biggie_file_number + 1);
+            log_to_screen(tmp);
+            paranoid_free(tmp);
+            fatal_error
+                ("Hard disk full. You should have bought a bigger one.");
+        }
+    }
+    mr_free(tempblock);
     mr_free(suffix);
     paranoid_fclose(fin);
@@ -3037 +3207 @@
     }
     log_msg(1, tmp);
-    mr_free(tmp);
-
+    paranoid_free(tmp);
+
+    paranoid_free(checksum_line);
     return (retval);
 }
@@ -3117 +3288 @@
     log_msg(2, tmp);
     center_string(tmp, 80);
+#ifndef _XWIN
     if (!g_text_mode) {
         newtPushHelpLine(tmp);
     }
+#endif
     res = write_iso_and_go_on(TRUE);
+#ifndef _XWIN
     if (!g_text_mode) {
         newtPopHelpLine();
     }
+#endif
     log_msg(2, "Returning from writing final ISO (res=%d)", res);
     paranoid_free(tmp);
@@ -3152 +3327 @@
 
     /*@ buffers ***************************************************** */
-    char *tmp = NULL;
-    char *tmp1 = NULL;
-    char *cdno_fname = NULL;
-    char *lastcd_fname = NULL;
-    char *isofile = NULL;
+    char *tmp;
+    char *cdno_fname;
+    char *lastcd_fname;
+    char *isofile;
     char *mds = NULL;
 
@@ -3167 +3341 @@
 
     malloc_string(tmp);
+    malloc_string(cdno_fname);
+    malloc_string(lastcd_fname);
+    malloc_string(isofile);
 
     assert(bkpinfo != NULL);
@@ -3180 +3357 @@
     /* label the ISO with its number */
 
-    mr_asprintf(cdno_fname, "%s/archives/THIS-CD-NUMBER", bkpinfo->scratchdir);
+    sprintf(cdno_fname, "%s/archives/THIS-CD-NUMBER", bkpinfo->scratchdir);
     fout = fopen(cdno_fname, "w");
-    mr_free(cdno_fname);
-
     fprintf(fout, "%d", g_current_media_number);
     paranoid_fclose(fout);
 
-    mr_asprintf(tmp1, "cp -f %s/autorun %s/", g_mondo_home, bkpinfo->scratchdir);
-    if (run_program_and_log_output(tmp1, FALSE)) {
+    sprintf(tmp, "cp -f %s/autorun %s/", g_mondo_home,
+            bkpinfo->scratchdir);
+    if (run_program_and_log_output(tmp, FALSE)) {
         log_msg(2, "Warning - unable to copy autorun to scratchdir");
     }
-    mr_free(tmp1);
 
     /* last CD or not? Label accordingly */
-    mr_asprintf(lastcd_fname, "%s/archives/NOT-THE-LAST", bkpinfo->scratchdir);
+    sprintf(lastcd_fname, "%s/archives/NOT-THE-LAST", bkpinfo->scratchdir);
     if (last_cd) {
         unlink(lastcd_fname);
@@ -3205 +3380 @@
         paranoid_fclose(fout);
     }
-    mr_free(lastcd_fname);
-
     if (space_occupied_by_cd(bkpinfo->scratchdir) / 1024 > bkpinfo->media_size) {
-        log_to_screen("Warning! CD is too big. It occupies %ld KB, which is more than the %ld KB allowed.",(long) space_occupied_by_cd(bkpinfo->scratchdir),(long) bkpinfo->media_size);
-    }
-    mr_asprintf(isofile, "%s/%s/%s-%d.iso", bkpinfo->isodir,
+        sprintf(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);
+        log_to_screen(tmp);
+    }
+    sprintf(isofile, "%s/%s/%s-%d.iso", bkpinfo->isodir,
             bkpinfo->netfs_remote_dir, bkpinfo->prefix,
             g_current_media_number);
@@ -3225 +3402 @@
             {
                 log_msg(3, "*Sigh* Mike, I hate your computer.");
-                // if it can't be found then force pausing
                 bkpinfo->manual_cd_tray = TRUE;
-            } else {
+            }                   // if it can't be found then force pausing
+            else {
                 log_msg(3, "Great. Found Mike's CD-ROM drive.");
             }
@@ -3233 +3410 @@
         if (bkpinfo->verify_data && !res) {
             mds = media_descriptor_string(g_backup_media_type);
-            log_to_screen("Please reboot from the 1st %s in Compare Mode, as a precaution.", mds);
+            log_to_screen
+                ("Please reboot from the 1st %s in Compare Mode, as a precaution.", mds);
             mr_free(mds);
             if (chdir("/")) {
@@ -3250 +3428 @@
         } else {
             mds = media_descriptor_string(bkpinfo->backup_media_type);
-            mr_asprintf(tmp1, "Failed to create %s #%d. Retry?", mds, g_current_media_number);
+            sprintf(tmp, "Failed to create %s #%d. Retry?", mds, g_current_media_number);
             mr_free(mds);
-            res = ask_me_yes_or_no(tmp1);
-            mr_free(tmp1);
-
+            res = ask_me_yes_or_no(tmp);
             if (!res) {
                 if (ask_me_yes_or_no("Abort the backup?")) {
@@ -3267 +3443 @@
         }
     }
-    mr_free(isofile);
-
     g_current_media_number++;
     wipe_archives(bkpinfo->scratchdir);
-    mr_asprintf(tmp1, "rm -Rf %s/images/*gz %s/images/*data*img", bkpinfo->scratchdir, bkpinfo->scratchdir);
-    if (system(tmp1)) {
-        log_msg(2, "Error occurred when I tried to delete the redundant IMGs and GZs");
-    }
-    mr_free(tmp1);
+    sprintf(tmp, "rm -Rf %s/images/*gz %s/images/*data*img",
+            bkpinfo->scratchdir, bkpinfo->scratchdir);
+    if (system(tmp)) {
+        log_msg
+            (2,
+             "Error occurred when I tried to delete the redundant IMGs and GZs");
+    }
 
     if (last_cd) {
@@ -3285 +3461 @@
     bkpinfo->verify_data = orig_vfy_flag_val;
     paranoid_free(tmp);
+    paranoid_free(cdno_fname);
+    paranoid_free(lastcd_fname);
+    paranoid_free(isofile);
     return (0);
 }
@@ -3353 +3532 @@
             if (res) {
                 mds = media_descriptor_string(bkpinfo->backup_media_type);
-                log_to_screen("Warnings/errors were reported while checking %s #%d", mds, g_current_media_number);
+                mr_asprintf(tmp, "Warnings/errors were reported while checking %s #%d", mds, g_current_media_number);
                 mr_free(mds);
+                log_to_screen(tmp);
+                mr_free(tmp);
 
             }