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

Timestamp:

Sep 25, 2013, 8:55:39 AM (11 years ago)

Author:

Bruno Cornec

Message:

• Backport tons of dynamic memory management rewrite from 3.1 branch. Test is needed

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;
-/*
-extern char *g_tmpfs_mountpt;
-*/
-extern char *g_serial_string;
+
+/**
+ * The serial string (used to differentiate between backups) of the current backup.
+ */
+char *g_serial_string = NULL;
+
 extern char *g_getfacl;
 extern char *g_getfattr;
@@ -200 +202 @@
 
     if (!does_file_exist(filelist)) {
-        mr_asprintf(tmp, "(archive_this_fileset) - filelist %s does not exist", filelist);
-        log_to_screen(tmp);
-        paranoid_free(tmp);
+        log_to_screen("(archive_this_fileset) - filelist %s does not exist", filelist);
         return (1);
     }
@@ -208 +208 @@
     mr_asprintf(tmp, "echo hi > %s 2> /dev/null", fname);
     if (system(tmp)) {
-        paranoid_free(tmp);
+        mr_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;
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
 
         if (res) {
@@ -251 +251 @@
         }
     }
-    paranoid_free(command);
+    mr_free(command);
 
     retval += res;
@@ -307 +307 @@
 
     if (!does_file_exist(filelist)) {
-        mr_asprintf(tmp, "(archive_this_fileset) - filelist %s does not exist",
-                filelist);
-        log_to_screen(tmp);
-        paranoid_free(tmp);
+        log_to_screen("(archive_this_fileset) - filelist %s does not exist", filelist);
         return (1);
     }
     mr_asprintf(tmp, "echo hi > %s 2> /dev/null", fname);
     if (system(tmp)) {
-        paranoid_free(tmp);
+        mr_free(tmp);
         fatal_error("Unable to write tarball to scratchdir");
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
 
 
@@ -324 +321 @@
         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);
@@ -331 +327 @@
             log_msg(3, "%s not found. Cannot exclude zipfiles, etc.", tmp);
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
     } else {
         mr_asprintf(zipparams, "");
     }
-
-//  make_hole_for_file(fname);
 
     if (!does_file_exist(bkpinfo->tmpdir)) {
@@ -346 +340 @@
         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);
-    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_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);
 
     mr_asprintf(tmp, "echo hi > %s 2> /dev/null", fname);
     if (system(tmp)) {
-        paranoid_free(tmp);
+        mr_free(tmp);
         fatal_error("Unable to write tarball to scratchdir");
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     for (res = 99, tries = 0; tries < 3 && res != 0; tries++) {
@@ -406 +398 @@
 {
     int retval = 0, res = 0;
-    char *tmp;
+    char *tmp = NULL;
 
     assert(bkpinfo != NULL);
     set_g_cdrom_and_g_dvd_to_bkpinfo_value();
-    malloc_string(tmp);
     if (bkpinfo->backup_media_type == dvd) {
 #ifdef DVDRWFORMAT
@@ -431 +422 @@
     }
 
-/*
-      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);
+    mr_asprintf(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");
     }
-    sprintf(tmp, "cp -f %s/archives/*list*.gz %s", bkpinfo->scratchdir,
-            bkpinfo->tmpdir);
+    mr_free(tmp);
+
+    mr_asprintf(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
@@ -464 +454 @@
     }
     retval += do_that_initial_phase();  // prepare
-    sprintf(tmp, "rm -f %s/images/*.iso", bkpinfo->scratchdir);
+    mr_asprintf(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
@@ -473 +465 @@
         sleep(2);
     }
-    paranoid_free(tmp);
     return (retval);
 }
@@ -514 +505 @@
     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;
@@ -542 +534 @@
     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);
@@ -550 +541 @@
         mr_asprintf(tmp, "%s/tmpfs/filelist.full", bkpinfo->tmpdir);
         if (!does_file_exist(tmp)) {
-            fatal_error
-                ("Cannot find filelist.full, so I cannot count its lines");
+            mr_free(tmp);
+            fatal_error ("Cannot find filelist.full, so I cannot count its lines");
         }
     }
@@ -571 +562 @@
             }
         }
-        paranoid_free(ntapedev);
+        mr_free(ntapedev);
         mr_asprintf(tape_device, "%s", bkpinfo->media_device);
     } else {
@@ -586 +577 @@
     } 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) {
@@ -660 +656 @@
             ch = 'U';
         if (bkpinfo->boot_loader != '\0') {
-            mr_asprintf(tmp, "User specified boot loader. It is '%c'.", bkpinfo->boot_loader);
-            log_msg(2, tmp);
-            mr_free(tmp);
+            log_msg(2, "User specified boot loader. It is '%c'.", bkpinfo->boot_loader);
         } else {
             bkpinfo->boot_loader = ch;
         }
         if (bkpinfo->boot_device[0] != '\0') {
-            mr_asprintf(tmp, "User specified boot device. It is '%s'.", bkpinfo->boot_device);
-            log_msg(2, tmp);
-            mr_free(tmp);
+            log_msg(2, "User specified boot device. It is '%s'.", bkpinfo->boot_device);
         } else {
             strcpy(bkpinfo->boot_device, bootdev);
@@ -692 +684 @@
         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"));
@@ -710 +698 @@
         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') {
@@ -753 +728 @@
         mr_asprintf(bootldr_str, "unknown");
     }
-    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);
+    log_to_screen("Your boot loader is %s and it boots from %s", bootldr_str, bkpinfo->boot_device);
+
     if (bootldr_ver != NULL) {
-        mr_asprintf(tmp, "Boot loader version string: %s", bootldr_ver);
-        log_to_screen(tmp);
-        mr_free(tmp);
+        log_to_screen("Boot loader version string: %s", bootldr_ver);
     }
 
@@ -799 +771 @@
         fatal_error("Unknown backup_media_type");
     }
-    if (bkpinfo->backup_media_type == usb) {
+
+    if ((bkpinfo->backup_media_type == usb) && (bkpinfo->media_device)) {
         mr_asprintf(tmp2, "--usb %s", bkpinfo->media_device);
     } else {
@@ -808 +781 @@
     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);
@@ -817 +789 @@
     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);
@@ -865 +836 @@
     }
 
-    estimated_total_noof_slices =
-        size_of_all_biggiefiles_K(bkpinfo) / bkpinfo->optimal_set_size + 1;
-    /* add netfs stuff here? */
+    estimated_total_noof_slices = size_of_all_biggiefiles_K(bkpinfo) / bkpinfo->optimal_set_size + 1;
+
+    /* TODO: add netfs stuff here? */
     mr_asprintf(command, "mkdir -p %s/images", bkpinfo->scratchdir);
     if (system(command)) {
@@ -873 +844 @@
         log_OS_error("Unable to make images directory");
     }
-    paranoid_free(command);
+    mr_free(command);
     log_msg(1, "lines_in_filelist = %ld", lines_in_filelist);
     update_evalcall_form(3);
@@ -890 +861 @@
             use_lzo_sz,         // parameter #8
             cd_recovery_sz,     // parameter #9
-            bkpinfo->image_devs,    // parameter #10
+            (bkpinfo->image_devs == NULL) ? "\"\"" : bkpinfo->image_devs,   // parameter #10
             broken_bios_sz,     // parameter #11
             last_filelist_number,   // parameter #12 (STRING)
@@ -900 +871 @@
             bkpinfo->internal_tape_block_size,  // parameter #18 (LONG)
             bkpinfo->differential,  // parameter #19 (INT)
-            use_gzip_sz);       // parameter #20 (STRING)
+            use_gzip_sz,        // parameter #19 (STRING)
+            use_lzma_sz,        // parameter #20 (STRING)
+            value,              // parameter #21 (STRING)
+            MONDO_LOGFILE);
 
     mr_free(last_filelist_number);
@@ -906 +880 @@
     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);
@@ -913 +888 @@
     mr_free(tape_size_sz);
 
+    /* This parameter is always the last one and optional */
     if (bkpinfo->nonbootable_backup) {
         mr_strcat(command, " NONBOOTABLE");
@@ -929 +905 @@
     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);
-        paranoid_free(command);
+        mr_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)) {
-                paranoid_free(command);
+                mr_free(command);
                 fatal_error("Unable to create temporary all tarball");
             }
-            paranoid_free(command);
+            mr_free(command);
         }
         /* For USB we already have everything on the key */
@@ -948 +922 @@
             mr_asprintf(command, "rm -rf %s/images", bkpinfo->scratchdir);
             run_program_and_log_output(command, FALSE);
-            paranoid_free(command);
+            mr_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");
@@ -966 +939 @@
         mr_asprintf(command, "grep 'Fatal error' /var/log/mindi.log");
         mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
-        paranoid_free(command);
+        mr_free(command);
 
         if (strlen(tmp) > 1) {
@@ -1017 +990 @@
 void *create_afio_files_in_background(void *inbuf)
 {
-    long int archiving_set_no;
-    char *archiving_filelist_fname;
-    char *archiving_afioball_fname;
+    long int archiving_set_no = 0L;
+    char *archiving_filelist_fname = NULL;
+    char *archiving_afioball_fname = NULL;
     char *curr_xattr_list_fname = NULL;
-    char *curr_acl_list_fname;
-
-    char *tmp;
+    char *curr_acl_list_fname = NULL;
+
+    char *tmp = NULL;
     int res = 0, retval = 0;
     int *p_archival_threads_running;
@@ -1031 +1004 @@
     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);
@@ -1041 +1009 @@
     p_list_of_fileset_flags = (char *) (inbuf + 12);
 
-    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)) {
+    mr_asprintf(archiving_filelist_fname, FILELIST_FNAME_RAW_SZ, bkpinfo->tmpdir, 0L);
+
+    while (does_file_exist(archiving_filelist_fname)) {
         if (g_exiting) {
+            mr_free(archiving_filelist_fname);
             fatal_error("Execution run aborted (pthread)");
         }
         if (archiving_set_no >= MAX_NOOF_SETS_HERE) {
-            fatal_error
-                ("Maximum number of filesets exceeded. Adjust MAX_NOOF_SETS_HERE, please.");
+            mr_free(archiving_filelist_fname);
+            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");
         }
@@ -1062 +1030 @@
         *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 */
-        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);
+        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);
         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);
+            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);
             break;
         }
 
-        sprintf(tmp, AFIOBALL_FNAME_RAW_SZ, bkpinfo->tmpdir,
-                archiving_set_no - ARCH_BUFFER_NUM, bkpinfo->zip_suffix);
+        mr_asprintf(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);
@@ -1088 +1052 @@
             log_msg(4, "[%d] - continuing", getpid());
         }
-
-        log_msg(4, "%s[%d:%d] - EXATing %d...", FORTY_SPACES, getpid(),
-                this_thread_no, archiving_set_no);
+        mr_free(tmp);
+
+        log_msg(4, "%s[%d:%d] - EXATing %d...", FORTY_SPACES, getpid(), this_thread_no, archiving_set_no);
+
         if (g_getfattr) {
-            sprintf(curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ,
-                bkpinfo->tmpdir, archiving_set_no);
+            mr_asprintf(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) {
-            sprintf(curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ,
-                bkpinfo->tmpdir, archiving_set_no);
+            mr_asprintf(curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ, bkpinfo->tmpdir, archiving_set_no);
             get_acl_list(archiving_filelist_fname, 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(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);
+
         retval += res;
 
         if (res) {
-            sprintf(tmp,
-                    "Errors occurred while archiving set %ld. Please review logs.",
-                    archiving_set_no);
-            log_to_screen(tmp);
-        }
+            log_to_screen("Errors occurred while archiving set %ld. Please review logs.", archiving_set_no);
+        }
+
         if (!semaphore_p()) {
+            mr_free(archiving_filelist_fname);
             fatal_error("Cannot get semaphore P");
         }
@@ -1127 +1089 @@
 
         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");
@@ -1140 +1107 @@
         fatal_error("Cannot get semaphore V");
     }
-    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);
+    log_msg(3, "%s[%d:%d] - exiting", FORTY_SPACES, getpid(), this_thread_no);
     pthread_exit(NULL);
 }
@@ -1228 +1189 @@
 
     /*@ buffers *********************************** */
-    char *command, *tmpfile, *data_disks_file;
+    char *command = NULL;
+    char *tmpfile = NULL;
+    char *data_disks_file = NULL;
 
     assert(bkpinfo != NULL);
-    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"));
+    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"));
     strip_spaces(g_serial_string);
     strcat(g_serial_string, "...word.");
@@ -1245 +1202 @@
     assert(strlen(g_serial_string) < MAX_STR_LEN);
 
-    sprintf(tmpfile, "%s/archives/SERIAL-STRING", bkpinfo->scratchdir);
+    mr_asprintf(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");
@@ -1269 +1227 @@
         }
     }
-
-    sprintf(command, "rm -f %s/%s/%s-[1-9]*.iso", bkpinfo->isodir,
-            bkpinfo->netfs_remote_dir, bkpinfo->prefix);
+    mr_free(data_disks_file);
+
+    mr_asprintf(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.");
@@ -1281 +1241 @@
                                      BLK_START_OF_BACKUP);
     }
-    paranoid_free(command);
-    paranoid_free(tmpfile);
-    paranoid_free(data_disks_file);
     return (retval);
 }
@@ -1356 +1313 @@
 
     /*@ buffers ********************************************** */
-    char *storing_filelist_fname;
-    char *storing_afioball_fname;
+    char *storing_filelist_fname = NULL;
+    char *storing_afioball_fname = NULL;
     char *tmp = NULL;
     char *media_usage_comment = NULL;
@@ -1374 +1331 @@
     assert(bkpinfo != NULL);
     malloc_string(result_str);
-    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);
+    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;
@@ -1399 +1349 @@
                        "Please wait. This may take a couple of hours.",
                        "Working...",
-                       get_last_filelist_number() + 1);
+                       (long)get_last_filelist_number() + 1L);
 
     log_msg(5, "We're gonna party like it's your birthday.");
@@ -1438 +1388 @@
             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) {
@@ -1446 +1395 @@
             */
             sleep(1);
-            } else
+            } else {
                 // store set N
-            {
-                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);
+                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);
                 if (g_getfattr) {
-                    sprintf(curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ,
-                        bkpinfo->tmpdir, storing_set_no);
+                    mr_asprintf(curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ, bkpinfo->tmpdir, storing_set_no);
                 }
                 if (g_getfacl) {
-                    sprintf(curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ,
-                        bkpinfo->tmpdir, storing_set_no);
+                    mr_asprintf(curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ, bkpinfo->tmpdir, storing_set_no);
                 }
 
@@ -1470 +1414 @@
                     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 +=
@@ -1510 +1452 @@
                 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) {
-                    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.");
+                    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.");
                 }
                 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);
         }
     }
@@ -1540 +1487 @@
     }
     log_to_screen(tmp);
-    paranoid_free(tmp);
+    mr_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);
 }
@@ -1598 +1541 @@
     mr_asprintf(tmp, "chmod 700 %s", bkpinfo->scratchdir);
     run_program_and_log_output(tmp, FALSE);
-    paranoid_free(tmp);
+    mr_free(tmp);
     if (chdir(bkpinfo->scratchdir)) {
         // FIXME
@@ -1608 +1551 @@
     log_msg(1, message_to_screen);
 
-    mr_asprintf(tmp1, "%s1", bkpinfo->media_device);
+    if (bkpinfo->media_device) {
+        mr_asprintf(tmp1, "%s1", bkpinfo->media_device);
+    } else {
+        mr_asprintf(tmp1, "");
+    }
     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);
-        paranoid_free(tmp);
-    }
-    paranoid_free(tmp1);
+        mr_free(tmp);
+    }
+    mr_free(tmp1);
 
     log_msg(1, "Mounting USB device.");
@@ -1621 +1568 @@
     mr_asprintf(tmp, "mkdir -p %s", tmp1);
     run_program_and_log_output(tmp, FALSE);
-    paranoid_free(tmp);
+    mr_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);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     if (bkpinfo->nonbootable_backup) {
@@ -1642 +1590 @@
         }
         log_to_screen(result_sz);
-        paranoid_free(result_sz);
-        paranoid_free(tmp);
+        mr_free(result_sz);
+        mr_free(tmp);
         retval += res;
 
@@ -1649 +1597 @@
         mr_asprintf(tmp,"mkdir %s/archive", bkpinfo->scratchdir); 
         run_program_and_log_output(tmp, FALSE);
-        paranoid_free(tmp);
+        mr_free(tmp);
     }
     paranoid_free(message_to_screen);
@@ -1657 +1605 @@
         mr_asprintf(tmp, "umount %s1", bkpinfo->media_device);
         run_program_and_log_output(tmp, FALSE);
-        paranoid_free(tmp);
+        mr_free(tmp);
     }
 
@@ -1695 +1643 @@
 
     /*@ buffers ****************************************** */
-    char *tmp;
+    char *tmp = NULL;
+    char *tmp2 = NULL;
     char *old_pwd;
     char *result_sz = NULL;
     char *message_to_screen = NULL;
     char *sz_blank_disk = NULL;
-    char *fnam;
-    char *tmp2;
-    char *tmp3;
+    char *fnam = NULL;
+    char *tmp3 = NULL;
     char *isofs_cmd = NULL;
     char *full_isofs_cmd = NULL;
@@ -1710 +1658 @@
     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);
 
-    sprintf(tmp, "%s/isolinux.bin", bkpinfo->scratchdir);
-    sprintf(tmp2, "%s/isolinux.bin", bkpinfo->tmpdir);
+    /* 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);
     if (does_file_exist(tmp)) {
-        sprintf(tmp3, "cp -f %s %s", tmp, tmp2);
+        mr_asprintf(tmp3, "cp -f %s %s", tmp, tmp2);
         paranoid_system(tmp3);
+        mr_free(tmp3);
     }
     if (!does_file_exist(tmp) && does_file_exist(tmp2)) {
-        sprintf(tmp3, "cp -f %s %s", tmp2, tmp);
+        mr_asprintf(tmp3, "cp -f %s %s", tmp2, tmp);
         paranoid_system(tmp3);
-    }
-    free(tmp2);
-    free(tmp3);
-    tmp2 = NULL;
-    tmp3 = NULL;
+        mr_free(tmp3);
+    }
+    mr_free(tmp2);
+    mr_free(tmp3);
     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);
-    sprintf(tmp, "chmod 700 %s", bkpinfo->scratchdir);
+    if (! tmp2) {
+        //FIXME
+    }
+    mr_asprintf(tmp, "chmod 700 %s", bkpinfo->scratchdir);
     run_program_and_log_output(tmp, FALSE);
+    mr_free(tmp);
+
     if (chdir(bkpinfo->scratchdir)) {
         // FIXME
@@ -1744 +1694 @@
 
     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");
@@ -1763 +1709 @@
     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);
@@ -1774 +1719 @@
         } 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);
-                sprintf(tmp, "tail -n10 %s | grep -F ':-('", MONDO_LOGFILE);
+                mr_asprintf(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
-            sprintf(tmp,
-                    "tail -n8 %s | grep 'blank=full.*dvd-compat.*DAO'",
-                    MONDO_LOGFILE);
+            mr_asprintf(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))) {
@@ -1800 +1741 @@
                 /* reset error counter before trying to blank DVD */
                 retval -= res;
-                paranoid_system("sync");
+                sync();
                 pause_for_N_seconds(5, "Letting DVD drive settle");
 
@@ -1810 +1751 @@
                 }
                 pause_for_N_seconds(5, "Letting DVD drive settle");
-                mr_asprintf(sz_blank_disk, "dvd+rw-format -force %s", bkpinfo->media_device);
+                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");
+                }
                 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.");
@@ -1838 +1777 @@
                 }
                 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) {
@@ -1856 +1790 @@
                 }
             }
+            mr_free(tmp);
 #endif
             if (g_backup_media_type == dvd && !bkpinfo->please_dont_eject) {
@@ -1876 +1811 @@
             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 {
@@ -1888 +1821 @@
 
 
-            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");
@@ -1895 +1827 @@
                 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);
-                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);
+                // 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);
                 mr_free(full_isofs_cmd);
 #endif
@@ -1916 +1840 @@
                 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);
             }
@@ -1940 +1860 @@
         || 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);
-            sprintf(tmp, "umount %s", 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);
             run_program_and_log_output(tmp, FALSE);
+            mr_free(tmp);
         }
     }
@@ -1954 +1873 @@
         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");
@@ -1973 +1889 @@
         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");
@@ -2044 +1957 @@
 
     /*@ pointers ******************************************* */
-    FILE *fin;
+    FILE *fin = NULL;
     char *p;
     char *q;
@@ -2050 +1963 @@
     /*@ buffers ******************************************** */
     char *tmp = NULL;
-    char *bigfile_fname;
+    char *bigfile_fname = NULL;
     char *sz_devfile = NULL;
     char *ntfsprog_fifo = NULL;
@@ -2086 +1999 @@
     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);
-    paranoid_free(tmp);
+    open_progress_form("Backing up big files", tmp, "Please wait. This may take some time.", "", estimated_total_noof_slices);
+    mr_free(tmp);
 
     if (!(fin = fopen(biggielist_fname, "r"))) {
@@ -2121 +2032 @@
             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;
@@ -2137 +2043 @@
                     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 ?
-                    paranoid_free(bigfile_fname);
+                    mr_free(bigfile_fname);
                     mr_free(sz_devfile);
                     */
@@ -2148 +2052 @@
                     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));
                 }
             }
@@ -2160 +2062 @@
             // 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);
-            }
-            res =
-                slice_up_file_etc(bigfile_fname,
-                                  ntfsprog_fifo, biggie_file_number,
-                                  noof_biggie_files, use_ntfsprog);
+                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);
 
             /* Free it here as ntfsprog_fifo is not used anymore */
@@ -2197 +2093 @@
             }
         }
-#ifndef _XWIN
         if (!g_text_mode) {
             newtDrawRootText(0, g_noof_rows - 2, tmp);
             newtRefresh();
         }
-#endif
-        paranoid_free(tmp);
-    }
+        mr_free(tmp);
+    }
+    mr_free(bigfile_fname);
+
     log_msg(1, "Finished backing up bigfiles");
     log_msg(1, "estimated slices = %ld; actual slices = %ld",
@@ -2210 +2106 @@
     close_progress_form();
     paranoid_fclose(fin);
-    paranoid_free(bigfile_fname);
     return (retval);
 }
@@ -2271 +2166 @@
         retval += res;
         if (res) {
-            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());
+            log_to_screen("Errors occurred while archiving set %ld. Perhaps your live filesystem changed?", curr_set_no);
+        }
 
         /* copy to CD (scratchdir) ... and an actual CD-R if necessary */
@@ -2319 +2210 @@
         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) {
-            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.");
+            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_free(curr_filelist_fname);
@@ -2428 +2318 @@
     }
 
-    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);
@@ -2443 +2332 @@
     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);
@@ -2733 +2621 @@
     /*@ buffers ********************************************* */
     char *tmp = NULL;
-    char *cdrom_dev;
-    char *cdrw_dev;
+    char *cdrom_dev = NULL;
+    char *cdrw_dev = NULL;
     char *our_serial_str = NULL;
     bool ok_go_ahead_burn_it;
@@ -2740 +2628 @@
     int attempt_to_mount_returned_this = 999;
     char *mtpt = NULL;
-    char *szcdno;
-    char *szserfname;
-    char *szunmount;
+    char *szcdno = NULL;
+    char *szserfname = NULL;
+    char *szunmount = NULL;
     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);
-    mr_asprintf(tmp, "I am about to burn %s #%d", mds, g_current_media_number);
+    log_to_screen("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...");
-    sprintf(mtpt, "%s/cd.mtpt", bkpinfo->tmpdir);
+    mr_asprintf(mtpt, "%s/cd.mtpt", bkpinfo->tmpdir);
     make_hole_for_dir(mtpt);
 
@@ -2767 +2649 @@
     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);
-        sprintf(szcdno, "%s/archives/THIS-CD-NUMBER", mtpt);
-        sprintf(szserfname, "%s/archives/SERIAL-STRING", mtpt);
-        sprintf(szunmount, "umount %s", mtpt);
+        mr_asprintf(szcdno, "%s/archives/THIS-CD-NUMBER", mtpt);
+        mr_asprintf(szserfname, "%s/archives/SERIAL-STRING", mtpt);
+        mr_asprintf(szunmount, "umount %s", mtpt);
         cd_number = -1;
         mr_asprintf(tmp, "mount %s %s", cdrom_dev, mtpt);
@@ -2781 +2663 @@
         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.");
-            /*
-               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)) {
+        } 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 {
@@ -2809 +2679 @@
             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);
@@ -2849 +2722 @@
         }
         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);
 
@@ -2861 +2733 @@
 
     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);
@@ -2869 +2740 @@
     paranoid_free(cdrom_dev);
     paranoid_free(cdrw_dev);
-    paranoid_free(mtpt);
-    paranoid_free(szcdno);
-    paranoid_free(szserfname);
-    paranoid_free(szunmount);
+    mr_free(mtpt);
     if (pmountable) {
         if (attempt_to_mount_returned_this) {
@@ -2882 +2750 @@
 
 }
-
-
-
-
-
-
 
 
@@ -2917 +2779 @@
 
 /* @} - end of utilityGroup */
-
-
-
-
-
-
 
 
@@ -2945 +2801 @@
  */
 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, *command;
-    char *tempblock;
+    char *checksum_line = NULL;
+    char *command = NULL;
+    char *tempblock = NULL;
     char *curr_slice_fname_uncompressed = NULL;
     char *curr_slice_fname_compressed = NULL;
     char *file_to_archive = NULL;
-    char *file_to_openin;
+    char *file_to_openin = NULL;
     /*@ pointers ************************************************** */
-    char *pB;
-    FILE *fin = NULL, *fout = NULL;
+    char *pB = NULL;
+    FILE *fin = NULL;
+    FILE *fout = NULL;
 
     /*@ bool ****************************************************** */
@@ -2966 +2821 @@
 
     /*@ long ****************************************************** */
-    size_t blksize = 0;
-    long slice_num = 0;
-    long i;
-    long optimal_set_size;
-    bool should_I_compress_slices;
+    size_t blksize = (size_t)0;
+    long slice_num = 0L;
+    long i = 0L;
+    bool should_I_compress_slices = TRUE;
     char *suffix = NULL;                // for compressed slices
 
@@ -2983 +2837 @@
     /*@ 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;
-    optimal_set_size = bkpinfo->optimal_set_size;
-    if (is_this_file_compressed(biggie_filename)
-        || bkpinfo->compression_level == 0) {
+    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 {
@@ -3002 +2851 @@
     }
 
-    if (optimal_set_size < 999) {
+    if (bkpinfo->optimal_set_size < 999L) {
         fatal_error("bkpinfo->optimal_set_size is insanely small");
     }
+
     if (ntfsprog_fifo) {
         file_to_openin = ntfsprog_fifo;
-        strcpy(checksum_line, "IGNORE");
-        log_msg(2,
-                "Not calculating checksum for %s: it would take too long",
-                biggie_filename);
+        mr_asprintf(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");
@@ -3020 +2868 @@
         log_it("res of it = %s", tmp); 
         totallength = (off_t)atoll(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
     } else {
         file_to_openin = biggie_filename;
@@ -3034 +2882 @@
         }
         mr_free(command);
-        tmp = fgets(checksum_line, MAX_STR_LEN, fin);
+        mr_getline(checksum_line, fin);
         pclose(fin);
         totallength = length_of_file (biggie_filename);
@@ -3048 +2896 @@
     }
     strcpy(biggiestruct.checksum, checksum_line);
+    mr_free(checksum_line);
 
     mr_asprintf(tmp, "%s", slice_fname(biggie_file_number, 0, bkpinfo->tmpdir, ""));
@@ -3053 +2902 @@
     if (fout == NULL) {
         log_msg(1, "Unable to open and write to %s\n", tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
         mr_free(suffix);
         return (1);
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     res = fwrite((void *) &biggiestruct, 1, sizeof(biggiestruct), fout);
@@ -3063 +2912 @@
         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");
-        mr_asprintf(tmp, "Cannot archive bigfile '%s': not found", biggie_filename);
-        log_to_screen(tmp);
-        paranoid_free(tmp);
-
-        paranoid_free(checksum_line);
+        log_to_screen("Cannot archive bigfile '%s': not found", biggie_filename);
+
         mr_free(suffix);
         return (1);
@@ -3094 +2939 @@
         mr_asprintf(tmp, "%s", percent_media_full_comment());
         update_progress_form(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
 
         if (!(fout = fopen(curr_slice_fname_uncompressed, "w"))) {
@@ -3101 +2946 @@
             return (1);
         }
-        if ((i == bkpinfo->optimal_set_size / 256)
-            && (totalread < 1.1 * totallength)) {
-            for (i = 0; i < bkpinfo->optimal_set_size / 256; i++) {
+        if ((i == bkpinfo->optimal_set_size / 256) && (totalread < 1.1 * totallength)) {
+            for (i = 0L; i < bkpinfo->optimal_set_size / 256; i++) {
                 blksize = fread(tempblock, 1, 256 * 1024, fin);
                 if (blksize > 0) {
@@ -3112 +2956 @@
                 }
             }
+            mr_free(tempblock);
         } else {
-            i = 0;
+            i = 0L;
         }
         paranoid_fclose(fout);
-        if (i > 0)              // length_of_file (curr_slice_fname_uncompressed)
+        if (i > 0L)             // length_of_file (curr_slice_fname_uncompressed)
         {
             if (!does_file_exist(curr_slice_fname_uncompressed)) {
-                log_msg(2,
-                        "Warning - '%s' doesn't exist. How can I compress slice?",
-                        curr_slice_fname_uncompressed);
+                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) {
@@ -3141 +2984 @@
                 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);
             }
@@ -3149 +2990 @@
                 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);
-            }
-#ifndef _XWIN
+                mr_asprintf(tmp, "%s - Bigfile #%ld, slice #%ld compressed OK          ", biggie_filename, biggie_file_number + 1, slice_num);
+            }
             if (!g_text_mode) {
                 newtDrawRootText(0, g_noof_rows - 2, tmp);
@@ -3159 +2998 @@
                 log_msg(2, tmp);
             }
-#else
-            log_msg(2, tmp);
-#endif
-            paranoid_free(tmp);
+            mr_free(tmp);
 
             mr_asprintf(file_to_archive, "%s", curr_slice_fname_compressed);
@@ -3178 +3014 @@
 
         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 {
@@ -3190 +3024 @@
         retval += res;
         if (res) {
-            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);
+            log_to_screen("Failed to add slice %ld of bigfile %ld to scratchdir", slice_num, biggie_file_number + 1);
+            fatal_error("Hard disk full. You should have bought a bigger one.");
+        }
+    }
     mr_free(suffix);
     paranoid_fclose(fin);
@@ -3207 +3037 @@
     }
     log_msg(1, tmp);
-    paranoid_free(tmp);
-
-    paranoid_free(checksum_line);
+    mr_free(tmp);
+
     return (retval);
 }
@@ -3288 +3117 @@
     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);
@@ -3327 +3152 @@
 
     /*@ buffers ***************************************************** */
-    char *tmp;
-    char *cdno_fname;
-    char *lastcd_fname;
-    char *isofile;
+    char *tmp = NULL;
+    char *tmp1 = NULL;
+    char *cdno_fname = NULL;
+    char *lastcd_fname = NULL;
+    char *isofile = NULL;
     char *mds = NULL;
 
@@ -3341 +3167 @@
 
     malloc_string(tmp);
-    malloc_string(cdno_fname);
-    malloc_string(lastcd_fname);
-    malloc_string(isofile);
 
     assert(bkpinfo != NULL);
@@ -3357 +3180 @@
     /* label the ISO with its number */
 
-    sprintf(cdno_fname, "%s/archives/THIS-CD-NUMBER", bkpinfo->scratchdir);
+    mr_asprintf(cdno_fname, "%s/archives/THIS-CD-NUMBER", bkpinfo->scratchdir);
     fout = fopen(cdno_fname, "w");
+    mr_free(cdno_fname);
+
     fprintf(fout, "%d", g_current_media_number);
     paranoid_fclose(fout);
 
-    sprintf(tmp, "cp -f %s/autorun %s/", g_mondo_home,
-            bkpinfo->scratchdir);
-    if (run_program_and_log_output(tmp, FALSE)) {
+    mr_asprintf(tmp1, "cp -f %s/autorun %s/", g_mondo_home, bkpinfo->scratchdir);
+    if (run_program_and_log_output(tmp1, FALSE)) {
         log_msg(2, "Warning - unable to copy autorun to scratchdir");
     }
+    mr_free(tmp1);
 
     /* last CD or not? Label accordingly */
-    sprintf(lastcd_fname, "%s/archives/NOT-THE-LAST", bkpinfo->scratchdir);
+    mr_asprintf(lastcd_fname, "%s/archives/NOT-THE-LAST", bkpinfo->scratchdir);
     if (last_cd) {
         unlink(lastcd_fname);
@@ -3380 +3205 @@
         paranoid_fclose(fout);
     }
+    mr_free(lastcd_fname);
+
     if (space_occupied_by_cd(bkpinfo->scratchdir) / 1024 > bkpinfo->media_size) {
-        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,
+        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,
             bkpinfo->netfs_remote_dir, bkpinfo->prefix,
             g_current_media_number);
@@ -3402 +3225 @@
             {
                 log_msg(3, "*Sigh* Mike, I hate your computer.");
+                // if it can't be found then force pausing
                 bkpinfo->manual_cd_tray = TRUE;
-            }                   // if it can't be found then force pausing
-            else {
+            } else {
                 log_msg(3, "Great. Found Mike's CD-ROM drive.");
             }
@@ -3410 +3233 @@
         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("/")) {
@@ -3428 +3250 @@
         } else {
             mds = media_descriptor_string(bkpinfo->backup_media_type);
-            sprintf(tmp, "Failed to create %s #%d. Retry?", mds, g_current_media_number);
+            mr_asprintf(tmp1, "Failed to create %s #%d. Retry?", mds, g_current_media_number);
             mr_free(mds);
-            res = ask_me_yes_or_no(tmp);
+            res = ask_me_yes_or_no(tmp1);
+            mr_free(tmp1);
+
             if (!res) {
                 if (ask_me_yes_or_no("Abort the backup?")) {
@@ -3443 +3267 @@
         }
     }
+    mr_free(isofile);
+
     g_current_media_number++;
     wipe_archives(bkpinfo->scratchdir);
-    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");
-    }
+    mr_asprintf(tmp1, "rm -Rf %s/images/*gz %s/images/*data*img", bkpinfo->scratchdir, bkpinfo->scratchdir);
+    if (system(tmp1)) {
+        log_msg(2, "Error occurred when I tried to delete the redundant IMGs and GZs");
+    }
+    mr_free(tmp1);
 
     if (last_cd) {
@@ -3461 +3285 @@
     bkpinfo->verify_data = orig_vfy_flag_val;
     paranoid_free(tmp);
-    paranoid_free(cdno_fname);
-    paranoid_free(lastcd_fname);
-    paranoid_free(isofile);
     return (0);
 }
@@ -3532 +3353 @@
             if (res) {
                 mds = media_descriptor_string(bkpinfo->backup_media_type);
-                mr_asprintf(tmp, "Warnings/errors were reported while checking %s #%d", mds, g_current_media_number);
+                log_to_screen("Warnings/errors were reported while checking %s #%d", mds, g_current_media_number);
                 mr_free(mds);
-                log_to_screen(tmp);
-                mr_free(tmp);
 
             }