Changeset 3192 in MondoRescue

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.

Location:

branches/3.0/mondo/src

Files:

• common/libmondo-archive.c (modified) (127 diffs)
• common/libmondo-cli.c (modified) (39 diffs)
• common/libmondo-devices-EXT.h (modified) (2 diffs)
• common/libmondo-devices.c (modified) (112 diffs)
• common/libmondo-fifo.c (modified) (3 diffs)
• common/libmondo-filelist.c (modified) (55 diffs)
• common/libmondo-files-EXT.h (modified) (1 diff)
• common/libmondo-files.c (modified) (48 diffs)
• common/libmondo-files.h (modified) (1 diff)
• common/libmondo-fork.c (modified) (32 diffs)
• common/libmondo-gui-EXT.h (modified) (1 diff)
• common/libmondo-gui.c (modified) (1 diff)
• common/libmondo-gui.h (modified) (1 diff)
• common/libmondo-mountlist.c (modified) (30 diffs)
• common/libmondo-raid.c (modified) (21 diffs)
• common/libmondo-stream.c (modified) (42 diffs)
• common/libmondo-string.c (modified) (20 diffs)
• common/libmondo-tools.c (modified) (57 diffs)
• common/libmondo-verify.c (modified) (52 diffs)
• common/mondostructures.h (modified) (6 diffs)
• common/newt-specific.c (modified) (88 diffs)
• include/my-stuff.h (modified) (2 diffs)
• lib/mr_err.c (modified) (2 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);
 
             }

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

@@ -97 +97 @@
     for (i = 0; i < 128; i++) {
         if (flag_set[i]) {
-            log_msg(3, "-%c %s", i, flag_val[i]);
+            mr_asprintf(tmp, "-%c %s", i, flag_val[i]);
+            log_msg(3, tmp);
+            mr_free(tmp);
         }
     }
@@ -148 +150 @@
     char *tmp = NULL;
     char *tmp1 = NULL;
-    char *tmp2 = NULL;
     char *psz = NULL;
     char *p = NULL;
@@ -207 +208 @@
             log_msg(1, "Using star instead of afio");
         } else {
-            fatal_error("Neither afio nor star is installed. Please install at least one.");
+            fatal_error
+                ("Neither afio nor star is installed. Please install at least one.");
         }
     }
@@ -217 +219 @@
         }
         if (!find_home_of_exe("star")) {
-            fatal_error("Please install 'star' RPM or tarball if you are going to use -R. Thanks.");
+            fatal_error
+                ("Please install 'star' RPM or tarball if you are going to use -R. Thanks.");
         }
     }
@@ -231 +234 @@
 
     if (flag_set['I']) {
-        if (bkpinfo->include_paths && bkpinfo->include_paths[0] == '-') {
+        if (bkpinfo->include_paths[0] == '-') {
             retval++;
             log_to_screen("Please supply a sensible value with '-I'\n");
@@ -265 +268 @@
             }
         }
-        mr_free(tmp1);
+        paranoid_free(tmp1);
         mr_make_devlist_from_pathlist(flag_val['I'], 'I');
         log_msg(4, "Finished with the -I option");
     }
 
-    if (g_kernel_version >= 2.6 && !flag_set['d'] && (flag_set['c'] || flag_set['w']) && (! bkpinfo->restore_data)) {
-        fatal_error("If you are using the 2.6.x kernel, please specify the CD-R(W) device.");
+    if (g_kernel_version >= 2.6 && !flag_set['d']
+        && (flag_set['c'] || flag_set['w']) && (! bkpinfo->restore_data)) {
+        fatal_error
+            ("If you are using the 2.6.x kernel, please specify the CD-R(W) device.");
     }
 
@@ -278 +283 @@
         if (flag_set['I']) {
             retval++;
-            log_to_screen("Please do not use -J in combination with -I. If you want to make a list of files to backup, that's fine, use -J <filename> but please don't muddy the waters by combining -J with -I. Thanks. :-)");
+            log_to_screen
+                ("Please do not use -J in combination with -I. If you want to make a list of files to backup, that's fine, use -J <filename> but please don't muddy the waters by combining -J with -I. Thanks. :-)");
         }
         bkpinfo->make_filelist = FALSE;
-        mr_asprintf(bkpinfo->include_paths, "%s", flag_val['J']);
+        strcpy(bkpinfo->include_paths, flag_val['J']);
     }
 
     if ((flag_set['c'] || flag_set['w'] || flag_set['C'] || flag_set['r']) && (! bkpinfo->restore_data)) {
-        if (!flag_set['r'] && g_kernel_version <= 2.5 && strstr(flag_val['d'], "/dev/")) {
-            fatal_error("Please don't give a /dev entry. Give a SCSI node for the parameter of the -d flag.");
-        }
-        if (flag_set['r'] && g_kernel_version <= 2.5 && !strstr(flag_val['d'], "/dev/")) {
-            fatal_error("Please give a /dev entry, not a SCSI node, as the parameter of the -d flag.");
+        if (!flag_set['r'] && g_kernel_version <= 2.5
+            && strstr(flag_val['d'], "/dev/")) {
+            fatal_error
+                ("Please don't give a /dev entry. Give a SCSI node for the parameter of the -d flag.");
+        }
+        if (flag_set['r'] && g_kernel_version <= 2.5
+            && !strstr(flag_val['d'], "/dev/")) {
+            fatal_error
+                ("Please give a /dev entry, not a SCSI node, as the parameter of the -d flag.");
         }
         if (g_kernel_version >= 2.6 && !strstr(flag_val['d'], "/dev/")) {
-            log_to_screen("Linus says 2.6 has a broken ide-scsi module. Proceed at your own risk...");
-        }
-
-        if (system("which cdrecord > /dev/null 2> /dev/null") && system("which dvdrecord > /dev/null 2> /dev/null")) {
-            fatal_error("Please install dvdrecord/cdrecord and try again.");
+            log_to_screen
+                ("Linus says 2.6 has a broken ide-scsi module. Proceed at your own risk...");
+        }
+
+        if (system("which cdrecord > /dev/null 2> /dev/null")
+            && system("which dvdrecord > /dev/null 2> /dev/null")) {
+            fatal_error
+                ("Please install dvdrecord/cdrecord and try again.");
         }
         if (flag_set['C']) {
             bkpinfo->cdrw_speed = atoi(flag_val['C']);
             if (bkpinfo->cdrw_speed < 1) {
-                fatal_error("You specified a silly speed for a CD-R[W] drive");
+                fatal_error
+                    ("You specified a silly speed for a CD-R[W] drive");
             }
             if (!flag_set['L']) {
-                log_to_screen("You must use -L with -C. Therefore I am setting it for you.");
+                log_to_screen
+                    ("You must use -L with -C. Therefore I am setting it for you.");
                 flag_set['L'] = 1;
                 flag_val['L'][0] = '\0';
@@ -311 +326 @@
             log_msg(3, "flag_val['c'] = %s", flag_val['c']);
             log_msg(3, "flag_val['w'] = %s", flag_val['w']);
+//    log_msg(3, "flag_set['r'] = %i", flag_set['r'] );
             if (flag_set['c']) {
                 bkpinfo->cdrw_speed = atoi(flag_val['c']);
@@ -320 +336 @@
 
             if (bkpinfo->cdrw_speed < 1) {
-                fatal_error("You specified a silly speed for a CD-R[W] drive");
+                fatal_error
+                    ("You specified a silly speed for a CD-R[W] drive");
             }
         }
@@ -328 +345 @@
         log_it("Hmm! No tape drive specified. Let's see what we can do.");
         if (find_tape_device_and_size(flag_val['d'], tmp)) {
-            fatal_error("Tape device not specified. I couldn't find it either.");
+            fatal_error
+                ("Tape device not specified. I couldn't find it either.");
         }
         flag_set['d'] = TRUE;
-        log_to_screen("You didn't specify a tape streamer device. I'm assuming %s", flag_val['d']);
+        sprintf(tmp,
+                "You didn't specify a tape streamer device. I'm assuming %s",
+                flag_val['d']);
+        log_to_screen(tmp);
     }
 
@@ -337 +358 @@
     {
         if (! flag_set['d']) {
-            fatal_error("You need to specify a device file with -d for bootable USB device usage");
+            fatal_error
+                ("You need to specify a device file with -d for bootable USB device usage");
         }
         if ((!flag_set['s']) && (! bkpinfo->restore_data)) {
@@ -347 +369 @@
     {
         if (flag_set['m']) {
-            fatal_error("Manual CD tray (-m) not yet supported in conjunction w/ DVD drives. Drop -m.");
+            fatal_error
+                ("Manual CD tray (-m) not yet supported in conjunction w/ DVD drives. Drop -m.");
         }
         if (!flag_set['d']) {
@@ -356 +379 @@
         }
         if (strchr(flag_val['d'], ',')) {
-            fatal_error("Please don't give a SCSI node. Give a _device_, preferably a /dev entry, for the parameter of the -d flag.");
+            fatal_error
+                ("Please don't give a SCSI node. Give a _device_, preferably a /dev entry, for the parameter of the -d flag.");
         }
         if (! bkpinfo->restore_data) {
             if (!find_home_of_exe("growisofs")) {
-                fatal_error("Please install growisofs (probably part of dvd+rw-tools). If you want DVD support, you need it.");
+                fatal_error
+                    ("Please install growisofs (probably part of dvd+rw-tools). If you want DVD support, you need it.");
             }
             if (!find_home_of_exe("dvd+rw-format")) {
-                fatal_error("Please install dvd+rw-format (probably part of dvd+rw-tools). If you want DVD support, you need it.");
+                fatal_error
+                    ("Please install dvd+rw-format (probably part of dvd+rw-tools). If you want DVD support, you need it.");
             }
             if (!flag_set['s']) {
                 sprintf(flag_val['s'], "%d", DEFAULT_DVD_DISK_SIZE);    // 4.7 salesman's GB = 4.482 real GB = 4582 MB
                 strcat(flag_val['s'], "m");
-                log_to_screen("You did not specify a size (-s) for DVD. I'm guessing %s.", flag_val['s']);
+                log_to_screen
+                    ("You did not specify a size (-s) for DVD. I'm guessing %s.",
+                    flag_val['s']);
                 flag_set['s'] = 1;
             }
         }
+/*
+      if (flag_set['Z']) {
+      bkpinfo->blank_dvd_first = TRUE;
+      }
+*/
     }
 
     if (flag_set['t'] || flag_set['u']) {   /* tape size */
         if (strchr(flag_val['d'], ',')) {
-            fatal_error("Please don't give a SCSI node. Give a _device_, preferably a /dev entry, for the parameter of the -d flag.");
+            fatal_error
+                ("Please don't give a SCSI node. Give a _device_, preferably a /dev entry, for the parameter of the -d flag.");
         }
         if ((flag_set['O']) && (! bkpinfo->restore_data)) {
             if (flag_set['s']) {
                 if (flag_set['t']) {
-                    fatal_error("For the moment, please don't specify a tape size. Mondo should handle end-of-tape gracefully anyway.");
+                    fatal_error
+                        ("For the moment, please don't specify a tape size. Mondo should handle end-of-tape gracefully anyway.");
                 }
                 if (process_the_s_switch(flag_val['s'])) {
@@ -405 +440 @@
 
     if (flag_set['n']) {
-        mr_free(bkpinfo->netfs_mount);
-        mr_asprintf(bkpinfo->netfs_mount, "%s", flag_val['n']);
+        strncpy(bkpinfo->netfs_mount, flag_val['n'], MAX_STR_LEN);
         if (!flag_set['d']) {
-            mr_free(bkpinfo->netfs_remote_dir);
-            mr_asprintf(bkpinfo->netfs_remote_dir, "/");
+            strncpy(bkpinfo->netfs_remote_dir, "/", MAX_STR_LEN);
         }
         /* test for protocol */
@@ -440 +473 @@
         /* Store the 2 values */
         /*  using memmove instead of strcpy as per #584 */
-        /* memmove(bkpinfo->netfs_mount, p, MAX_STR_LEN); */
-        bkpinfo->netfs_mount = p;
+        memmove(bkpinfo->netfs_mount, p, MAX_STR_LEN); 
 
         /* test if we specified a user */
@@ -447 +479 @@
         if (p != NULL) {
             /* User found. Store the 2 values */
-            bkpinfo->netfs_user = bkpinfo->netfs_mount;
             p++;
             /* new netfs mount */
-            mr_asprintf(bkpinfo->netfs_mount, "%s", p);
-            /* now that user is computed, create the right value by removing end of string */
+            strcpy(tmp,p);
             p--;
             *p = '\0';
-        }
-        mr_asprintf(tmp1, "mount | grep -E \"^[a-z]*#*[%s@]*%s[/]* .*\" | cut -d' ' -f3", bkpinfo->netfs_user, bkpinfo->netfs_mount);
-        strncpy(bkpinfo->isodir, call_program_and_get_last_line_of_output(tmp), MAX_STR_LEN / 4);
-        mr_free(tmp1);
-
+            mr_asprintf(q,"%s",bkpinfo->netfs_mount);
+            bkpinfo->netfs_user = q;
+            strcpy(bkpinfo->netfs_mount,tmp);
+        }
+        sprintf(tmp, "mount | grep -E \"^[a-z]*#*[%s@]*%s[/]* .*\" | cut -d' ' -f3", bkpinfo->netfs_user,
+                bkpinfo->netfs_mount);
+        strncpy(bkpinfo->isodir,
+                call_program_and_get_last_line_of_output(tmp),
+                MAX_STR_LEN / 4);
         if (strlen(bkpinfo->isodir) < 3) {
             log_to_screen("Network share is not mounted. Trying to mount it for you.\n");
             if (bkpinfo->netfs_user) {
                 if (strstr(bkpinfo->netfs_proto, "sshfs")) {
-                    mr_asprintf(tmp1, "sshfs %s@%s", bkpinfo->netfs_user, bkpinfo->netfs_mount);
+                    sprintf(tmp, "sshfs %s@%s", bkpinfo->netfs_user, bkpinfo->netfs_mount);
                 } else if (strstr(bkpinfo->netfs_proto, "smbfs")) {
-                    mr_asprintf(tmp1, "mount -t cifs %s -o user=%s", bkpinfo->netfs_mount, bkpinfo->netfs_user);
+                    sprintf(tmp, "mount -t cifs %s -o user=%s", bkpinfo->netfs_mount, bkpinfo->netfs_user);
                 } else if (strstr(bkpinfo->netfs_proto, "nfs")) {
-                    mr_asprintf(tmp1, "mount %s@%s", bkpinfo->netfs_user, bkpinfo->netfs_mount);
+                    sprintf(tmp, "mount %s@%s", bkpinfo->netfs_user, bkpinfo->netfs_mount);
                 } else {
                     log_to_screen("Protocol %s not supported yet for network backups.\n", bkpinfo->netfs_proto);
@@ -474 +508 @@
             } else {
                 if (strstr(bkpinfo->netfs_proto, "sshfs")) {
-                    mr_asprintf(tmp1, "sshfs %s", bkpinfo->netfs_mount);
+                    sprintf(tmp, "sshfs %s", bkpinfo->netfs_mount);
                 } else if (strstr(bkpinfo->netfs_proto, "smbfs")) {
-                    mr_asprintf(tmp1, "mount -t cifs %s", bkpinfo->netfs_mount);
+                    sprintf(tmp, "mount -t cifs %s", bkpinfo->netfs_mount);
                 } else if (strstr(bkpinfo->netfs_proto, "nfs")) {
-                    mr_asprintf(tmp1, "mount %s", bkpinfo->netfs_mount);
+                    sprintf(tmp, "mount %s", bkpinfo->netfs_mount);
                 } else {
                     log_to_screen("Protocol %s not supported yet for network backups.\n", bkpinfo->netfs_proto);
@@ -484 +518 @@
                 }
             }
-            i = system(tmp1);
-            mr_free(tmp1);
-
-            if (i) {
+            if (system(tmp)) {
                 log_to_screen("Unable to mount Network share %s. Please mount manually.\n", bkpinfo->netfs_mount);
                 retval++;
             } else {
                 if (bkpinfo->netfs_user) {
-                    mr_asprintf(tmp1, "mount | grep -E \"^[%s@]*%s[/]* .*\" | cut -d' ' -f3", bkpinfo->netfs_user, bkpinfo->netfs_mount);
+                    sprintf(tmp, "mount | grep -E \"^[%s@]*%s[/]* .*\" | cut -d' ' -f3", bkpinfo->netfs_user,
+                        bkpinfo->netfs_mount);
                 } else {
-                    mr_asprintf(tmp1, "mount | grep -E \"^%s[/]* .*\" | cut -d' ' -f3", bkpinfo->netfs_mount);
+                    sprintf(tmp, "mount | grep -E \"^%s[/]* .*\" | cut -d' ' -f3", bkpinfo->netfs_mount);
                 }
-                strncpy(bkpinfo->isodir, call_program_and_get_last_line_of_output(tmp), MAX_STR_LEN / 4);
+                strncpy(bkpinfo->isodir,
+                        call_program_and_get_last_line_of_output(tmp),
+                        MAX_STR_LEN / 4);
                 if (strlen(bkpinfo->isodir) < 3) {
                     retval++;
@@ -590 +624 @@
             }
         }
-        mr_free(tmp1);
+        paranoid_free(tmp1);
 
         mr_make_devlist_from_pathlist(flag_val['E'], 'E');
@@ -634 +668 @@
         log_msg(1, "Internal tape block size is now %ld bytes", itbs);
         if (itbs % 512 != 0 || itbs < 256 || itbs > 1024L * 1024) {
-            fatal_error("Are you nuts? Silly, your internal tape block size is. Abort, I shall.");
+            fatal_error
+                ("Are you nuts? Silly, your internal tape block size is. Abort, I shall.");
         }
         bkpinfo->internal_tape_block_size = itbs;
@@ -643 +678 @@
 //      bkpinfo->differential = atoi (flag_val['D']);
         if ((bkpinfo->differential < 1) || (bkpinfo->differential > 9)) {
-            fatal_error("The D option should be between 1 and 9 inclusive");
+            fatal_error
+                ("The D option should be between 1 and 9 inclusive");
         }
     }
@@ -666 +702 @@
             && !does_file_exist(bkpinfo->kernel_path)) {
             retval++;
-            log_to_screen("You specified kernel '%s', which does not exist\n", bkpinfo->kernel_path);
+            sprintf(tmp,
+                    "You specified kernel '%s', which does not exist\n",
+                    bkpinfo->kernel_path);
+            log_to_screen(tmp);
         }
     }
@@ -684 +723 @@
             }
         } else if (flag_set['n']) {
-            mr_free(bkpinfo->netfs_remote_dir);
-            mr_asprintf(bkpinfo->netfs_remote_dir, "%s", flag_val['d']);
+            strncpy(bkpinfo->netfs_remote_dir, flag_val['d'], MAX_STR_LEN);
         } else {                /* backup device (if tape/CD-R/CD-RW) */
             strncpy(bkpinfo->media_device, flag_val['d'], MAX_STR_LEN / 4);
@@ -694 +732 @@
         mr_asprintf(tmp1,"%s/%s/.dummy.txt", bkpinfo->isodir,bkpinfo->netfs_remote_dir);
         if ((bkpinfo->netfs_user) && (strstr(bkpinfo->netfs_proto,"nfs"))) {
-            mr_asprintf(tmp2, "su - %s -c \"echo hi > %s\"", bkpinfo->netfs_user, tmp1);
+            sprintf(tmp, "su - %s -c \"echo hi > %s\"", bkpinfo->netfs_user, tmp1);
         } else {
-            mr_asprintf(tmp2, "echo hi > %s", tmp1);
-        }
-        i = run_program_and_log_output(tmp2, 2);
-        mr_free(tmp2);
-
-        if (i) {
-            retval++;
-            log_to_screen("Are you sure directory '%s' exists in remote dir '%s'?\nIf so, do you have rights to write to it?\n", bkpinfo->netfs_remote_dir, bkpinfo->netfs_mount);
+            sprintf(tmp, "echo hi > %s", tmp1);
+        }
+        if (run_program_and_log_output(tmp, 2)) {
+            retval++;
+            sprintf(tmp,
+                    "Are you sure directory '%s' exists in remote dir '%s'?\nIf so, do you have rights to write to it?\n",
+                    bkpinfo->netfs_remote_dir, bkpinfo->netfs_mount);
+            log_to_screen(tmp);
         }
         unlink(tmp1);
-        mr_free(tmp1);
-    }
-
-    if (!flag_set['d'] && (flag_set['c'] || flag_set['w'] || flag_set['C'])) {
+        paranoid_free(tmp1);
+    }
+
+    if (!flag_set['d']
+        && (flag_set['c'] || flag_set['w'] || flag_set['C'])) {
         if (g_kernel_version >= 2.6) {
             if (popup_and_get_string
@@ -730 +769 @@
         retval++;
         log_to_screen("Please specify the backup device/directory.\n");
-        fatal_error("You didn't use -d to specify the backup device/directory.");
+        fatal_error
+            ("You didn't use -d to specify the backup device/directory.");
     }
 
@@ -741 +781 @@
     if (flag_set['S']) {
         setup_scratchdir(flag_val['S']);
-        mr_asprintf(tmp1, "touch %s/.foo.dat", bkpinfo->scratchdir);
-        if (run_program_and_log_output(tmp1, 1)) {
-            retval++;
-            mr_free(tmp1);
+        sprintf(tmp, "touch %s/.foo.dat", bkpinfo->scratchdir);
+        if (run_program_and_log_output(tmp, 1)) {
+            retval++;
             log_to_screen("Please specify a scratchdir which I can write to. :)");
             fatal_error("I cannot write to the scratchdir you specified.");
         }
-        mr_free(tmp1);
-
-        mr_asprintf(tmp1, "ln -sf %s/.foo.dat %s/.bar.dat", bkpinfo->scratchdir, bkpinfo->scratchdir);
-        if (run_program_and_log_output(tmp1, 1)) {
-            retval++;
-            mr_free(tmp1);
+        sprintf(tmp, "ln -sf %s/.foo.dat %s/.bar.dat", bkpinfo->scratchdir, bkpinfo->scratchdir);
+        if (run_program_and_log_output(tmp, 1)) {
+            retval++;
             log_to_screen("Please don't specify a SAMBA or VFAT or NFS scratchdir.");
             fatal_error("I cannot write to the scratchdir you specified.");
         }
-        mr_free(tmp1);
     }
 
     if (flag_set['T']) {
         setup_tmpdir(flag_val['T']);
-        mr_asprintf(tmp1, "touch %s/.foo.dat", bkpinfo->tmpdir);
-        i = run_program_and_log_output(tmp1, 1);
-        mr_free(tmp1);
-
-        if (i) {
+        sprintf(tmp, "touch %s/.foo.dat", bkpinfo->tmpdir);
+        if (run_program_and_log_output(tmp, 1)) {
             retval++;
             log_to_screen("Please specify a tempdir which I can write to. :)");
             fatal_error("I cannot write to the tempdir you specified.");
         }
-        mr_asprintf(tmp1, "ln -sf %s/.foo.dat %s/.bar.dat", bkpinfo->tmpdir, bkpinfo->tmpdir);
-        i = run_program_and_log_output(tmp1, 1);
-        mr_free(tmp1);
-
-        if (i) {
+        sprintf(tmp, "ln -sf %s/.foo.dat %s/.bar.dat", bkpinfo->tmpdir, bkpinfo->tmpdir);
+        if (run_program_and_log_output(tmp, 1)) {
             retval++;
             log_to_screen("Please don't specify a SAMBA or VFAT or NFS tmpdir.");
@@ -804 +833 @@
 #  endif
 #endif
-        if (!strchr(BOOT_LOADER_CHARS, (bkpinfo->boot_loader = flag_val['l'][0]))) {
-            log_msg(1, "%c? What is %c? I need G, L, E or R.", bkpinfo->boot_loader, bkpinfo->boot_loader);
-            fatal_error("Please specify GRUB, LILO, ELILO  or RAW with the -l switch");
+        if (!strchr
+            (BOOT_LOADER_CHARS,
+             (bkpinfo->boot_loader = flag_val['l'][0]))) {
+            log_msg(1, "%c? WTF is %c? I need G, L, E or R.",
+                    bkpinfo->boot_loader, bkpinfo->boot_loader);
+            fatal_error
+                ("Please specify GRUB, LILO, ELILO  or RAW with the -l switch");
         }
 #undef BOOT_LOADER_CHARS
@@ -812 +845 @@
 
     if (flag_set['f']) {
-        strncpy(bkpinfo->boot_device, resolve_softlinks_to_get_to_actual_device_file(flag_val['f']),MAX_STR_LEN / 4);
+        strncpy(bkpinfo->boot_device,
+                resolve_softlinks_to_get_to_actual_device_file(flag_val
+                                                               ['f']),
+                MAX_STR_LEN / 4);
     }
 
@@ -830 +866 @@
         if (run_program_and_log_output("which lzop", 2)) {
             retval++;
-            log_to_screen("Please install LZOP. You can't use '-L' until you do.\n");
+            log_to_screen
+                ("Please install LZOP. You can't use '-L' until you do.\n");
         }
     }
@@ -843 +880 @@
         if (run_program_and_log_output("which gzip", 2)) {
             retval++;
-            log_to_screen("Please install gzip. You can't use '-G' until you do.\n");
-        }
-    }
-
-    if ((flag_set['Y']) && (! bkpinfo->restore_data)) {
-        bkpinfo->use_lzma = TRUE;
-        if (run_program_and_log_output("which lzma", 2)) {
-            retval++;
-            log_to_screen("Please install lzma. You can't use '-Y' until you do.\n");
+            log_to_screen
+                ("Please install gzip. You can't use '-G' until you do.\n");
         }
     }
@@ -867 +897 @@
     if ((!is_this_a_valid_disk_format("vfat")) && (! bkpinfo->restore_data)) {
         bkpinfo->make_cd_use_lilo = TRUE;
-        log_to_screen("Your kernel appears not to support vfat filesystems. I am therefore");
-        log_to_screen("using LILO instead of SYSLINUX as the media boot loader.");
+        log_to_screen
+            ("Your kernel appears not to support vfat filesystems. I am therefore");
+        log_to_screen
+            ("using LILO instead of SYSLINUX as the media boot loader.");
     }
     if ((run_program_and_log_output("which mkfs.vfat", 2)) && (! bkpinfo->restore_data)) {
         bkpinfo->make_cd_use_lilo = TRUE;
 #ifdef __IA32__
-        log_to_screen("Your filesystem is missing 'mkfs.vfat', so I cannot use SYSLINUX as");
-        log_to_screen("your boot loader. I shall therefore use LILO instead.");
+        log_to_screen
+            ("Your filesystem is missing 'mkfs.vfat', so I cannot use SYSLINUX as");
+        log_to_screen
+            ("your boot loader. I shall therefore use LILO instead.");
 #endif
 #ifdef __IA64__
-        log_to_screen("Your filesystem is missing 'mkfs.vfat', so I cannot prepare the EFI");
+        log_to_screen
+            ("Your filesystem is missing 'mkfs.vfat', so I cannot prepare the EFI");
         log_to_screen("environment correctly. Please install it.");
         fatal_error("Aborting");
@@ -897 +932 @@
 
     if ((! bkpinfo->restore_data) && (flag_set['Z'])) {
-            fatal_error("The -Z switch is only valid in restore mode");
+            fatal_error
+                ("The -Z switch is only valid in restore mode");
     }
 
@@ -937 +973 @@
  * @return The number of problems with the command line (0 for success).
  */
-int retrieve_switches_from_command_line(int argc, char *argv[], char flag_val[128][MAX_STR_LEN], bool flag_set[128])
+int
+retrieve_switches_from_command_line(int argc, char *argv[],
+                                    char flag_val[128][MAX_STR_LEN],
+                                    bool flag_set[128])
 {
     /*@ ints ** */
     int opt = 0;
+    char *tmp = NULL;
     int i = 0;
     int len;
@@ -954 +994 @@
         flag_set[i] = FALSE;
     }
-    while ((opt = getopt(argc, argv, MONDO_OPTIONS)) != -1) {
+    while ((opt =
+            getopt(argc, argv, MONDO_OPTIONS))
+           != -1) {
         if (opt == '?') {
             bad_switches = TRUE;
+            /*log_it("Invalid option: %c\n",optopt); */
         } else {
             if (flag_set[opt]) {
                 bad_switches = TRUE;
-                log_to_screen("Switch -%c previously defined as %s\n", opt, flag_val[opt]);
+                mr_asprintf(tmp, "Switch -%c previously defined as %s\n", opt, flag_val[opt]);
+                log_to_screen(tmp);
+                paranoid_free(tmp);
             } else {
                 flag_set[opt] = TRUE;
@@ -974 +1019 @@
                         if (strchr(flag_val[opt], '/')
                             && flag_val[opt][0] != '/') {
-                            log_to_screen("-%c flag --- must be absolute path --- '%s' isn't absolute", opt, flag_val[opt]);
+                            mr_asprintf(tmp, "-%c flag --- must be absolute path --- '%s' isn't absolute", opt, flag_val[opt]);
+                            log_to_screen(tmp);
+                            paranoid_free(tmp);
                             bad_switches = TRUE;
                         }
@@ -985 +1032 @@
     for (i = optind; i < argc; i++) {
         bad_switches = TRUE;
-        log_to_screen("Invalid arg -- %s\n", argv[i]);
+        mr_asprintf(tmp, "Invalid arg -- %s\n", argv[i]);
+        log_to_screen(tmp);
+        paranoid_free(tmp);
     }
     return (bad_switches);
@@ -1048 +1097 @@
     mr_strcat(tmp, " signal received from OS");
     log_to_screen(tmp);
-    mr_free(tmp);
+    paranoid_free(tmp);
 
     log_to_screen(tmp2);
-    mr_free(tmp2);
+    paranoid_free(tmp2);
     if (sig == SIGABRT) {
         sleep(10);
@@ -1059 +1108 @@
     free_MR_global_filenames();
 
-    fatal_error("MondoRescue is terminating in response to a signal from the OS");
+    fatal_error
+        ("MondoRescue is terminating in response to a signal from the OS");
     finish(254);                // just in case
 }
@@ -1072 +1122 @@
 void set_signals(int on)
 {
-    int signals[] = { SIGTERM, SIGHUP, SIGTRAP, SIGABRT, SIGINT, SIGKILL, SIGSTOP, 0 };
+    int signals[] =
+        { SIGTERM, SIGHUP, SIGTRAP, SIGABRT, SIGINT, SIGKILL, SIGSTOP, 0 };
     int i;
 

branches/3.0/mondo/src/common/libmondo-devices-EXT.h

@@ -16 +16 @@
 extern int find_device_in_mountlist(struct mountlist_itself *mountlist,
                                     char *device);
-extern int mount_CDROM_here(char *device, const char *mountpoint);
+extern int mount_CDROM_here(char *device, char *mountpoint);
 extern long long size_of_specific_device_in_mountlist(struct
                                                       mountlist_itself
@@ -57 +57 @@
 extern int inject_device(char *dev);
 extern bool does_nonMS_partition_exist(void);
-extern char *resolve_softlinks_to_get_to_actual_device_file(char *incoming);
+extern char *resolve_softlinks_to_get_to_actual_device_file(char
+                                                            *incoming);
 
 extern void set_g_cdrom_and_g_dvd_to_bkpinfo_value();

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

@@ -21 +21 @@
 #include "libmondo-stream-EXT.h"
 
-extern void mr_strip_spaces(char *);
-
 #include <sys/types.h>
 #ifdef __FreeBSD__
@@ -129 +127 @@
 {
     char *tmp = NULL;
+    char *comment;
     bool is_this_a_ramdisk = FALSE;
 
+    malloc_string(comment);
     mr_asprintf(tmp, "%s", where_is_root_mounted());
-    log_msg(0, "root is mounted at %s\n", tmp);
-    log_msg(0, "That doesn't mean %s is the root partition. It's just a debugging message. Relax. It's part of am_I_in_disaster_recovery_mode().", tmp);
+    sprintf(comment, "root is mounted at %s\n", tmp);
+    log_msg(0, comment);
+    log_msg(0,
+            "No, Schlomo, that doesn't mean %s is the root partition. It's just a debugging message. Relax. It's part of am_I_in_disaster_recovery_mode().",
+            tmp);
 
 #ifdef __FreeBSD__
@@ -153 +156 @@
     if (is_this_a_ramdisk) {
         if (!does_file_exist("/THIS-IS-A-RAMDISK")) {
-            log_to_screen("Using /dev/root is stupid of you but I'll forgive you.");
+            log_to_screen
+                ("Using /dev/root is stupid of you but I'll forgive you.");
             is_this_a_ramdisk = FALSE;
         }
@@ -160 +164 @@
         is_this_a_ramdisk = TRUE;
     }
-
-    log_msg(1, "Is this a ramdisk? result = %s", (is_this_a_ramdisk) ? "TRUE" : "FALSE");
+    paranoid_free(comment);
+    log_msg(1, "Is this a ramdisk? result = %d", is_this_a_ramdisk);
     return (is_this_a_ramdisk);
 }
@@ -225 +229 @@
 int eject_device(char *dev)
 {
-    char *command = NULL;
+    char *command;
     int res1 = 0, res2 = 0;
 
-    if (dev == NULL) {
-        return (1);
-    }
+    malloc_string(command);
 
     if (IS_THIS_A_STREAMING_BACKUP(g_backup_media_type)
         && g_backup_media_type != udev) {
-        mr_asprintf(command, "mt -f %s offline", dev);
+        sprintf(command, "mt -f %s offline", dev);
         res1 = run_program_and_log_output(command, 1);
-        mr_free(command);
     } else {
         res1 = 0;
@@ -243 +244 @@
 #ifdef __FreeBSD__
     if (strstr(dev, "acd")) {
-        mr_asprintf(command, "cdcontrol -f %s eject", dev);
+        sprintf(command, "cdcontrol -f %s eject", dev);
     } else {
-        mr_asprintf(command, "camcontrol eject `echo %s | sed 's|/dev/||'`", dev);
+        sprintf(command, "camcontrol eject `echo %s | sed 's|/dev/||'`",
+                dev);
     }
 #else
-    mr_asprintf(command, "eject %s", dev);
+    sprintf(command, "eject %s", dev);
 #endif
 
     log_msg(3, "Ejecting %s", dev);
     res2 = run_program_and_log_output(command, 1);
-    mr_free(command);
+    paranoid_free(command);
     if (res1 && res2) {
         return (1);
@@ -268 +270 @@
 int inject_device(char *dev)
 {
-    char *command = NULL;
+    char *command;
     int i;
 
-    if (dev == NULL) {
-        return (1);
-    }
+    malloc_string(command);
+
 
 #ifdef __FreeBSD__
     if (strstr(dev, "acd")) {
-        mr_asprintf(command, "cdcontrol -f %s close", dev);
+        sprintf(command, "cdcontrol -f %s close", dev);
     } else {
-        mr_asprintf(command, "camcontrol load `echo %s | sed 's|/dev/||'`", dev);
+        sprintf(command, "camcontrol load `echo %s | sed 's|/dev/||'`",
+                dev);
     }
 #else
-    mr_asprintf(command, "eject -t %s", dev);
+    sprintf(command, "eject -t %s", dev);
 #endif
     i = run_program_and_log_output(command, FALSE);
-    mr_free(command);
+    paranoid_free(command);
     return (i);
 }
@@ -299 +301 @@
 
     /*@ buffers *********************************************************** */
-    char *tmp = NULL;
+    char *tmp;
     bool ret;
 
+    malloc_string(tmp);
     assert_string_is_neither_NULL_nor_zerolength(device);
 
-    mr_asprintf(tmp, "ls %s > /dev/null 2> /dev/null", device);
+    sprintf(tmp, "ls %s > /dev/null 2> /dev/null", device);
 
     if (system(tmp)) {
@@ -311 +314 @@
         ret = TRUE;
     }
-    mr_free(tmp);
+    paranoid_free(tmp);
     return (ret);
 }
@@ -342 +345 @@
 {
     /*@ buffers **************************************************** */
-    char *program = NULL;
-    char *incoming = NULL;
+    char *program;
+    char *incoming;
     char *searchstr = NULL;
+    char *tmp;
+    char *p;
 
     /*@ ints ******************************************************* */
@@ -351 +356 @@
     /*@ pointers *************************************************** */
     FILE *fin;
+
 
     /*@ end vars *************************************************** */
@@ -356 +362 @@
     assert(partno >= 0 && partno < 999);
 
+    malloc_string(program);
+    malloc_string(incoming);
     malloc_string(searchstr);
+    malloc_string(tmp);
 
 #ifdef __FreeBSD__
     // We assume here that this is running from mondorestore. (It is.)
-    mr_asprintf(program, "ls %s %s >/dev/null 2>&1", drive, build_partition_name(tmp, drive, partno));
-    res = system(program);
-    mr_free(program);
-    return(res);
-#endif
-
-    mr_asprintf(program, "parted2fdisk -l %s 2> /dev/null", drive);
+    sprintf(program, "ls %s %s >/dev/null 2>&1", drive,
+            build_partition_name(tmp, drive, partno));
+    return system(program);
+#else
+    tmp[0] = '\0';
+#endif
+
+    sprintf(program, "parted2fdisk -l %s 2> /dev/null", drive);
     fin = popen(program, "r");
     if (!fin) {
         log_it("program=%s", program);
         log_OS_error("Cannot popen-in program");
-        mr_free(program);
         return (0);
     }
-    mr_free(program);
-
     (void) build_partition_name(searchstr, drive, partno);
     strcat(searchstr, " ");
-    for (res = 0, mr_getline(incoming, fin); !res && !feof(fin) ; mr_getline(incoming, fin)) {
+    for (res = 0; !res && (p = fgets(incoming, MAX_STR_LEN - 1, fin));) {
         if (strstr(incoming, searchstr)) {
             res = 1;
         }
-        mr_free(incoming);
-    }
-    mr_free(incoming);
-
+    }
     if (pclose(fin)) {
         log_OS_error("Cannot pclose fin");
     }
+    paranoid_free(program);
+    paranoid_free(incoming);
     paranoid_free(searchstr);
+    paranoid_free(tmp);
     return (res);
 }
@@ -406 +413 @@
 {
     /*@ buffers **************************************************** */
-    char *command = NULL;
+    char *command;
 
     /*@ end vars *************************************************** */
@@ -414 +421 @@
     assert_string_is_neither_NULL_nor_zerolength(str);
 
-    /* For UEFI detection, this should be extended to count=2 */
-    mr_asprintf(command, "dd if=%s bs=446 count=1 2> /dev/null | strings | grep \"%s\" > /dev/null 2> /dev/null", dev, str);
+    malloc_string(command);
+    sprintf(command,
+            "dd if=%s bs=446 count=1 2> /dev/null | strings | grep \"%s\" > /dev/null 2> /dev/null",
+            dev, str);
     i = system(command);
-    mr_free(command);
+    paranoid_free(command);
     if (i) {
         return (FALSE);
@@ -435 +444 @@
 {
     /*@ buffers **************************************************** */
-    char *command = NULL;
+    char *command;
     /*@ end vars *************************************************** */
     int i;
 
-    mr_asprintf(command, "dd if=%s bs=512 count=%i 2> /dev/null | strings | grep \"%s\" > /dev/null 2> /dev/null", dev, n, str);
+    malloc_string(command);
+    sprintf(command,
+            "dd if=%s bs=512 count=%i 2> /dev/null | strings | grep \"%s\" > /dev/null 2> /dev/null",
+            dev, n, str);
     i = system(command);
-    mr_free(command);
+    paranoid_free(command);
     if (i) {
         return (FALSE);
@@ -454 +466 @@
  * Try to mount CD-ROM at @p mountpoint. If the CD-ROM is not found or has
  * not been specified, call find_cdrom_device() to find it.
+ * @param bkpinfo The backup information structure. The only field used is @c bkpinfo->media_device.
  * @param mountpoint Where to mount the CD-ROM.
  * @return 0 for success, nonzero for failure.
  * @see mount_CDROM_here
  */
-int find_and_mount_actual_cd(char *mountpoint) {
-
+int find_and_mount_actual_cd(char *mountpoint)
+{
     /*@ buffers ***************************************************** */
 
     /*@ int's  ****************************************************** */
     int res;
-    char *dev = NULL;
+    char *dev;
 
     /*@ end vars **************************************************** */
@@ -519 +532 @@
 {
     /*@ buffers ************************ */
+    char *comment;
     char *tmp = NULL;
     char *cdr_exe = NULL;
-    char *command = NULL;
-
+    char *command;
+
+    malloc_string(comment);
+    malloc_string(command);
     if (g_cdrw_drive_is_here[0]) {
         strcpy(cdrw_device, g_cdrw_drive_is_here);
         log_msg(3, "Been there, done that. Returning %s", cdrw_device);
+        paranoid_free(comment);
+        paranoid_free(command);
         return (0);
     }
     if (g_backup_media_type == dvd) {
-        log_msg(1, "This is dumb. You're calling find_cdrw_device() but you're backing up to DVD. WTF?");
+        log_msg(1,
+                "This is dumb. You're calling find_cdrw_device() but you're backing up to DVD. WTF?");
+        paranoid_free(comment);
+        paranoid_free(command);
         return (1);
     }
@@ -539 +560 @@
     }
     if (find_home_of_exe(cdr_exe)) {
-        mr_asprintf(command, "%s -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep -E '[D|C][V|D]' | cut -d' ' -f2 | head -n1", cdr_exe);
+        sprintf(command,
+                "%s -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep -E '[D|C][V|D]' | cut -d' ' -f2 | head -n1",
+                cdr_exe);
         mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
-        mr_free(command);
     }
     if ((tmp == NULL) || (strlen(tmp) < 2)) {
+        paranoid_free(comment);
         mr_free(tmp);
         mr_free(cdr_exe);
+        paranoid_free(command);
         return 1;
     } else {
         strcpy(cdrw_device, tmp);
-        log_it("Found CDRW device - %s", cdrw_device);
+        sprintf(comment, "Found CDRW device - %s", cdrw_device);
+        log_it(comment);
         strcpy(g_cdrw_drive_is_here, cdrw_device);
+        paranoid_free(comment);
         mr_free(tmp);
         mr_free(cdr_exe);
+        paranoid_free(command);
         return (0);
     }
 }
+
+
 
 
@@ -580 +609 @@
 
     /*@ buffers ***************************************************** */
-    char *tmp = NULL;
+    char *tmp;
     char *tmp1 = NULL;
     char *cdr_exe = NULL;
     char *phrase_one;
-    char *phrase_two = NULL;
-    char *command = NULL;
-#ifndef __FreeBSD__
-    char *dvd_last_resort = NULL;
-#endif
-    char *mountpoint = NULL;
+    char *phrase_two;
+    char *command;
+    char *dvd_last_resort;
+    char *mountpoint;
     static char the_last_place_i_found_it[MAX_STR_LEN] = "";
 
@@ -595 +622 @@
     malloc_string(tmp);
     malloc_string(phrase_one);
+    malloc_string(phrase_two);
+    malloc_string(command);
+    malloc_string(dvd_last_resort);
     malloc_string(mountpoint);
 
     output[0] = '\0';
     phrase_one[0] = '\0';
+    phrase_two[0] = '\0';
+    dvd_last_resort[0] = '\0';
 
     /*@ end vars **************************************************** */
@@ -610 +642 @@
     if (the_last_place_i_found_it[0] != '\0' && !try_to_mount) {
         strcpy(output, the_last_place_i_found_it);
-        log_msg(3, "find_cdrom_device() --- returning last found location - '%s'", output);
+        log_msg(3,
+                "find_cdrom_device() --- returning last found location - '%s'",
+                output);
         retval = 0;
         goto end_of_find_cdrom_device;
@@ -637 +671 @@
     }
 
-    mr_asprintf(command, "%s -scanbus 2> /dev/null", cdr_exe);
+    sprintf(command, "%s -scanbus 2> /dev/null", cdr_exe);
     fin = popen(command, "r");
     if (!fin) {
@@ -643 +677 @@
         log_OS_error("Cannot popen command");
         mr_free(cdr_exe);
-        mr_free(command);
         return (1);
     }
-    mr_free(command);
-
     for (tmp1 = fgets(tmp, MAX_STR_LEN, fin); !feof(fin) && (tmp1 != NULL);
          tmp1 = fgets(tmp, MAX_STR_LEN, fin)) {
@@ -665 +696 @@
                         }
                         *q = '\0';
-                        mr_asprintf(phrase_two, "%s", p);
+                        strcpy(phrase_two, p);
                     }
                 }
@@ -674 +705 @@
 
 #ifndef __FreeBSD__
-    if (!phrase_two || strlen(phrase_two) == 0) {
+    if (strlen(phrase_two) == 0) {
         log_msg(4, "Not running phase two. String is empty.");
     } else {
-        mr_asprintf(command, "dmesg | grep \"%s\" 2> /dev/null", phrase_two);
+        sprintf(command, "dmesg | grep \"%s\" 2> /dev/null", phrase_two);
         fin = popen(command, "r");
-        mr_free(command);
-
         if (!fin) {
             log_msg(4, "Cannot run 2nd command - non-fatal, fortunately");
@@ -692 +721 @@
                         *p = '\0';
                         if (strstr(tmp, "DVD")) {
-                            mr_free(dvd_last_resort);
-                            mr_asprintf(dvd_last_resort, "/dev/%s", tmp);
-                            log_msg(4, "Ignoring '%s' because it's a DVD drive", tmp);
+                            sprintf(dvd_last_resort, "/dev/%s", tmp);
+                            log_msg(4,
+                                    "Ignoring '%s' because it's a DVD drive",
+                                    tmp);
                         } else {
                             sprintf(output, "/dev/%s", tmp);
@@ -745 +775 @@
 #else
     if (!found_it && strlen(dvd_last_resort) > 0) {
-        log_msg(4, "Well, I'll use the DVD - %s - as a last resort", dvd_last_resort);
+        log_msg(4, "Well, I'll use the DVD - %s - as a last resort",
+                dvd_last_resort);
         strcpy(output, dvd_last_resort);
         found_it = TRUE;
     }
     if (found_it) {
-        sprintf(tmp, "grep \"%s=ide-scsi\" /proc/cmdline &> /dev/null", strrchr(output, '/') + 1);
+        sprintf(tmp, "grep \"%s=ide-scsi\" /proc/cmdline &> /dev/null",
+                strrchr(output, '/') + 1);
         if (system(tmp) == 0) {
-            log_msg(4, "%s is not right. It's being SCSI-emulated. Continuing.", output);
+            log_msg(4,
+                    "%s is not right. It's being SCSI-emulated. Continuing.",
+                    output);
             found_it = FALSE;
             output[0] = '\0';
@@ -818 +852 @@
                 found_it = FALSE;
             } else {
-                mr_asprintf(command, "umount %s", output);
+                sprintf(command, "umount %s", output);
                 paranoid_system(command);
-                mr_free(command);
-
                 log_msg(4, "I'm confident the Mondo CD is in %s", output);
             }
@@ -840 +872 @@
     }
 
-    mr_asprintf(command, "%s -scanbus | grep \"[0-9],[0-9],[0-9]\" | grep -E \"[D|C][V|D]\" | grep -n \"\" | grep \"%s\" | cut -d':' -f2", cdr_exe, g_cdrw_drive_is_here);
-
+    sprintf(command,
+            "%s -scanbus | grep \"[0-9],[0-9],[0-9]\" | grep -E \"[D|C][V|D]\" | grep -n \"\" | grep \"%s\" | cut -d':' -f2",
+            cdr_exe, g_cdrw_drive_is_here);
     log_msg(1, "command=%s", command);
     mr_asprintf(tmp1, "%s", call_program_and_get_last_line_of_output(command));
-    mr_free(command);
-
     if (strlen(tmp1) > 0) {
         strcpy(output, tmp1);
@@ -857 +888 @@
 
   end_of_find_cdrom_device:
+    paranoid_free(tmp);
     mr_free(cdr_exe);
-    mr_free(phrase_two);
-    mr_free(dvd_last_resort);
-
-    paranoid_free(tmp);
     paranoid_free(phrase_one);
+    paranoid_free(phrase_two);
+    paranoid_free(command);
+    paranoid_free(dvd_last_resort);
     paranoid_free(mountpoint);
     return (retval);
@@ -868 +899 @@
 
 
+
+
+
 int find_dvd_device(char *output, bool try_to_mount)
 {
+    char *command;
     char *tmp;
     int retval = 0, devno = -1;
+
+    malloc_string(command);
+    malloc_string(tmp);
 
     if (g_dvd_drive_is_here[0]) {
@@ -879 +917 @@
     }
 
-    malloc_string(tmp);
-    mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output("dvdrecord -scanbus 2> /dev/null | grep -E '\)\ \'' | grep -n '' | grep -E '[D|C][V|D]' | cut -d':' -f1"));
+    sprintf(tmp, "%s", call_program_and_get_last_line_of_output("dvdrecord -scanbus 2> /dev/null | grep -E '\)\ \'' | grep -n '' | grep -E '[D|C][V|D]' | cut -d':' -f1"));
     log_msg(5, "tmp = '%s'", tmp);
-    if (!tmp[0]) {
-        mr_free(tmp);
-        mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output("cdrecord -scanbus 2> /dev/null | grep \)\ \' | grep -n '' | grep -E '[D|C][V|D]' | cut -d':' -f1"));
-    }
+    if (!tmp[0])
+        sprintf(tmp, "%s", call_program_and_get_last_line_of_output
+                ("cdrecord -scanbus 2> /dev/null | grep \)\ \' | grep -n '' | grep -E '[D|C][V|D]' | cut -d':' -f1")
+            );
     if (tmp[0]) {
         devno = atoi(tmp) - 1;
     }
-    mr_free(tmp);
-
     if (devno >= 0) {
         retval = 0;
@@ -901 +936 @@
     }
 
+    if (try_to_mount) {
+        log_msg(1, "Ignoring the fact that try_to_mount==TRUE");
+    }
     return (retval);
 }
@@ -1015 +1053 @@
 {
     char *good_formats = NULL;
-    char *command = NULL;
-    char *format_sz = NULL;
+    char *command;
+    char *format_sz;
     char *p;
 
@@ -1022 +1060 @@
     int retval;
     malloc_string(good_formats);
+    malloc_string(command);
+    malloc_string(format_sz);
 
     assert_string_is_neither_NULL_nor_zerolength(format);
 
-    mr_asprintf(format_sz, "%s ", format);
+    sprintf(format_sz, "%s ", format);
 
 #ifdef __FreeBSD__
-    mr_asprintf(command, "lsvfs | tr -s '\t' ' ' | grep -v Filesys | grep -v -- -- | cut -d' ' -f1 | tr -s '\n' ' '");
+    sprintf(command,
+            "lsvfs | tr -s '\t' ' ' | grep -v Filesys | grep -v -- -- | cut -d' ' -f1 | tr -s '\n' ' '");
 #else
-    mr_asprintf(command, "grep -v nodev /proc/filesystems | tr -s '\t' ' ' | cut -d' ' -f2 | tr -s '\n' ' '");
+    sprintf(command,
+            "grep -v nodev /proc/filesystems | tr -s '\t' ' ' | cut -d' ' -f2 | tr -s '\n' ' '");
 #endif
 
     pin = popen(command, "r");
-    mr_free(command);
-
     if (!pin) {
         log_OS_error("Unable to read good formats");
@@ -1054 +1094 @@
     }
     paranoid_free(good_formats);
-    mr_free(format_sz);
-
+    paranoid_free(command);
+    paranoid_free(format_sz);
     return (retval);
 }
@@ -1074 +1114 @@
 
     /*@ buffers ***************************************************** */
-    char *incoming = NULL;
+    char *incoming;
     char *device_with_tab = NULL;
     char *device_with_space = NULL;
@@ -1088 +1128 @@
     /*@ end vars **************************************************** */
 
-    if (device_raw == NULL) {
-        return(FALSE);
-    }
-
+    malloc_string(incoming);
+    assert(device_raw != NULL);
+//  assert_string_is_neither_NULL_nor_zerolength(device_raw);
     if (device_raw[0] != '/' && !strstr(device_raw, ":/")) {
         log_msg(1, "%s needs to have a '/' prefixed - I'll do it",
@@ -1114 +1153 @@
         return(FALSE);
     }
-
-    for (mr_getline(incoming, fin); !feof(fin); mr_getline(incoming, fin)) {
-        if (strstr(incoming, device_with_space) || strstr(incoming, device_with_tab)) {
+    for (tmp = fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin) && (tmp != NULL);
+         tmp = fgets(incoming, MAX_STR_LEN - 1, fin)) {
+        if (strstr(incoming, device_with_space) //> incoming
+            || strstr(incoming, device_with_tab))   // > incoming)
+        {
             paranoid_pclose(fin);
-            mr_free(incoming);
+            paranoid_free(incoming);
             return(TRUE);
         }
-        mr_free(incoming);
-    }
-    mr_free(incoming);
+    }
     mr_free(device_with_tab);
     paranoid_pclose(fin);
@@ -1133 +1172 @@
     }
     mr_free(tmp);
+    paranoid_free(incoming);
     return(retval);
 }
@@ -1149 +1189 @@
     char command[MAX_STR_LEN];
     int vndev = 2;
-    if (atoi(call_program_and_get_last_line_of_output("/sbin/sysctl -n kern.osreldate")) < 500000) {
+    if (atoi
+        (call_program_and_get_last_line_of_output
+         ("/sbin/sysctl -n kern.osreldate")) < 500000) {
         do {
             sprintf(mddevice, "vn%ic", vndev++);
@@ -1181 +1223 @@
 int kick_vn(char *dname)
 {
-    char *command = NULL;
-    int res = 0;
+    char command[MAX_STR_LEN];
 
     if (strncmp(dname, "/dev/", 5) == 0) {
@@ -1188 +1229 @@
     }
 
-    if (atoi(call_program_and_get_last_line_of_output("/sbin/sysctl -n kern.osreldate")) < 500000) {
-        mr_asprintf(command, "vnconfig -d %s", dname);
+    if (atoi
+        (call_program_and_get_last_line_of_output
+         ("/sbin/sysctl -n kern.osreldate")) < 500000) {
+        sprintf(command, "vnconfig -d %s", dname);
+        return system(command);
     } else {
-        mr_asprintf(command, "mdconfig -d -u %s", dname);
-    }
-    res = system(command);
-    mr_free(command);
-    return(res);
+        sprintf(command, "mdconfig -d -u %s", dname);
+        return system(command);
+    }
+     /*NOTREACHED*/ return 255;
 }
 #endif
@@ -1209 +1252 @@
 {
     /*@ buffer ****************************************************** */
-    char *command = NULL;
+    char *command;
     int retval;
 
+    malloc_string(command);
     assert_string_is_neither_NULL_nor_zerolength(device);
     assert_string_is_neither_NULL_nor_zerolength(mountpoint);
@@ -1219 +1263 @@
         return(1);
     }
-    log_msg(4, "(mount_USB_here --- device=%s, mountpoint=%s", device, mountpoint);
+    log_msg(4, "(mount_USB_here --- device=%s, mountpoint=%s", device,
+            mountpoint);
 
 #ifdef __FreeBSD__
-    mr_asprintf(command, "mount_vfat %s %s 2>> %s", device, mountpoint, MONDO_LOGFILE);
+    sprintf(command, "mount_vfat %s %s 2>> %s",
+            device, mountpoint, MONDO_LOGFILE);
 
 #else
-    mr_asprintf(command, "mount %s -t vfat %s 2>> %s", device, mountpoint, MONDO_LOGFILE);
+    sprintf(command, "mount %s -t vfat %s 2>> %s",
+            device, mountpoint, MONDO_LOGFILE);
 #endif
 
@@ -1231 +1278 @@
     retval = system(command);
     log_msg(1, "system(%s) returned %d", command, retval);
-    mr_free(command);
-
+
+    paranoid_free(command);
     return (retval);
 }
@@ -1242 +1289 @@
  * @return 0 for success, nonzero for failure.
  */
-int mount_CDROM_here(char *device, const char *mountpoint)
+int mount_CDROM_here(char *device, char *mountpoint)
 {
     /*@ buffer ****************************************************** */
@@ -1280 +1327 @@
 
     }
-    log_msg(4, "(mount_CDROM_here --- device=%s, mountpoint=%s", device, mountpoint);
+    log_msg(4, "(mount_CDROM_here --- device=%s, mountpoint=%s", device,
+            mountpoint);
     /*@ end vars *************************************************** */
 
@@ -1297 +1345 @@
     retval = system(command);
     log_msg(1, "system(%s) returned %d", command, retval);
-    mr_free(command);
+    paranoid_free(command);
 
     return (retval);
@@ -1314 +1362 @@
 int mount_media()
 {
-char *mount_cmd = NULL;
+char *mount_cmd;
 char *mountdir = NULL;
 int i, res;
 #ifdef __FreeBSD__
-    char mdd[32];
-    char *mddev = mdd;
-#endif
-
-    if (bkpinfo->backup_media_type == tape || bkpinfo->backup_media_type == udev) {
+char mdd[32];
+char *mddev = mdd;
+#endif
+
+malloc_string(mount_cmd);
+assert(bkpinfo != NULL);
+
+    if (bkpinfo->backup_media_type == tape
+        || bkpinfo->backup_media_type == udev) {
         log_msg(8, "Tape/udev. Therefore, no need to mount a media.");
+        paranoid_free(mount_cmd);
         return 0;
     }
@@ -1329 +1382 @@
     if (!run_program_and_log_output("mount | grep -F " MNT_CDROM, FALSE)) {
         log_msg(2, "mount_media() - media already mounted. Fair enough.");
+        paranoid_free(mount_cmd);
         return (0);
     }
@@ -1335 +1389 @@
         log_msg(2, "Mounting for Network thingy");
         log_msg(2, "isodir = %s", bkpinfo->isodir);
-        if ((!bkpinfo->isodir[0] || !strcmp(bkpinfo->isodir, "/")) && am_I_in_disaster_recovery_mode()) {
+        if ((!bkpinfo->isodir[0] || !strcmp(bkpinfo->isodir, "/"))
+            && am_I_in_disaster_recovery_mode()) {
             strcpy(bkpinfo->isodir, "/tmp/isodir");
             log_msg(1, "isodir is being set to %s", bkpinfo->isodir);
         }
 #ifdef __FreeBSD__
-        mr_asprintf(mount_cmd, "/mnt/isodir/%s/%s/%s-%d.iso", bkpinfo->isodir,
+        sprintf(mount_cmd, "/mnt/isodir/%s/%s/%s-%d.iso", bkpinfo->isodir,
             bkpinfo->netfs_remote_dir, bkpinfo->prefix, g_current_media_number);
         mddev = make_vn(mount_cmd);
-        mr_free(mount_cmd);
-
-        mr_asprintf(mount_cmd, "mount_cd9660 -r %s " MNT_CDROM, mddev);
+        sprintf(mount_cmd, "mount_cd9660 -r %s " MNT_CDROM, mddev);
 #else
-        mr_asprintf(mount_cmd, "mount %s/%s/%s-%d.iso -t iso9660 -o loop,ro %s", bkpinfo->isodir, bkpinfo->netfs_remote_dir, bkpinfo->prefix, g_current_media_number, MNT_CDROM);
+        sprintf(mount_cmd, "mount %s/%s/%s-%d.iso -t iso9660 -o loop,ro %s",
+            bkpinfo->isodir, bkpinfo->netfs_remote_dir,
+            bkpinfo->prefix, g_current_media_number, MNT_CDROM);
 #endif
 
@@ -1357 +1412 @@
         }
 #ifdef __FreeBSD__
-        mr_asprintf(mount_cmd, "%s/%s-%d.iso", mountdir, bkpinfo->prefix, g_current_media_number);
+        sprintf(mount_cmd, "%s/%s-%d.iso", mountdir,
+            bkpinfo->prefix, g_current_media_number);
         mddev = make_vn(mount_cmd);
-        mr_free(mount_cmd);
-
-        mr_asprintf(mount_cmd, "mount_cd9660 -r %s %s", mddev, MNT_CDROM);
+        sprintf(mount_cmd, "mount_cd9660 -r %s %s", mddev, MNT_CDROM);
 #else
-        mr_asprintf(mount_cmd, "mount %s/%s-%d.iso -t iso9660 -o loop,ro %s", mountdir, bkpinfo->prefix, g_current_media_number, MNT_CDROM);
+        sprintf(mount_cmd, "mount %s/%s-%d.iso -t iso9660 -o loop,ro %s",
+            mountdir, bkpinfo->prefix, g_current_media_number, MNT_CDROM);
 #endif
         mr_free(mountdir);
     } else if (bkpinfo->backup_media_type == usb) {
-        mr_asprintf(mount_cmd, "mount -t vfat %s %s", bkpinfo->media_device, MNT_CDROM);
+        sprintf(mount_cmd, "mount -t vfat %s %s", bkpinfo->media_device, MNT_CDROM);
     } else if (strstr(bkpinfo->media_device, "/dev/")) {
 #ifdef __FreeBSD__
-        mr_asprintf(mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device, MNT_CDROM);
+        sprintf(mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device,
+        MNT_CDROM);
 #else
-        mr_asprintf(mount_cmd, "mount %s -t iso9660 -o ro %s", bkpinfo->media_device, MNT_CDROM);
+        sprintf(mount_cmd, "mount %s -t iso9660 -o ro %s",
+        bkpinfo->media_device, MNT_CDROM);
 #endif
     } else {
@@ -1384 +1441 @@
 
 #ifdef __FreeBSD__
-        mr_asprintf(mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device, MNT_CDROM);
+    sprintf(mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device,
+        MNT_CDROM);
 #else
-        mr_asprintf(mount_cmd, "mount %s -t iso9660 -o ro %s", bkpinfo->media_device, MNT_CDROM);
+    sprintf(mount_cmd, "mount %s -t iso9660 -o ro %s",
+        bkpinfo->media_device, MNT_CDROM);
 #endif
     }
@@ -1398 +1457 @@
             log_msg(2, "Failed to mount device.");
             sleep(5);
-            sync();
-        }
-    }
-    mr_free(mount_cmd);
+            run_program_and_log_output("sync", FALSE);
+        }
+    }
 
     if (res) {
@@ -1408 +1466 @@
         log_msg(2, "Mounted media drive OK");
     }
+    paranoid_free(mount_cmd);
     return (res);
 }
@@ -1437 +1496 @@
 
     /*@ buffers ********************************************************* */
-    char *tmp = NULL;
+    char *tmp;
     char *mds = NULL;
-    char *request = NULL;
+    char *request;
 
     assert(bkpinfo != NULL);
@@ -1451 +1510 @@
         return;
     }
-    mr_asprintf(tmp, "mkdir -p " MNT_CDROM);
+    if (g_ISO_restore_mode || bkpinfo->backup_media_type == iso
+        || bkpinfo->backup_media_type == netfs) {
+        g_ISO_restore_mode = TRUE;
+    }
+    malloc_string(tmp);
+    malloc_string(request);
+    sprintf(tmp, "mkdir -p " MNT_CDROM);
     run_program_and_log_output(tmp, 5);
-    mr_free(tmp);
-
-    if (g_ISO_restore_mode || bkpinfo->backup_media_type == iso || bkpinfo->backup_media_type == netfs) {
-        g_ISO_restore_mode = TRUE;
-    }
     if ((res = what_number_cd_is_this()) != cd_number_i_want) {
-        log_msg(3, "Currently, we hold %d but we want %d", res, cd_number_i_want);
+        log_msg(3, "Currently, we hold %d but we want %d", res,
+                cd_number_i_want);
 
         /* Now we need to umount the current media to have the next mounted after */
@@ -1468 +1529 @@
 
         mds = media_descriptor_string(bkpinfo->backup_media_type);
-        log_msg(3, "Insisting on %s #%d", mds, cd_number_i_want);
-        mr_asprintf(request, "Please insert %s #%d and press Enter.", mds, cd_number_i_want);
+        sprintf(tmp, "Insisting on %s #%d", mds, cd_number_i_want);
+        sprintf(request, "Please insert %s #%d and press Enter.", mds, cd_number_i_want);
         mr_free(mds);
-
+        log_msg(3, tmp);
         while (what_number_cd_is_this() != cd_number_i_want) {
-            sync();
+            paranoid_system("sync");
             if (is_this_device_mounted(MNT_CDROM)) {
                 res =
@@ -1495 +1556 @@
                 inject_device(bkpinfo->media_device);
             }
-            sync();
-        }
-        mr_free(request);
-
+            paranoid_system("sync");
+        }
         log_msg(1, "Thankyou. Proceeding...");
         g_current_media_number = cd_number_i_want;
     }
+    paranoid_free(tmp);
+    paranoid_free(request);
 }
 
@@ -1615 +1676 @@
     log_msg(5, "Running: %s", command);
     mr_asprintf(mounted_file_system, "%s", call_program_and_get_last_line_of_output(command));
-    mr_free(command);
+    paranoid_free(command);
 
     mount_cnt = atoi(mounted_file_system);
     log_msg (5, "mount_cnt: %d", mount_cnt);
-    mr_free(mounted_file_system);
+    paranoid_free(mounted_file_system);
 
     for (i=mount_cnt; i > 0; i--) {
@@ -1625 +1686 @@
         log_msg(5, "Running: %s", command);
         mr_asprintf(mounted_file_system, "%s", call_program_and_get_last_line_of_output(command));
-        mr_free(command);
+        paranoid_free(command);
 
         log_msg (5, "mounted_file_system: %s", mounted_file_system);
         if ((token = mr_strtok(mounted_file_system, token_chars, &lastpos)) == NULL) {
             log_msg (4, "Could not get the list of mounted file systems");
-            mr_free(mounted_file_system);
+            paranoid_free(mounted_file_system);
             mr_free(token);
             return (1);
@@ -1658 +1719 @@
         mr_free(mounted_file_system);
     }
+    /********
+    * DSFptr = DSF_Head;
+    * while (DSFptr != NULL) {
+    * printf ("Dev: %s  MP: %s  Check: %d\n", DSFptr->device, DSFptr->mount_point, DSFptr->check);
+    * DSFptr = DSFptr->next;
+    * }
+    ********/
     return (0);
 }
@@ -1705 +1773 @@
     log_msg(5, "  Executing: %s", command);
     mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
-    mr_free(command);
+    paranoid_free(command);
 
     log_msg(5, "  Return value: %s", tmp);
     c = atoi(tmp);
-    mr_free(tmp);
+    paranoid_free(tmp);
 
     if (!c) {
@@ -1731 +1799 @@
     log_msg(5, "Executing: %s", command);
     mr_asprintf(partition_list, "%s", call_program_and_get_last_line_of_output(command));
-    mr_free(command);
+    paranoid_free(command);
     log_msg(4, "Partition list for %s: %s", dsf, partition_list);
     if (!strlen(partition_list)) {
@@ -1794 +1862 @@
         log_msg(4, "Processing partition: %s", partitions[i]);
         /* See if it's swap. If it is, ignore it. */
-        mr_asprintf(command, "parted2fdisk -l %s 2>/dev/null | awk '{if(($1==\"%s\")&&(toupper($0) ~ \"SWAP\")){print $1;exit}}'", ndsf, partitions[i]);
+        mr_asprintf(command, "parted2fdisk -l %s 2>/dev/null | awk '{if(($1==\"%s\")&&(toupper($0) ~ \"SWAP\")){print $1;exit}}'", 
+          ndsf, partitions[i]);
         log_msg(5, "  Running: %s", command);
         mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
-        mr_free(command);
-
+        paranoid_free(command);
         log_msg(5, "  Return value: %s", tmp);
         c = strlen(tmp);
-        mr_free(tmp);
-
+        paranoid_free(tmp);
         if (c) {
             log_msg(4, "It's swap. Ignoring partition %s", partitions[i]); 
             continue;
         } 
-
         /* It's not swap. See if we can find the mount point from the mount command. */
         mr_asprintf(command, "mount 2>/dev/null | awk '{if((NF>0)&&($1==\"%s\")){print $3}}'", partitions[i]);
         mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
-        mr_free(command);
-
+        paranoid_free(command);
         if (strlen(tmp)) {
             log_msg(4, "  %s is mounted: %s", partitions[i], tmp);
             if ((DSFptr = find_mount_point_in_list(tmp)) == NULL) {
                 log_msg (4, "Can't find mount point %s in mounted file systems list", tmp);
-                mr_free(tmp);
+                paranoid_free(tmp);
                 return (1);
             }
             DSFptr->check = 1;
-            mr_free(tmp);
+            paranoid_free(tmp);
             continue;
         }
-        mr_free(tmp);
-
+        paranoid_free(tmp);
         /* It's not swap and it's not mounted. See if it's LVM */
         log_msg(4, "  It's not mounted. Checking to see if it's LVM...");
-
         /* Check for LVM */
         mr_asprintf(command, "pvdisplay -c %s 2> /dev/null", partitions[i]);
         log_msg(5, "  Running: %s", command);
         mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
-        mr_free(command);
-
+        paranoid_free(command);
         if (strlen(tmp)) {
             log_msg(4, "Found an LVM partition at %s. Find the VG it's in...", partitions[i]);
@@ -1841 +1903 @@
             log_msg(5, "  Running: %s", command);
             strcpy(VG, call_program_and_get_last_line_of_output(command));
-            mr_free(command);
-
+            paranoid_free(command);
             log_msg(4, "  Volume Group: %s", VG);
             if (strlen(VG)) {
@@ -1850 +1911 @@
                 log_msg(5, "  Running: %s", command);
                 mr_asprintf(mount_list, "%s", call_program_and_get_last_line_of_output(command));
-                mr_free(command);
-
+                paranoid_free(command);
                 log_msg(4, "  VG %s mount_list: %s", VG, mount_list);
                 lastpos = 0;
@@ -1858 +1918 @@
                     if ((DSFptr = find_mount_point_in_list(token)) == NULL) {
                         log_msg (4, "Can't find mount point %s in mounted file systems list", token);
-                        mr_free(tmp);
+                        paranoid_free(tmp);
                         mr_free(token);
                         return (1);
@@ -1869 +1929 @@
                  * any of the Logical Volumes on the Volume Group.
                  *******/
-                mr_free(mount_list);
+                paranoid_free(mount_list);
 
                 mr_asprintf(command, "%s", "cat /proc/mdstat|grep -iv Personal|awk '{if($0~\"^.*[ ]+:\"){printf(\"/dev/%s \", $1)}}END{print \"\"}'");
                 log_msg (5, "Running: %s", command);
                 mr_asprintf(mount_list, "%s", call_program_and_get_last_line_of_output(command));
-                mr_free(command);
+                paranoid_free(command);
                 log_msg(4, "  Software raid device list: %s", mount_list);
                 lastpos = 0;
@@ -1880 +1940 @@
                     mr_asprintf(command, "mdadm --detail %s 2>/dev/null | grep -c %s", token, VG);
                     log_msg (5, "Running: %s", command);
-                    mr_free(tmp);
+                    paranoid_free(tmp);
                     mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
-                    mr_free(command);
+                    paranoid_free(command);
                     log_msg(4, "Number of Software raid device: %s", tmp);
                     if (atoi(tmp)) {
@@ -1888 +1948 @@
                         if ((DSFptr = find_device_in_list(token)) == NULL) {
                             log_msg (4, "Can't find device %s in mounted file systems list", token);
-                            mr_free(tmp);
+                            paranoid_free(tmp);
                             mr_free(token);
                             return (1);
@@ -1899 +1959 @@
             } else {
                 log_msg (4, "Error finding Volume Group for partition %s", partitions[i]);
-                mr_free(tmp);
+                paranoid_free(tmp);
                 return (1);
             }
-            mr_free(tmp);
+            paranoid_free(tmp);
             continue;
         } else {
             log_msg (4, "Error finding partition type for the partition %s", partitions[i]);
         }
-        mr_free(tmp);
-
+        paranoid_free(tmp);
         /********
          * It's not swap, mounted, or LVM. See if it's used in a software raid device.
@@ -1916 +1975 @@
         log_msg(4, "  Running: %s", command);
         mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
-        mr_free(command);
-
+        paranoid_free(command);
         if (!strlen(tmp)) {
             log_msg(4, "  Partition %s is not used in a non-LVM software raid device", partitions[i]);
-            mr_free(tmp);
+            paranoid_free(tmp);
             continue;
         }
         log_msg (5, "  UUID: %s", tmp);
-
         /* Get the Software raid device list */
         mr_asprintf(command, "%s", "cat /proc/mdstat|grep -iv Personal|awk '{if($0~\"^.*[ ]+:\"){printf(\"/dev/%s \", $1)}}END{print \"\"}'");
         log_msg (5, "  Running: %s", command);
         mr_asprintf(mount_list, "%s", call_program_and_get_last_line_of_output(command));
-        mr_free(command);
-
+        paranoid_free(command);
         log_msg(4, "  Software raid device list: %s", mount_list);
         /* Loop through the software raid device list to see if we can find the partition */
@@ -1937 +1993 @@
             mr_asprintf(command, "mdadm --detail %s 2>/dev/null | grep -c %s", token, tmp);
             log_msg(4, "  Running: %s", command);
-            mr_free(tmp);
+            paranoid_free(tmp);
             mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
-            mr_free(command);
-
+            paranoid_free(command);
             if (!atoi(tmp)) {
                 log_msg (4,"  Didn't find partition %s in software raid device %s", partitions[i], token);
@@ -1946 +2001 @@
                 if ((DSFptr = find_device_in_list(token)) == NULL) {
                     log_msg (4, "Can't find device %s in mounted file systems list", token);
-                    mr_free(tmp);
+                    paranoid_free(tmp);
                     mr_free(token);
                     return (1);
@@ -1955 +2010 @@
             mr_free(token);
         }
-        mr_free(tmp);
-        mr_free(mount_list);
+        paranoid_free(tmp);
+        paranoid_free(mount_list);
     }
 
@@ -1992 +2047 @@
     return (0);
 }
+
+
+
 
 
@@ -2041 +2099 @@
             log_to_screen("Archiving only the following file systems on %s:", token);
             log_to_screen("==> %s", mounted_on_dsf);
-            mr_free(bkpinfo->include_paths);
-            mr_asprintf(bkpinfo->include_paths, "%s", "/");
+            strcpy(bkpinfo->include_paths, "/");
             if (strlen(not_mounted_on_dsf)) {
                 log_msg (5, "Adding to bkpinfo->exclude_paths due to -I option: %s", not_mounted_on_dsf);
@@ -2079 +2136 @@
             mr_asprintf(tmp,"|%s|",bkpinfo->include_paths);
             if (strstr(tmp,tmp2) == NULL) {
-                mr_strcat(bkpinfo->include_paths, "%s", tmp1);
+                strcat(bkpinfo->include_paths,tmp1);
             }
             mr_free(tmp1);
@@ -2124 +2181 @@
     char *q = NULL;
     char p[16*MAX_STR_LEN];
-    char *sz_size = NULL;
-    char *command = NULL;
+    char *sz_size;
+    char *command;
     char *compression_type = NULL;
-    char *comment = NULL;
+    char *comment;
+    char *prompt;
     int i;
     FILE *fin;
 
+    malloc_string(sz_size);
+    malloc_string(command);
+    malloc_string(comment);
+    malloc_string(prompt);
     malloc_string(tmp1);
     assert(bkpinfo != NULL);
+    sz_size[0] = '\0';
     bkpinfo->nonbootable_backup = FALSE;
 
@@ -2169 +2232 @@
         setup_scratchdir(tmp);
     }
-    log_msg(3, "media type = %s", bkptype_to_string(bkpinfo->backup_media_type));
+    log_msg(3, "media type = %s",
+            bkptype_to_string(bkpinfo->backup_media_type));
     bkpinfo->cdrw_speed = (bkpinfo->backup_media_type == cdstream) ? 2 : 4;
-    bkpinfo->compression_level = (bkpinfo->backup_media_type == cdstream) ? 1 : 5;
-    bkpinfo->use_lzo = (bkpinfo->backup_media_type == cdstream) ? TRUE : FALSE;
+    bkpinfo->compression_level =
+        (bkpinfo->backup_media_type == cdstream) ? 1 : 5;
+    bkpinfo->use_lzo =
+        (bkpinfo->backup_media_type == cdstream) ? TRUE : FALSE;
     mvaddstr_and_log_it(2, 0, " ");
 
@@ -2187 +2253 @@
         if (archiving_to_media) {
             if ((bkpinfo->backup_media_type != dvd) && (bkpinfo->backup_media_type != usb)) {
-                if (ask_me_yes_or_no("Is your computer a laptop, or does the CD writer incorporate BurnProof technology?")) {
+                if (ask_me_yes_or_no
+                    ("Is your computer a laptop, or does the CD writer incorporate BurnProof technology?"))
+                {
                     bkpinfo->manual_cd_tray = TRUE;
                 }
@@ -2195 +2263 @@
                 finish(1);
             }
-
-            if ((bkpinfo->compression_level = which_compression_level()) == -1) {
+            if ((bkpinfo->compression_level =
+                 which_compression_level()) == -1) {
                 log_to_screen("User has chosen not to backup the PC");
                 finish(1);
             }
             mds = media_descriptor_string(bkpinfo->backup_media_type);
-            mr_asprintf(comment, "What speed is your %s (re)writer?", mds);
+            sprintf(comment, "What speed is your %s (re)writer?", mds);
             if (bkpinfo->backup_media_type == dvd) {
                 find_dvd_device(bkpinfo->media_device, FALSE);
                 strcpy(tmp1, "1");
-                mr_asprintf(sz_size, "%d", DEFAULT_DVD_DISK_SIZE);  // 4.7 salesman's GB = 4.482 real GB = 4482 MB
+                sprintf(sz_size, "%d", DEFAULT_DVD_DISK_SIZE);  // 4.7 salesman's GB = 4.482 real GB = 4482 MB
                 log_msg(1, "Setting to DVD defaults");
             } else {
                 strcpy(bkpinfo->media_device, VANILLA_SCSI_CDROM);
                 strcpy(tmp1, "4");
-                mr_asprintf(sz_size, "%d", 650);
+                strcpy(sz_size, "650");
                 log_msg(1, "Setting to CD defaults");
             }
@@ -2216 +2284 @@
                 if (!popup_and_get_string("Speed", comment, tmp1, 4)) {
                     log_to_screen("User has chosen not to backup the PC");
-                    mr_free(comment);
                     finish(1);
                 }
             }
-            mr_free(comment);
             bkpinfo->cdrw_speed = atoi(tmp1);   // if DVD then this shouldn't ever be used anyway :)
 
-            strcpy(tmp1, sz_size);
-            mr_asprintf(comment, "How much data (in Megabytes) will each %s store?", mds);
+            sprintf(comment,
+                    "How much data (in Megabytes) will each %s store?", mds);
             mr_free(mds);
-            if (!popup_and_get_string("Size", comment, tmp1, 5)) {
+            if (!popup_and_get_string("Size", comment, sz_size, 5)) {
                 log_to_screen("User has chosen not to backup the PC");
                 finish(1);
             }
-            mr_asprintf(sz_size, "%s", tmp1);
             bkpinfo->media_size = atoi(sz_size);
-
             if (bkpinfo->media_size <= 0) {
                 log_to_screen("User has chosen not to backup the PC");
@@ -2244 +2308 @@
         if ((bkpinfo->disaster_recovery) && (bkpinfo->backup_media_type != usb)) {
             strcpy(bkpinfo->media_device, "/dev/cdrom");
-            log_msg(2, "CD-ROM device assumed to be at %s", bkpinfo->media_device);
-        } else if ((bkpinfo->restore_data && (bkpinfo->backup_media_type != usb))  || bkpinfo->backup_media_type == dvd) {
+            log_msg(2, "CD-ROM device assumed to be at %s",
+                    bkpinfo->media_device);
+        } else if ((bkpinfo->restore_data && (bkpinfo->backup_media_type != usb))
+                   || bkpinfo->backup_media_type == dvd) {
             if (!bkpinfo->media_device[0]) {
                 strcpy(bkpinfo->media_device, "/dev/cdrom");
             }                   // just for the heck of it :)
-            log_msg(1, "bkpinfo->media_device = %s", bkpinfo->media_device);
-            if (bkpinfo->backup_media_type == dvd || find_cdrom_device(bkpinfo->media_device, FALSE)) {
-                log_msg(1, "bkpinfo->media_device = %s", bkpinfo->media_device);
-                mr_asprintf(comment, "Please specify your %s drive's /dev entry", mds);
-                if (!popup_and_get_string("Device?", comment, bkpinfo->media_device, MAX_STR_LEN / 4)) {
+            log_msg(1, "bkpinfo->media_device = %s",
+                    bkpinfo->media_device);
+            if (bkpinfo->backup_media_type == dvd
+                || find_cdrom_device(bkpinfo->media_device, FALSE)) {
+                log_msg(1, "bkpinfo->media_device = %s",
+                        bkpinfo->media_device);
+                sprintf(comment,
+                        "Please specify your %s drive's /dev entry", mds);
+                if (!popup_and_get_string
+                    ("Device?", comment, bkpinfo->media_device,
+                     MAX_STR_LEN / 4)) {
                     log_to_screen("User has chosen not to backup the PC");
                     finish(1);
@@ -2327 +2399 @@
             } else {
                 if (does_file_exist("/tmp/mondo-restore.cfg")) {
-                    read_cfg_var("/tmp/mondo-restore.cfg", "media-dev", bkpinfo->media_device);
+                    read_cfg_var("/tmp/mondo-restore.cfg", "media-dev",
+                                 bkpinfo->media_device);
                 }
             }
@@ -2382 +2455 @@
                 finish(1);
             }
-            if ((bkpinfo->compression_level = which_compression_level()) == -1) {
+            if ((bkpinfo->compression_level =
+                 which_compression_level()) == -1) {
                 log_to_screen("User has chosen not to backup the PC");
                 finish(1);
@@ -2394 +2468 @@
         /* Never try to eject a NETFS device */
         bkpinfo->please_dont_eject = TRUE;
-        /*  Force NFS to be the protocol by default */
-        if (bkpinfo->netfs_proto == NULL) {
-            mr_asprintf(bkpinfo->netfs_proto, "nfs");
-        }
 
         /* Initiate bkpinfo netfs_mount path from running environment if not already done */
-        if (!bkpinfo->netfs_mount == NULL) {
-            mr_asprintf(bkpinfo->netfs_mount, call_program_and_get_last_line_of_output("mount | grep \":\" | cut -d' ' -f1 | head -n1"));
+        if (!bkpinfo->netfs_mount[0]) {
+            strcpy(bkpinfo->netfs_mount,
+                   call_program_and_get_last_line_of_output
+                   ("mount | grep \":\" | cut -d' ' -f1 | head -n1"));
         }
 #ifdef __FreeBSD__
@@ -2412 +2484 @@
                 ("Network shared dir.",
                  "Please enter path and directory where archives are stored remotely. (Mondo has taken a guess at the correct value. If it is incorrect, delete it and type the correct one.)",
-                 p, MAX_STR_LEN / 4)) {
+                 bkpinfo->netfs_mount, MAX_STR_LEN / 4)) {
                 log_to_screen("User has chosen not to backup the PC");
                 finish(1);
             }
-            mr_free(bkpinfo->netfs_mount);
-            mr_asprintf(bkpinfo->netfs_mount, "%s", p;
             if (!bkpinfo->restore_data) {
                 if ((compression_type = which_compression_type()) == NULL) {
@@ -2423 +2493 @@
                     finish(1);
                 }
-
-                if ((bkpinfo->compression_level = which_compression_level()) == -1) {
+                if ((bkpinfo->compression_level =
+                     which_compression_level()) == -1) {
                     log_to_screen("User has chosen not to backup the PC");
                     finish(1);
@@ -2431 +2501 @@
             // check whether already mounted - we better remove
             // surrounding spaces and trailing '/' for this
-            mr_strip_spaces(bkpinfo->netfs_mount);
+            strip_spaces(bkpinfo->netfs_mount);
             if (bkpinfo->netfs_mount[strlen(bkpinfo->netfs_mount) - 1] == '/')
                 bkpinfo->netfs_mount[strlen(bkpinfo->netfs_mount) - 1] = '\0';
@@ -2443 +2513 @@
                 strcpy(tmp1,bkpinfo->netfs_mount);
             }
-            mr_asprintf(command, "mount | grep \"%s \" | cut -d' ' -f3", tmp1);
+            sprintf(command, "mount | grep \"%s \" | cut -d' ' -f3", tmp1);
             strcpy(bkpinfo->isodir, call_program_and_get_last_line_of_output(command));
-            mr_free(command);
 
             if (!bkpinfo->restore_data) {
-                mr_sprintf(sz_size, "%d", DEFAULT_DVD_DISK_SIZE);   // 4.7 salesman's GB = 4.482 real GB = 4482 MB
-                mr_asprintf(comment, "How much data (in Megabytes) will each media store?");
-                strcpy(tmp1, sz_size);
-                mr_free(sz_size);
-                if (!popup_and_get_string("Size", comment, tmp1, 5)) {
+                sprintf(sz_size, "%d", DEFAULT_DVD_DISK_SIZE);  // 4.7 salesman's GB = 4.482 real GB = 4482 MB
+                sprintf(comment,
+                    "How much data (in Megabytes) will each media store?");
+                if (!popup_and_get_string("Size", comment, sz_size, 5)) {
                     log_to_screen("User has chosen not to backup the PC");
                     finish(1);
                 }
-                mr_free(comment);
-                mr_asprintf(sz_size, "%s", tmp1);
             } else {
-                mr_asprintf(sz_size, "0");
+                strcpy(sz_size, "0");
             }
             bkpinfo->media_size = atoi(sz_size);
-            mr_free(sz_size);
-
             if (bkpinfo->media_size < 0) {
                 log_to_screen("User has chosen not to backup the PC");
@@ -2469 +2533 @@
             }
         }
+        /*  Force NFS to be the protocol by default */
+        if (bkpinfo->netfs_proto == NULL) {
+            mr_asprintf(bkpinfo->netfs_proto, "nfs");
+        }
         if (bkpinfo->disaster_recovery) {
-            mr_asprintf(command ,"umount %s/isodir 2> /dev/null", bkpinfo->tmpdir);
+            sprintf(command ,"umount %s/isodir 2> /dev/null", bkpinfo->tmpdir);
             paranoid_system(command);
-            mr_free(command);
-
         }
         strcpy(tmp1, bkpinfo->netfs_proto);
-        if (!popup_and_get_string("Network protocol", "Which protocol should I use (nfs/sshfs/smbfs) ?",tmp1, MAX_STR_LEN)) {
+        if (!popup_and_get_string
+            ("Network protocol", "Which protocol should I use (nfs/sshfs/smbfs) ?",
+             tmp1, MAX_STR_LEN)) {
             log_to_screen("User has chosen not to backup the PC");
             finish(1);
@@ -2482 +2550 @@
         mr_free(bkpinfo->netfs_proto);
         mr_asprintf(bkpinfo->netfs_proto, "%s", tmp1);
-
-        strcpy(tmp1, bkpinfo->netfs_mount);
-        if (!popup_and_get_string("Network share", "Which remote share should I mount?", tmp1, MAX_STR_LEN)) {
+        if (!popup_and_get_string
+            ("Network share", "Which remote share should I mount?",
+             bkpinfo->netfs_mount, MAX_STR_LEN)) {
             log_to_screen("User has chosen not to backup the PC");
             finish(1);
         }
-        mr_free(bkpinfo->netfs_mount);
-        mr_asprintf(bkpinfo->netfs_mount, "%s", tmp1);
 
         if (bkpinfo->netfs_user) {
@@ -2496 +2562 @@
             strcpy(tmp1, "");
         }
-        if (!popup_and_get_string("Network user", "Which user should I use if any ?",tmp1)) {
+        if (!popup_and_get_string
+            ("Network user", "Which user should I use if any ?",
+             tmp1, MAX_STR_LEN)) {
             log_to_screen("User has chosen not to backup the PC");
             finish(1);
@@ -2507 +2575 @@
         /* Initiate bkpinfo isodir path from running environment if mount already done */
         if (is_this_device_mounted(bkpinfo->netfs_mount)) {
-            strcpy(bkpinfo->isodir, call_program_and_get_last_line_of_output("mount | grep \":\" | cut -d' ' -f3 | head -n1"));
+            strcpy(bkpinfo->isodir,
+                   call_program_and_get_last_line_of_output
+                   ("mount | grep \":\" | cut -d' ' -f3 | head -n1"));
         } else {
             sprintf(bkpinfo->isodir, "%s/netfsdir", bkpinfo->tmpdir);
-            mr_asprintf(command, "mkdir -p %s", bkpinfo->isodir);
+            sprintf(command, "mkdir -p %s", bkpinfo->isodir);
             run_program_and_log_output(command, 5);
-            mr_free(command);
 
             if (bkpinfo->restore_data) {
@@ -2546 +2615 @@
         }
         if (!is_this_device_mounted(bkpinfo->netfs_mount)) {
-            popup_and_OK("Please mount that partition before you try to backup to or restore from it.");
+            popup_and_OK
+                ("Please mount that partition before you try to backup to or restore from it.");
             finish(1);
         }
@@ -2570 +2640 @@
         log_msg(3, "prefix set to %s", bkpinfo->prefix);
 
-        log_msg(3, "Just set netfs_remote_dir to %s", bkpinfo->netfs_remote_dir);
+        log_msg(3, "Just set netfs_remote_dir to %s",
+                bkpinfo->netfs_remote_dir);
         log_msg(3, "isodir is still %s", bkpinfo->isodir);
         break;
@@ -2588 +2659 @@
                     finish(1);
                 }
-                if ((bkpinfo->compression_level = which_compression_level()) == -1) {
+                if ((bkpinfo->compression_level =
+                     which_compression_level()) == -1) {
                     log_to_screen("User has chosen not to backup the PC");
                     finish(1);
                 }
-                sprintf(tmp1, "%d", DEFAULT_DVD_DISK_SIZE); // 4.7 salesman's GB = 4.482 real GB = 4482 MB
+                sprintf(sz_size, "%d", DEFAULT_DVD_DISK_SIZE);  // 4.7 salesman's GB = 4.482 real GB = 4482 MB
                 if (!popup_and_get_string
                     ("ISO size.",
                      "Please enter how big you want each ISO image to be (in megabytes). This should be less than or equal to the size of the CD-R[W]'s (700) or DVD's (4480) you plan to backup to.",
-                     tmp1, 16)) {
+                     sz_size, 16)) {
                     log_to_screen("User has chosen not to backup the PC");
                     finish(1);
                 }
-                bkpinfo->media_size = atoi(tmp1);
+                bkpinfo->media_size = atoi(sz_size);
             } else {
                 bkpinfo->media_size = 650;
@@ -2651 +2723 @@
                 finish(1);
             }
-            if (does_string_exist_in_boot_block(bkpinfo->boot_device, "LILO")) {
+            if (does_string_exist_in_boot_block
+                (bkpinfo->boot_device, "LILO")) {
                 i = 'L';
             } else
-                if (does_string_exist_in_boot_block(bkpinfo->boot_device, "ELILO")) {
+                if (does_string_exist_in_boot_block
+                    (bkpinfo->boot_device, "ELILO")) {
                 i = 'E';
             } else
-                if (does_string_exist_in_boot_block(bkpinfo->boot_device, "GRUB")) {
+                if (does_string_exist_in_boot_block
+                    (bkpinfo->boot_device, "GRUB")) {
                 i = 'G';
             } else {
@@ -2664 +2739 @@
 #endif
             if (i == 'U') {
-                if (ask_me_yes_or_no("Unidentified boot loader. Shall I restore it byte-for-byte at restore time and hope for the best?")) {
+                if (ask_me_yes_or_no
+                    ("Unidentified boot loader. Shall I restore it byte-for-byte at restore time and hope for the best?"))
+                {
                     i = 'R';    // raw
                 } else {
-                    log_to_screen("I cannot find your boot loader. Please run mondoarchive with parameters.");
+                    log_to_screen
+                        ("I cannot find your boot loader. Please run mondoarchive with parameters.");
                     finish(1);
                 }
@@ -2673 +2751 @@
         }
         bkpinfo->boot_loader = i;
-
-        mr_free(bkpinfo->include_paths);
-        strcpy(tmp1, "/");
+        strcpy(bkpinfo->include_paths, "/");
         if (!popup_and_get_string
             ("Backup paths",
              "Please enter paths (separated by '|') which you want me to backup. The default is '/' (i.e. everything).",
-             tmp1, MAX_STR_LEN)) {
+             bkpinfo->include_paths, MAX_STR_LEN)) {
             log_to_screen("User has chosen not to backup the PC");
             finish(1);
         }
-        mr_asprintf(bkpinfo->include_paths, "%s", tmp1);
-
         tmp = list_of_NETFS_mounts_only();
         if (strlen(tmp) > 2) {
@@ -2741 +2815 @@
         if (ask_me_yes_or_no("Do you want to backup extended attributes?")) {
             if (find_home_of_exe("getfattr")) {
-                mr_free(g_getfattr);
                 mr_asprintf(g_getfattr,"getfattr");
             }
             if (find_home_of_exe("getfacl")) {
-                mr_free(g_getfacl);
                 mr_asprintf(g_getfacl,"getfacl");
             }
@@ -2763 +2835 @@
             strcpy(bkpinfo->zip_exe, "gzip");
             strcpy(bkpinfo->zip_suffix, "gz");
-        } else if (strcmp(compression_type,"lzma") == 0) {
+        //} else if (strcmp(compression_type,"lzma") == 0) {
             //strcpy(bkpinfo->zip_exe, "xy");
             //strcpy(bkpinfo->zip_suffix, "xy");
@@ -2777 +2849 @@
             ("Will you want to verify your backups after Mondo has created them?");
 
+#ifndef __FreeBSD__
+        if (!ask_me_yes_or_no
+            ("Are you confident that your kernel is a sane, sensible, standard Linux kernel? Say 'no' if you are using a Gentoo <1.4 or Debian <3.0, please."))
+#endif
+        {
+            strcpy(bkpinfo->kernel_path, "FAILSAFE");
+        }
+
         if (!ask_me_yes_or_no
             ("Are you sure you want to proceed? Hit 'no' to abort.")) {
@@ -2795 +2875 @@
 #else
     if (bkpinfo->backup_media_type == netfs) {
-        log_msg(3, "I think the Remote mount is mounted at %s", bkpinfo->isodir);
+        log_msg(3, "I think the Remote mount is mounted at %s",
+                bkpinfo->isodir);
     }
     log_it("isodir = %s", bkpinfo->isodir);
-    if (bkpinfo->netfs_mount) {
-        log_it("netfs_mount = '%s'", bkpinfo->netfs_mount);
+    log_it("netfs_mount = '%s'", bkpinfo->netfs_mount);
+    if (bkpinfo->netfs_proto) {
+        log_it("netfs_proto = '%s'", bkpinfo->netfs_proto);
     }
     if (bkpinfo->netfs_user) {
         log_it("netfs_user = '%s'", bkpinfo->netfs_user);
-    }
-    if (bkpinfo->netfs_proto) {
-        log_it("netfs_proto = '%s'", bkpinfo->netfs_proto);
     }
 #endif
@@ -2812 +2891 @@
     log_it("media size = %ld", bkpinfo->media_size);
     log_it("media type = %s", bkptype_to_string(bkpinfo->backup_media_type));
-    if (bkpinfo->prefix) {
-        log_it("prefix = %s", bkpinfo->prefix);
-    }
+    log_it("prefix = %s", bkpinfo->prefix);
     log_it("compression = %ld", bkpinfo->compression_level);
     log_it("exclude_path = %s", bkpinfo->exclude_paths);
@@ -2820 +2897 @@
 
     /* Handle devices passed in bkpinfo and print result */
-    /*  the mr_make_devlist_from_pathlist function appends
-    /*  to the *_paths variables so copy before */
+    /*  the mr_make_devlist_from_pathlist function appends 
+     *  to the *_paths variables so copy before */
     mr_make_devlist_from_pathlist(bkpinfo->exclude_paths, 'E');
     mr_make_devlist_from_pathlist(bkpinfo->include_paths, 'I');
@@ -2827 +2904 @@
     log_it("scratchdir = '%s'", bkpinfo->scratchdir);
     log_it("tmpdir = '%s'", bkpinfo->tmpdir);
-    if (bkpinfo->image_devs) {
-        log_it("image_devs = '%s'", bkpinfo->image_devs);
-    }
-    log_it("boot_device = '%s' (loader=%c)", bkpinfo->boot_device, bkpinfo->boot_loader);
+    log_it("image_devs = '%s'", bkpinfo->image_devs);
+    log_it("boot_device = '%s' (loader=%c)", bkpinfo->boot_device,
+           bkpinfo->boot_loader);
     if (bkpinfo->media_size < 0) {
         if (archiving_to_media) {
@@ -2841 +2917 @@
     paranoid_free(sz_size);
     paranoid_free(tmp1);
+    paranoid_free(command);
+    paranoid_free(comment);
+    paranoid_free(prompt);
     return (0);
 }
@@ -3091 +3170 @@
 
     malloc_string(current_drive);
-
-    /* UEFI is not supported here - but should be managed as a BIOS/UEFI option not a Boot Loader one per se */
 
 #ifdef __IA64__

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

@@ -85 +85 @@
     wise_upper_limit = (am_I_in_disaster_recovery_mode()? 8 : 32);
     wise_lower_limit = 1;       // wise_upper_limit/2 + 1;
-    sync();
+    paranoid_system("sync");
     for (bufsize = wise_upper_limit, res = -1;
          res != 0 && bufsize >= wise_lower_limit; bufsize--) {
-        mr_asprintf(tmp,"dd if=/dev/zero bs=1024 count=16k 2> /dev/null | buffer -o /dev/null -s %ld -m %d%c", internal_tape_block_size, bufsize, 'm');
+        mr_asprintf(tmp,
+                "dd if=/dev/zero bs=1024 count=16k 2> /dev/null | buffer -o /dev/null -s %ld -m %d%c",
+                internal_tape_block_size, bufsize, 'm');
         res = run_program_and_log_output(tmp, 2);
         mr_free(tmp);
@@ -94 +96 @@
     if (!res) {
         bufsize++;
-        log_to_screen(tmp, "Negotiated max buffer of %d MB ", bufsize);
+        mr_asprintf(tmp, "Negotiated max buffer of %d MB ", bufsize);
+        log_to_screen(tmp);
+        mr_free(tmp);
     } else {
         bufsize = 0;
@@ -162 +166 @@
         return;
     }
-    sync();
+    paranoid_system("sync");
     mr_asprintf(command, "ps %s | grep -F \"%s\" | grep -Fv grep | awk '{print $2;}' | grep -v PID | head -1", ps_options, g_sz_call_to_buffer);
     log_msg(2, "kill_buffer() --- command = %s", command);

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

@@ -86 +86 @@
 
     /*@ pointers ********************** */
-    char *ptr = NULL;
+    char *ptr;
     FILE *fout;
 
@@ -116 +116 @@
     mr_free(tempfile);
 
-    if (bkpinfo->image_devs) {
-        log_it("image_devs : %s", bkpinfo->image_devs);
-
-        ptr = bkpinfo->image_devs;
-
-        while (ptr && *ptr) {
-            mr_asprintf(dev, "%s", ptr);
-            log_it("Examining imagedev %s", dev);
-            for (i = 0; i < (int) strlen(dev) && dev[i] != ' '; i++);
-            dev[i] = '\0';
-            if (!strlen(dev)) {
-                mr_free(dev);
-                continue;
-            }
-            fprintf(fout, "%s\n", dev);
-            log_it("Adding '%s' to biggielist", dev);
-            if ((ptr = strchr(ptr, ' '))) {
-                ptr++;
-            }
-            mr_free(dev);
+    log_it(bkpinfo->image_devs);
+
+    ptr = bkpinfo->image_devs;
+
+    malloc_string(dev);
+    while (ptr && *ptr) {
+        strcpy(dev, ptr);
+        log_it("Examining imagedev %s", dev);
+        for (i = 0; i < (int) strlen(dev) && dev[i] != ' '; i++);
+        dev[i] = '\0';
+        if (!strlen(dev)) {
+            continue;
+        }
+        fprintf(fout, "%s\n", dev);
+        log_it("Adding '%s' to biggielist", dev);
+        if ((ptr = strchr(ptr, ' '))) {
+            ptr++;
         }
     }
@@ -141 +138 @@
     mvaddstr_and_log_it(g_currentY++, 74, "Done.");
 
+    paranoid_free(dev);
     return (retval);
 }
@@ -160 +158 @@
 
     mr_asprintf(tmp_fname, "%s/sortfile", bkpinfo->tmpdir);
+
     mr_asprintf(command, "sort %s > %s 2>> %s", orig_fname, tmp_fname, MONDO_LOGFILE);
     retval = system(command);
@@ -332 +331 @@
 
     if (curr_set_no == 0) {
-        log_msg(1, "Only one fileset. Fine.");
+        mr_asprintf(tmp, "Only one fileset. Fine.");
     } else {
-        log_msg(1, "Filelist divided into %ld sets", curr_set_no + 1);
-    }
+        mr_asprintf(tmp, "Filelist divided into %ld sets", curr_set_no + 1);
+    }
+    log_msg(1, tmp);
+    mr_free(tmp);
     close_evalcall_form();
     /* This is to work around an obscure bug in Newt; open a form, close it,
@@ -341 +342 @@
        then update_progress_form() won't show the "time taken / time remaining"
        line. The bug only crops up AFTER the call to chop_filelist(). Weird. */
+#ifndef _XWIN
     if (!g_text_mode) {
         open_progress_form("", "", "", "", 100);
@@ -347 +349 @@
         newtPopWindow();
     }
+#endif
     return (err ? 0 : curr_set_no + 1);
 }
@@ -407 +410 @@
 int call_exe_and_pipe_output_to_fd(char *syscall, FILE * pout)
 {
-    FILE *pattr = NULL;
-    char *tmp = NULL;
+    FILE *pattr;
+    char *tmp;
+    char *p;
 
     pattr = popen(syscall, "r");
@@ -420 +424 @@
         return (2);
     }
-    for (mr_getline(tmp, pattr); !feof(pattr); mr_getline(tmp, pattr)) {
+    malloc_string(tmp);
+    for (p = fgets(tmp, MAX_STR_LEN, pattr); !feof(pattr) && (p != NULL);
+         p = fgets(tmp, MAX_STR_LEN, pattr)) {
         fputs(tmp, pout);
-        mr_free(tmp);
-    }
-    mr_free(tmp);
+    }
     paranoid_pclose(pattr);
+    paranoid_free(tmp);
     return (0);
 }
@@ -434 +439 @@
                  char *auxlist_fname)
 {
-    FILE *fin = NULL;
-    FILE *pout = NULL;
+    FILE *fin;
+    FILE *pout;
     char *pout_command = NULL;
-    char *syscall = NULL;
-    char *file_to_analyze = NULL;
+    char *syscall;
+    char *file_to_analyze;
     char *strtmp = NULL;
     char *tmp = NULL;
+    char *p = NULL;
     int i;
 
@@ -456 +462 @@
     mr_free(pout_command);
 
-    for (mr_getline(file_to_analyze, fin); !feof(fin); mr_getline(file_to_analyze, fin)) {
+    malloc_string(file_to_analyze);
+    for (p = fgets(file_to_analyze, MAX_STR_LEN, fin); !feof(fin) && (p != NULL);
+         p = fgets(file_to_analyze, MAX_STR_LEN, fin)) {
         i = strlen(file_to_analyze);
         if (i > 0 && file_to_analyze[i - 1] < 32) {
@@ -464 +472 @@
         tmp = mr_stresc(file_to_analyze, "'", '\\', '\'');
         mr_asprintf(syscall, "%s '%s' 2>> /dev/null", syscall_sprintf, tmp);    // " MONDO_LOGFILE);
-        mr_free(tmp);
+        paranoid_free(tmp);
         log_msg(20,"calling %s\n",syscall);
         call_exe_and_pipe_output_to_fd(syscall, pout);
-        mr_free(syscall);
-        mr_free(file_to_analyze);
-    }
-    mr_free(file_to_analyze);
+        paranoid_free(syscall);
+    }
     paranoid_fclose(fin);
     paranoid_pclose(pout);
+    paranoid_free(file_to_analyze);
     return (0);
 }
@@ -515 +522 @@
     char *syscall_pin = NULL;
     char *syscall_pout = NULL;
-    char *incoming = NULL;
-    char *current_subset_file = NULL;
-    char *current_master_file = NULL;
+    char *incoming;
+    char *current_subset_file, *current_master_file;
     char *masklist = NULL;
     int retval = 0;
     int i;
-    char *p, *q;
+    char *p, *q, *r;
     char *tmp = NULL;
     FILE *pin, *pout, *faclin;
 
-    log_msg(1, "set_EXAT_list(%s, %s, %s)", orig_msklist, original_exat_fname, executable);
+    log_msg(1, "set_EXAT_list(%s, %s, %s)", orig_msklist,
+            original_exat_fname, executable);
     if (!orig_msklist || !orig_msklist[0]
         || !does_file_exist(orig_msklist)) {
@@ -545 +552 @@
     }
     if (length_of_file(original_exat_fname) <= 0) {
-        log_msg(1, "original_exat_fname %s is empty or missing, so no need to set EXAT list", original_exat_fname);
+        log_msg(1,
+                "original_exat_fname %s is empty or missing, so no need to set EXAT list",
+                original_exat_fname);
         return (0);
     }
+    malloc_string(incoming);
+    malloc_string(current_subset_file);
+    malloc_string(current_master_file);
     mr_asprintf(masklist, "%s/masklist", bkpinfo->tmpdir);
     mr_asprintf(command, "cp -f %s %s", orig_msklist, masklist);
@@ -554 +566 @@
 
     sort_file(masklist);
+    current_subset_file[0] = current_master_file[0] = '\0';
 
     mr_asprintf(syscall_pout, "%s --restore - 2>> %s", executable, MONDO_LOGFILE);
@@ -586 +599 @@
 //  printf("Hi there. Starting the loop\n");
 
-    mr_getline(current_subset_file, faclin);
-    mr_getline(incoming, pin);
-    while (!feof(pin) && !feof(faclin)) {
-        mr_asprintf(current_master_file, "%s", incoming + 8);
+    r = fgets(current_subset_file, MAX_STR_LEN, faclin);
+    r = fgets(incoming, MAX_STR_LEN, pin);
+    while (!feof(pin) && !feof(faclin) && (r != NULL)) {
+//      printf("incoming = %s", incoming);
+
+        strcpy(current_master_file, incoming + 8);
 
         p = current_subset_file;
@@ -617 +632 @@
         if (i < 0) {            // read another subset file in.
             log_msg(my_depth, "Reading next subset line in\n\n");
-            mr_free(current_subset_file);
-            mr_getline(current_subset_file, faclin);
+            r = fgets(current_subset_file, MAX_STR_LEN, faclin);
             continue;
         }
@@ -625 +639 @@
             fputs(incoming, pout);
         }
-        mr_free(incoming);
-        mr_getline(incoming, pin);
+        r = fgets(incoming, MAX_STR_LEN, pin);
         if (!i) {
             log_msg(my_depth, "Copying master %s", q);
         }
+//      if (!i) { printf("Match --- %s\n", q); }
 
         while (!feof(pin) && strncmp(incoming, "# file: ", 8)) {
             if (!i) {
+
+//    printf("%s", incoming);
+
                 fputs(incoming, pout);
             }
-            mr_free(incoming);
-            mr_getline(incoming, pin);
+            r = fgets(incoming, MAX_STR_LEN, pin);
         }
         if (!i) {
-            mr_free(current_subset_file);
-            mr_getline(current_subset_file, faclin);
-        }
-        mr_free(current_master_file);
-    }
-    mr_free(current_subset_file);
-    mr_free(incoming);
+            r = fgets(current_subset_file, MAX_STR_LEN, faclin);
+        }
+    }
+    while (!feof(pin)) {
+        r = fgets(incoming, MAX_STR_LEN, pin);
+    }
     fclose(faclin);
     pclose(pin);
     pclose(pout);
 
+//  printf("OK, loop is done\n");
+
     unlink(masklist);
     mr_free(masklist);
 
+    paranoid_free(current_subset_file);
+    paranoid_free(current_master_file);
+    paranoid_free(incoming);
     return (retval);
 }
@@ -750 +770 @@
     noof_chars = strlen(string_to_add) + 1; /* we include the '\0' */
 
-    /* walk across tree if necessary */
+/* walk across tree if necessary */
     node = startnode;
     char_to_add = string_to_add[0];
@@ -759 +779 @@
     }
 
-    /* walk down tree if appropriate */
+/* walk down tree if appropriate */
     if (node->down != NULL && node->ch == char_to_add) {
         log_msg(7, "depth=%d char=%c --- going DOWN", depth, char_to_add);
@@ -773 +793 @@
     }
 
-    /* add here */
+/* add here */
     if (!(newnode = (struct s_node *) malloc(sizeof(struct s_node)))) {
         log_to_screen("failed to malloc");
@@ -844 +864 @@
     /*@ buffers **************************************************** */
     char *command_to_open_fname = NULL;
-    char *fname = NULL;
-    char *tmp = NULL;
+    char fname[MAX_STR_LEN];
+    char tmp[MAX_STR_LEN];
     char *tmp1 = NULL;
     int pos_in_fname;
@@ -891 +911 @@
 
     open_evalcall_form("Loading filelist from disk");
-    for (mr_getline(fname, pin); !feof(pin); mr_getline(fname, pin)) {
-        if ((strlen(fname) > 0) && (fname[strlen(fname) - 1] == 13 || fname[strlen(fname) - 1] == 10)) {
+    for (tmp1 = fgets(fname, MAX_STR_LEN, pin); !feof(pin);
+         tmp1 = fgets(fname, MAX_STR_LEN, pin)) {
+        if (((fname[strlen(fname) - 1] == 13) || (fname[strlen(fname) - 1] == 10)) && (strlen(fname) > 0)) {
             fname[strlen(fname) - 1] = '\0';
         }
+//      strip_spaces (fname);
         if (!strlen(fname)) {
-            mr_free(fname);
             continue;
         }
@@ -903 +924 @@
                 continue;
             }
-            mr_asprintf(tmp, "%s", fname);
+            strcpy(tmp, fname);
             tmp[pos_in_fname] = '\0';
             if (strlen(tmp)) {
                 add_string_at_node(filelist, tmp);
             }
-            mr_free(tmp);
         }
         add_string_at_node(filelist, fname);
-
         if (!(++lino % 1111)) {
             percentage = (int) (lino * 100 / lines_in_filelist);
             update_evalcall_form(percentage);
         }
-        mr_free(fname);
-    }
-    mr_free(fname);
-
+    }
     paranoid_pclose(pin);
     close_evalcall_form();
@@ -1281 +1297 @@
 
 
+
+
 /**
  * Number of entries in the skeleton filelist.
@@ -1296 +1314 @@
  * @bug Return value should be @c void.
  */
-int open_and_list_dir(char *dir1, char *sth, FILE * fout, time_t time_of_last_full_backup) {
-
+int open_and_list_dir(char *dir1, char *sth, FILE * fout,
+                      time_t time_of_last_full_backup)
+{
     const char delims[] = "|";
 
@@ -1304 +1323 @@
     struct stat statbuf;
     char *new;
-    char *tmp = NULL;
+    char *tmp;
     char *dir = NULL;
     static int percentage = 0;
-    char *skip_these = NULL;
+    char *skip_these;
     char *new_with_pipe;
     char *strtmp = NULL;
     char *token = NULL;
     char *find_excludes = NULL;
-    char *name_of_evalcall_form = NULL;
-    char *find_skeleton_marker = NULL;
+    static char *name_of_evalcall_form;
     int i;
     int lastpos = 0;
@@ -1320 +1338 @@
     static int counter = 0;
     static int uberctr = 0;
-    static long skeleton_lino = 0L;
-    static time_t last_time = (time_t)0;
+    static char *find_skeleton_marker;
+    static long skeleton_lino = 0;
+    static time_t last_time = 0;
     time_t this_time;
 
@@ -1336 +1355 @@
 
     if (!depth) {
+        malloc_string(name_of_evalcall_form);
+        malloc_string(find_skeleton_marker);
         while((token = mr_strtok(sth, delims, &lastpos)) != NULL) {
           mr_strcat(find_excludes," -path %s -prune -o", token);
@@ -1354 +1375 @@
         mr_asprintf(strtmp, "find '%s' -maxdepth %d -fstype mvfs -prune -o -path /proc -prune -o %s -type d -print > %s 2> /dev/null", dir, MAX_SKEL_DEPTH, find_excludes, g_skeleton_filelist);
 #endif
-        mr_free(find_excludes);
-
+        paranoid_free(find_excludes);
         log_msg(5, "find command = %s", strtmp);
         paranoid_system(strtmp);
-        mr_free(strtmp);
-
+        paranoid_free(strtmp);
         mr_asprintf(tmp, "wc -l %s | awk '{print $1;}'", g_skeleton_filelist);
-        g_skeleton_entries = 1 + atol(call_program_and_get_last_line_of_output(tmp));
-        mr_free(tmp);
-
-        mr_asprintf(name_of_evalcall_form, "Making catalog of %s", dir1);
+        g_skeleton_entries =
+            1 + atol(call_program_and_get_last_line_of_output(tmp));
+        paranoid_free(tmp);
+        sprintf(name_of_evalcall_form, "Making catalog of %s", dir1);
         open_evalcall_form(name_of_evalcall_form);
-        mr_free(name_of_evalcall_form);
-
+        find_skeleton_marker[0] = '\0';
         skeleton_lino = 1;
         log_msg(5, "entries = %ld", g_skeleton_entries);
@@ -1373 +1391 @@
     } else if (depth <= MAX_SKEL_DEPTH) // update evalcall form if appropriate
     {
-        mr_asprintf(find_skeleton_marker, "grep -Fv '%s' %s > %s.new 2> /dev/null", dir, g_skeleton_filelist, g_skeleton_filelist);
+        sprintf(find_skeleton_marker,
+                "grep -Fv '%s' %s > %s.new 2> /dev/null", dir,
+                g_skeleton_filelist, g_skeleton_filelist);
+//    log_msg(0, "fsm = %s", find_skeleton_marker);
         if (!system(find_skeleton_marker)) {
             percentage = (int) (skeleton_lino * 100 / g_skeleton_entries);
             skeleton_lino++;
-            mr_free(find_skeleton_marker);
-
-            mr_asprintf(find_skeleton_marker, "mv -f %s.new %s", g_skeleton_filelist, g_skeleton_filelist);
+//        log_msg(5, "Found %s", dir);
+//        log_msg(2, "Incrementing skeleton_lino; now %ld/%ld (%d%%)", skeleton_lino, g_skeleton_entries, percentage);
+            sprintf(find_skeleton_marker, "mv -f %s.new %s",
+                    g_skeleton_filelist, g_skeleton_filelist);
+//        log_msg(6, "fsm = %s", find_skeleton_marker);
             paranoid_system(find_skeleton_marker);
             time(&this_time);
             if (this_time != last_time) {
                 last_time = this_time;
+#ifndef _XWIN
                 if (!g_text_mode) {
                     int cols, rows;
@@ -1391 +1415 @@
                     mr_free(tmp);
                 }
+#endif
                 update_evalcall_form(percentage);
             }
         }
-        mr_free(find_skeleton_marker);
     }
 
@@ -1406 +1430 @@
         mr_asprintf(tmp,"opendir %s", dir1);
         log_OS_error(tmp);
-        mr_free(tmp);
+        paranoid_free(tmp);
     } else if (strstr(skip_these, new_with_pipe)) {
         log_msg(10, "Found dir ***%s**** excluded", dir1);
@@ -1420 +1444 @@
                 mr_asprintf(new,"%s%s",dir1,dit->d_name);
             }
-            mr_free(new_with_pipe);
+            paranoid_free(new_with_pipe);
             mr_asprintf(new_with_pipe, "|%s|", new);
             if (strstr(skip_these, new_with_pipe)) {
                 fprintf(fout, "%s\n", new);
                 log_msg(10, "Found child dir ***%s**** excluded", new);
-                mr_free(new_with_pipe);
+                paranoid_free(new_with_pipe);
             } else {
-                mr_free(new_with_pipe);
+                paranoid_free(new_with_pipe);
                 if (!lstat(new, &statbuf)) {
                     if (!S_ISLNK(statbuf.st_mode)
                         && S_ISDIR(statbuf.st_mode)) {
                         log_msg(10, "Found child dir ***%s**** parsed", new);
-                        open_and_list_dir(new, skip_these, fout, time_of_last_full_backup);
+                        open_and_list_dir(new, skip_these, fout,
+                                          time_of_last_full_backup);
                     } else {
-                        if (time_of_last_full_backup == 0 || time_of_last_full_backup < statbuf.st_ctime) {
+                        if (time_of_last_full_backup == 0
+                            || time_of_last_full_backup <
+                            statbuf.st_ctime) {
                             log_msg(10, "Found child file ***%s**** parsed", new);
                             fprintf(fout, "%s\n", new);
@@ -1441 +1468 @@
                                 uberctr++;
                                 mr_asprintf(tmp, " %c ", special_dot_char(uberctr));
+#ifndef _XWIN
                                 if (!g_text_mode) {
-                                    newtDrawRootText(77, g_noof_rows - 3, tmp);
+                                    newtDrawRootText(77, g_noof_rows - 3,
+                                                     tmp);
                                     newtRefresh();
                                 }
-                                mr_free(tmp);
+#endif
+                                paranoid_free(tmp);
                             }
                         }
@@ -1451 +1481 @@
                 }
             }
-            mr_free(new);
-        }
-    }
-    mr_free(new_with_pipe);
-    mr_free(skip_these);
+            paranoid_free(new);
+        }
+    }
+    paranoid_free(new_with_pipe);
+    paranoid_free(skip_these);
     mr_free(dir);
 
@@ -1466 +1496 @@
     if (!depth) {
         close_evalcall_form();
+        paranoid_free(name_of_evalcall_form);
+        paranoid_free(find_skeleton_marker);
         unlink(g_skeleton_filelist);
         log_msg(5, "g_skeleton_entries = %ld", g_skeleton_entries);
@@ -1493 +1525 @@
     char *p, *q;
     char *sz_datefile;
-    char *sz_filelist;
+    char *sz_filelist, *tmp;
     char *exclude_paths = NULL;
     FILE *fout;
@@ -1502 +1534 @@
     char *tmp2 = NULL;
 
+    malloc_string(tmp);
+    malloc_string(g_skeleton_filelist);
     mr_asprintf(sz_datefile,MONDO_CACHE"/difflevel.%d" , 0);
     if (!include_paths && !userdef_filelist) {
-        fatal_error("Please supply either include_paths or userdef_filelist");
-    }
-    // make hole for filelist
+        fatal_error
+            ("Please supply either include_paths or userdef_filelist");
+    }
+// make hole for filelist
     mr_asprintf(command, "mkdir -p %s/archives", scratchdir);
     paranoid_system(command);
@@ -1522 +1557 @@
         // backup last known good datefile just in case :)
         if (does_file_exist(sz_datefile)) {
-            mr_asprintf(command, "mv -f %s %s.aborted", sz_datefile, sz_datefile);
+            mr_asprintf(command, "mv -f %s %s.aborted", sz_datefile,
+                    sz_datefile);
             paranoid_system(command);
             mr_free(command);
@@ -1531 +1567 @@
                                   ("date +%s"));
     } else if (lstat(sz_datefile, &statbuf)) {
-        log_msg(2, "Warning - unable to find date of previous backup. Full backup instead.");
+        log_msg(2,
+                "Warning - unable to find date of previous backup. Full backup instead.");
         differential = 0;
         time_of_last_full_backup = 0;
@@ -1542 +1579 @@
 // use user-specified filelist (if specified)
     if (userdef_filelist) {
-        log_msg(1, "Using the user-specified filelist - %s - instead of calculating one", userdef_filelist);
+        log_msg(1,
+                "Using the user-specified filelist - %s - instead of calculating one",
+                userdef_filelist);
         mr_asprintf(command, "cp -f %s %s", userdef_filelist, sz_filelist);
         if (run_program_and_log_output(command, 3)) {
@@ -1550 +1589 @@
         mr_free(command);
     } else {
-        if (include_paths) {
-            log_msg(2, "include_paths = '%s'", include_paths);
-        }
+        log_msg(2, "include_paths = '%s'", include_paths);
         log_msg(1, "Calculating filelist");
         mr_asprintf(tmp2, "%s", call_program_and_get_last_line_of_output("mount | grep -Ew 'ntfs|ntfs-3g|fat|vfat|dos' | awk '{print $3}'"));
@@ -1560 +1597 @@
             log_msg(2, "Found windows FS: %s",tmp2);
             mr_asprintf(tmp1, "find %s -name '/win386.swp' -o -name '/hiberfil.sys' -o -name '/pagefile.sys' 2> /dev/null\n",tmp2);
-            mr_free(tmp2);
+            paranoid_free(tmp2);
             mr_asprintf(tmp2, "%s", call_program_and_get_last_line_of_output(tmp1));
             log_msg(2, "Found windows files: %s",tmp2);
         }
-        mr_free(tmp1);
+        paranoid_free(tmp1);
 
         mr_asprintf(exclude_paths, MONDO_CACHE"|%s|%s|%s|.|..|"MNT_CDROM"|"MNT_FLOPPY"|/media|/tmp|/proc|/sys|/run|/dev/shm|"MINDI_CACHE, tmp2, (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
@@ -1570 +1607 @@
             mr_strcat(exclude_paths,"|%s",excp);
         }
-        mr_free(tmp2);
+        paranoid_free(tmp2);
 
         log_msg(2, "Excluding paths = '%s'", exclude_paths);
-        log_msg(2, "Generating skeleton filelist so that we can track our progress");
-        mr_asprintf(g_skeleton_filelist, "%s/tmpfs/skeleton.txt", tmpdir);
+        log_msg(2,
+                "Generating skeleton filelist so that we can track our progress");
+        sprintf(g_skeleton_filelist, "%s/tmpfs/skeleton.txt", tmpdir);
         make_hole_for_file(g_skeleton_filelist);
-
         log_msg(4, "g_skeleton_entries = %ld", g_skeleton_entries);
         log_msg(2, "Opening out filelist to %s", sz_filelist);
@@ -1582 +1619 @@
             fatal_error("Cannot openout to sz_filelist");
         }
-        if ((include_paths != NULL) && (strlen(include_paths) == 0)) {
+        if (strlen(include_paths) == 0) {
             log_msg(1, "Including only '/' in %s", sz_filelist);
             open_and_list_dir("/", exclude_paths, fout,
@@ -1600 +1637 @@
             }
         }
-        mr_free(exclude_paths);
         paranoid_fclose(fout);
     }
@@ -1618 +1654 @@
     paranoid_free(sz_filelist);
     log_msg(2, "Freeing variables");
-    mr_free(g_skeleton_filelist);
+    paranoid_free(exclude_paths);
+    paranoid_free(tmp);
+    paranoid_free(g_skeleton_filelist);
     log_msg(2, "Exiting");
     return (0);
 }
-
 
 /**
@@ -1643 +1680 @@
 
     assert(bkpinfo != NULL);
-    log_it("tmpdir=%s; scratchdir=%s", bkpinfo->tmpdir, bkpinfo->scratchdir);
+    log_it("tmpdir=%s; scratchdir=%s", bkpinfo->tmpdir,
+           bkpinfo->scratchdir);
     if (bkpinfo->make_filelist) {
         mvaddstr_and_log_it(g_currentY, 0,
@@ -1754 +1792 @@
     FILE *fin;
     FILE *fout;
-    char *fname = NULL;
-    char *tmp = NULL;
-
+    char *fname;
+    char *tmp;
+    size_t len = 0;             // Scrub's patch doesn't work without that
+
+//  log_msg(1, "use_star = %s", (use_star)?"TRUE":"FALSE");
+    malloc_string(fname);
+    malloc_string(tmp);
     log_msg(5, "starting");
     log_msg(5, "needles_list_fname = %s", needles_list_fname);
@@ -1767 +1809 @@
     }
     while (!feof(fin)) {
-        mr_getline(fname, fin);
+//      fscanf(fin, "%s\n", fname);
+        len = MAX_STR_LEN - 1;
+        if (getline(&fname, &len, fin)) {
+            // FIXME
+        }
         if (!use_star) {
             if (fname[0] == '/') {
-                mr_asprintf(tmp, "%s", fname);
+                strcpy(tmp, fname);
             } else {
-                mr_asprintf(tmp, "/%s", fname);
+                tmp[0] = '/';
+                strcpy(tmp + 1, fname);
             }
-            mr_free(fname);
-            fname = tmp;
+            strcpy(fname, tmp);
         }
         while (strlen(fname) > 0 && fname[strlen(fname) - 1] < 32) {
@@ -1786 +1832 @@
             if (found_node->selected) {
                 if (fname[0] == '/') {
-                    mr_asprintf(tmp, "%s", fname + 1);
-                    mr_free(fname);
-                    fname = tmp;
+                    strcpy(tmp, fname + 1);
+                    strcpy(fname, tmp);
                 }
                 log_msg(5, "Found '%s'", fname);
-                tmp = mr_stresc(fname, "[]*?", '\\', "'");
-                mr_free(fname);
-                fname = tmp;
-                fprintf(fout, "%s\n", fname);
+                turn_wildcard_chars_into_literal_chars(tmp, fname);
+                fprintf(fout, "%s\n", tmp);
                 retval++;
             }
         }
-        mr_free(fname);
     }
     paranoid_fclose(fout);
     paranoid_fclose(fin);
+    paranoid_free(fname);
+    paranoid_free(tmp);
     return (retval);
 }
+
+
+
 
 
@@ -1818 +1865 @@
                                   char *list_of_files_fname, bool flag_em)
 {
-    FILE *fin = NULL;
-    char *tmp = NULL;
-    struct s_node *nod = NULL;
-
+    FILE *fin;
+    char *tmp;
+    char *p;
+    struct s_node *nod;
+
+    malloc_string(tmp);
     log_msg(3, "Adding %s to filelist", list_of_files_fname);
     if (!(fin = fopen(list_of_files_fname, "r"))) {
@@ -1827 +1876 @@
         return (1);
     }
-    for (mr_getline(tmp, fin); !feof(fin); mr_getline(tmp, fin)) {
+    for (p = fgets(tmp, MAX_STR_LEN, fin); !feof(fin) && (p != NULL);
+         p = fgets(tmp, MAX_STR_LEN, fin)) {
         if (!tmp[0]) {
-            mr_free(tmp);
             continue;
         }
-        if ((strlen(tmp) > 0) && (tmp[strlen(tmp) - 1] == 13 || tmp[strlen(tmp) - 1] == 10)) {
+        if ((tmp[strlen(tmp) - 1] == 13 || tmp[strlen(tmp) - 1] == 10)
+            && strlen(tmp) > 0) {
             tmp[strlen(tmp) - 1] = '\0';
         }
         log_msg(2, "tmp = '%s'", tmp);
         if (!tmp[0]) {
-            mr_free(tmp);
             continue;
         }
@@ -1851 +1900 @@
             log_msg(5, "Flagged '%s'", tmp);
         }
-        mr_free(tmp);
-    }
-    mr_free(tmp);
+    }
     paranoid_fclose(fin);
+    paranoid_free(tmp);
     return (0);
 }

branches/3.0/mondo/src/common/libmondo-files-EXT.h

@@ -41 +41 @@
 
 
-extern int make_hole_for_dir(const char *outdir_fname);
+extern int make_hole_for_dir(char *outdir_fname);
 
 extern long size_of_partition_in_mountlist_K(char *tmpdir, char *dev);

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

@@ -47 +47 @@
     /*@ buffers ***************************************************** */
     static char output[MAX_STR_LEN];
-    char *command = NULL;
+    char command[MAX_STR_LEN * 2];
+    char tmp[MAX_STR_LEN];
 
     /*@ pointers **************************************************** */
-    char *p = NULL;
+    char *p;
     char *q;
     FILE *fin;
@@ -62 +63 @@
     assert_string_is_neither_NULL_nor_zerolength(filename);
     if (does_file_exist(filename)) {
-        mr_asprintf(command, "md5sum \"%s\"", filename);
+        sprintf(command, "md5sum \"%s\"", filename);
         fin = popen(command, "r");
         if (fin) {
@@ -72 +73 @@
             paranoid_pclose(fin);
         }
-        mr_free(command);
     } else {
-        log_it("File '%s' not found; cannot calc checksum", filename);
+        sprintf(tmp, "File '%s' not found; cannot calc checksum",
+                filename);
+        log_it(tmp);
     }
     if (p) {
@@ -128 +130 @@
 
     /*@ buffers ***************************************************** */
-    char *command = NULL;
-    char *incoming = NULL;
+    char command[MAX_STR_LEN * 2];
+    char incoming[MAX_STR_LEN];
+    char tmp[MAX_STR_LEN];
+    char *q;
 
     /*@ long ******************************************************** */
@@ -137 +141 @@
     FILE *fin;
 
+    /*@ initialize [0] to null ******************************************** */
+    incoming[0] = '\0';
+
     assert_string_is_neither_NULL_nor_zerolength(filename);
     if (!does_file_exist(filename)) {
-        log_it("%s does not exist, so I cannot found the number of lines in it", filename);
+        sprintf(tmp,
+                "%s does not exist, so I cannot found the number of lines in it",
+                filename);
+        log_it(tmp);
         return (0);
     }
-    mr_asprintf(command, "cat %s | wc -l", filename);
+    sprintf(command, "cat %s | wc -l", filename);
     if (!does_file_exist(filename)) {
-        mr_free(command);
         return (-1);
     }
     fin = popen(command, "r");
-    mr_free(command);
-
     if (fin) {
         if (feof(fin)) {
             noof_lines = 0;
         } else {
-            mr_getline(incoming, fin);
-            while (strlen(incoming) > 0 && incoming[strlen(incoming) - 1] < 32) {
+            q = fgets(incoming, MAX_STR_LEN - 1, fin);
+            if (!q) {
+                // FIXME
+            }
+            while (strlen(incoming) > 0 && (q != NULL)
+                   && incoming[strlen(incoming) - 1] < 32) {
                 incoming[strlen(incoming) - 1] = '\0';
             }
             noof_lines = atol(incoming);
-            mr_free(incoming);
         }
         paranoid_pclose(fin);
@@ -205 +215 @@
 void exclude_nonexistent_files(char *inout)
 {
-    char *infname = NULL;
-    char *outfname = NULL;
-    char *tmp = NULL;
-    char *incoming = NULL;
+    char infname[MAX_STR_LEN];
+    char outfname[MAX_STR_LEN];
+    char tmp[MAX_STR_LEN];
+    char incoming[MAX_STR_LEN];
+    char *q;
 
     /*@ int ********************************************************* */
@@ -220 +231 @@
 
     assert_string_is_neither_NULL_nor_zerolength(inout);
-    mr_asprintf(infname, "%s.in", inout);
-    mr_asprintf(tmp, "cp -f %s %s", inout, infname);
+    sprintf(infname, "%s.in", inout);
+    sprintf(outfname, "%s", inout);
+    sprintf(tmp, "cp -f %s %s", inout, infname);
     run_program_and_log_output(tmp, FALSE);
-    mr_free(tmp);
-
     if (!(fin = fopen(infname, "r"))) {
         log_OS_error("Unable to openin infname");
-        mr_free(infname);
         return;
     }
-
-    mr_asprintf(outfname, "%s", inout);
     if (!(fout = fopen(outfname, "w"))) {
         log_OS_error("Unable to openout outfname");
-        mr_free(infname);
-        mr_free(outfname);
         return;
     }
-    mr_free(outfname);
-
-    for (mr_getline(incoming, fin); !feof(fin); mr_getline(incoming, fin)) {
+    for (q = fgets(incoming, MAX_STR_LEN, fin); !feof(fin) && (q != NULL);
+         q = fgets(incoming, MAX_STR_LEN, fin)) {
         i = strlen(incoming) - 1;
         if (i >= 0 && incoming[i] < 32) {
@@ -248 +252 @@
             fprintf(fout, "%s\n", incoming);
         } else {
-            log_it("Excluding '%s'-nonexistent\n", incoming);
-        }
-        mr_free(incoming);
-    }
-    mr_free(incoming);
-
+            sprintf(tmp, "Excluding '%s'-nonexistent\n", incoming);
+            log_it(tmp);
+        }
+    }
     paranoid_fclose(fout);
     paranoid_fclose(fin);
     unlink(infname);
-    mr_free(infname);
-}
+}
+
+
+
+
+
+
+
 
 
@@ -270 +278 @@
 int figure_out_kernel_path_interactively_if_necessary(char *kernel)
 {
-    char *tmp = NULL;
-    char *command = NULL;
+    char tmp[MAX_STR_LEN];
+    char *command;
 
     if (!kernel[0]) {
-        strcpy(kernel, call_program_and_get_last_line_of_output("mindi --findkernel 2> /dev/null"));
+        strcpy(kernel,
+               call_program_and_get_last_line_of_output
+               ("mindi --findkernel 2> /dev/null"));
     }
     // If we didn't get anything back, check whether mindi raised a fatal error
     if (!kernel[0]) {
-        mr_asprintf(command, "%s", "grep 'Fatal error' /var/log/mindi.log");
-        mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
+        malloc_string(command);
+        strcpy(command, "grep 'Fatal error' /var/log/mindi.log");
+        strcpy(tmp, call_program_and_get_last_line_of_output(command));
         if (strlen(tmp) > 1) {
             popup_and_OK(tmp);
-            mr_free(tmp);
-            mr_free(command);
             fatal_error("Mindi gave a fatal error. Please check '/var/log/mindi.log'.");
         }
-        mr_free(tmp);
-        mr_free(command);
+        paranoid_free(command);
     }
     log_it("Calling Mindi with kernel path of '%s'", kernel);
@@ -302 +310 @@
                 ("Kernel not found. Please specify with the '-k' flag.");
         }
-        log_it("User says kernel is at %s", kernel);
+        sprintf(tmp, "User says kernel is at %s", kernel);
+        log_it(tmp);
     }
     return (0);
 }
+
+
+
+
 
 
@@ -321 +334 @@
     /*@ buffers ********************* */
     static char output[MAX_STR_LEN];
-    char *incoming = NULL;
-    char *command = NULL;
-
+    char *incoming;
+    char *command;
+
+    malloc_string(incoming);
+    malloc_string(command);
+    incoming[0] = '\0';
     /*@******************************* */
 
     assert_string_is_neither_NULL_nor_zerolength(fname);
-    mr_asprintf(command, "which %s 2> /dev/null", fname);
-    mr_asprintf(incoming, call_program_and_get_last_line_of_output(command));
-    mr_free(command);
-
+    sprintf(command, "which %s 2> /dev/null", fname);
+    strcpy(incoming, call_program_and_get_last_line_of_output(command));
     if (incoming[0] == '\0') {
         if (system("which file > /dev/null 2> /dev/null")) {
-            mr_free(incoming);
+            paranoid_free(incoming);
+            paranoid_free(command);
             output[0] = '\0';
             return (NULL);      // forget it :)
         }
-        mr_asprintf(command, "file %s 2> /dev/null | cut -d':' -f1 2> /dev/null", incoming);
-        mr_free(incomig);
-
-        mr_asprintf(incoming, "%s", call_program_and_get_last_line_of_output(command));
-        mr_free(command);
-    }
-    if (incoming[0] == '\0') {
-        mr_asprintf(command, "dirname %s 2> /dev/null", incoming);
-        mr_free(incoming);
-
-        mr_asprintf(incoming, "%s", call_program_and_get_last_line_of_output(command));
-        mr_free(command);
+        sprintf(command,
+                "file %s 2> /dev/null | cut -d':' -f1 2> /dev/null",
+                incoming);
+        strcpy(incoming,
+               call_program_and_get_last_line_of_output(command));
+    }
+    if (incoming[0] == '\0')    // yes, it is == '\0' twice, not once :)
+    {
+        sprintf(command, "dirname %s 2> /dev/null", incoming);
+        strcpy(incoming,
+               call_program_and_get_last_line_of_output(command));
     }
     strcpy(output, incoming);
     if (output[0] != '\0' && does_file_exist(output)) {
-        log_msg(4, "find_home_of_exe () --- Found %s at %s", fname, incoming);
+        log_msg(4, "find_home_of_exe () --- Found %s at %s", fname,
+                incoming);
     } else {
         output[0] = '\0';
         log_msg(4, "find_home_of_exe() --- Could not find %s", fname);
     }
-    mr_free(incoming);
+    paranoid_free(incoming);
+    paranoid_free(command);
     if (!output[0]) {
         return (NULL);
@@ -366 +382 @@
 
 
+
+
+
+
+
+
 /**
  * Get the last sequence of digits surrounded by non-digits in the first 32k of
@@ -399 +421 @@
     for (; len > 0 && isdigit(datablock[len - 1]); len--);
     trackno = atoi(datablock + len);
+    /*
+       sprintf(tmp,"datablock=%s; trackno=%d",datablock+len, trackno);
+       log_it(tmp);
+     */
     return (trackno);
 }
@@ -418 +444 @@
 
     /*@ buffers ***************************************************** */
-    char *lastline = NULL;
-    char *command = NULL;
+    char tmp[MAX_STR_LEN];
+    char lastline[MAX_STR_LEN];
+    char command[MAX_STR_LEN];
     /*@ pointers **************************************************** */
-    char *p = NULL;
+    char *p;
 
     /*@ int's ******************************************************* */
-    int i = 0;
-
-    for (i = NOOF_ERR_LINES - 1; i >= 0 && !strstr(err_log_lines[i], "% Done") && !strstr(err_log_lines[i], "% done"); i--);
+    int i;
+
+    for (i = NOOF_ERR_LINES - 1;
+         i >= 0 && !strstr(err_log_lines[i], "% Done")
+         && !strstr(err_log_lines[i], "% done"); i--);
     if (i < 0) {
-        mr_asprintf(command, "tail -n3 %s | grep -Fi \"%c\" | tail -n1 | awk '{print $0;}'", filename, '%');
-        mr_asprintf(lastline, "%s", call_program_and_get_last_line_of_output(command));
-        mr_free(command);
+        sprintf(command,
+                "tail -n3 %s | grep -Fi \"%c\" | tail -n1 | awk '{print $0;}'",
+                filename, '%');
+        strcpy(lastline,
+               call_program_and_get_last_line_of_output(command));
         if (!lastline[0]) {
-            mr_free(lastline);
             return (0);
         }
     } else {
-        mr_asprintf(lastline, "%s", err_log_lines[i]);
+        strcpy(lastline, err_log_lines[i]);
     }
 
@@ -442 +472 @@
     if (p) {
         *p = '\0';
-    } else {
-        mr_free(lastline);
+    }
+//  log_msg(2, "lastline='%s', ", p, lastline);
+    if (!p) {
         return (0);
     }
-
-    for (p--; isdigit(*p) && p != lastline; p--);
+    *p = '\0';
+    for (p--; *p != ' ' && p != lastline; p--);
     if (p != lastline) {
         p++;
     }
     i = atoi(p);
-    mr_free(lastline);
+
+    sprintf(tmp, "'%s' --> %d", p, i);
+//     log_to_screen(tmp);
+
     return (i);
 }
@@ -470 +504 @@
     /*@ buffers ***************************************************** */
     static char output[MAX_STR_LEN];
-    char *command = NULL;
+    static char command[MAX_STR_LEN * 2];
+    static char tmp[MAX_STR_LEN];
+    char *p = NULL;
 
     /*@ pointers **************************************************** */
@@ -478 +514 @@
 
     if (!does_file_exist(filename)) {
-        log_it("Tring to get last line of nonexistent file (%s)", filename);
+        sprintf(tmp, "Tring to get last line of nonexistent file (%s)",
+                filename);
+        log_it(tmp);
         output[0] = '\0';
         return (output);
     }
-    mr_asprintf(command, "tail -n1 %s", filename);
+    sprintf(command, "tail -n1 %s", filename);
     fin = popen(command, "r");
-    mr_free(command);
     p = fgets(output, MAX_STR_LEN, fin);
     if (p == NULL) {
@@ -527 +564 @@
  * @bug I don't know what this function does. However, it seems orphaned, so it should probably be removed.
  */
-int make_checksum_list_file(char *filelist, char *cksumlist, char *comppath) {
+int
+make_checksum_list_file(char *filelist, char *cksumlist, char *comppath)
+{
     /*@ pointers **************************************************** */
     FILE *fin;
@@ -538 +577 @@
 
     /*@ buffer ****************************************************** */
-    char *stub_fname = NULL;
-    char *curr_fname = NULL;
-    char *curr_cksum = NULL;
-    char *tmp = NULL;
+    char stub_fname[1000];
+    char curr_fname[1000];
+    char curr_cksum[1000];
+    char tmp[1000];
+    char *q;
 
     /*@ long [long] ************************************************* */
@@ -555 +595 @@
     start_time = get_time();
     filelist_length = length_of_file(filelist);
-    log_it("filelist = %s; cksumlist = %s", filelist, cksumlist);
-
+    sprintf(tmp, "filelist = %s; cksumlist = %s", filelist, cksumlist);
+    log_it(tmp);
     fin = fopen(filelist, "r");
     if (fin == NULL) {
@@ -570 +610 @@
         return (1);
     }
-    for (mr_getline(stub_fname, fin); !feof(fin); mr_getline(stub_fname, fin)) {
+    for (q = fgets(stub_fname, 999, fin); !feof(fin) && (q != NULL);
+         q = fgets(stub_fname, 999, fin)) {
         if (stub_fname[(i = strlen(stub_fname) - 1)] < 32) {
             stub_fname[i] = '\0';
         }
-        mr_asprintf(tmp, "%s%s", comppath, stub_fname);
-        mr_free(stub_fname);
-
-        mr_asprintf(curr_fname, "%s", tmp + 1);
-        mr_free(tmp);
-
-        mr_asprintf(curr_cksum, "%s", calc_file_ugly_minichecksum(curr_fname));
+        sprintf(tmp, "%s%s", comppath, stub_fname);
+        strcpy(curr_fname, tmp + 1);
+        strcpy(curr_cksum, calc_file_ugly_minichecksum(curr_fname));
         fprintf(fout, "%s\t%s\n", curr_fname, curr_cksum);
-        mr_free(curr_cksum);
-
         if (counter++ > 12) {
             current_time = get_time();
             counter = 0;
-            /* BERLIOS: 37 really ? */
             curr_fname[37] = '\0';
             curr_pos = ftello(fin) / 1024;
             percentage = (int) (curr_pos * 100 / filelist_length);
             time_taken = current_time - start_time;
-            if (percentage != 0) {
-                time_remaining = time_taken * 100 / (long) (percentage) - time_taken;
-                log_to_screen("%02d%% done   %02d:%02d taken   %02d:%02d remaining  %-37s\r", percentage, (int) (time_taken / 60), (int) (time_taken % 60), (int) (time_remaining / 60), (int) (time_remaining % 60), curr_fname);
+            if (percentage == 0) {
+                /*              printf("%0d%% done      \r",percentage); */
+            } else {
+                time_remaining =
+                    time_taken * 100 / (long) (percentage) - time_taken;
+                sprintf(tmp,
+                        "%02d%% done   %02d:%02d taken   %02d:%02d remaining  %-37s\r",
+                        percentage, (int) (time_taken / 60),
+                        (int) (time_taken % 60),
+                        (int) (time_remaining / 60),
+                        (int) (time_remaining % 60), curr_fname);
+                log_to_screen(tmp);
             }
             sync();
         }
-        mr_free(curr_fname);
-    }
-    mr_free(stub_fname);
-
+    }
     paranoid_fclose(fout);
     paranoid_fclose(fin);
@@ -614 +654 @@
  * @return The return value of @c mkdir.
  */
-int make_hole_for_dir(const char *outdir_fname)
-{
-    char *tmp = NULL;
+int make_hole_for_dir(char *outdir_fname)
+{
+    char tmp[MAX_STR_LEN * 2];
     int res = 0;
 
     assert_string_is_neither_NULL_nor_zerolength(outdir_fname);
-    mr_asprintf(tmp, "mkdir -p %s", outdir_fname);
+    sprintf(tmp, "mkdir -p %s", outdir_fname);
     res = system(tmp);
-    mr_free(tmp);
     return (res);
 }
@@ -636 +675 @@
 {
     /*@ buffer ****************************************************** */
-    char *command = NULL;
+    char command[MAX_STR_LEN * 2];
 
     /*@ int  ******************************************************** */
@@ -646 +685 @@
     assert(!strstr(outfile_fname, MNT_CDROM));
     assert(!strstr(outfile_fname, "/dev/cdrom"));
-    mr_asprintf(command, "mkdir -p \"%s\" 2> /dev/null", outfile_fname);
+    sprintf(command, "mkdir -p \"%s\" 2> /dev/null", outfile_fname);
     res += system(command);
-    mr_free(command);
-
-    mr_asprintf(command, "rmdir \"%s\" 2> /dev/null", outfile_fname);
+    sprintf(command, "rmdir \"%s\" 2> /dev/null", outfile_fname);
     res += system(command);
-    mr_free(command);
-
-    mr_asprintf(command, "rm -f \"%s\" 2> /dev/null", outfile_fname);
+    sprintf(command, "rm -f \"%s\" 2> /dev/null", outfile_fname);
     res += system(command);
-    mr_free(command);
-
     unlink(outfile_fname);
     return (0);
 }
+
+
 
 
@@ -678 +713 @@
 
     /*@ buffers **************************************************** */
-    char *incoming = NULL;
+    char incoming[MAX_STR_LEN];
+    char *p = NULL;
 
     /*@ end vars *************************************************** */
@@ -689 +725 @@
         return (0);
     }
-    mr_getline(incoming, fin);
-    while (!feof(fin)) {
+    p = fgets(incoming, MAX_STR_LEN - 1, fin);
+    while (!feof(fin) && (p != NULL)) {
         if (strstr(incoming, wildcard)) {
             matches++;
         }
-        mr_free(incoming);
-        mr_getline(incoming, fin);
-    }
-    mr_free(incoming);
+        p = fgets(incoming, MAX_STR_LEN - 1, fin);
+    }
     paranoid_fclose(fin);
     return (matches);
@@ -712 +746 @@
 long size_of_partition_in_mountlist_K(char *tmpdir, char *dev)
 {
-    char *command = NULL;
-    char *mountlist = NULL;
-    char *sz_res = NULL;
+    char command[MAX_STR_LEN];
+    char mountlist[MAX_STR_LEN];
+    char sz_res[MAX_STR_LEN];
     long file_len_K;
 
-    mr_asprintf(mountlist, "%s/mountlist.txt", tmpdir);
-    mr_asprintf(command, "grep \"%s \" %s/mountlist.txt | head -n1 | awk '{print $4}'", dev, tmpdir);
-    mr_free(mountlist);
-
+    sprintf(mountlist, "%s/mountlist.txt", tmpdir);
+    sprintf(command,
+            "grep \"%s \" %s/mountlist.txt | head -n1 | awk '{print $4}'",
+            dev, tmpdir);
     log_it(command);
-    mr_asprintf(sz_res, "%s", call_program_and_get_last_line_of_output(command));
+    strcpy(sz_res, call_program_and_get_last_line_of_output(command));
     file_len_K = atol(sz_res);
     log_msg(4, "%s --> %s --> %ld", command, sz_res, file_len_K);
-    mr_free(sz_res);
-    mr_free(command);
-
     return (file_len_K);
 }
@@ -739 +770 @@
 {
     /*@ buffers ***************************************************** */
-    char *fname = NULL;
-    char *biggielist = NULL;
-    char *tmp = NULL;
-    char *command = NULL;
+    char *fname;
+    char *biggielist;
+    char *comment;
+    char *tmp;
+    char *q;
+    char *command;
 
     /*@ long ******************************************************** */
@@ -753 +786 @@
     /*@ end vars *************************************************** */
 
+    malloc_string(fname);
+    malloc_string(biggielist);
+    malloc_string(comment);
+    malloc_string(tmp);
+    malloc_string(command);
     log_it("Calculating size of all biggiefiles (in total)");
-    mr_asprintf(biggielist, "%s/biggielist.txt", bkpinfo->tmpdir);
+    sprintf(biggielist, "%s/biggielist.txt", bkpinfo->tmpdir);
     log_it("biggielist = %s", biggielist);
-    fin = fopen(biggielist, "r");
-    mr_free(biggielist);
-
-    if (!(fin)) {
-        log_OS_error("Cannot open biggielist. OK, so estimate is based on filesets only.");
+    if (!(fin = fopen(biggielist, "r"))) {
+        log_OS_error
+            ("Cannot open biggielist. OK, so estimate is based on filesets only.");
     } else {
         log_msg(4, "Reading it...");
-        for (mr_getline(fname, fin); !feof(fin); mr_getline(fname, fin)) {
+        for (q = fgets(fname, MAX_STR_LEN, fin); !feof(fin) && (q != NULL);
+             q = fgets(fname, MAX_STR_LEN, fin)) {
             if (fname[strlen(fname) - 1] <= 32) {
                 fname[strlen(fname) - 1] = '\0';
@@ -770 +807 @@
                 if (is_dev_an_NTFS_dev(fname)) {
                     if ( !find_home_of_exe("ntfsresize")) {
-                        mr_free(tmp);
-                        mr_free(fname);
                         fatal_error("ntfsresize not found");
                     }
-                    mr_free(tmp);
-
-                    mr_asprintf(command, "ntfsresize --force --info %s|grep '^You might resize at '|cut -d' ' -f5", fname);
+                    sprintf(command, "ntfsresize --force --info %s|grep '^You might resize at '|cut -d' ' -f5", fname);
                     log_it("command = %s", command);
-                    mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
-                    mr_free(command);
-
+                    strcpy (tmp, call_program_and_get_last_line_of_output(command));
                     log_it("res of it = %s", tmp);
                     file_len_K = atoll(tmp) / 1024L;
-                    mr_free(tmp);
                 } else {
                     file_len_K = get_phys_size_of_drive(fname) * 1024L;
@@ -795 +825 @@
                 log_msg(4, "%s --> %ld K", fname, file_len_K);
             }
-            log_msg(4, "After adding %s, scratchL+%ld now equals %ld", fname, file_len_K, scratchL);
+            sprintf(comment,
+                    "After adding %s, scratchL+%ld now equals %ld", fname,
+                    file_len_K, scratchL);
+            log_msg(4, comment);
             if (feof(fin)) {
                 break;
             }
-            mr_free(fname);
-        }
-        mr_free(fname);
+        }
     }
     log_it("Closing...");
     paranoid_fclose(fin);
     log_it("Finished calculating total size of all biggiefiles");
+    paranoid_free(fname);
+    paranoid_free(biggielist);
+    paranoid_free(comment);
+    paranoid_free(tmp);
+    paranoid_free(command);
     return (scratchL);
 }
@@ -818 +854 @@
 {
     /*@ buffer ****************************************************** */
-    char *tmp = NULL;
-    char *command = NULL;
+    char tmp[MAX_STR_LEN];
+    char command[MAX_STR_LEN * 2];
     long long llres;
     /*@ pointers **************************************************** */
@@ -827 +863 @@
     /*@ end vars *************************************************** */
 
-    mr_asprintf(command, "du -sk %s", mountpt);
+    sprintf(command, "du -sk %s", mountpt);
     errno = 0;
     fin = popen(command, "r");
@@ -834 +870 @@
       llres = 0;
     } else {
-      mr_getline(tmp, fin);
+      p = fgets(tmp, MAX_STR_LEN, fin);
       paranoid_pclose(fin);
       p = strchr(tmp, '\t');
@@ -844 +880 @@
         llres += (int) (*p - '0');
       }
-      mr_free(tmp);
-    }
-    mr_free(command);
+    }
 
     return (llres);
@@ -894 +928 @@
 {
     /*@ buffers *** */
-    char *command = NULL;
-    int res = 0;
-
-    mr_asprintf(command, "which %s > /dev/null 2> /dev/null", fname);
-    res = system(command);
-    mr_free(command);
-
-    if (res) {
-        log_to_screen("Please install '%s'. I cannot find it on your system.", fname);
-        log_to_screen("There may be hyperlink at http://www.mondorescue.org which");
+    char command[MAX_STR_LEN * 2];
+    char errorstr[MAX_STR_LEN];
+
+
+    sprintf(command, "which %s > /dev/null 2> /dev/null", fname);
+    sprintf(errorstr,
+            "Please install '%s'. I cannot find it on your system.",
+            fname);
+    if (system(command)) {
+        log_to_screen(errorstr);
+        log_to_screen
+            ("There may be hyperlink at http://www.mondorescue.org/downloads.shtml which");
         log_to_screen("will take you to the relevant (missing) package.");
         return (1);
@@ -1002 +1038 @@
 {
     /*@ Char buffers ** */
-    char *command = NULL;
-    char *tmp = NULL;
+    char command[MAX_STR_LEN * 2];
+    char tmp[MAX_STR_LEN];
     char old_pwd[MAX_STR_LEN];
-    int res = 0;
-
-    mvaddstr_and_log_it(g_currentY, 0, "Copying Mondo's core files to the scratch directory");
+
+    mvaddstr_and_log_it(g_currentY, 0,
+                        "Copying Mondo's core files to the scratch directory");
 
     log_msg(4, "g_mondo_home='%s'", g_mondo_home);
@@ -1013 +1049 @@
         find_and_store_mondoarchives_home(g_mondo_home);
     }
-    mr_asprintf(command, CP_BIN " --parents -pRdf %s %s", g_mondo_home, bkpinfo->scratchdir);
+    sprintf(command, CP_BIN " --parents -pRdf %s %s", g_mondo_home,
+            bkpinfo->scratchdir);
 
     log_msg(4, "command = %s", command);
-    res = run_program_and_log_output(command, 1);
-    mr_free(command);
-
-    if (res) {
+    if (run_program_and_log_output(command, 1)) {
         fatal_error("Failed to copy Mondo's stuff to scratchdir");
     }
 
-    mr_asprintf(tmp, "%s/payload.tgz", g_mondo_home);
+    sprintf(tmp, "%s/payload.tgz", g_mondo_home);
     if (does_file_exist(tmp)) {
-        log_it("Untarring payload %s to scratchdir %s", tmp, bkpinfo->scratchdir);
+        log_it("Untarring payload %s to scratchdir %s", tmp,
+               bkpinfo->scratchdir);
         if (getcwd(old_pwd, MAX_STR_LEN - 1)) {
             // FIXME
@@ -1032 +1067 @@
             // FIXME
         }
-        mr_asprintf(command, "tar -zxvf %s", tmp);
-        res = run_program_and_log_output(command, FALSE);
-        if (res) {
-            mr_free(command);
-            mr_free(tmp);
+        sprintf(command, "tar -zxvf %s", tmp);
+        if (run_program_and_log_output(command, FALSE)) {
             fatal_error("Failed to untar payload");
         }
-        mr_free(command);
         if (chdir(old_pwd)) {
             // FIXME
         }
     }
-    mr_free(tmp);
-
-    mr_asprintf(command, "cp -f %s/LAST-FILELIST-NUMBER %s", bkpinfo->tmpdir, bkpinfo->scratchdir);
+
+    sprintf(command, "cp -f %s/LAST-FILELIST-NUMBER %s", bkpinfo->tmpdir,
+            bkpinfo->scratchdir);
 
     if (run_program_and_log_output(command, FALSE)) {
         fatal_error("Failed to copy LAST-FILELIST-NUMBER to scratchdir");
     }
-    mr_free(command);
-
-    mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output("which mondorestore"));
+
+    strcpy(tmp,
+           call_program_and_get_last_line_of_output("which mondorestore"));
     if (!tmp[0]) {
-        mr_free(tmp);
-        fatal_error("'which mondorestore' returned null. Where's your mondorestore? `which` can't find it. That's odd. Did you install mondorestore?");
-    }
-
-    mr_asprintf(command, "cp -f %s %s", tmp, bkpinfo->tmpdir);
-    mr_free(tmp);
-    res = run_program_and_log_output(command, FALSE);
-    if (res) {
-        mr_free(command);
+        fatal_error
+            ("'which mondorestore' returned null. Where's your mondorestore? `which` can't find it. That's odd. Did you install mondorestore?");
+    }
+    sprintf(command, "cp -f %s %s", tmp, bkpinfo->tmpdir);
+    if (run_program_and_log_output(command, FALSE)) {
         fatal_error("Failed to copy mondorestore to tmpdir");
     }
-    mr_free(command);
-
-    mr_asprintf(command, "hostname > %s/HOSTNAME", bkpinfo->scratchdir);
+
+    sprintf(command, "hostname > %s/HOSTNAME", bkpinfo->scratchdir);
     paranoid_system(command);
-    mr_free(command);
 
     if (bkpinfo->postnuke_tarball[0]) {
-        mr_asprintf(command, "cp -f %s %s/post-nuke.tgz", bkpinfo->postnuke_tarball, bkpinfo->tmpdir);
-        res = run_program_and_log_output(command, FALSE);
-        mr_free(command);
-
-        if (res) {
+        sprintf(command, "cp -f %s %s/post-nuke.tgz",
+                bkpinfo->postnuke_tarball, bkpinfo->tmpdir);
+        if (run_program_and_log_output(command, FALSE)) {
             fatal_error("Unable to copy post-nuke tarball to tmpdir");
         }
     }
+
 
     mvaddstr_and_log_it(g_currentY++, 74, "Done.");
@@ -1101 +1125 @@
 
     /*@ buffers ******** */
-    char *netfs_dev = NULL;
-    char *netfs_client_hwaddr = NULL;
-    char *netfs_mount = NULL;
-    char *netfs_client_ipaddr = NULL;
-    char *netfs_client_netmask = NULL;
-    char *netfs_client_broadcast = NULL;
-    char *netfs_client_defgw = NULL;
-    char *netfs_server_ipaddr = NULL;
-    char *tmp = NULL;
-    char *command = NULL;
+    char netfs_dev[MAX_STR_LEN];
+    char netfs_mount[MAX_STR_LEN];
+    char netfs_client_hwaddr[MAX_STR_LEN];
+    char netfs_client_ipaddr[MAX_STR_LEN];
+    char netfs_client_netmask[MAX_STR_LEN];
+    char netfs_client_broadcast[MAX_STR_LEN];
+    char netfs_client_defgw[MAX_STR_LEN];
+    char netfs_server_ipaddr[MAX_STR_LEN];
+    char tmp[MAX_STR_LEN];
+    char command[MAX_STR_LEN * 2];
 
     /*@ pointers ***** */
     char *p;
 
-    if (! bkpinfo->netfs_mount) {
-        fatal_error("No netfs_mount found !");
-    }
-
     log_it("Storing Network configuration");
-    mr_asprintf(tmp, "%s", bkpinfo->netfs_mount);
+    strcpy(tmp, bkpinfo->netfs_mount);
     p = strchr(tmp, ':');
     if (!p) {
-        fatal_error("Network mount doesn't have a colon in it, e.g. 192.168.1.4:/home/nfs");
+        fatal_error
+            ("Network mount doesn't have a colon in it, e.g. 192.168.1.4:/home/nfs");
     }
     *(p++) = '\0';
-    mr_asprintf(netfs_server_ipaddr, "%s", tmp);
-    mr_asprintf(netfs_mount, "%s", p);
-    mr_free(tmp);
+    strcpy(netfs_server_ipaddr, tmp);
+    strcpy(netfs_mount, p);
 
     /* BERLIOS : there is a bug #67 here as it only considers the first NIC */
-    mr_asprintf(command, "%s", "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\n' | head -n1 | cut -d' ' -f1");
-    mr_asprintf(netfs_dev, "%s", call_program_and_get_last_line_of_output(command));
-    mr_free(command);
-
-    mr_asprintf(command, "%s", "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\\n' | head -n1 | tr -s '\t' ' ' | cut -d' ' -f7 | cut -d':' -f2");
-    mr_asprintf(netfs_client_ipaddr, "%s", call_program_and_get_last_line_of_output(command));
-    mr_free(command);
-
-    mr_asprintf(command, "%s", "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\\n' | head -n1 | tr -s '\t' ' ' | cut -d' ' -f9 | cut -d':' -f2");
-    mr_asprintf(netfs_client_netmask, "%s", call_program_and_get_last_line_of_output(command));
-    mr_free(command);
-
-    mr_asprintf(command, "%s", "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\\n' | head -n1 | tr -s '\t' ' ' | cut -d' ' -f8 | cut -d':' -f2");
-    mr_asprintf(netfs_client_broadcast, "%s", call_program_and_get_last_line_of_output(command));
-    mr_free(command);
-
-    mr_asprintf(command, "%s", "route -n | grep '^0.0.0.0' | awk '{print $2}'");
-    mr_asprintf(netfs_client_defgw, "%s", call_program_and_get_last_line_of_output(command));
-    mr_free(command);
-
-    mr_asprintf(command, "ifconfig %s | head -1 | awk '{print $5}'", netfs_dev);
-    mr_asprintf(netfs_client_hwaddr, "%s" call_program_and_get_last_line_of_output(command));
-    mr_free(command);
-
-    log_it("netfs_client_hwaddr=%s; netfs_client_ipaddr=%s; netfs_server_ipaddr=%s; netfs_mount=%s", netfs_client_hwaddr, netfs_client_ipaddr, netfs_server_ipaddr, netfs_mount);
+    sprintf(command,
+            "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\n' | head -n1 | cut -d' ' -f1");
+    strcpy(netfs_dev, call_program_and_get_last_line_of_output(command));
+    sprintf(command,
+            "ifconfig %s | head -1 | awk '{print $5}'", netfs_dev);
+    strcpy(netfs_client_hwaddr, call_program_and_get_last_line_of_output(command));
+    sprintf(command,
+            "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\\n' | head -n1 | tr -s '\t' ' ' | cut -d' ' -f7 | cut -d':' -f2");
+    strcpy(netfs_client_ipaddr,
+           call_program_and_get_last_line_of_output(command));
+    sprintf(command,
+            "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\\n' | head -n1 | tr -s '\t' ' ' | cut -d' ' -f9 | cut -d':' -f2");
+    strcpy(netfs_client_netmask,
+           call_program_and_get_last_line_of_output(command));
+    sprintf(command,
+            "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\\n' | head -n1 | tr -s '\t' ' ' | cut -d' ' -f8 | cut -d':' -f2");
+    strcpy(netfs_client_broadcast,
+           call_program_and_get_last_line_of_output(command));
+    sprintf(command,
+            "route -n | grep '^0.0.0.0' | awk '{print $2}'");
+    strcpy(netfs_client_defgw,
+           call_program_and_get_last_line_of_output(command));
+    sprintf(tmp,
+            "netfs_client_hwaddr=%s; netfs_client_ipaddr=%s; netfs_server_ipaddr=%s; netfs_mount=%s",
+            netfs_client_hwaddr, netfs_client_ipaddr, netfs_server_ipaddr, netfs_mount);
     if (strlen(netfs_dev) < 2) {
-        fatal_error("Unable to find ethN (eth0, eth1, ...) adapter via Network mount you specified.");
-    }
-
+        fatal_error
+            ("Unable to find ethN (eth0, eth1, ...) adapter via Network mount you specified.");
+    }
     /********
-    * If the Network device found above is a bonded device, 
+    * If the Network device that found above is a bonded device, 
     * we need to replace it with an ethN device or the
     * networking will not start during an Network restore.
@@ -1171 +1191 @@
     if (!strncmp(netfs_dev, "bond", 4) || !strncmp(netfs_dev, "alb", 3) || !strncmp(netfs_dev, "aft", 3)) {
         log_to_screen("Found bonding device %s; looking for corresponding ethN slave device\n", netfs_dev);
-        mr_asprintf(command, "ifconfig | grep -E '%s' | grep -v '%s' | head -n1 | cut -d' ' -f1",netfs_client_hwaddr,netfs_dev);
-        mr_asprintf(netfs_dev, "%s", call_program_and_get_last_line_of_output(command));
-        mr_free(command);
+        sprintf(command,
+                "ifconfig | grep -E '%s' | grep -v '%s' | head -n1 | cut -d' ' -f1",netfs_client_hwaddr,netfs_dev);
+        strcpy(netfs_dev, call_program_and_get_last_line_of_output(command));
         log_to_screen("Replacing it with %s\n", netfs_dev);
     }
 
-    mr_asprintf(tmp, "%s/NETFS-DEV", bkpinfo->tmpdir);
+    sprintf(tmp, "%s/NETFS-DEV", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, netfs_dev);
-    mr_free(netfs_dev);
-    mr_free(tmp);
-
-    mr_asprintf(tmp, "%s/NETFS-CLIENT-HWADDR", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, netfs_client_hwaddr);
-    mr_free(netfs_client_hwaddr);
-    mr_free(tmp);
-
-    mr_asprintf(tmp, "%s/NETFS-CLIENT-IPADDR", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, netfs_client_ipaddr);
-    mr_free(netfs_client_ipaddr);
-    mr_free(tmp);
-
-    mr_asprintf(tmp, "%s/NETFS-CLIENT-NETMASK", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, netfs_client_netmask);
-    mr_free(netfs_client_netmask);
-    mr_free(tmp);
-
-    mr_asprintf(tmp, "%s/NETFS-CLIENT-BROADCAST", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, netfs_client_broadcast);
-    mr_free(netfs_client_broadcast);
-    mr_free(tmp);
-
-    mr_asprintf(tmp, "%s/NETFS-CLIENT-DEFGW", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, netfs_client_defgw);
-    mr_free(netfs_client_defgw);
-    mr_free(tmp);
-
-    mr_asprintf(tmp, "%s/NETFS-SERVER-IPADDR", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, netfs_server_ipaddr);
-    mr_free(netfs_server_ipaddr);
-    mr_free(tmp);
-
-    mr_asprintf(tmp, "%s/NETFS-SERVER-MOUNT", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, bkpinfo->netfs_mount);
-    mr_free(tmp);
-
-    if (bkpinfo->netfs_user) {
-        mr_asprintf(tmp, "%s/NETFS-SERVER-USER", bkpinfo->tmpdir);
-        write_one_liner_data_file(tmp, bkpinfo->netfs_user);
-        mr_free(tmp);
-    }
-    mr_asprintf(tmp, "%s/NETFS-SERVER-PATH", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, bkpinfo->netfs_remote_dir);
-    mr_free(tmp);
-
-    mr_asprintf(tmp, "%s/ISO-PREFIX", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, bkpinfo->prefix);
-    mr_free(tmp);
 
     sprintf(tmp, "%s/NETFS-PROTO", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, bkpinfo->netfs_proto);
-    mr_free(tmp);
-
-
+
+    sprintf(tmp, "%s/NETFS-CLIENT-HWADDR", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, netfs_client_hwaddr);
+    sprintf(tmp, "%s/NETFS-CLIENT-IPADDR", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, netfs_client_ipaddr);
+    sprintf(tmp, "%s/NETFS-CLIENT-NETMASK", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, netfs_client_netmask);
+    sprintf(tmp, "%s/NETFS-CLIENT-BROADCAST", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, netfs_client_broadcast);
+    sprintf(tmp, "%s/NETFS-CLIENT-DEFGW", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, netfs_client_defgw);
+    sprintf(tmp, "%s/NETFS-SERVER-IPADDR", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, netfs_server_ipaddr);
+    sprintf(tmp, "%s/NETFS-SERVER-MOUNT", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, bkpinfo->netfs_mount);
+    if (bkpinfo->netfs_user) {
+        sprintf(tmp, "%s/NETFS-SERVER-USER", bkpinfo->tmpdir);
+        write_one_liner_data_file(tmp, bkpinfo->netfs_user);
+    }
+    sprintf(tmp, "%s/NETFS-SERVER-PATH", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, bkpinfo->netfs_remote_dir);
+    sprintf(tmp, "%s/ISO-PREFIX", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, bkpinfo->prefix);
     log_it("Finished storing Network configuration");
 }
+
+
+
+
 
 
@@ -1258 +1253 @@
 {
     /*@ buffers *************** */
-    char *tmp = NULL;
+    char tmp[MAX_STR_LEN];
     char *mds = NULL;
 
@@ -1270 +1265 @@
 
     log_it("Estimating number of media required...");
-    scratchLL = (long long) (noof_sets) * (long long) (bkpinfo->optimal_set_size) + (long long) (size_of_all_biggiefiles_K());
+    scratchLL =
+        (long long) (noof_sets) * (long long) (bkpinfo->optimal_set_size)
+        + (long long) (size_of_all_biggiefiles_K());
     scratchLL = (scratchLL / 1024) / bkpinfo->media_size;
     scratchLL++;
@@ -1277 +1274 @@
     } else if (bkpinfo->use_gzip) {
         scratchLL = (scratchLL * 2) / 3;
-    } else if (bkpinfo->use_lzma) {
-        scratchLL = (scratchLL * 2) / 3;
     } else {
         scratchLL = scratchLL / 2;
@@ -1287 +1282 @@
     if (scratchLL <= 1) {
         mds = media_descriptor_string(bkpinfo->backup_media_type);
-        mr_asprintf(tmp, "Your backup will probably occupy a single %s. Maybe two.", mds);
+        sprintf(tmp,
+                "Your backup will probably occupy a single %s. Maybe two.", mds);
         mr_free(mds);
     } else if (scratchLL > 4) {
-        mr_asprintf(tmp, "Your backup will occupy one meeeeellion media! (maybe %s)", number_to_text((int) (scratchLL + 1)));
+        sprintf(tmp,
+                "Your backup will occupy one meeeeellion media! (maybe %s)",
+                number_to_text((int) (scratchLL + 1)));
     } else {
-        mr_asprintf(tmp, "Your backup will occupy approximately %s media.", number_to_text((int) (scratchLL + 1)));
-    }
-    if (scratchLL < 50) {
+        sprintf(tmp, "Your backup will occupy approximately %s media.",
+                number_to_text((int) (scratchLL + 1)));
+    }
+    if (!bkpinfo->image_devs[0] && (scratchLL < 50)) {
         log_to_screen(tmp);
     }
-    mr_free(tmp);
+}
+
+
+/**
+ * Get the last suffix of @p instr.
+ * If @p instr was "httpd.log.gz", we would return "gz".
+ * @param instr The filename to get the suffix of.
+ * @return The suffix (without a dot), or "" if none.
+ * @note The returned string points to static storage that will be overwritten with each call.
+ */
+char *sz_last_suffix(char *instr)
+{
+    static char outstr[MAX_STR_LEN];
+    char *p;
+
+    p = strrchr(instr, '.');
+    if (!p) {
+        outstr[0] = '\0';
+    } else {
+        strcpy(outstr, p);
+    }
+    return (outstr);
 }
 
@@ -1309 +1329 @@
 bool is_this_file_compressed(char *filename)
 {
-    char *do_not_compress_these = NULL;
-    char *tmp = NULL;
+    char do_not_compress_these[MAX_STR_LEN];
+    char tmp[MAX_STR_LEN];
     char *p;
     char *q = NULL;
@@ -1319 +1339 @@
     }
 
-    mr_asprintf(tmp, "%s/do-not-compress-these", g_mondo_home);
+    sprintf(tmp, "%s/do-not-compress-these", g_mondo_home);
     if (!does_file_exist(tmp)) {
-        mr_free(tmp);
         return (FALSE);
     }
     /* BERLIOS: This is just plain WRONG !! */
-    mr_asprintf(do_not_compress_these,"%s", last_line_of_file(tmp));
-    mr_free(tmp);
+    strcpy(do_not_compress_these,last_line_of_file(tmp));
 
     for (p = do_not_compress_these; p != NULL; p++) {
-        mr_asprintf(tmp, "%s", p);
+        strcpy(tmp, p);
         if (strchr(tmp, ' ')) {
             *(strchr(tmp, ' ')) = '\0';
         }
         if (!strcmp(q, tmp)) {
-            mr_free(tmp);
-            mr_free(do_not_compress_these);
             return (TRUE);
         }
@@ -1341 +1357 @@
             break;
         }
-        mr_free(tmp);
-    }
-    mr_free(do_not_compress_these);
+    }
     return (FALSE);
 }

branches/3.0/mondo/src/common/libmondo-files.h

@@ -42 +42 @@
 
 
-int make_hole_for_dir(const char *outdir_fname);
+int make_hole_for_dir(char *outdir_fname);
 long size_of_partition_in_mountlist_K(char *tmpdir, char *dev);
 int read_one_liner_data_file(char *fname, char *contents);

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

@@ -8 +8 @@
 #include "my-stuff.h"
 #include "mr_mem.h"
-#include "mr_str.h"
 #include "mondostructures.h"
 #include "libmondo-fork.h"
@@ -39 +38 @@
     /*@ buffers ***************************************************** */
     static char result[MAX_STR_LEN];
-    char *tmp = NULL;
+    char *tmp;
+    char *p;
 
     /*@ pointers **************************************************** */
-    FILE *fin = NULL;
-    int res = 0;
+    FILE *fin;
 
     /*@ initialize data ********************************************* */
+    malloc_string(tmp);
     result[0] = '\0';
+    tmp[0] = '\0';
 
     /*@******************************************************************** */
@@ -52 +53 @@
     assert_string_is_neither_NULL_nor_zerolength(call);
     if ((fin = popen(call, "r"))) {
-        for (mr_getline(tmp, fin); !feof(fin); mr_getline(tmp, fin)) {
+        for (p = fgets(tmp, MAX_STR_LEN, fin); !feof(fin) && (p != NULL);
+             p = fgets(tmp, MAX_STR_LEN, fin)) {
             if (strlen(tmp) > 1) {
                 strcpy(result, tmp);
             }
-            mr_free(tmp);
         }
         paranoid_pclose(fin);
     } else {
-        log_OS_error("Unable to open resulting file");
+        log_OS_error("Unable to popen call");
     }
     strip_spaces(result);
-    mr_free(tmp);
-    return(result);
-}
+    paranoid_free(tmp);
+    return (result);
+}
+
+
+
+
 
 
@@ -81 +86 @@
  * @param isofile Replaces @c _ISO_ in @p basic_call. Should probably be the ISO image to create (-o parameter to mkisofs).
  * @param cd_no Replaces @c _CD#_ in @p basic_call. Should probably be the CD number.
+ * @param logstub Unused.
  * @param what_i_am_doing The action taking place (e.g. "Making ISO #1"). Used as the title of the progress dialog.
  * @return Exit code of @c mkisofs (0 is success, anything else indicates failure).
+ * @bug @p logstub is unused.
  */
 int
@@ -94 +101 @@
 
     /*@ buffers      *** */
-    char *midway_call = NULL;
-    char *ultimate_call = NULL;
-    char *tmp = NULL;
-        
-    char *cd_number_str = NULL;
-    char *command = NULL;
-    char *p= NULL;
+    char *midway_call, *ultimate_call, *tmp, *command, *incoming,
+        *old_stderr, *cd_number_str;
+    char *p;
     char *tmp1 = NULL;
-    char *tmp2 = NULL;
 
 /*@***********   End Variables ***************************************/
@@ -108 +110 @@
     log_msg(3, "Starting");
     assert(bkpinfo != NULL);
+    // BERLIOS: doesn't work even if the string is correct !
+    //assert_string_is_neither_NULL_nor_zerolength(basic_call);
     assert_string_is_neither_NULL_nor_zerolength(isofile);
-
+    assert_string_is_neither_NULL_nor_zerolength(logstub);
     if (!(midway_call = malloc(1200))) {
         fatal_error("Cannot malloc midway_call");
@@ -119 +123 @@
         fatal_error("Cannot malloc tmp");
     }
+    if (!(command = malloc(1200))) {
+        fatal_error("Cannot malloc command");
+    }
+    malloc_string(incoming);
+    malloc_string(old_stderr);
+    malloc_string(cd_number_str);
+
+    incoming[0] = '\0';
+    old_stderr[0] = '\0';
 
     if ((bkpinfo->netfs_user) && (strstr(bkpinfo->netfs_proto,"nfs"))) {
@@ -126 +139 @@
     }
 
-    mr_asprintf(cd_number_str, "%d", cd_no);
+    sprintf(cd_number_str, "%d", cd_no);
     resolve_naff_tokens(midway_call, tmp1, isofile, "_ISO_");
+    resolve_naff_tokens(tmp, midway_call, cd_number_str, "_CD#_");
+    resolve_naff_tokens(ultimate_call, tmp, MONDO_LOGFILE, "_ERR_");
     log_msg(4, "basic call = '%s'", tmp1);
-    mr_free(tmp1);
-
-    resolve_naff_tokens(tmp, midway_call, cd_number_str, "_CD#_");
     log_msg(4, "midway_call = '%s'", midway_call);
-    mr_free(cd_number_str);
-
-    resolve_naff_tokens(ultimate_call, tmp, MONDO_LOGFILE, "_ERR_");
+    log_msg(4, "tmp = '%s'", tmp);
     log_msg(4, "ultimate call = '%s'", ultimate_call);
-    mr_asprintf(command, "%s >> %s", ultimate_call, MONDO_LOGFILE);
-
-    log_to_screen("Please be patient. Do not be alarmed by on-screen inactivity.");
-    log_msg(4, "Calling open_evalcall_form() with what_i_am_doing='%s'", what_i_am_doing);
+    sprintf(command, "%s >> %s", ultimate_call, MONDO_LOGFILE);
+
+    log_to_screen
+        ("Please be patient. Do not be alarmed by on-screen inactivity.");
+    log_msg(4, "Calling open_evalcall_form() with what_i_am_doing='%s'",
+            what_i_am_doing);
+    strcpy(tmp, command);
     if (bkpinfo->manual_cd_tray) {
-        mr_asprintf(tmp2, "%s", command);
-        p = strstr(tmp2, "2>>");
+        p = strstr(tmp, "2>>");
         if (p) {
             sprintf(p, "   ");
@@ -149 +161 @@
                 p++;
             }
-            for (; (*p != ' ') && (*p != '\0'); p++) {
+            for (; *p != ' '; p++) {
                 *p = ' ';
             }
         }
-        mr_free(command);
-        command = tmp2;
+        strcpy(command, tmp);
+#ifndef _XWIN
         if (!g_text_mode) {
             newtSuspend();
         }
+#endif
         log_msg(1, "command = '%s'", command);
         retval += system(command);
@@ -164 +177 @@
         }
         if (retval) {
-            popup_and_OK("mkisofs and/or cdrecord returned an error. CD was not created");
+            log_msg(2, "Basic call '%s' returned an error.", tmp1);
+            popup_and_OK("Press ENTER to continue.");
+            popup_and_OK
+                ("mkisofs and/or cdrecord returned an error. CD was not created");
         }
     }
@@ -170 +186 @@
     else {
         log_msg(3, "command = '%s'", command);
-        retval = run_external_binary_with_percentage_indicator_NEW(what_i_am_doing, command);
-    }
-    mr_free(command);
+//      yes_this_is_a_goto:
+        retval =
+            run_external_binary_with_percentage_indicator_NEW
+            (what_i_am_doing, command);
+    }
+
+    mr_free(tmp1);
     paranoid_free(midway_call);
     paranoid_free(ultimate_call);
     paranoid_free(tmp);
+    paranoid_free(command);
+    paranoid_free(incoming);
+    paranoid_free(old_stderr);
+    paranoid_free(cd_number_str);
     return (retval);
 }
@@ -208 +232 @@
     log_msg(1, "command = '%s'", command);
     if (!g_text_mode) {
-        retval = run_external_binary_with_percentage_indicator_NEW(what_i_am_doing, command);
+        retval = run_external_binary_with_percentage_indicator_NEW
+            (what_i_am_doing, command);
     } else {
         retval += system(command);
@@ -252 +277 @@
         return (1);
     }
+//  if (debug_level == TRUE) { debug_level=5; }
+
+    //  assert_string_is_neither_NULL_nor_zerolength(program);
 
     if (debug_level <= g_loglevel) {
@@ -294 +322 @@
                 }
             }
+            /* end of patch */
             strip_spaces(incoming);
             if ((res == 0 && log_if_success) || (res != 0 && log_if_failure)) {
@@ -313 +342 @@
         }
     }
+//  else
+//    { log_msg (0, "-------------------------------ran w/ res=%d------------------------------", res); }
     return (res);
 }
@@ -337 +368 @@
 
     /*@ buffers **************************************************** */
+    char *tmp = NULL;
     char *command = NULL;
-    char *lockfile = NULL;
+    char lockfile[MAX_STR_LEN];
 
     /*@ end vars *************************************************** */
@@ -344 +376 @@
     assert_string_is_neither_NULL_nor_zerolength(basic_call);
 
-    mr_asprintf(lockfile, "%s/mojo-jojo.bla.bla", bkpinfo->tmpdir);
-
-    mr_asprintf(command, "echo hi > %s ; %s >> %s 2>> %s; res=$?; sleep 1; rm -f %s; exit $res", lockfile, basic_call, MONDO_LOGFILE, MONDO_LOGFILE, lockfile);
+    sprintf(lockfile, "%s/mojo-jojo.bla.bla", bkpinfo->tmpdir);
+
+    mr_asprintf(command,
+            "echo hi > %s ; %s >> %s 2>> %s; res=$?; sleep 1; rm -f %s; exit $res",
+            lockfile, basic_call, MONDO_LOGFILE, MONDO_LOGFILE, lockfile);
     open_evalcall_form(what_i_am_doing);
-    log_msg(2, "Executing %s", basic_call);
+    mr_asprintf(tmp, "Executing %s", basic_call);
+    log_msg(2, tmp);
+    mr_free(tmp);
 
     if (!(fin = popen(command, "r"))) {
         log_OS_error("Unable to popen-in command");
-        log_to_screen("Failed utterly to call '%s'", command);
+        mr_asprintf(tmp, "Failed utterly to call '%s'", command);
+        log_to_screen(tmp);
+        mr_free(tmp);
         mr_free(command);
-        mr_free(lockfile);
         return (1);
     }
-
     if (!does_file_exist(lockfile)) {
         log_to_screen("Waiting for '%s' to start",command);
@@ -365 +401 @@
     }
     mr_free(command);
-
+#ifdef _XWIN
+    /* This only can update when newline goes into the file,
+       but it's *much* prettier/faster on Qt. */
+    while (does_file_exist(lockfile)) {
+        while (!feof(fin)) {
+            /* TODO: Dead and wrong code */
+            if (!fgets(tmp, 512, fin))
+                break;
+            log_to_screen(tmp);
+        }
+        usleep(500000);
+    }
+#else
+    /* This works on Newt, and it gives quicker updates. */
     for (; does_file_exist(lockfile); sleep(1)) {
         log_file_end_to_screen(MONDO_LOGFILE, "");
         update_evalcall_form(1);
     }
-
+#endif
     /* Evaluate the status returned by pclose to get the exit code of the called program. */
     errno = 0;
@@ -385 +434 @@
     close_evalcall_form();
     unlink(lockfile);
-    mr_free(lockfile);
-
     return (retval);
 }
@@ -406 +453 @@
 // if dir=='w' then copy from orig to archived
 // if dir=='r' then copy from archived to orig
-    char *tmp = NULL;
-    char *tmp1 = NULL;
-    char *buf = NULL;
-    char *filestr = NULL;
+    char *tmp;
+    char *buf;
+    char filestr[MAX_STR_LEN];
     long int bytes_to_be_read, bytes_read_in, bytes_written_out =
         0, bufcap, subsliceno = 0;
@@ -419 +465 @@
 
     log_msg(5, "Opening.");
-
+    if (!(tmp = malloc(tmpcap))) {
+        fatal_error("Failed to malloc() tmp");
+    }
+    tmp[0] = '\0';
     bufcap = 256L * 1024L;
     if (!(buf = malloc(bufcap))) {
@@ -428 +477 @@
         fin = f_orig;
         fout = f_archived;
-        mr_asprintf(tmp, "%-64s", PIMP_START_SZ);
+        sprintf(tmp, "%-64s", PIMP_START_SZ);
         if (fwrite(tmp, 1, 64, fout) != 64) {
-            mr_free(tmp);
             fatal_error("Can't write the introductory block");
         }
-        mr_free(tmp);
-
         while (1) {
             bytes_to_be_read = bytes_read_in = fread(buf, 1, bufcap, fin);
@@ -440 +486 @@
                 break;
             }
-            mr_asprintf(tmp, "%-64ld", bytes_read_in);
+            sprintf(tmp, "%-64ld", bytes_read_in);
             if (fwrite(tmp, 1, 64, fout) != 64) {
-                mr_free(tmp);
                 fatal_error("Cannot write introductory block");
             }
-            mr_free(tmp);
-
             log_msg(7,
                     "subslice #%ld --- I have read %ld of %ld bytes in from f_orig",
                     subsliceno, bytes_read_in, bytes_to_be_read);
             bytes_written_out += fwrite(buf, 1, bytes_read_in, fout);
-            mr_asprintf(tmp, "%-64ld", subsliceno);
+            sprintf(tmp, "%-64ld", subsliceno);
             if (fwrite(tmp, 1, 64, fout) != 64) {
-                mr_free(tmp);
                 fatal_error("Cannot write post-thingy block");
             }
-            mr_free(tmp);
             log_msg(7, "Subslice #%d written OK", subsliceno);
             subsliceno++;
         }
-        mr_asprintf(tmp, "%-64ld", 0L);
+        sprintf(tmp, "%-64ld", 0L);
         if (fwrite(tmp, 1, 64L, fout) != 64L) {
-            mr_free(tmp);
             fatal_error("Cannot write final introductory block");
         }
-        mr_free(tmp);
-
-        mr_asprintf(tmp, "%-64s", PIMP_END_SZ);
-        if (fwrite(tmp, 1, 64, fout) != 64) {
-            mr_free(tmp);
-            fatal_error("Can't write the final block");
-        }
-        mr_free(tmp);
     } else {
         fin = f_archived;
         fout = f_orig;
-        if (!(tmp1 = malloc(tmpcap))) {
-            fatal_error("Failed to malloc() tmp");
-        }
-        if (fread(tmp1, 1, 64L, fin) != 64L) {
-            mr_free(tmp1);
+        if (fread(tmp, 1, 64L, fin) != 64L) {
             fatal_error("Cannot read the introductory block");
         }
-        log_msg(5, "tmp1 is %s", tmp1);
-        if (!strstr(tmp1, PIMP_START_SZ)) {
-            mr_free(tmp1);
+        log_msg(5, "tmp is %s", tmp);
+        if (!strstr(tmp, PIMP_START_SZ)) {
             fatal_error("Can't find intro blk");
         }
-        if (fread(tmp1, 1, 64L, fin) != 64L) {
-            mr_free(tmp1);
+        if (fread(tmp, 1, 64L, fin) != 64L) {
             fatal_error("Cannot read introductory blk");
         }
-        bytes_to_be_read = atol(tmp1);
+        bytes_to_be_read = atol(tmp);
         while (bytes_to_be_read > 0) {
-            log_msg(7, "subslice#%ld, bytes=%ld", subsliceno, bytes_to_be_read);
+            log_msg(7, "subslice#%ld, bytes=%ld", subsliceno,
+                    bytes_to_be_read);
             bytes_read_in = fread(buf, 1, bytes_to_be_read, fin);
             if (bytes_read_in != bytes_to_be_read) {
-                mr_free(tmp1);
-                fatal_error("Danger, WIll Robinson. Failed to read whole subvol from archives.");
+                fatal_error
+                    ("Danger, WIll Robinson. Failed to read whole subvol from archives.");
             }
             bytes_written_out += fwrite(buf, 1, bytes_read_in, fout);
-            if (fread(tmp1, 1, 64, fin) != 64) {
-                mr_free(tmp1);
+            if (fread(tmp, 1, 64, fin) != 64) {
                 fatal_error("Cannot read post-thingy block");
             }
-            if (atol(tmp1) != subsliceno) {
-                log_msg(1, "Wanted subslice %ld but got %ld ('%s')", subsliceno, atol(tmp1), tmp1);
+            if (atol(tmp) != subsliceno) {
+                log_msg(1, "Wanted subslice %ld but got %ld ('%s')",
+                        subsliceno, atol(tmp), tmp);
             }
             log_msg(7, "Subslice #%ld read OK", subsliceno);
             subsliceno++;
-            if (fread(tmp1, 1, 64, fin) != 64) {
-                mr_free(tmp1);
+            if (fread(tmp, 1, 64, fin) != 64) {
                 fatal_error("Cannot read introductory block");
             }
-            bytes_to_be_read = atol(tmp1);
-        }
-    }
+            bytes_to_be_read = atol(tmp);
+        }
+    }
+
+//  log_msg(4, "Written %ld of %ld bytes", bytes_written_out, bytes_read_in);
 
     if (direction == 'w') {
-        mr_asprintf(tmp, "%-64s", PIMP_END_SZ);
+        sprintf(tmp, "%-64s", PIMP_END_SZ);
         if (fwrite(tmp, 1, 64, fout) != 64) {
-            mr_free(tmp);
             fatal_error("Can't write the final block");
         }
-        mr_free(tmp);
     } else {
-        log_msg(1, "tmpA is %s", tmp1);
-        if (!strstr(tmp1, PIMP_END_SZ)) {
-            if (fread(tmp1, 1, 64, fin) != 64) {
-                mr_free(tmp1);
+        log_msg(1, "tmpA is %s", tmp);
+        if (!strstr(tmp, PIMP_END_SZ)) {
+            if (fread(tmp, 1, 64, fin) != 64) {
                 fatal_error("Can't read the final block");
             }
-            log_msg(5, "tmpB is %s", tmp1);
-            if (!strstr(tmp1, PIMP_END_SZ)) {
-                mr_asprintf(filestr, "%s/out.leftover", bkpinfo->tmpdir);
+            log_msg(5, "tmpB is %s", tmp);
+            if (!strstr(tmp, PIMP_END_SZ)) {
+                sprintf(filestr, "%s/out.leftover", bkpinfo->tmpdir);
                 ftmp = fopen(filestr, "w");
-                mr_free(filestr);
-
-                bytes_read_in = fread(tmp1, 1, 64, fin);
+                bytes_read_in = fread(tmp, 1, 64, fin);
                 log_msg(1, "bytes_read_in = %ld", bytes_read_in);
-
+//      if (bytes_read_in!=128+64) { fatal_error("Can't read the terminating block"); }
                 if (fwrite(tmp, 1, bytes_read_in, ftmp)) {
                     fatal_error("Can't fwrite here");
                 }
-
-                mr_asprintf(tmp, "I am here - %lld", (long long)ftello(fin));
+                sprintf(tmp, "I am here - %lld", (long long)ftello(fin));
+//    log_msg(0, tmp);
                 if (fread(tmp, 1, tmpcap, fin)) {
-                    mr_free(tmp);
                     fatal_error("Can't fread here");
                 }
                 log_msg(0, "tmp = '%s'", tmp);
                 if (fwrite(tmp, 1, tmpcap, ftmp)) {
-                    mr_free(tmp);
                     fatal_error("Can't fwrite there");
                 }
                 fclose(ftmp);
-                mr_free(tmp);
                 fatal_error("Missing terminating block");
             }
         }
     }
-    mr_free(tmp1);
 
     paranoid_free(buf);
+    paranoid_free(tmp);
     log_msg(3, "Successfully copied %ld bytes", bytes_written_out);
     return (retval);
@@ -581 +601 @@
 // BACKUP
     int res = -1;
-    char *command = NULL;
+    char*command;
 
     if (!does_file_exist(input_device)) {
@@ -589 +609 @@
         fatal_error("ntfsclone not found");
     }
-    mr_asprintf(command, "ntfsclone --rescue --force --save-image --overwrite %s %s", output_fname, input_device);
+    malloc_string(command);
+    sprintf(command, "ntfsclone --rescue --force --save-image --overwrite %s %s", output_fname, input_device);
     res = run_program_and_log_output(command, 5);
-    mr_free(command);
-
+    paranoid_free(command);
     unlink(output_fname);
     return (res);
@@ -618 +638 @@
 
 
-int run_external_binary_with_percentage_indicator_NEW(char *tt, char *cmd) {
+int run_external_binary_with_percentage_indicator_NEW(char *tt, char *cmd)
+{
 
     /*@ int *************************************************************** */
@@ -629 +650 @@
 
     /*@ buffers *********************************************************** */
-    char *command = NULL;
+    char *command;
+    char *title;
     /*@ pointers ********************************************************** */
     static int chldres = 0;
@@ -640 +662 @@
     *pchild_result = 999;
 
-    mr_asprintf(command, "%s 2>> %s", cmd, MONDO_LOGFILE);
+    malloc_string(title);
+    malloc_string(command);
+    strcpy(title, tt);
+    sprintf(command, "%s 2>> %s", cmd, MONDO_LOGFILE);
     log_msg(3, "command = '%s'", command);
-    if ((res = pthread_create(&childthread, NULL, run_prog_in_bkgd_then_exit, (void *) command))) {
+    if ((res =
+         pthread_create(&childthread, NULL, run_prog_in_bkgd_then_exit,
+                        (void *) command))) {
         fatal_error("Unable to create an archival thread");
     }
 
     log_msg(8, "Parent running");
-    open_evalcall_form(tt);
-
+    open_evalcall_form(title);
     for (sleep(1); command[0] != '\0'; sleep(1)) {
         pcno = grab_percentage_from_last_line_of_file(MONDO_LOGFILE);
-        if (pcno < 0 || pcno > 100) {
-            log_msg(8, "Weird pc# %d", pcno);
+        if (pcno <= 0 || pcno > 100) {
+            log_msg(8, "Weird pc#");
             continue;
         }
@@ -658 +684 @@
         if (pcno <= 5 && last_pcno >= 40) {
             close_evalcall_form();
-            open_evalcall_form("Verifying...");
+            strcpy(title, "Verifying...");
+            open_evalcall_form(title);
         }
         if (counter++ >= 5) {
@@ -667 +694 @@
         update_evalcall_form(percentage);
     }
-    mr_free(command);
-
     log_file_end_to_screen(MONDO_LOGFILE, "");
     close_evalcall_form();
@@ -678 +703 @@
     }
     log_msg(3, "Parent res = %d", res);
+    paranoid_free(command);
+    paranoid_free(title);
     return (res);
 }
+
+
 
 
@@ -692 +721 @@
 // RESTORE
     int res = -1;
-    char *command = NULL;
+    char *command;
 
     if ( !find_home_of_exe("ntfsclone")) {
         fatal_error("ntfsclone not found");
     }
-    mr_asprintf(command, "ntfsclone --rescue --force --restore-image --overwrite %s %s", output_device, input_fifo);
+    malloc_string(command);
+    sprintf(command, "ntfsclone --rescue --force --restore-image --overwrite %s %s", output_device, input_fifo);
     res = run_program_and_log_output(command, 5);
-    mr_free(command);
+    paranoid_free(command);
     return (res);
 }

branches/3.0/mondo/src/common/libmondo-gui-EXT.h

@@ -1 +1 @@
 /* libmondo-gui-EXT.h */
 
+#ifdef _XWIN
+#include "X-specific-EXT.h"
+#else
 #include "newt-specific-EXT.h"
+#endif

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

@@ -9 +9 @@
  */
 
+#ifdef _XWIN
+#include "X-specific.c"
+#else
 #include "newt-specific.c"
+#endif

branches/3.0/mondo/src/common/libmondo-gui.h

@@ -3 +3 @@
  */
 
+#ifdef _XWIN
+#include "X-specific.h"
+#else
 #include "newt-specific.h"
+#endif

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

@@ -59 +59 @@
     char tmp = NULL;
     char device[MAX_STR_LEN];
+    char mountpoint[MAX_STR_LEN];
 
     char *flaws_str = NULL;
@@ -99 +100 @@
                 continue;
             }
+            strcpy(mountpoint, mountlist->el[pos].mountpoint);
             /* is it too big? */
             if (curr_part_no > 'h') {
@@ -174 +176 @@
 
         build_partition_name(device, drive, curr_part_no);
+        strcpy(mountpoint, mountlist->el[pos].mountpoint);
         if (pos > 0 && !npos) {
             /* gap in the partition list? */
@@ -257 +260 @@
                     continue;
                 }
+                strcpy(mountpoint, mountlist->el[pos].mountpoint);
                 /* is it too big? */
                 if (curr_part_no > 'h') {
@@ -323 +327 @@
         if (amount_allocated > physical_drive_size) { 
             // Used to be +1, but what if you're 1 MB too high?
-            mr_asprintf(tmp, " %ld MB over-allocated on %s.",amount_allocated - physical_drive_size, drive);
+            mr_asprintf(tmp, " %ld MB over-allocated on %s.",
+                    amount_allocated - physical_drive_size, drive);
             log_it(tmp);
 
@@ -343 +348 @@
 
     /* Over-allocated the disk? Unallocated space on disk? */
-    if (amount_allocated > physical_drive_size) // Used to be +1, but what if you're 1 MB too high?
-    {
-        mr_asprintf(tmp, " %ld MB over-allocated on %s.", amount_allocated - physical_drive_size, drive);
-        log_it(tmp);
-        mr_strcat(flaws_str, "%s", tmp);
-        mr_free(tmp);
-        res++;
-    } else if (amount_allocated < physical_drive_size - 1) {    /* NOT AN ERROR, JUST A WARNING :-) */
-        mr_asprintf(tmp, " %ld MB unallocated on %s.", physical_drive_size - amount_allocated, drive);
+    if (amount_allocated < physical_drive_size - 1) {   /* NOT AN ERROR, JUST A WARNING :-) */
+        mr_asprintf(tmp, " %ld MB unallocated on %s.",
+                physical_drive_size - amount_allocated, drive);
         log_it(tmp);
         mr_strcat(flaws_str, "%s", tmp);
@@ -406 +405 @@
             goto endoffunc;
         } else {
-            log_it(" %s (dm) will be setup later on", drive);
+            mr_asprintf(tmp, " %s (dm) will be setup later on", drive);
+            log_it(tmp);
+            mr_free(tmp);
         }
     } else {
-        log_it("%s is %ld MB", drive, physical_drive_size);
+        mr_asprintf(tmp, "%s is %ld MB", drive, physical_drive_size);
+        log_it(tmp);
+        mr_free(tmp);
     }
 
@@ -429 +432 @@
             } else if (curr_part_no > 5
                        || (curr_part_no <= 4 && prev_part_no > 0)) {
-                mr_asprintf(tmp, " Gap on %s between %d and %d.", drive, prev_part_no, curr_part_no);
+                mr_asprintf(tmp, " Gap on %s between %d and %d.", drive,
+                        prev_part_no, curr_part_no);
                 log_it(tmp);
                 mr_strcat(flaws_str, "%s", tmp);
@@ -439 +443 @@
         part_table_fmt = which_partition_format(drive);
         /* no spare primary partitions to help accommodate the logical(s)? */
-        if ((curr_part_no >= 5 && prev_part_no == 4) && (strcmp(part_table_fmt, "MBR") == 0)) {
+        if ((curr_part_no >= 5 && prev_part_no == 4)
+            && (strcmp(part_table_fmt, "MBR") == 0)) {
             mr_asprintf(tmp, " Partition 4 of %s is occupied.", drive);
             log_it(tmp);
@@ -446 +451 @@
             res++;
         }
-        mr_free(part_table_fmt);
-
         /* does partition /dev/hdNX exist more than once in the mountlist? */
         for (i = 0, device_copies = 0;
@@ -456 +459 @@
         }
         if (device_copies > 1) {
-            mr_asprintf(tmp, " %s %s's.", number_to_text(device_copies), device);
+            mr_asprintf(tmp, " %s %s's.", number_to_text(device_copies),
+                    device);
             if (!strstr(flaws_str, tmp)) {
                 log_it(tmp);
@@ -500 +504 @@
     /* Over-allocated the disk? Unallocated space on disk? */
     if (amount_allocated > physical_drive_size + 1) {
-        mr_asprintf(tmp, " %ld MB over-allocated on %s.", amount_allocated - physical_drive_size, drive);
+        mr_asprintf(tmp, " %ld MB over-allocated on %s.",
+                amount_allocated - physical_drive_size, drive);
         log_it(tmp);
         mr_strcat(flaws_str, "%s", tmp);
@@ -506 +511 @@
         res++;
     } else if (amount_allocated < physical_drive_size - 1) {    /* NOT AN ERROR, JUST A WARNING :-) */
-        mr_asprintf(tmp, " %ld MB unallocated on %s.", physical_drive_size - amount_allocated, drive);
+        mr_asprintf(tmp, " %ld MB unallocated on %s.",
+                physical_drive_size - amount_allocated, drive);
         log_it(tmp);
         mr_strcat(flaws_str, "%s", tmp);
@@ -564 +570 @@
             (drivelist->el[i].device,
              DONT_KNOW_HOW_TO_EVALUATE_THIS_DEVICE_TYPE)) {
-            log_it(" Not evaluating %s (I don't know how yet)", drivelist->el[i].device);
+            mr_asprintf(tmp, " Not evaluating %s (I don't know how yet)", drivelist->el[i].device);
+            log_it(tmp);
+            paranoid_free(tmp);
         } else {
             log_msg(8, "Evaluating drive #%d (%s) within mountlist", i, drivelist->el[i].device);
@@ -574 +582 @@
             log_msg(8,"Adding: %s to flaws_str", tmp);
             mr_strcat(flaws_str, "%s", tmp);
-            mr_free(tmp);
+            paranoid_free(tmp);
         }
     }
@@ -594 +602 @@
             mr_strcat(flaws_str, "%s", tmp);
             log_msg(8,"Adding: %s to flaws_str", tmp);
-            mr_free(tmp);
-        }
-        mr_free(curr_mountpoint);
+            paranoid_free(tmp);
+        }
+        paranoid_free(curr_mountpoint);
     }
 
@@ -661 +669 @@
         if (!strncmp(drive, RAID_DEVICE_STUB, strlen(RAID_DEVICE_STUB))) {
             log_msg(8, "Not putting %s in list of drives: it's a virtual drive", drive);
-            mr_free(drive);
+            paranoid_free(drive);
             continue;
         }
@@ -668 +676 @@
         if (size == 0) {
             log_msg(8, "Not putting %s in list of drives: it has zero size (maybe an LVM volume)", drive);
-            mr_free(drive);
+            paranoid_free(drive);
             continue;
         }
@@ -676 +684 @@
         /* memory allocation */
         truncdrive = truncate_to_drive_name(drive);
-        mr_free(drive);
+        paranoid_free(drive);
 
         log_msg(8, "drive truncated to %s", truncdrive);
@@ -725 +733 @@
     int used_by = 0;
 
+    /*@ buffers ********************************************************* */
+    char *tmp = NULL;
+
     assert(output_list != NULL);
     assert(mountlist != NULL);
@@ -734 +745 @@
     for (i = 0; i < mountlist->entries; i++) {
         if (strstr(mountlist->el[i].mountpoint, "raid")) {
-            used_by = which_raid_device_is_using_this_partition(raidlist, mountlist->el[i].device);
+            used_by =
+                which_raid_device_is_using_this_partition(raidlist,
+                                                          mountlist->el[i].
+                                                          device);
             if (used_by < 0) {
                 memcpy((void *) &output_list->el[items++],
                        (void *) &mountlist->el[i],
                        sizeof(struct mountlist_line));
-                log_it("%s is available; user may choose to add it to raid device", output_list->el[items - 1].device);
+                mr_asprintf(tmp, "%s is available; user may choose to add it to raid device", output_list->el[items - 1].device);
+                log_it(tmp);
+                paranoid_free(tmp);
             }
         }
@@ -794 +810 @@
     char *tmp = NULL;
     char *p = NULL;
+    char *q = NULL;
 
     int items = 0;
@@ -807 +824 @@
         return (1);
     }
+    malloc_string(incoming);
     malloc_string(siz);
+    q = fgets(incoming, MAX_STR_LEN - 1, fin);
     log_it("Loading mountlist...");
-    mr_getline(incoming, fin);
-    while (!feof(fin)) {
+    while (!feof(fin) && (q != NULL)) {
 #if linux
-        res = sscanf(incoming, "%s %s %s %s %s", mountlist->el[items].device, mountlist->el[items].mountpoint, mountlist->el[items].format, siz, mountlist->el[items].label);
+        res = sscanf(incoming,
+               "%s %s %s %s %s",
+               mountlist->el[items].device,
+               mountlist->el[items].mountpoint,
+               mountlist->el[items].format,
+               siz, mountlist->el[items].label);
         if (res < 5) {
             /* no label found */
@@ -819 +842 @@
         }
 #elif __FreeBSD__
-        res = sscanf(incoming, "%s %s %s %s", mountlist->el[items].device, mountlist->el[items].mountpoint, mountlist->el[items].format, siz);
+        res = sscanf(incoming,
+               "%s %s %s %s",
+               mountlist->el[items].device,
+               mountlist->el[items].mountpoint,
+               mountlist->el[items].format, siz);
         strcpy(mountlist->el[items].label,"");
 #endif
@@ -832 +859 @@
             !strcmp(mountlist->el[items].device, "devpts")
             ) {
-            log_msg(1, "Ignoring %s in mountlist - not loading that line :) ", mountlist->el[items].device);
-            mr_free(incoming);
-            mr_getline(incoming, fin);
+            log_msg(1,
+                    "Ignoring %s in mountlist - not loading that line :) ",
+                    mountlist->el[items].device);
+            q = fgets(incoming, MAX_STR_LEN - 1, fin);
             continue;
         }
@@ -846 +874 @@
             if (j < items) {
                 strcat(mountlist->el[items].device, "_dup");
-                log_it("Duplicate entry in mountlist - renaming to %s", mountlist->el[items].device);
+                mr_asprintf(tmp, "Duplicate entry in mountlist - renaming to %s", mountlist->el[items].device);
+                log_it(tmp);
+                paranoid_free(tmp);
             }
             mr_asprintf(tmp, "%s", mountlist->el[items].device);
@@ -857 +887 @@
                     *(p + 2) = *(p + 3);
                 }
-                log_it("It was %s; it is now %s", mountlist->el[items].device, tmp);
+                log_it("It was %s; it is now %s",
+                       mountlist->el[items].device, tmp);
                 strcpy(mountlist->el[items].device, tmp);
             }
             paranoid_free(tmp);
 
-            log_it("%s %s %s %lld %s", mountlist->el[items].device, mountlist->el[items].mountpoint, mountlist->el[items].format, mountlist->el[items].size, mountlist->el[items].label);
+            log_it("%s %s %s %lld %s",
+                     mountlist->el[items].device,
+                     mountlist->el[items].mountpoint,
+                     mountlist->el[items].format,
+                     mountlist->el[items].size,
+                     mountlist->el[items].label);
             items++;
             if (items >= MAX_MOUNTLIST_ENTRIES) {
@@ -869 +905 @@
             }
         }
-        mr_free(incoming);
-        mr_getline(incoming, fin);
-    }
-    mr_free(incoming);
+        q = fgets(incoming, MAX_STR_LEN - 1, fin);
+    }
     paranoid_fclose(fin);
     mountlist->entries = items;
@@ -879 +913 @@
     log_it("%d entries in mountlist", items);
 
+    paranoid_free(incoming);
     paranoid_free(siz);
     return (0);
@@ -1015 +1050 @@
 
     mountlist->el[b].size = size;
-    mr_free(device);
-    mr_free(mountpoint);
-    mr_free(format);
+    paranoid_free(device);
+    paranoid_free(mountpoint);
+    paranoid_free(format);
 }
 

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

@@ -335 +335 @@
 #ifdef __FreeBSD__
     int i, j;
-    char *org = NULL;
 
     fprintf(fout, "\nvolume %s\n", raidrec->volname);
     for (i = 0; i < raidrec->plexes; ++i) {
+        char org[24];
         switch (raidrec->plex[i].raidlevel) {
         case -1:
-            mr_asprintf(org, "concat");
+            strcpy(org, "concat");
             break;
         case 0:
-            mr_asprintf(org, "striped");
+            strcpy(org, "striped");
             break;
         case 5:
-            mr_asprintf(org, "raid5");
+            strcpy(org, "raid5");
             break;
         }
         fprintf(fout, "  plex org %s", org);
-        mr_free(org);
-
         if (raidrec->plex[i].raidlevel != -1) {
             fprintf(fout, " %ik", raidrec->plex[i].stripesize);
@@ -359 +357 @@
 
         for (j = 0; j < raidrec->plex[i].subdisks; ++j) {
-            fprintf(fout, "    sd drive %s size 0\n", raidrec->plex[i].sd[j].which_device);
+            fprintf(fout, "    sd drive %s size 0\n",
+                    raidrec->plex[i].sd[j].which_device);
         }
     }
@@ -428 +427 @@
 int get_next_raidtab_line(FILE * fin, char *label, char *value)
 {
-    char *incoming = NULL;
+    char *incoming;
     char *p;
-
+    char *q;
+
+    malloc_string(incoming);
     assert(fin != NULL);
     assert(label != NULL);
@@ -437 +438 @@
     label[0] = value[0] = '\0';
     if (feof(fin)) {
+        paranoid_free(incoming);
         return (1);
     }
-    for (mr_getline(incoming, fin); !feof(fin); mr_getline(incoming, fin)) {
-        mr_strip_spaces(incoming);
+    for (q = fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin) && (q != NULL);
+         q = fgets(incoming, MAX_STR_LEN - 1, fin)) {
+        strip_spaces(incoming);
         p = strchr(incoming, ' ');
         if (strlen(incoming) < 3 || incoming[0] == '#' || !p) {
-            mr_free(incoming);
             continue;
         }
@@ -452 +454 @@
         strcpy(label, incoming);
         strcpy(value, p);
-        mr_free(incoming);
+        paranoid_free(incoming);
         return (0);
     }
-    mr_free(incoming);
     return (1);
 }
@@ -472 +473 @@
 {
     FILE *fin;
+    char *tmp1 = NULL;
     int items;
 
@@ -502 +504 @@
 
             if (get_option_state(argc, argv, "hotspare")) {
-                strcpy(raidlist->spares.el[raidlist->spares.entries].name, drivename);
-                strcpy(raidlist->spares.el[raidlist->spares.entries].  device, devname);
+                strcpy(raidlist->spares.el[raidlist->spares.entries].name,
+                       drivename);
+                strcpy(raidlist->spares.el[raidlist->spares.entries].
+                       device, devname);
                 raidlist->spares.el[raidlist->spares.entries].index =
                     raidlist->disks.entries;
                 raidlist->spares.entries++;
             } else {
-                strcpy(raidlist->disks.el[raidlist->disks.entries].name, drivename);
-                strcpy(raidlist->disks.el[raidlist->disks.entries].device, devname);
+                strcpy(raidlist->disks.el[raidlist->disks.entries].name,
+                       drivename);
+                strcpy(raidlist->disks.el[raidlist->disks.entries].device,
+                       devname);
                 raidlist->disks.el[raidlist->disks.entries].index =
                     raidlist->disks.entries;
@@ -581 +587 @@
     fclose(fin);
     log_it("Raidtab loaded successfully.");
-    log_it("%d RAID devices in raidtab", raidlist->entries);
+    mr_asprintf(tmp1, "%d RAID devices in raidtab", raidlist->entries);
+    log_it(tmp1);
+    mr_free(tmp1);
     return (0);
 }
@@ -588 +596 @@
 #else
 
-int load_raidtab_into_raidlist(struct raidlist_itself *raidlist, char *fname) {
-
-    FILE *fin = NULL;
-    char *label = NULL;
-    char *value = NULL;
+int load_raidtab_into_raidlist(struct raidlist_itself *raidlist,
+                               char *fname)
+{
+    FILE *fin;
+    char *label;
+    char *value;
     int items;
     int v;
@@ -671 +680 @@
 
     /*@ add mallocs * */
+    char *tmp = NULL;
     char *labelB;
     char *valueB;
@@ -729 +739 @@
         }
         if (!disklist) {
-            log_it("Ignoring '%s %s' pair of disk %s", labelB, valueB, label);
+            mr_asprintf(tmp, "Ignoring '%s %s' pair of disk %s", labelB, valueB, label);
+            log_it(tmp);
+            mr_free(tmp);
         } else {
             index = atoi(valueB);
@@ -799 +811 @@
     static char *argv[64];
     char **ap;
-    char *line = NULL;
-
-    mr_getline(line, f);
-    if (feof(f)) {
+    char *q;
+    char *line = (char *) malloc(MAX_STR_LEN);
+
+    if (!line)
+        errx(1,
+             "unable to allocate %i bytes of memory for `char *line' at %s:%i",
+             MAX_STR_LEN, __FILE__, __LINE__);
+    q = fgets(line, MAX_STR_LEN, f);
+    if (feof(f) && (q != NULL)) {
         log_it("[GNVCL] Uh... I reached the EOF.");
         return 0;
@@ -813 +830 @@
             cnt++;
         }
-    mr_free(line);
 
     if (strchr(argv[cnt - 1], '\n')) {
@@ -1103 +1119 @@
             while((token = mr_strtok (string, delims, &lastpos))) {
                 if ((pos = strstr(token, "("))) {
-                    type = *(pos+1);
+                    type = *(pos+1);
                 } else {
-                    type = ' ';
+                    type = ' ';
                 }
                 pos = strstr(token, "[");
@@ -1111 +1127 @@
                 switch(type) {
                 case ' ': // normal data disks
-                    raidlist->el[raidlist->entries].data_disks.el[raidlist->el[raidlist->entries].data_disks.entries].index = atoi(pos + 1);
-                    mr_asprintf(strtmp,"%s%s", device_prefix, token);
-                    strcpy(raidlist->el[raidlist->entries].data_disks.el[raidlist->el[raidlist->entries].data_disks.entries].device, strtmp);
-                    mr_free(strtmp);
-                    raidlist->el[raidlist->entries].data_disks.entries++;
-                    break;
+                    raidlist->el[raidlist->entries].data_disks.el[raidlist->el[raidlist->entries].data_disks.entries].index = atoi(pos + 1);
+                    mr_asprintf(strtmp,"%s%s", device_prefix, token);
+                    strcpy(raidlist->el[raidlist->entries].data_disks.el[raidlist->el[raidlist->entries].data_disks.entries].device, strtmp);
+                    mr_free(strtmp);
+                    raidlist->el[raidlist->entries].data_disks.entries++;
+                    break;
                 case 'S': // spare disks
-                    raidlist->el[raidlist->entries].spare_disks.el[raidlist->el[raidlist->entries].spare_disks.entries].index = atoi(pos + 1);
-                    mr_asprintf(strtmp,"%s%s", device_prefix, token);
-                    strcpy(raidlist->el[raidlist->entries].spare_disks.el[raidlist->el[raidlist->entries].spare_disks.entries].device, strtmp);
-                    mr_free(strtmp);
-                    raidlist->el[raidlist->entries].spare_disks.entries++;
-                    break;
+                    raidlist->el[raidlist->entries].spare_disks.el[raidlist->el[raidlist->entries].spare_disks.entries].index = atoi(pos + 1);
+                    mr_asprintf(strtmp,"%s%s", device_prefix, token);
+                    strcpy(raidlist->el[raidlist->entries].spare_disks.el[raidlist->el[raidlist->entries].spare_disks.entries].device, strtmp);
+                    mr_free(strtmp);
+                    raidlist->el[raidlist->entries].spare_disks.entries++;
+                    break;
                 case 'F': // failed disks
-                    raidlist->el[raidlist->entries].failed_disks.el[raidlist->el[raidlist->entries].failed_disks.entries].index = atoi(pos + 1);
-                    mr_asprintf(strtmp,"%s%s", device_prefix, token);
-                    strcpy(raidlist->el[raidlist->entries].failed_disks.el[raidlist->el[raidlist->entries].failed_disks.entries].device, strtmp);
-                    mr_free(strtmp);
-                    raidlist->el[raidlist->entries].failed_disks.entries++;
-                    log_it("At least one failed disk found in RAID array.\n");
-                    break;
+                    raidlist->el[raidlist->entries].failed_disks.el[raidlist->el[raidlist->entries].failed_disks.entries].index = atoi(pos + 1);
+                    mr_asprintf(strtmp,"%s%s", device_prefix, token);
+                    strcpy(raidlist->el[raidlist->entries].failed_disks.el[raidlist->el[raidlist->entries].failed_disks.entries].device, strtmp);
+                    mr_free(strtmp);
+                    raidlist->el[raidlist->entries].failed_disks.entries++;
+                    log_it("At least one failed disk found in RAID array.\n");
+                    break;
                 default: // error
-                    log_msg(1, "Unknown device type '%c'\n", type);
-                    mr_free(string);
-                    mr_free(token);
-                    return 1;
-                    break;
+                    log_msg(1, "Unknown device type '%c'\n", type);
+                    mr_free(string);
+                    mr_free(token);
+                    return 1;
+                    break;
                 }
                 mr_free(token);
@@ -1146 +1162 @@
             for (i=0; i<raidlist->el[raidlist->entries].data_disks.entries;i++) {
                 if (raidlist->el[raidlist->entries].data_disks.el[i].index < index_min) {
-                    index_min = raidlist->el[raidlist->entries].data_disks.el[i].index;
+                    index_min = raidlist->el[raidlist->entries].data_disks.el[i].index;
                 }
             }
             if (index_min > 0) {
                 for (i=0; i<raidlist->el[raidlist->entries].data_disks.entries;i++) {
-                    raidlist->el[raidlist->entries].data_disks.el[i].index = raidlist->el[raidlist->entries].data_disks.el[i].index - index_min;    
+                    raidlist->el[raidlist->entries].data_disks.el[i].index = raidlist->el[raidlist->entries].data_disks.el[i].index - index_min;    
                 }
             }
@@ -1157 +1173 @@
             for (i=0; i<raidlist->el[raidlist->entries].spare_disks.entries;i++) {
                 if (raidlist->el[raidlist->entries].spare_disks.el[i].index < index_min) {
-                    index_min = raidlist->el[raidlist->entries].spare_disks.el[i].index;
+                    index_min = raidlist->el[raidlist->entries].spare_disks.el[i].index;
                 }
             }
             if (index_min > 0) {
                 for (i=0; i<raidlist->el[raidlist->entries].spare_disks.entries;i++) {
-                        raidlist->el[raidlist->entries].spare_disks.el[i].index = raidlist->el[raidlist->entries].spare_disks.el[i].index - index_min;  
+                    raidlist->el[raidlist->entries].spare_disks.el[i].index = raidlist->el[raidlist->entries].spare_disks.el[i].index - index_min;  
                 }
             }
@@ -1168 +1184 @@
             for (i=0; i<raidlist->el[raidlist->entries].failed_disks.entries;i++) {
                 if (raidlist->el[raidlist->entries].failed_disks.el[i].index < index_min) {
-                    index_min = raidlist->el[raidlist->entries].failed_disks.el[i].index;
+                    index_min = raidlist->el[raidlist->entries].failed_disks.el[i].index;
                 }
             }
             if (index_min > 0) {
                 for (i=0; i<raidlist->el[raidlist->entries].failed_disks.entries;i++) {
-                        raidlist->el[raidlist->entries].failed_disks.el[i].index = raidlist->el[raidlist->entries].failed_disks.el[i].index - index_min;    
+                    raidlist->el[raidlist->entries].failed_disks.el[i].index = raidlist->el[raidlist->entries].failed_disks.el[i].index - index_min;    
                 }
             }
@@ -1189 +1205 @@
             } else {
                 while (*pos != ' ') {
-                    pos -= 1;
-                    if (pos < string) {
-                        log_it("String underflow!\n");
-                        mr_free(string);
-                        return 1;
-                    }
+                    pos -= 1;
+                    if (pos < string) {
+                            log_it("String underflow!\n");
+                            mr_free(string);
+                            return 1;
+                    }
                 }
                 raidlist->el[raidlist->entries].chunk_size = atoi(pos + 1);
@@ -1208 +1224 @@
             if (!(pos = strchr(string, '\%'))) {
                 if (strcasestr(string, "delayed")) {
-                    raidlist->el[raidlist->entries].progress = -1;  // delayed (therefore, stuck at 0%)
+                    raidlist->el[raidlist->entries].progress = -1;  // delayed (therefore, stuck at 0%)
                 } else {
-                    raidlist->el[raidlist->entries].progress = 999; // not found
+                    raidlist->el[raidlist->entries].progress = 999; // not found
                 }
             } else {
                 while (*pos != ' ') {
-                    pos -= 1;
-                    if (pos < string) {
-                        printf("ERROR: String underflow!\n");
-                        mr_free(string);
-                        return 1;
-                    }
+                    pos -= 1;
+                    if (pos < string) {
+                        printf("ERROR: String underflow!\n");
+                            mr_free(string);
+                            return 1;
+                    }
                 }
                 raidlist->el[raidlist->entries].progress = atoi(pos);
             }
             break;
-        default: // error or IN PROGRESS
+        default: // error or IN PROGRESS
             if (raidlist->el[raidlist->entries].progress != -1 &&
                 raidlist->el[raidlist->entries].progress != 999) {
@@ -1230 +1246 @@
             }
             break;
-        }
-    row++;
+        }
+        row++;
     }
     // free string

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

@@ -138 +138 @@
     }
     sleep(1);
-    sync();
+    paranoid_system("sync");
     sleep(1);
     paranoid_pclose(g_tape_stream);
     log_it("closein_tape() -- leaving");
+/*
+  for(i=0; i < g_tapecatalog->entries; i++)
+    {
+      log_it("i=%d type=%s num=%d aux=%ld", i, (g_tapecatalog->el[i].type==fileset)?"fileset":"bigslice", g_tapecatalog->el[i].number, g_tapecatalog->el[i].aux);
+    }
+*/
     if (!bkpinfo->please_dont_eject) {
         eject_device(bkpinfo->media_device);
@@ -177 +183 @@
 
     sleep(1);
-    sync();
+    paranoid_system("sync");
     sleep(1);
     log_it("closeout_tape() -- entering");
@@ -222 +228 @@
                g_tapecatalog->el[i].tape_posK);
     }
+    //  if (!bkpinfo->please_dont_eject)
+    //    { eject_device(bkpinfo->media_device); }
     paranoid_free(blk);
     paranoid_free(g_tapecatalog);
@@ -258 +266 @@
     char tmp[MAX_STR_LEN];
     char *command = NULL;
-    char *cdr_exe = NULL;
+    char cdr_exe[MAX_STR_LEN];
     int res;
 
@@ -264 +272 @@
     dev[0] = siz[0] = '\0';
     if (find_home_of_exe("cdrecord")) {
-        mr_asprintf(cdr_exe, "cdrecord");
-    } else {
-        mr_asprintf(cdr_exe, "dvdrecord");
-    }
-    mr_asprintf(command, "%s -scanbus 2> /dev/null | grep -i tape | wc -l", cdr_exe);
-    mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
+        strcpy(cdr_exe, "cdrecord");
+    } else {
+        strcpy(cdr_exe, "dvdrecord");
+    }
+    mr_asprintf(command, "%s -scanbus 2> /dev/null | grep -i tape | wc -l",
+            cdr_exe);
+    strcpy(tmp, call_program_and_get_last_line_of_output(command));
     mr_free(command);
 
     if (atoi(tmp) != 1) {
-        log_it("Either too few or too many tape streamers for me to detect...");
+        log_it
+            ("Either too few or too many tape streamers for me to detect...");
         strcpy(dev, VANILLA_SCSI_TAPE);
-        mr_free(tmp);
-        mr_free(cdr_exe);
         return 1;
     }
-    mr_free(tmp);
-
-    mr_asprintf(command, "%s -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep -i TAPE | cut -d' ' -f2 | head -n1", cdr_exe);
-    mr_asprintf(tmp, "%s", all_program_and_get_last_line_of_output(command));
+    mr_asprintf(command,
+            "%s -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep -i TAPE | cut -d' ' -f2 | head -n1",
+            cdr_exe);
+    strcpy(tmp, call_program_and_get_last_line_of_output(command));
     mr_free(command);
 
     if (strlen(tmp) < 2) {
         log_it("Could not find tape device");
-        mr_free(cdr_exe);
-        mr_free(tmp);
         return 1;
     }
-    mr_asprintf(command, "%s -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep -i TAPE | cut -d' ' -f3 | cut -d')' -f1 | head -n1", cdr_exe);
-    mr_free(cdr_exe);
-
-    mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
+    mr_asprintf(command,
+            "%s -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep -i TAPE | cut -d' ' -f3 | cut -d')' -f1 | head -n1",
+            cdr_exe);
+    strcpy(tmp, call_program_and_get_last_line_of_output(command));
     mr_free(command);
 
@@ -300 +306 @@
     dev[strlen(dev) - 1] = '\0';
     strcat(dev, tmp);           // e.g. '/dev/st0' becomes '/dev/stN'
-    mr_free(tmp);
-
     res = 0;
     if (!mt_says_tape_exists(dev)) {
@@ -320 +324 @@
     }
 
-    if (dev) {
-        log_it("At this point, dev = %s and res = %d", dev, res);
-    } else {
-        log_it("At this point, dev is NULL and res = %d", dev, res);
-    }
-
-    mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output("cdrecord -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep -i TAPE | awk '{for(i=1; i<NF; i++) { if (index($i, \"GB\")>0) { print $i;};};};'"));
+    log_it("At this point, dev = %s and res = %d", dev, res);
+
+    strcpy(tmp, call_program_and_get_last_line_of_output("\
+cdrecord -scanbus 2> /dev/null | tr -s '\t' ' ' | \
+grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep -i TAPE | \
+awk '{for(i=1; i<NF; i++) { if (index($i, \"GB\")>0) { print $i;};};};'"));
 
     if (mt_says_tape_exists(dev)) {
@@ -332 +335 @@
     } else {
         log_it("Turning %s", dev);
-        mr_free(tmp);
-        mr_asprintf(tmp, "%s", (strrchr(dev, '/') != NULL) ? strrchr(dev, '/') : dev);
+        strcpy(tmp, (strrchr(dev, '/') != NULL) ? strrchr(dev, '/') : dev);
         sprintf(dev, "/dev/os%s", tmp);
         log_it("...into %s", dev);
@@ -353 +355 @@
         siz[0] = '\0';
         log_it("Warning - size of tape unknown");
+        return (0);
     } else {
         strcpy(siz, tmp);
-    }
-    mr_free(tmp);
-    return (0);
-}
+        return (0);
+    }
+}
+
+
+
+
 
 
@@ -473 +479 @@
     log_it("Insisting on tape #%d", tapeno);
     if (g_current_media_number != tapeno) {
-        mr_asprintf(tmp, "When the tape drive goes quiet, please insert volume %d in this series.", tapeno);
+        mr_asprintf(tmp,
+                "When the tape drive goes quiet, please insert volume %d in this series.",
+                tapeno);
         popup_and_OK(tmp);
         mr_free(tmp);
@@ -606 +614 @@
     int res;
 
-    if (bkpinfo->media_device == NULL) {
-        return(1);
-    }
-
     if (strncmp(bkpinfo->media_device, "/dev/", 5)) {
-        log_msg(1, "Not using 'mt setblk'. This isn't an actual /dev entry.");
+        log_msg(1,
+                "Not using 'mt setblk'. This isn't an actual /dev entry.");
         return (0);
     }
@@ -682 +687 @@
     int res = 0;
 
-    if (bkpinfo->media_device == NULL) {
-        return(1);
-    }
-
     log_it("Skipping OBDR headers");
     mr_asprintf(command, "mt -f %s rewind",bkpinfo->media_device);
@@ -711 +712 @@
     char *command = NULL;
     int res = 0;
-
-    if (bkpinfo->media_device == NULL) {
-        return(1);
-    }
 
     log_it("Creating OBDR headers");
@@ -783 +780 @@
     /*@ end vars *************************************************** */
 
-    g_tapecatalog = mr_malloc(sizeof(struct s_tapecatalog));
+    assert_string_is_neither_NULL_nor_zerolength(bkpinfo->media_device);
+    if (!(g_tapecatalog = malloc(sizeof(struct s_tapecatalog)))) {
+        fatal_error("Cannot alloc mem for tape catalog");
+    }
     g_tapecatalog->entries = 0;
     g_tape_posK = 0;
@@ -800 +800 @@
         if (bkpinfo->media_device == NULL) {
             log_it("Not able to skip OBDR - Restore will have to be done manually");
-            return (1);
         }
         set_tape_block_size_with_mt(bkpinfo->internal_tape_block_size);
@@ -809 +808 @@
     make_hole_for_file(outfname);
 
+//  start_buffer_process( bkpinfo->media_device, g_tape_fifo, FALSE);
     log_it("Opening IN tape");
-    if (!(g_tape_stream = open_device_via_buffer(bkpinfo->media_device, 'r', bkpinfo->internal_tape_block_size))) {
+    if (!
+        (g_tape_stream =
+         open_device_via_buffer(bkpinfo->media_device, 'r',
+                                bkpinfo->internal_tape_block_size))) {
         log_OS_error(g_tape_fifo);
         log_to_screen("Cannot openin stream device");
@@ -818 +821 @@
     log_to_screen("Reading stream");
     log_it("stream device = '%s'", bkpinfo->media_device);
-    /* skip data disks */
+/* skip data disks */
     open_evalcall_form("Skipping data disks on stream");
     log_to_screen("Skipping data disks on stream");
@@ -871 +874 @@
         // FIXME
     }
-    mr_asprintf(tmp, "tar -zxf %s ./tmp/mondo-restore.cfg 2> /dev/null", outfname);
+    mr_asprintf(tmp, "tar -zxf %s ./tmp/mondo-restore.cfg 2> /dev/null",
+            outfname);
     paranoid_system(tmp);
     mr_free(tmp);
@@ -899 +903 @@
     /*@ end vars *************************************************** */
 
-    if (cddev == NULL) {
-        log_to_screen("Failed to openout NULL cddev");
-        return (1);
-    }
     /*  add 'dummy' if testing */
     mr_asprintf(command, "cdrecord -eject dev=%s speed=%d fs=24m -waiti - >> %s 2>> %s", cddev, speed, MONDO_LOGFILE, MONDO_LOGFILE);
@@ -942 +942 @@
     return (0);
 }
-if (bkpinfo->media_device == NULL) {
-    log_it("Unable to openout NULL device");
-    return(1);
-}
-g_tapecatalog = mr_malloc(sizeof(struct s_tapecatalog));
+if (!(g_tapecatalog = malloc(sizeof(struct s_tapecatalog)))) {
+    fatal_error("Cannot alloc mem for tape catalog");
+}
 g_tapecatalog->entries = 0;
 g_tape_posK = 0;
@@ -956 +954 @@
 }
 log_it("Opening OUT tape");
-if (!(g_tape_stream = open_device_via_buffer(bkpinfo->media_device, 'w', bkpinfo->internal_tape_block_size))) {
+if (!
+    (g_tape_stream =
+     open_device_via_buffer(bkpinfo->media_device, 'w', bkpinfo->internal_tape_block_size))) {
     log_OS_error(g_tape_fifo);
     log_to_screen("Cannot openin stream device");
@@ -969 +969 @@
 /**
  * Copy a file from the opened stream (CD or tape) to @p outfile.
+ * @param bkpinfo The backup information structure. @c bkpinfo->media_device is the only field used.
  * @param outfile The file to write to.
  * @param size The size of the file in the input stream.
@@ -1030 +1031 @@
 {
     /*@ buffers ***************************************************** */
+    char *tmp = NULL;
     char *datablock;
     char *temp_fname;
     char *temp_cksum;
     char *actual_cksum = NULL;
+//  char *pA, *pB;
 
     /*@ int ********************************************************* */
@@ -1075 +1078 @@
     }
     if (orig_size != temp_size && orig_size != -1) {
-        log_to_screen("output file's size should be %ld K but is apparently %ld K", (long) size >> 10, (long) temp_size >> 10);
+        mr_asprintf(tmp, "output file's size should be %ld K but is apparently %ld K", (long) size >> 10, (long) temp_size >> 10);
+        log_to_screen(tmp);
+        mr_free(tmp);
     }
     if (ctrl_chr != BLK_START_FILE) {
@@ -1146 +1151 @@
     }
     if (strcmp(temp_cksum, actual_cksum)) {
-        log_to_screen("actual cksum=%s; recorded cksum=%s", actual_cksum, temp_cksum);
-        log_to_screen("%s (%ld K) is corrupt on tape", temp_fname, (long) orig_size >> 10);
+        mr_asprintf(tmp, "actual cksum=%s; recorded cksum=%s", actual_cksum,
+                temp_cksum);
+        log_to_screen(tmp);
+        mr_free(tmp);
+
+        mr_asprintf(tmp, "%s (%ld K) is corrupt on tape", temp_fname,
+                (long) orig_size >> 10);
+        log_to_screen(tmp);
+        mr_free(tmp);
+
         retval++;
     }
@@ -1191 +1204 @@
         g_tape_posK += fread(tempblock, 1, (size_t) TAPE_BLOCK_SIZE, g_tape_stream) / 1024;
     }
+/*  memcpy((char*)plength_of_incoming_file,(char*)tempblock+7001,sizeof(long long)); */
+/*  for(*plen=0,i=7;i>=0;i--) {*plen<<=8; *plen |= tempblock[7001+i];} */
     memcpy((char *) plen, tempblock + 7001, sizeof(long long));
     if (strcmp(tempblock + 6000 + *pcontrol_char, STR_HEADER)) {
@@ -1196 +1211 @@
     }
     strcpy(filename, tempblock + 1000);
+/*  strcpy(cksum,tempblock+5555);*/
+/*  log_it( "%s  (reading) fname=%s, filesize=%ld K",
+       marker_to_string (*pcontrol_char), filename,
+       (long) ((*plen) >> 10));
+*/
     if (*pcontrol_char == BLK_ABORTED_BACKUP) {
         log_to_screen("I can't verify an aborted backup.");
@@ -1343 +1363 @@
     while (ctrl_chr != BLK_START_FILE) {
         res = read_header_block_from_stream(&temp_size, temp_fname, &ctrl_chr);
-        if (res) {
-            //FIXME
-        }
         if (ctrl_chr == BLK_START_FILE) {
             break;
@@ -1366 +1383 @@
     }
     while (strcmp(pA, pB)) {
-        log_msg(6, "Skipping %s (it's not %s)", temp_fname, the_file_I_was_reading);
+        log_msg(6, "Skipping %s (it's not %s)", temp_fname,
+                the_file_I_was_reading);
         for (size = temp_size; size > 0; size -= bytes_to_write) {
             bytes_to_write =
@@ -1403 +1421 @@
         }
     }
-    log_msg(2, "Reading %s (it matches %s)", temp_fname, the_file_I_was_reading);
+    log_msg(2, "Reading %s (it matches %s)", temp_fname,
+            the_file_I_was_reading);
     paranoid_free(temp_fname);
     paranoid_free(datablock);
@@ -1425 +1444 @@
     /*@ end vars *************************************************** */
 
-    if (bkpinfo->media_device == NULL) {
-        log_it("Unable to open in from NULL device");
-        return (1);
-    }
-
     paranoid_pclose(g_tape_stream);
     sync();
@@ -1437 +1451 @@
     insist_on_this_tape_number(g_current_media_number + 1); // will increment it, too
     log_it("Opening IN the next tape");
-    if (!(g_tape_stream = open_device_via_buffer(bkpinfo->media_device, 'r', bkpinfo->internal_tape_block_size))) {
+    if (!
+        (g_tape_stream =
+         open_device_via_buffer(bkpinfo->media_device, 'r',
+                                bkpinfo->internal_tape_block_size))) {
         log_OS_error(g_tape_fifo);
         log_to_screen("Cannot openin stream device");
@@ -1470 +1487 @@
     char *command = NULL;
 
-    if (bkpinfo->media_device == NULL) {
-        log_it("Unable to open out from NULL device");
-        return (1);
-    }
-
     paranoid_pclose(g_tape_stream);
-    sync();
-    sync();
-    sync();
+    paranoid_system("sync");
+    paranoid_system("sync");
+    paranoid_system("sync");
     log_it("New tape requested.");
     insist_on_this_tape_number(g_current_media_number + 1); // will increment g_current_media, too
     if (bkpinfo->backup_media_type == cdstream) {
-        mr_asprintf(command, "cdrecord -eject dev=%s speed=%d fs=24m -waiti - >> %s 2>> %s", bkpinfo->media_device, bkpinfo->cdrw_speed, MONDO_LOGFILE, MONDO_LOGFILE);
+        mr_asprintf(command,
+                "cdrecord -eject dev=%s speed=%d fs=24m -waiti - >> %s 2>> %s",
+                bkpinfo->media_device, bkpinfo->cdrw_speed, MONDO_LOGFILE,
+                MONDO_LOGFILE);
         log_it("Opening OUT to next CD with the command");
         log_it(command);
@@ -1495 +1510 @@
     } else {
         log_it("Opening OUT to next tape");
-        if (!(g_tape_stream = open_device_via_buffer(bkpinfo->media_device, 'w', bkpinfo->internal_tape_block_size))) {
+        if (!
+            (g_tape_stream =
+             open_device_via_buffer(bkpinfo->media_device, 'w',
+                                    bkpinfo->internal_tape_block_size))) {
             log_OS_error(g_tape_fifo);
             log_to_screen("Cannot openin stream device");
@@ -1566 +1584 @@
     /*@ pointers *************************************************** */
     FILE *fin;
+    char *tmp = NULL;
 
     /*@ long ******************************************************* */
@@ -1583 +1602 @@
     log_it("Data disks = %s", fname);
     if (!does_file_exist(fname)) {
-        log_to_screen("Cannot find %s", fname);
+        mr_asprintf(tmp, "Cannot find %s", fname);
+        log_to_screen(tmp);
+        mr_free(tmp);
         return (1);
     }
@@ -1626 +1647 @@
 {
     /*@ buffers **************************************************** */
+    char *tmp = NULL;
     char datablock[TAPE_BLOCK_SIZE];
     char *checksum = NULL;
@@ -1678 +1700 @@
         p++;
     }
-    log_it("Writing file '%s' to tape (%ld KB)", p, (long) filesize >> 10);
+    mr_asprintf(tmp, "Writing file '%s' to tape (%ld KB)", p,
+            (long) filesize >> 10);
+    log_it(tmp);
+    mr_free(tmp);
     write_header_block_to_stream(filesize, infile_basename,
                                  BLK_START_FILE);
@@ -1750 +1775 @@
     /*@ buffers **************************************************** */
     char tempblock[TAPE_BLOCK_SIZE];
+    char *tmp = NULL;
     char *p;
 
@@ -1768 +1794 @@
     }
     if (!g_tape_stream) {
-        log_to_screen("You're not backing up to tape. Why write a tape header?");
+        log_to_screen
+            ("You're not backing up to tape. Why write a tape header?");
         return (1);
     }
@@ -1778 +1805 @@
     memcpy(tempblock + 7001, (char *) &olen, sizeof(off_t));
     strcpy(tempblock + 1000, filename);
-    g_tape_posK += fwrite(tempblock, 1, (size_t) TAPE_BLOCK_SIZE, g_tape_stream) / 1024;
-    log_msg(6, "%s (fname=%s, size=%ld K)", marker_to_string(control_char), p, (long) length_of_incoming_file >> 10);
+    g_tape_posK +=
+        fwrite(tempblock, 1, (size_t) TAPE_BLOCK_SIZE,
+               g_tape_stream) / 1024;
+    mr_asprintf(tmp, "%s (fname=%s, size=%ld K)",
+            marker_to_string(control_char), p,
+            (long) length_of_incoming_file >> 10);
+    log_msg(6, tmp);
+    mr_free(tmp);
     return (0);
 }
@@ -1799 +1832 @@
 void wrong_marker(int should_be, int it_is)
 {
-    log_to_screen("Wrong marker! (Should be %s, is actually %s)", marker_to_string(should_be), marker_to_string(it_is));
+    /*@ buffer ***************************************************** */
+    char *tmp = NULL;
+
+
+    /*@ end vars *************************************************** */
+    mr_asprintf(tmp, "Wrong marker! (Should be %s, is actually %s)", marker_to_string(should_be), marker_to_string(it_is));
+    log_to_screen(tmp);
+    mr_free(tmp);
 }
 

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

@@ -51 +51 @@
     if (c && strncmp(c, "/disc", 5) == 0) {
         /* yup it's devfs, return the "part" path */
-        /* This strcpy is safe */
         strcpy(c + 1, "part");
         p = c + 5;
@@ -66 +65 @@
     }
     sprintf(p, "%d", partno);
-    return(partition);
-}
+    return (partition);
+}
+
+
+
+
+
+
+
+
+
+
+
 
 
@@ -108 +118 @@
 
 
+
+
+inline void turn_wildcard_chars_into_literal_chars(char *sout, char *sin)
+{
+    char *p, *q;
+
+    for (p = sin, q = sout; *p != '\0'; *(q++) = *(p++)) {
+        if (strchr("[]*?", *p)) {
+            *(q++) = '\\';
+        }
+    }
+    *q = *p;                    // for the final '\0'
+}
+
+
+
 /**
  * Add commas every third place in @p input.
@@ -129 +155 @@
         tmp[j - 6] = ',';
         strcpy(tmp + j - 5, pos_w_commas + j - 6);
+//      tmp[j-2] = ',';
+//      strcpy(tmp+j-1, pos_w_commas+j-3);
         strcpy(pos_w_commas, tmp);
     }
@@ -142 +170 @@
     return (output);
 }
+
+
+
+
+
+
+
 
 
@@ -182 +217 @@
     long outval;
     int i;
-    char *tmp = NULL;
+    char *tmp;
     char ch;
 
@@ -193 +228 @@
         fatal_error("Please use integers only. No decimal points.");
     }
-
-    mr_asprintf(tmp, "%s", incoming);
+    malloc_string(tmp);
+    strcpy(tmp, incoming);
     i = (int) strlen(tmp);
     if (tmp[i - 1] == 'B' || tmp[i - 1] == 'b') {
@@ -203 +238 @@
     tmp[i] = '\0';
     outval = atol(tmp);
-    mr_free(tmp);
-
     if (ch == 'g' || ch == 'G') {
         outval = outval * 1024;
@@ -220 +253 @@
         fatal_error("Integer overflow.");
     } else if (ch != 'm' && ch != 'M') {
-        mr_asprintf(tmp, "Re: parameter '%s' - bad multiplier ('%c')", incoming, ch);
+        sprintf(tmp, "Re: parameter '%s' - bad multiplier ('%c')",
+                incoming, ch);
         fatal_error(tmp);
     }
+    paranoid_free(tmp);
     return (outval);
 }
@@ -481 +516 @@
 
     input = malloc(2000);
+    // BERLIOS: seems to cause invalid errors 
+    //assert_string_is_neither_NULL_nor_zerolength(ip);
+    assert_string_is_neither_NULL_nor_zerolength(token);
     assert(value != NULL);
 
@@ -519 +557 @@
     /*@ buffers **************************************************** */
     static char output[MAX_STR_LEN];
-    char *suffix = NULL;
+    static char suffix[MAX_STR_LEN];
 
     /*@ end vars *************************************************** */
@@ -525 +563 @@
     assert_string_is_neither_NULL_nor_zerolength(path);
     if (s[0] != '\0') {
-        mr_asprintf(suffix, ".%s", s);
+        sprintf(suffix, ".%s", s);
     } else {
-        mr_asprintf(suffix, "");
-    }
-    sprintf(output, "%s/slice-%07ld.%05ld.dat%s", path, bigfileno, sliceno, suffix);
-    mr_free(suffix);
+        suffix[0] = '\0';
+    }
+    sprintf(output, "%s/slice-%07ld.%05ld.dat%s", path, bigfileno, sliceno,
+            suffix);
     return (output);
 }
@@ -608 +646 @@
     numA = atol(stringA + start_of_numbers_in_A);
     numB = atol(stringB + start_of_numbers_in_B);
+    /*
+       sprintf(tmp,"Comparing %s and %s --> %ld,%ld\n",stringA,stringB,numA,numB);
+       log_to_screen(tmp);
+     */
     return ((int) (numA - numB));
 }
@@ -733 +775 @@
     in_out[i] = '\0';
     paranoid_free(tmp);
+/*  for(i=strlen(in_out); i>0 && in_out[i-1]<=32; i--) {in_out[i-1]='\0';} */
 }
 
@@ -866 +909 @@
  * @return The severity (1-3).
  */
-int severity_of_difference(char *fn, char *out_reason) {
-
-    int sev = 3;
-    char *reason = NULL;
-    char *filename = NULL;
-
-    // out_reason might be null on purpose, so don't bomb if it is :) OK?
+int severity_of_difference(char *fn, char *out_reason)
+{
+    int sev;
+    char *reason;
+    char *filename;
+
+    malloc_string(reason);
+    malloc_string(filename);
+// out_reason might be null on purpose, so don't bomb if it is :) OK?
     assert_string_is_neither_NULL_nor_zerolength(fn);
     if (!strncmp(fn, MNT_RESTORING, strlen(MNT_RESTORING))) {
-        mr_asprintf(filename, "%s", fn + strlen(MNT_RESTORING));
+        strcpy(filename, fn + strlen(MNT_RESTORING));
     } else if (fn[0] != '/') {
-        mr_asprintf(filename, "/%s", fn);
+        sprintf(filename, "/%s", fn);
     } else {
-        mr_asprintf(filename, "%s", fn);
-    }
-
-    mr_asprintf(reason, "Changed since backup. Consider running a differential backup in a day or two.");
-
+        strcpy(filename, fn);
+    }
+
+    sev = 3;
+    sprintf(reason,
+            "Changed since backup. Consider running a differential backup in a day or two.");
     if (!strncmp(filename, "/var/", 5)) {
         sev = 2;
-        mr_free(reason);
-        mr_asprintf(reason, "/var's contents will change regularly, inevitably.");
+        sprintf(reason,
+                "/var's contents will change regularly, inevitably.");
     }
     if (!strncmp(filename, "/home", 5)) {
         sev = 2;
-        mr_free(reason);
-        mr_asprintf(reason, "It's in your /home directory. Therefore, it is important.");
+        sprintf(reason,
+                "It's in your /home directory. Therefore, it is important.");
     }
     if (!strncmp(filename, "/usr/", 5)) {
         sev = 3;
-        mr_free(reason);
-        mr_asprintf(reason, "You may have installed/removed software during the backup.");
+        sprintf(reason,
+                "You may have installed/removed software during the backup.");
     }
     if (!strncmp(filename, "/etc/", 5)) {
         sev = 3;
-        mr_free(reason);
-        mr_asprintf(reason, "Do not edit config files while backing up your PC.");
+        sprintf(reason,
+                "Do not edit config files while backing up your PC.");
     }
     if (!strcmp(filename, "/etc/adjtime")
         || !strcmp(filename, "/etc/mtab")) {
         sev = 1;
-        mr_free(reason);
-        mr_asprintf(reason, "This file changes all the time. It's OK.");
+        sprintf(reason, "This file changes all the time. It's OK.");
     }
     if (!strncmp(filename, "/root/", 6)) {
         sev = 3;
-        mr_free(reason);
-        mr_asprintf(reason, "Were you compiling/editing something in /root?");
+        sprintf(reason, "Were you compiling/editing something in /root?");
     }
     if (!strncmp(filename, "/root/.", 7)) {
         sev = 2;
-        mr_free(reason);
-        mr_asprintf(reason, "Temp or 'dot' files changed in /root.");
+        sprintf(reason, "Temp or 'dot' files changed in /root.");
     }
     if (!strncmp(filename, "/var/lib/", 9)) {
         sev = 2;
-        mr_free(reason);
-        mr_asprintf(reason, "Did you add/remove software during backing?");
+        sprintf(reason, "Did you add/remove software during backing?");
     }
     if (!strncmp(filename, "/var/lib/rpm", 12)) {
         sev = 3;
-        mr_free(reason);
-        mr_asprintf(reason, "Did you add/remove software during backing?");
+        sprintf(reason, "Did you add/remove software during backing?");
     }
     if (!strncmp(filename, "/var/lib/slocate", 16)) {
         sev = 1;
-        mr_free(reason);
-        mr_asprintf(reason, "The 'update' daemon ran during backup. This does not affect the integrity of your backup.");
+        sprintf(reason,
+                "The 'update' daemon ran during backup. This does not affect the integrity of your backup.");
     }
     if (!strncmp(filename, "/var/log/", 9)
@@ -939 +980 @@
         || !strcmp(filename + strlen(filename) - 4, ".log")) {
         sev = 1;
-        mr_free(reason);
-        mr_asprintf(reason, "Log files change frequently as the computer runs. Fret not.");
+        sprintf(reason,
+                "Log files change frequently as the computer runs. Fret not.");
     }
     if (!strncmp(filename, "/var/spool", 10)) {
         sev = 1;
-        mr_free(reason);
-        mr_asprintf(reason, "Background processes or printers were active. This does not affect the integrity of your backup.");
+        sprintf(reason,
+                "Background processes or printers were active. This does not affect the integrity of your backup.");
     }
     if (!strncmp(filename, "/var/spool/mail", 10)) {
         sev = 2;
-        mr_free(reason);
-        mr_asprintf(reason, "Mail was sent/received during backup.");
+        sprintf(reason, "Mail was sent/received during backup.");
     }
     if (filename[strlen(filename) - 1] == '~') {
         sev = 1;
-        mr_free(reason);
-        mr_asprintf(reason, "Backup copy of another file which was modified recently.");
+        sprintf(reason,
+                "Backup copy of another file which was modified recently.");
     }
     if (strstr(filename, "cache")) {
         sev = 1;
-        mr_free(reason);
-        mr_asprintf(reason, "Part of a cache of data. Caches change from time to time. Don't worry.");
+        sprintf(reason,
+                "Part of a cache of data. Caches change from time to time. Don't worry.");
     }
     if (!strncmp(filename, "/var/run/", 9)
@@ -967 +1007 @@
         || strstr(filename, "/.Xauthority")) {
         sev = 1;
-        mr_free(reason);
-        mr_asprintf(reason, "Temporary file (a lockfile, perhaps) used by software such as X or KDE to register its presence.");
+        sprintf(reason,
+                "Temporary file (a lockfile, perhaps) used by software such as X or KDE to register its presence.");
     }
     if (out_reason) {
         strcpy(out_reason, reason);
     }
-    mr_free(filename);
-    mr_free(reason);
+    paranoid_free(filename);
+    paranoid_free(reason);
     return (sev);
 }
@@ -1024 +1064 @@
     /*@ buffers ******************************************* */
     static char outstr[MAX_STR_LEN];
-    char *pos_w_commas = NULL;
+    char *pos_w_commas, *tmp;
     char *mds = NULL;
-    char *tmp = NULL;
 
     assert(bkpinfo != NULL);
-
-    if (bkpinfo->media_size <= 0) {
-        mr_asprintf(tmp, "%lld", g_tape_posK);
-        mr_asprintf(pos_w_commas, "%s", commarize(tmp));
-        mr_free(tmp);
-        sprintf(outstr, "Volume %d: %s kilobytes archived so far", g_current_media_number, pos_w_commas);
-        mr_free(pos_w_commas);
+    malloc_string(pos_w_commas);
+    malloc_string(tmp);
+    sprintf(tmp, "%lld", g_tape_posK);
+    strcpy(pos_w_commas, commarize(tmp));
+
+
+
+    if (bkpinfo->media_size <= 0)
+//    { fatal_error( "percentage_media_full_comment() - unknown media size"); }
+    {
+        sprintf(outstr, "Volume %d: %s kilobytes archived so far",
+                g_current_media_number, pos_w_commas);
         return (outstr);
     }
 
-    /* update screen */
+/* update screen */
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
         percentage = (int) (g_tape_posK / 10 / bkpinfo->media_size);
@@ -1047 +1091 @@
         sprintf(outstr, "Volume %d: [", g_current_media_number);
     } else {
-        percentage = (int) (space_occupied_by_cd(bkpinfo->scratchdir) * 100 / 1024 / bkpinfo->media_size);
+        percentage =
+            (int) (space_occupied_by_cd(bkpinfo->scratchdir) * 100 / 1024 / bkpinfo->media_size);
         mds = media_descriptor_string(bkpinfo->backup_media_type);
         sprintf(outstr, "%s %d: [", mds, g_current_media_number);
@@ -1060 +1105 @@
     j = (int) strlen(outstr);
     sprintf(outstr + j, "] %d%% used", percentage);
+    paranoid_free(pos_w_commas);
+    paranoid_free(tmp);
     return (outstr);
 }

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

@@ -30 +30 @@
 
 extern int g_tape_buffer_size_MB;
+extern char *g_serial_string;
 extern bool g_text_mode;
 extern int g_currentY;
 extern int g_current_media_number;
 extern char *MONDO_LOGFILE;
-extern char *g_serial_string;
 
 /* Reference to global bkpinfo */
@@ -113 +113 @@
         return;
     }
+#ifndef _XWIN
     if (!g_text_mode)
         newtSuspend();
+#endif
     printf("ASSERTION FAILED: `%s'\n", exp);
     printf("\tat %s:%d in %s\n\n", file, line, function);
@@ -161 +163 @@
     getchar();                  // skip \n
 
+#ifndef _XWIN
     if (!g_text_mode)
         newtResume();
+#endif
 }
 
@@ -171 +175 @@
 void clean_up_KDE_desktop_if_necessary(void)
 {
-    char *tmp = NULL;
-
-    mr_asprintf(tmp, "for i in `find /root /home -maxdepth 2 -type d -name Desktop -maxdepth 2`; do file=$i/.directory; if [ -f \"$file\" ] ; then mv -f $file $file.old ; awk '{if (index($0, \"rootimagesmindi\")) { while (length($0)>2) { getline;} ; } else { print $0;};}' $file.old  > $file ; fi ; done");
+    char *tmp;
+
+    malloc_string(tmp);
+    strcpy(tmp,
+           "for i in `find /root /home -maxdepth 2 -type d -name Desktop`; do \
+file=$i/.directory; if [ -f \"$file\" ] ; then mv -f $file $file.old ; \
+awk '{if (index($0, \"rootimagesmindi\")) { while (length($0)>2) { getline;} ; } \
+else { print $0;};}' $file.old  > $file ; fi ; done");
     run_program_and_log_output(tmp, 5);
-    mr_free(tmp);
+    paranoid_free(tmp);
 }
 
@@ -223 +232 @@
 double get_kernel_version(void)
 {
-    char *p = NULL;
-    char *tmp = NULL;
+    char *p, tmp[200];
     double d;
 #ifdef __FreeBSD__
@@ -230 +238 @@
     d = 5.2;                    // :-)
 #else
-    mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output("uname -r"));
+    strcpy(tmp, call_program_and_get_last_line_of_output("uname -r"));
     p = strchr(tmp, '.');
     if (p) {
@@ -241 +249 @@
         }
     }
+//  log_msg(1, "tmp = '%s'", tmp);
     d = atof(tmp);
-    mr_free(tmp);
 #endif
     log_msg(1, "g_kernel_version = %f", d);
@@ -249 +257 @@
 
 
+
+
+
 /**
  * Get the current time.
@@ -257 +268 @@
     return (long) time((void *) 0);
 }
+
+
+
+
+
 
 
@@ -352 +368 @@
     char *mondo_mkisofs_sz = NULL;
     char *command = NULL;
-    char *hostname = NULL;
+    char *mtpt;
+    char *hostname;
     char *isofs_cmd = NULL;
     char *ip_address = NULL;
     int retval = 0;
     char *colon;
-    char *cdr_exe = NULL;
+    char *cdr_exe;
     char *tmp = NULL;
-    char *p = NULL;
-    char *call_before_iso_user = NULL;
+    char call_before_iso_user[MAX_STR_LEN] = "\0";
+    /*
+    long avm = 0;
+    int rdsiz_MB;
+    */
     char *iso_dev = NULL;
     char *iso_mnt = NULL;
@@ -367 +387 @@
 
     assert(bkpinfo != NULL);
-
+    malloc_string(mtpt);
+    malloc_string(hostname);
+    malloc_string(cdr_exe);
     bkpinfo->optimal_set_size =
         (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type) ? 16 : 16) *
@@ -378 +400 @@
         }
         log_msg(1, "Tape");
-        if (bkpinfo->media_device == NULL) {
-            return(1);
-        }
         mr_asprintf(tmp, "mt -f %s status", bkpinfo->media_device);
         log_msg(1, "tmp = '%s'", tmp);
@@ -410 +429 @@
         strcpy(bkpinfo->zip_exe, "gzip");
         strcpy(bkpinfo->zip_suffix, "gz");
-    } else if (bkpinfo->use_lzma) {
-        strcpy(bkpinfo->zip_exe, "lzma");
-        strcpy(bkpinfo->zip_suffix, "lzma");
     } else if (bkpinfo->compression_level != 0) {
         strcpy(bkpinfo->zip_exe, "bzip2");
@@ -424 +440 @@
     if (bkpinfo->backup_media_type == dvd) {
         if (find_home_of_exe("growisofs")) {
-            mr_asprintf(cdr_exe, "growisofs");
+            strcpy(cdr_exe, "growisofs");
         }                       // unlikely to be used
         else {
@@ -446 +462 @@
     }
 #endif
-        else {
+        else
+        {
             mr_asprintf(mondo_mkisofs_sz, MONDO_GROWISOFS_REGULAR_SYSLINUX);
         }
         if (bkpinfo->manual_cd_tray) {
+            paranoid_free(mondo_mkisofs_sz);
             fatal_error("Manual CD tray + DVD not supported yet.");
             // -m isn't supported by growisofs, BTW...
@@ -457 +475 @@
                     mondo_mkisofs_sz,
                     "", bkpinfo->media_device);
-        }
-        mr_free(mondo_mkisofs_sz);
+            paranoid_free(mondo_mkisofs_sz);
+        }
         if (getenv ("SUDO_COMMAND")) {
             mr_asprintf(command, "strings `which growisofs` | grep -c SUDO_COMMAND");
@@ -468 +486 @@
             mr_free(command);
         }
-        log_msg(2, "call_make_iso (DVD res) is ... %s", bkpinfo->call_make_iso);
+        log_msg(2, "call_make_iso (DVD res) is ... %s",
+                bkpinfo->call_make_iso);
     }                           // end of DVD code
 
@@ -485 +504 @@
         }
         if (find_home_of_exe("cdrecord")) {
-            mr_asprintf(cdr_exe, "cdrecord");
+            strcpy(cdr_exe, "cdrecord");
         } else if (find_home_of_exe("dvdrecord")) {
-            mr_asprintf(cdr_exe, "dvdrecord");
+            strcpy(cdr_exe, "dvdrecord");
         } else {
             fatal_error("Please install either cdrecord or dvdrecord.");
@@ -525 +544 @@
                         mondo_mkisofs_sz, bkpinfo->tmpdir);
                 } else {
-                mr_asprintf(call_before_iso_user, "%s", bkpinfo->call_before_iso);
-                sprintf(bkpinfo->call_before_iso, "( %s -o %s/"MONDO_TMPISOS" . 2>> _ERR_ ; %s )", mondo_mkisofs_sz, bkpinfo->tmpdir, call_before_iso_user);
-                mr_free(call_before_iso_user);
+                strncpy(call_before_iso_user, bkpinfo->call_before_iso, MAX_STR_LEN);
+                sprintf (bkpinfo->call_before_iso,
+                                    "( %s -o %s/"MONDO_TMPISOS" . 2>> _ERR_ ; %s )",
+                        mondo_mkisofs_sz, bkpinfo->tmpdir, call_before_iso_user);
             }
             log_it("bkpinfo->call_before_iso = %s", bkpinfo->call_before_iso);
-            sprintf(bkpinfo->call_make_iso, "%s %s -v %s fs=4m dev=%s speed=%d %s/"MONDO_TMPISOS, cdr_exe, (bkpinfo->please_dont_eject) ? " " : "-eject", extra_cdrom_params, bkpinfo->media_device, bkpinfo->cdrw_speed, bkpinfo->tmpdir);
+            sprintf(bkpinfo->call_make_iso,
+                    "%s %s -v %s fs=4m dev=%s speed=%d %s/"MONDO_TMPISOS,
+                    cdr_exe, (bkpinfo->please_dont_eject) ? " " : "-eject",
+                    extra_cdrom_params, bkpinfo->media_device,
+                    bkpinfo->cdrw_speed, bkpinfo->tmpdir);
         } else {
-            sprintf(bkpinfo->call_make_iso, "%s . 2>> _ERR_ | %s %s %s fs=4m dev=%s speed=%d -", mondo_mkisofs_sz, cdr_exe, (bkpinfo->please_dont_eject) ? " " : "-eject", extra_cdrom_params, bkpinfo->media_device, bkpinfo->cdrw_speed);
-        }
-        mr_free(cdr_exe);
-        mr_free(mondo_mkisofs_sz);
-        mr_free(extra_cdrom_params);
+            sprintf(bkpinfo->call_make_iso,
+                    "%s . 2>> _ERR_ | %s %s %s fs=4m dev=%s speed=%d -",
+                    mondo_mkisofs_sz, cdr_exe,
+                    (bkpinfo->please_dont_eject) ? " " : "-eject",
+                    extra_cdrom_params, bkpinfo->media_device,
+                    bkpinfo->cdrw_speed);
+        }
+        paranoid_free(mondo_mkisofs_sz);
+        paranoid_free(extra_cdrom_params);
     }                           // end of CD code
 
@@ -549 +577 @@
 
         log_it("isodir = %s", bkpinfo->isodir);
-        mr_asprintf(command, "df -P %s | tail -n1 | cut -d' ' -f1", bkpinfo->isodir);
+        mr_asprintf(command, "df -P %s | tail -n1 | cut -d' ' -f1",
+                bkpinfo->isodir);
         log_it("command = %s", command);
+        log_it("res of it = %s", call_program_and_get_last_line_of_output(command));
         mr_asprintf(iso_dev, "%s", call_program_and_get_last_line_of_output(command));
-        log_it("res of it = %s", iso_dev);
         mr_asprintf(tmp, "%s/ISO-DEV", bkpinfo->tmpdir);
-        write_one_liner_data_file(tmp, iso_dev);
+        write_one_liner_data_file(tmp, call_program_and_get_last_line_of_output(command));
         mr_free(tmp);
         mr_free(command);
@@ -562 +591 @@
 
         log_it("command = %s", command);
+        log_it("res of it = %s", call_program_and_get_last_line_of_output(command));
         mr_asprintf(iso_mnt, "%s", call_program_and_get_last_line_of_output(command));
-        log_it("res of it = %s", iso_mnt);
         mr_asprintf(tmp, "%s/ISO-MNT", bkpinfo->tmpdir);
-        write_one_liner_data_file(tmp, iso_mnt);
+        write_one_liner_data_file(tmp, call_program_and_get_last_line_of_output(command));
         mr_free(tmp);
         mr_free(command);
@@ -583 +612 @@
             }
         }
+        mr_free(iso_tmp);
         mr_free(iso_mnt);
-        mr_free(iso_tmp);
 
         mr_asprintf(tmp, "%s/ISODIR", bkpinfo->tmpdir);
@@ -603 +632 @@
 
     if (bkpinfo->backup_media_type == netfs) {
-        if (bkpinfo->netfs_mount) {
-            mr_asprintf(hostname, "%s", bkpinfo->netfs_mount);
-        } else {
-            log_it("netfs_mount is NULL");
-            retval++;
-            mr_asprintf(hostname, "");
-        }
+        strcpy(hostname, bkpinfo->netfs_mount);
         colon = strchr(hostname, ':');
         if (!colon) {
@@ -628 +651 @@
             }
             if (!hent) {
-                log_it("Can't resolve Network mount (%s): %s", hostname, hstrerror(h_errno));
+                log_it("Can't resolve Network mount (%s): %s", hostname,
+                       hstrerror(h_errno));
                 retval++;
             } else {
@@ -634 +658 @@
                 mr_strcat(ip_address, strchr(bkpinfo->netfs_mount, ':'));
                 strcpy(bkpinfo->netfs_mount, ip_address);
-                mr_free(ip_address);
+                paranoid_free(ip_address);
             }
         }
-        mr_free(hostname);
         store_netfs_config();
     }
@@ -645 +668 @@
         fprintf(stderr, "Type 'man mondoarchive' for help.\n");
     }
-    if (bkpinfo->include_paths == NULL) {
-        mr_asprintf(bkpinfo->include_paths, "/");
-    }
+    if (strlen(bkpinfo->tmpdir) < 2 || strlen(bkpinfo->scratchdir) < 2) {
+        log_it("tmpdir or scratchdir are blank/missing");
+        retval++;
+    }
+    if (bkpinfo->include_paths[0] == '\0') {
+        //      fatal_error ("Why no backup path?");
+        strcpy(bkpinfo->include_paths, "/");
+    }
+    chmod(bkpinfo->scratchdir, 0700);
     g_backup_media_type = bkpinfo->backup_media_type;
+    paranoid_free(mtpt);
+    paranoid_free(hostname);
+    paranoid_free(cdr_exe);
     return (retval);
 }
@@ -672 +704 @@
     if (bkpinfo->disaster_recovery) {
         if (!does_nonMS_partition_exist()) {
-            fatal_error("I am in disaster recovery mode\nPlease don't run mondoarchive.");
+            fatal_error
+                ("I am in disaster recovery mode\nPlease don't run mondoarchive.");
         }
     }
@@ -680 +713 @@
     paranoid_free(tmp);
     if (find_and_store_mondoarchives_home(g_mondo_home)) {
-        fprintf(stderr, "Cannot find Mondo's homedir. I think you have >1 'mondo' directory on your hard disk. Please delete the superfluous 'mondo' directories and try again\n");
+        fprintf(stderr,
+                "Cannot find Mondo's homedir. I think you have >1 'mondo' directory on your hard disk. Please delete the superfluous 'mondo' directories and try again\n");
         res++;
         return (res);
@@ -689 +723 @@
     }
     g_current_media_number = 1;
-    bkpinfo->postnuke_tarball[0] = '\0';
+    bkpinfo->postnuke_tarball[0] = bkpinfo->netfs_mount[0] = '\0';
     return (res);
 }
@@ -738 +772 @@
     if (p == NULL) {
         log_it("Failed to create global tmp directory %s for Mondo.",tmp);
-        mr_free(tmp);
         finish(-1);
     }
-    mr_free(tmp);
-
     strcpy(bkpinfo->tmpdir,p);
-    log_it("bkpinfo->tmpdir is being set to %s", bkpinfo->tmpdir);
+    paranoid_free(tmp);
 
     mr_asprintf(tmp, "mkdir -p %s/tmpfs", bkpinfo->tmpdir);
@@ -786 +817 @@
     }
     strcpy(bkpinfo->scratchdir,p);
-    log_it("bkpinfo->scratchdir is being set to %s", bkpinfo->scratchdir);
     paranoid_free(tmp);
 
@@ -802 +832 @@
 {
     int i;
-    log_msg(1, "Initializing bkpinfo");
-
+
+    log_msg(1, "Hi");
     assert(bkpinfo != NULL);
     memset((void *) bkpinfo, 0, sizeof(struct s_bkpinfo));
@@ -817 +847 @@
     bkpinfo->use_lzo = FALSE;
     bkpinfo->use_gzip = FALSE;
-    bkpinfo->use_lzma = FALSE;
+    bkpinfo->do_not_compress_these[0] = '\0';
     bkpinfo->verify_data = FALSE;
     bkpinfo->backup_data = FALSE;
@@ -823 +853 @@
     bkpinfo->use_star = FALSE;
     bkpinfo->internal_tape_block_size = DEFAULT_INTERNAL_TAPE_BLOCK_SIZE;
-    
-/*  We need tmpdir as early as possible for further function calls */
-    bkpinfo->tmpdir = NULL;         // Really setup after
-    setup_tmpdir(NULL);
-    setup_scratchdir(NULL);
-
-    bkpinfo->disaster_recovery = am_I_in_disaster_recovery_mode();
+    bkpinfo->disaster_recovery =
+        (am_I_in_disaster_recovery_mode()? TRUE : FALSE);
     if (bkpinfo->disaster_recovery) {
         strcpy(bkpinfo->isodir, "/");
@@ -836 +861 @@
     }
     strcpy(bkpinfo->prefix, STD_PREFIX);
+    setup_tmpdir(NULL);
+    setup_scratchdir(NULL);
+
     bkpinfo->optimal_set_size = 0;
-    bkpinfo->backup_media_type = none;
+    strcpy(bkpinfo->include_paths, "/");
     bkpinfo->make_filelist = TRUE;  // unless -J supplied to mondoarchive
-    bkpinfo->exclude_paths = NULL;
-    bkpinfo->include_paths = NULL;
+    bkpinfo->include_paths[0] = '\0';
     bkpinfo->exclude_devs = NULL;
     bkpinfo->restore_path[0] = '\0';
@@ -852 +879 @@
     bkpinfo->netfs_user = NULL;
     bkpinfo->netfs_remote_dir[0] = '\0';
+    bkpinfo->exclude_paths = NULL;
+    bkpinfo->subdir = NULL;
     bkpinfo->postnuke_tarball[0] = '\0';
-    bkpinfo->subdir = NULL;
     bkpinfo->wipe_media_first = FALSE;
     bkpinfo->differential = 0;
@@ -866 +894 @@
 
 
+
+
 /**
  * Get the remaining free space (in MB) on @p partition.
@@ -886 +916 @@
     mr_free(command);
 
-    mr_asprintf(command, "df -m -P %s | tail -n1 | tr -s ' ' '\t' | cut -f4", partition);
+    mr_asprintf(command, "df -m -P %s | tail -n1 | tr -s ' ' '\t' | cut -f4",
+            partition);
     mr_asprintf(out_sz, "%s", call_program_and_get_last_line_of_output(command));
     mr_free(command);
@@ -926 +957 @@
     if (system("which mkfs.vfat 2> /dev/null 1> /dev/null")
         && !system("which mkfs.msdos 2> /dev/null 1> /dev/null")) {
-        log_it("OK, you've got mkfs.msdos but not mkfs.vfat; time for the fairy to wave her magic wand...");
-        run_program_and_log_output("ln -sf `which mkfs.msdos` /sbin/mkfs.vfat", FALSE);
-    }
-    mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output("free | grep Mem | head -n1 | tr -s ' ' '\t' | cut -f2"));
+        log_it
+            ("OK, you've got mkfs.msdos but not mkfs.vfat; time for the fairy to wave her magic wand...");
+        run_program_and_log_output
+            ("ln -sf `which mkfs.msdos` /sbin/mkfs.vfat", FALSE);
+    }
+    mr_asprintf(tmp, "%s",
+           call_program_and_get_last_line_of_output
+           ("free | grep Mem | head -n1 | tr -s ' ' '\t' | cut -f2"));
     if (atol(tmp) < 35000) {
         retval++;
@@ -935 +970 @@
     }
     if (atol(tmp) < 66000) {
-        log_to_screen("WARNING! You have very little RAM. Please upgrade to 64MB or more.");
+        log_to_screen
+            ("WARNING! You have very little RAM. Please upgrade to 64MB or more.");
     }
     mr_free(tmp);
@@ -990 +1026 @@
         whine_if_not_found("cmp");
     }
-    run_program_and_log_output("umount `mount | grep cdr | cut -d' ' -f3 | tr '\n' ' '`", 5);
-    mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output("mount | grep -E \"cdr(om|w)\""));
+    run_program_and_log_output
+        ("umount `mount | grep cdr | cut -d' ' -f3 | tr '\n' ' '`", 5);
+    mr_asprintf(tmp, "%s",
+           call_program_and_get_last_line_of_output
+           ("mount | grep -E \"cdr(om|w)\""));
     if (strcmp("", tmp)) {
         if (strstr(tmp, "autofs")) {
@@ -1065 +1104 @@
     /*@ buffer ****************************************************** */
     char *command = NULL;
+    char *tmp = NULL;
 
     /*@ end vars *************************************************** */
@@ -1071 +1111 @@
     assert_string_is_neither_NULL_nor_zerolength(label);
     if (!does_file_exist(config_file)) {
-        log_to_screen("(read_cfg_var) Cannot find %s config file", config_file);
+        mr_asprintf(tmp, "(read_cfg_var) Cannot find %s config file",
+                config_file);
+        log_to_screen(tmp);
+        mr_free(tmp);
+
         value[0] = '\0';
         return (1);
@@ -1083 +1127 @@
         mr_free(command);
 
-        log_msg(4, "Configuration item %s is %s", label, value);
         if (strlen(value) == 0) {
             return (1);
@@ -1199 +1242 @@
  * If this is a distribution like Gentoo that doesn't keep /boot mounted, mount it.
  */
-void mount_boot_if_necessary() {
+void mount_boot_if_necessary()
+{
     char *tmp = NULL;
     char *command = NULL;
@@ -1207 +1251 @@
     g_boot_mountpt[0] = '\0';
     log_msg(4, "Done. Great. Seeting command to something");
-    mr_asprintf(command, "%s", "grep -v \":\" /etc/fstab | grep -vE '^#.*$' | grep -E \"[   ]/boot[     ]\" | tr -s ' ' '\t' | cut -f1 | head -n1");
+    mr_asprintf(command, "%s",
+           "grep -v \":\" /etc/fstab | grep -vE '^#.*$' | grep -E \"[   ]/boot[     ]\" | tr -s ' ' '\t' | cut -f1 | head -n1");
     log_msg(4, "Cool. Command = '%s'", command);
     mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
@@ -1213 +1258 @@
 
     log_msg(4, "tmp = '%s'", tmp);
-    log_it("/boot is at %s according to /etc/fstab", tmp);
-    mr_asprintf(command, "mount | grep -Ew '/boot'");
-    mr_free(tmp);
-
-    mr_asprintf(tmp, call_program_and_get_last_line_of_output(command));
-    mr_free(command);
-
-    if (!strcmp(tmp,"")) {
-        if ((strstr(tmp, "LABEL=") != NULL) || (strstr(tmp,"UUID=") != NULL)) {
-            if (!run_program_and_log_output("mount /boot", 5)) {
-                strcpy(g_boot_mountpt, "/boot");
-                log_msg(1, "Mounted /boot");
+    if (tmp[0]) {
+        log_it("/boot is at %s according to /etc/fstab", tmp);
+        mr_asprintf(command, "mount | grep -Ew '/boot'");
+        mr_free(tmp);
+        mr_asprintf(tmp, call_program_and_get_last_line_of_output(command));
+        mr_free(command);
+
+        if (!strcmp(tmp,"")) {
+            if (((strstr(tmp, "LABEL=") != NULL) || (strstr(tmp,"UUID=")) != NULL)) {
+                if (!run_program_and_log_output("mount /boot", 5)) {
+                    strcpy(g_boot_mountpt, "/boot");
+                    log_msg(1, "Mounted /boot");
+                } else {
+                    log_it("...ignored cos it's a label or uuid :-)");
+                }
             } else {
-                log_it("...ignored cos it's a label or uuid :-)");
+                mr_asprintf(command, "mount | grep -E '^%s'", tmp);
+                log_msg(3, "command = %s", command);
+                if (run_program_and_log_output(command, 5)) {
+                    strcpy(g_boot_mountpt, tmp);
+                    mr_free(tmp);
+                    mr_asprintf(tmp,
+                            "%s (your /boot partition) is not mounted. I'll mount it before backing up",
+                            g_boot_mountpt);
+                    log_it(tmp);
+                    mr_free(tmp);
+
+                    mr_asprintf(tmp, "mount %s", g_boot_mountpt);
+                    if (run_program_and_log_output(tmp, 5)) {
+                        g_boot_mountpt[0] = '\0';
+                        log_msg(1, "Plan B");
+                        if (!run_program_and_log_output("mount /boot", 5)) {
+                            strcpy(g_boot_mountpt, "/boot");
+                            log_msg(1, "Plan B worked");
+                        } else {
+                            log_msg(1,
+                                "Plan B failed. Unable to mount /boot for backup purposes. This probably means /boot is mounted already, or doesn't have its own partition.");
+                        }
+                    }
+                    mr_free(tmp);
+                }
+                mr_free(command);
             }
-        } else {
-            mr_asprintf(command, "mount | grep -E '^%s'", tmp);
-            log_msg(3, "command = %s", command);
-            if (run_program_and_log_output(command, 5)) {
-                strcpy(g_boot_mountpt, tmp);
-                mr_free(tmp);
-                log_it("%s (your /boot partition) is not mounted. I'll mount it before backing up", g_boot_mountpt);
-
-                mr_asprintf(tmp, "mount %s", g_boot_mountpt);
-                if (run_program_and_log_output(tmp, 5)) {
-                    g_boot_mountpt[0] = '\0';
-                    log_msg(1, "Plan B");
-                    if (!run_program_and_log_output("mount /boot", 5)) {
-                        strcpy(g_boot_mountpt, "/boot");
-                        log_msg(1, "Plan B worked");
-                    } else {
-                        log_msg(1,
-                            "Plan B failed. Unable to mount /boot for backup purposes. This probably means /boot is mounted already, or doesn't have its own partition.");
-                    }
-                }
-            }
-            mr_free(command);
-        }
-    }
-    mr_free(tmp);
+        }
+    }
     log_msg(1, "Ended sub");
 }
@@ -1290 +1340 @@
     char *command = NULL;
     char *tempfile = NULL;
+    char *tmp = NULL;
 
 
@@ -1297 +1348 @@
     assert(value != NULL);
     if (!does_file_exist(config_file)) {
-        log_to_screen("(write_cfg_file) Cannot find %s config file", config_file);
+        mr_asprintf(tmp, "(write_cfg_file) Cannot find %s config file",
+                config_file);
+        log_to_screen(tmp);
+        mr_free(tmp);
         return (1);
     }
     mr_asprintf(tempfile, "%s/mojo-jojo.blah", bkpinfo->tmpdir);
     if (does_file_exist(config_file)) {
-        mr_asprintf(command, "grep -vE '^%s .*$' %s > %s", label, config_file, tempfile);
+        mr_asprintf(command, "grep -vE '^%s .*$' %s > %s",
+                label, config_file, tempfile);
         paranoid_system(command);
         mr_free(command);
@@ -1323 +1378 @@
  * information to the logfile.
  */
-void standard_log_debug_msg(int debug_level, const char *szFile, const char *szFunction, int nLine, const char *fmt, ...) {
-
+void standard_log_debug_msg(int debug_level, const char *szFile,
+                            const char *szFunction, int nLine,
+                            const char *fmt, ...)
+{
     va_list args;
+    int i;
     static int depth = 0;
     FILE *fout;
@@ -1338 +1396 @@
         if (!(fout = fopen(MONDO_LOGFILE, "a"))) {
             return;
-        }
+        }       // fatal_error("Failed to openout to logfile - sheesh..."); }
 
         // add tabs to distinguish log levels
         if (debug_level > 0) {
-            fprintf(fout, "DBG%d: ", debug_level);
+            for (i = 1; i < debug_level; i++)
+                fprintf(fout, "\t");
             if (getpid() == g_main_pid)
                 fprintf(fout, "[Main] %s->%s#%d: ", szFile, szFunction, nLine);
@@ -1349 +1408 @@
             else
                 fprintf(fout, "[TH=%d] %s->%s#%d: ", getpid(), szFile, szFunction, nLine);
-        } else {
-            fprintf(fout, "INFO: ");
         }
         va_start(args, fmt);
@@ -1356 +1413 @@
         va_end(args);
 
+        // do not slow down the progran if standard debug level
+        // must be enabled: if no flush, the log won't be up-to-date if there
+        // is a segfault
+        //if (g_dwDebugLevel != 1)
+
         fprintf(fout, "\n");
         paranoid_fclose(fout);
@@ -1368 +1430 @@
                        ...) = standard_log_debug_msg;
 
+
+/**
+ * If @p y, malloc @p x, else free @p x.
+ * @bug This function seems orphaned. Please remove.
+ */
+#define do_alloc_or_free_depending(x,y) { if(y) {x=malloc(MAX_STR_LEN);} else {paranoid_free(x);} }
 
 /**
@@ -1378 +1446 @@
         malloc_string(g_boot_mountpt);
         malloc_string(g_mondo_home);
+        /*
+        malloc_string(g_tmpfs_mountpt);
+        */
         malloc_string(g_serial_string);
         malloc_string(g_magicdev_command);
@@ -1383 +1454 @@
         paranoid_free(g_boot_mountpt);
         paranoid_free(g_mondo_home);
+        /*
+        paranoid_free(g_tmpfs_mountpt);
+        */
+        paranoid_free(g_serial_string);
         paranoid_free(g_magicdev_command);
 
-        mr_free(g_serial_string);
-    }
+    }
+
+    /*
+       char**list_of_arrays[] = {
+       &g_boot_mountpt,
+       &g_mondo_home,
+       &g_tmpfs_mountpt,
+       &g_serial_string,
+       &g_magicdev_command,
+       NULL};
+
+       char**ppcurr;
+       int i;
+
+       for(i=0;list_of_arrays[i];i++)
+       {
+       log_msg(5, "Allocating %d", i);
+       ppcurr = list_of_arrays[i];
+       if (mal)
+       { *ppcurr = malloc(MAX_STR_LEN); }
+       else
+       {
+       if (*ppcurr)
+       {
+       free(*ppcurr);
+       }
+       }
+       }
+       log_msg(5, "Returning");
+     */
 }
 
@@ -1415 +1518 @@
 void stop_magicdev_if_necessary()
 {
-    strcpy(g_magicdev_command, call_program_and_get_last_line_of_output("ps ax | grep -w magicdev | grep -v grep | tr -s '\t' ' '| cut -d' ' -f6-99"));
+    strcpy(g_magicdev_command,
+           call_program_and_get_last_line_of_output
+           ("ps ax | grep -w magicdev | grep -v grep | tr -s '\t' ' '| cut -d' ' -f6-99"));
     if (g_magicdev_command[0]) {
         log_msg(1, "g_magicdev_command = '%s'", g_magicdev_command);

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

@@ -55 +55 @@
     assert(bkpinfo != NULL);
     assert_string_is_neither_NULL_nor_zerolength(mountpoint);
-    sprintf(output, "%s/archives/%d.star.%s", mountpoint, setno, bkpinfo->zip_suffix);
+    sprintf(output, "%s/archives/%d.star.%s", mountpoint, setno,
+            bkpinfo->zip_suffix);
     if (!does_file_exist(output)) {
-        sprintf(output, "%s/archives/%d.afio.%s", mountpoint, setno, bkpinfo->zip_suffix);
+        sprintf(output, "%s/archives/%d.afio.%s", mountpoint, setno,
+                bkpinfo->zip_suffix);
     }
     return (output);
@@ -78 +80 @@
 {
     /*@ buffer ********************************************************** */
-    char *command = NULL;
-    char *afio_found_changes = NULL;
+    char *command;
+    char *afio_found_changes;
 
     /*@ int ************************************************************* */
@@ -87 +89 @@
     long afio_diffs = 0;
 
+    command = malloc(2000);
+    afio_found_changes = malloc(500);
     assert_string_is_neither_NULL_nor_zerolength(changedfiles_fname);
     assert_string_is_neither_NULL_nor_zerolength(ignorefiles_fname);
     assert_string_is_neither_NULL_nor_zerolength(stderr_fname);
 
-    mr_asprintf(afio_found_changes, "%s.afio", ignorefiles_fname);
-    sync();
+    sprintf(afio_found_changes, "%s.afio", ignorefiles_fname);
+    paranoid_system("sync");
+
+/*  sprintf (command,
+       "grep \"afio: \" %s | awk '{j=substr($0,8); i=index(j,\": \");printf \"/%%s\\n\",substr(j,1,i-2);}' | sort -u | grep -v \"incheckentry.*xwait\" | grep -vx \"/afio:.*\" | grep -vx \"/dev/.*\" > %s",
+       stderr_fname, afio_found_changes);
+*/
 
     log_msg(1, "Now scanning log file for 'afio: ' stuff");
-    mr_asprintf(command, "grep \"afio: \" %s | sed 's/afio: //' | grep -vE '^/dev/.*$' >> %s", stderr_fname, afio_found_changes);
+    sprintf(command,
+            "grep \"afio: \" %s | sed 's/afio: //' | grep -vE '^/dev/.*$' >> %s",
+            stderr_fname, afio_found_changes);
     log_msg(2, command);
     res = system(command);
-    mr_free(command);
-
     if (res) {
         log_msg(2, "Warning - failed to think");
@@ -105 +114 @@
 
     log_msg(1, "Now scanning log file for 'star: ' stuff");
-    mr_asprintf(command, "grep \"star: \" %s | sed 's/star: //' | grep -vE '^/dev/.*$' >> %s", stderr_fname, afio_found_changes);
+    sprintf(command,
+            "grep \"star: \" %s | sed 's/star: //' | grep -vE '^/dev/.*$' >> %s",
+            stderr_fname, afio_found_changes);
     log_msg(2, command);
     res = system(command);
-    mr_free(command);
-
     if (res) {
         log_msg(2, "Warning - failed to think");
     }
+//  exclude_nonexistent_files (afio_found_changes);
     afio_diffs = count_lines_in_file(afio_found_changes);
-    mr_asprintf(command, "sort %s %s %s | uniq -c | awk '{ if ($1==\"2\") {print $2;};}' | grep -v \"incheckentry xwait()\" > %s", ignorefiles_fname, afio_found_changes, afio_found_changes, changedfiles_fname);
-    mr_free(afio_found_changes);
+    sprintf(command,
+            "sort %s %s %s | uniq -c | awk '{ if ($1==\"2\") {print $2;};}' | grep -v \"incheckentry xwait()\" > %s",
+            ignorefiles_fname, afio_found_changes, afio_found_changes,
+            changedfiles_fname);
     log_msg(2, command);
     paranoid_system(command);
-    mr_free(command);
+    paranoid_free(command);
+    paranoid_free(afio_found_changes);
     return (afio_diffs);
 }
@@ -138 +151 @@
 
     /*@ buffers ********************************************************* */
-    char *tmp = NULL;
+    char *tmp;
     char *mds = NULL;
 
@@ -149 +162 @@
     assert_string_is_neither_NULL_nor_zerolength(mountpoint);
     assert(bkpinfo != NULL);
+    malloc_string(tmp);
 
     for (set_number = 0;
@@ -161 +175 @@
     if (g_last_afioball_number != set_number - 1) {
         if (set_number == 0) {
-            log_msg(1, "Weird error in verify_afioballs_on_CD() but it's really a cosmetic error, nothing more");
+            log_msg(1,
+                    "Weird error in verify_afioballs_on_CD() but it's really a cosmetic error, nothing more");
         } else {
             retval++;
-            log_to_screen("Warning - missing set(s) between %d and %d\n", g_last_afioball_number, set_number - 1);
+            sprintf(tmp, "Warning - missing set(s) between %d and %d\n",
+                    g_last_afioball_number, set_number - 1);
+            log_to_screen(tmp);
         }
     }
     mds = media_descriptor_string(bkpinfo->backup_media_type);
-    mr_asprintf(tmp, "Verifying %s #%d's tarballs", mds, g_current_media_number);
+    sprintf(tmp, "Verifying %s #%d's tarballs", mds, g_current_media_number);
     mr_free(mds);
 
     open_evalcall_form(tmp);
-    mr_free(tmp);
 
     for (total_sets = set_number;
@@ -192 +208 @@
     g_last_afioball_number = set_number - 1;
     close_evalcall_form();
+    paranoid_free(tmp);
     return (retval);
 }
@@ -210 +227 @@
 
     /*@ buffer ********************************************************** */
-    char *tmp = NULL;
-    char *mountpoint = NULL;
-    char *command = NULL;
+    char *tmp;
+    char *mountpoint;
+//  char ca, cb;
+    char *command;
     char *mds = NULL;
-    char *sz_exe = NULL;
+    char *sz_exe;
     static char *bufblkA = NULL;
     static char *bufblkB = NULL;
@@ -234 +252 @@
     FILE *fin;
     int retval = 0;
-
+//  long long outlen;
+
+    malloc_string(tmp);
+    malloc_string(mountpoint);
+    malloc_string(command);
+    malloc_string(sz_exe);
     if (!bufblkA) {
         if (!(bufblkA = malloc(maxbufsize))) {
@@ -251 +274 @@
     if (bkpinfo->compression_level > 0) {
         if (bkpinfo->use_lzo) {
-            mr_asprintf(sz_exe, "lzop");
+            strcpy(sz_exe, "lzop");
         } else if (bkpinfo->use_gzip) {
-            mr_asprintf(sz_exe, "gzip");
-        } else if (bkpinfo->use_lzma) {
-            mr_asprintf(sz_exe, "lzma");
+            strcpy(sz_exe, "gzip");
         } else {
-            mr_asprintf(sz_exe, "bzip2");
-        }
+            strcpy(sz_exe, "bzip2");
+        }
+    } else {
+        sz_exe[0] = '\0';
     }
 
     log_it("before vsbf");
     mds = media_descriptor_string(bkpinfo->backup_media_type);
-    mr_asprintf(tmp, "Verifying %s#%d's big files", mds, g_current_media_number);
+    sprintf(tmp, "Verifying %s#%d's big files", mds, g_current_media_number);
     mr_free(mds);
 
     open_evalcall_form(tmp);
-    mr_free(tmp);
-
     log_it("after vsbf");
-    mr_asprintf(mountpoint, "%s/archives", mtpt);
+    sprintf(mountpoint, "%s/archives", mtpt);
     if (last_bigfile_num == -1) {
         bigfile_num = 0;
@@ -281 +302 @@
         slice_num = last_slice_num + 1;
     }
-    while (does_file_exist(slice_fname(bigfile_num, slice_num, mountpoint, bkpinfo->zip_suffix))
+    while (does_file_exist
+           (slice_fname
+            (bigfile_num, slice_num, mountpoint, bkpinfo->zip_suffix))
            ||
-           does_file_exist(slice_fname(bigfile_num, slice_num, mountpoint, ""))) {
+           does_file_exist(slice_fname
+                           (bigfile_num, slice_num, mountpoint, ""))) {
         // handle slices until end of CD
         if (slice_num == 0) {
-            log_msg(2, "ISO=%d  bigfile=%ld --START--", g_current_media_number, bigfile_num);
-            if (! (fin = fopen(slice_fname(bigfile_num, slice_num, mountpoint, ""), "r"))) {
+            log_msg(2, "ISO=%d  bigfile=%ld --START--",
+                    g_current_media_number, bigfile_num);
+            if (!
+                (fin =
+                 fopen(slice_fname(bigfile_num, slice_num, mountpoint, ""),
+                       "r"))) {
                 log_msg(2, "Cannot open bigfile's info file");
             } else {
-                if (fread ((void *) &biggiestruct, 1, sizeof(biggiestruct), fin) < sizeof(biggiestruct)) {
+                if (fread
+                    ((void *) &biggiestruct, 1, sizeof(biggiestruct),
+                     fin) < sizeof(biggiestruct)) {
                     log_msg(2, "Unable to get biggiestruct");
                 }
                 paranoid_fclose(fin);
             }
-            if (bkpinfo->restore_path) {
-                mr_asprintf(tmp, "%s/%s", bkpinfo->restore_path, biggiestruct.filename);
-                log_msg(2, "Opening biggiefile #%ld - '%s'", bigfile_num, tmp);
-                forig = fopen(tmp, "r");
-                mr_free(tmp);
-    
-                if (!forig) {
-                    log_msg(2, "Failed to open bigfile. Darn.");
-                    log_to_screen("%s/%s not found on live filesystem", bkpinfo->restore_path, biggiestruct.filename);
-                    mr_asprintf(tmp, "echo \"%s/%s not found\" >> %s/biggies.changed", bkpinfo->restore_path, biggiestruct.filename, bkpinfo->tmpdir);
-                    paranoid_system(tmp);
-                    mr_free(tmp);
-
-                    bigfile_num++;
-                    slice_num = 0;
-                    retval++;
-                } else {
-                    slice_num++;
-                }
+            sprintf(tmp, "%s/%s", bkpinfo->restore_path,
+                    biggiestruct.filename);
+            log_msg(2, "Opening biggiefile #%ld - '%s'", bigfile_num, tmp);
+            if (!(forig = fopen(tmp, "r"))) {
+                log_msg(2, "Failed to open bigfile. Darn.");
+                log_to_screen("%s/%s not found on live filesystem",
+                            bkpinfo->restore_path,
+                            biggiestruct.filename);
+                mr_asprintf(mds, "echo \"%s/%s not found\" >> %s/biggies.changed",
+                            bkpinfo->restore_path,
+                            biggiestruct.filename,
+                            bkpinfo->tmpdir);
+                paranoid_system(mds);
+                paranoid_free(mds);
+
+                bigfile_num++;
+                slice_num = 0;
+                retval++;
             } else {
-                log_it("Unable to open bigfile as restore_path is NULL");
+                slice_num++;
             }
         } else if (does_file_exist(slice_fname(bigfile_num, slice_num, mountpoint, "")) &&
@@ -325 +354 @@
             slice_num = 0;
         } else {
-            log_msg(2, "ISO=%d  bigfile=%ld  slice=%ld", g_current_media_number, bigfile_num, slice_num);
-            if ((!does_file_exist(slice_fname(bigfile_num, slice_num, mountpoint, ""))) && (sz_exe != NULL)) {
-                mr_asprintf(command, "%s -dc %s 2>> %s", sz_exe, slice_fname(bigfile_num, slice_num, mountpoint, bkpinfo->zip_suffix), MONDO_LOGFILE);
+            log_msg(2, "ISO=%d  bigfile=%ld  slice=%ld",
+                    g_current_media_number, bigfile_num, slice_num);
+            if (!does_file_exist(slice_fname(bigfile_num, slice_num, mountpoint, ""))) {
+                sprintf(command, "%s -dc %s 2>> %s",
+                        sz_exe,
+                        slice_fname(bigfile_num, slice_num, mountpoint, bkpinfo->zip_suffix),
+                        MONDO_LOGFILE);
             } else {
-                mr_asprintf(command, "cat %s 2>> %s", slice_fname(bigfile_num, slice_num, mountpoint, ""), MONDO_LOGFILE);
+                sprintf(command, "cat %s 2>> %s",
+                        slice_fname(bigfile_num, slice_num, mountpoint, ""), MONDO_LOGFILE);
             }
-            pin = popen(command, "r");
-            mr_free(command);
-            if (pin) {
+            if ((pin = popen(command, "r"))) {
                 res = 0;
                 while (!feof(pin)) {
@@ -372 +404 @@
         }
     }
-    mr_free(mountpoint);
-    mr_free(sz_exe);
-
     last_bigfile_num = bigfile_num;
     last_slice_num = slice_num - 1;
@@ -387 +416 @@
         paranoid_free(bufblkB);
     }
+    paranoid_free(tmp);
+    paranoid_free(command);
+    paranoid_free(sz_exe);
+    paranoid_free(mountpoint);
     return (0);
 }
@@ -409 +442 @@
 {
     /*@ buffers ********************************************************* */
-    char *command = NULL;
-    char *outlog = NULL;
-    char *tmp = NULL;
-    char *p = NULL;
+    char *command;
+    char *outlog;
+    char *tmp;
+    char *p;
 
     /*@ pointers ******************************************************* */
@@ -429 +462 @@
 
     log_it("Verifying fileset '%s'", tarball_fname);
-    mr_asprintf(outlog, "%s/afio.log", bkpinfo->tmpdir);
-    /* if programmer forgot to say which compression thingy to use then find out */
-    if (strstr(tarball_fname, ".lzo") && strcmp(bkpinfo->zip_suffix, "lzo")) {
+    /*  chdir("/"); */
+    sprintf(outlog, "%s/afio.log", bkpinfo->tmpdir);
+/* if programmer forgot to say which compression thingy to use then find out */
+    if (strstr(tarball_fname, ".lzo")
+        && strcmp(bkpinfo->zip_suffix, "lzo")) {
         log_msg(2, "OK, I'm going to start using lzop.");
         strcpy(bkpinfo->zip_exe, "lzop");
@@ -437 +472 @@
         bkpinfo->use_lzo = TRUE;
         bkpinfo->use_gzip = FALSE;
-        bkpinfo->use_lzma = FALSE;
-    }
-    if (strstr(tarball_fname, ".gz") && strcmp(bkpinfo->zip_suffix, "gz")) {
+    }
+    if (strstr(tarball_fname, ".gz")
+        && strcmp(bkpinfo->zip_suffix, "gz")) {
         log_msg(2, "OK, I'm going to start using gzip.");
         strcpy(bkpinfo->zip_exe, "gzip");
@@ -445 +480 @@
         bkpinfo->use_lzo = FALSE;
         bkpinfo->use_gzip = TRUE;
-        bkpinfo->use_lzma = FALSE;
-    }
-    if (strstr(tarball_fname, ".bz2") && strcmp(bkpinfo->zip_suffix, "bz2")) {
+    }
+    if (strstr(tarball_fname, ".bz2")
+        && strcmp(bkpinfo->zip_suffix, "bz2")) {
         log_msg(2, "OK, I'm going to start using bzip2.");
         strcpy(bkpinfo->zip_exe, "bzip2");
@@ -453 +488 @@
         bkpinfo->use_lzo = FALSE;
         bkpinfo->use_gzip = FALSE;
-        bkpinfo->use_lzma = FALSE;
-    }
-    if (strstr(tarball_fname, ".lzma") && strcmp(bkpinfo->zip_suffix, "lzma")) {
-        log_msg(2, "OK, I'm going to start using lzma.");
-        strcpy(bkpinfo->zip_exe, "lzma");
-        strcpy(bkpinfo->zip_suffix, "lzma");
-        bkpinfo->use_lzo = FALSE;
-        bkpinfo->use_gzip = FALSE;
-        bkpinfo->use_lzma = TRUE;
-    }
-    if (bkpinfo->zip_exe == NULL) {
-        strcpy(bkpinfo->zip_exe, "none");
-    }
-    if (bkpinfo->zip_suffix == NULL) {
-        strcpy(bkpinfo->zip_suffix, "");
     }
     unlink(outlog);
@@ -473 +493 @@
         bkpinfo->use_star = TRUE;
         if (strstr(tarball_fname, ".bz2"))
-            mr_asprintf(command, "star -sparse -diff diffopts=mode,size,data file=%s %s >> %s 2>> %s", tarball_fname, (strstr(tarball_fname, ".bz2")) ? "-bz" : " ", outlog, outlog);
+            sprintf(command,
+                    "star -sparse -diff diffopts=mode,size,data file=%s %s >> %s 2>> %s",
+                    tarball_fname,
+                    (strstr(tarball_fname, ".bz2")) ? "-bz" : " ", outlog,
+                    outlog);
     } else {
         bkpinfo->use_star = FALSE;
-        /* Here we suppose that there is always a compression program called */
-        if (bkpinfo->zip_exe) {
-            mr_asprintf(command, "afio -r -P %s -Z %s >> %s 2>> %s", bkpinfo->zip_exe, tarball_fname, outlog, outlog);
-        } else {
-            mr_asprintf(command, "afio -r -Z %s >> %s 2>> %s", tarball_fname, outlog, outlog);
-        }
+        sprintf(command, "afio -r -P %s -Z %s >> %s 2>> %s",
+                bkpinfo->zip_exe, tarball_fname, outlog, outlog);
     }
     log_msg(6, "command=%s", command);
     paranoid_system(command);
-    mr_free(command);
-
     if (length_of_file(outlog) < 10) {
-        mr_asprintf(command, "cat %s >> %s", outlog, MONDO_LOGFILE);
+        sprintf(command, "cat %s >> %s", outlog, MONDO_LOGFILE);
     } else {
-        mr_asprintf(command, "cut -d: -f%d %s | sort -u", (bkpinfo->use_star) ? 1 : 2, outlog);
+        sprintf(command, "cut -d: -f%d %s | sort -u",
+                (bkpinfo->use_star) ? 1 : 2, outlog);
         pin = popen(command, "r");
         if (pin) {
-            for (mr_getline(tmp, pin); !feof(pin); mr_getline(tmp, pin)) {
+            for (p = fgets(tmp, MAX_STR_LEN, pin); !feof(pin) && (p != NULL);
+                 p = fgets(tmp, MAX_STR_LEN, pin)) {
                 if (bkpinfo->use_star) {
                     if (!strstr(tmp, "diffopts=")) {
-                        while (strlen(tmp) > 0 && tmp[strlen(tmp) - 1] < 32) {
+                        while (strlen(tmp) > 0
+                               && tmp[strlen(tmp) - 1] < 32) {
                             tmp[strlen(tmp) - 1] = '\0';
                         }
                         if (strchr(tmp, '/')) {
                             if (!diffs) {
-                                log_msg(0, "'%s' - differences found", tarball_fname);
+                                log_msg(0, "'%s' - differences found",
+                                        tarball_fname);
                             }
-                            log_msg(0, "star: /%s", strip_afio_output_line(tmp));
+                            log_msg(0, "star: /%s",
+                                    strip_afio_output_line(tmp));
                             diffs++;
                         }
@@ -509 +532 @@
                 } else {
                     if (!diffs) {
-                        log_msg(0, "'%s' - differences found", tarball_fname);
+                        log_msg(0, "'%s' - differences found",
+                                tarball_fname);
                     }
                     log_msg(0, "afio: /%s", strip_afio_output_line(tmp));
                     diffs++;
                 }
-                mr_free(tmp);
             }
-            mr_free(tmp);
             paranoid_pclose(pin);
         } else {
@@ -522 +544 @@
         }
     }
-    mr_free(command);
-    mr_free(outlog);
+    /*  chdir(old_pwd); */
+    //  sprintf (tmp, "uniq -u %s >> %s", "/tmp/mondo-verify.err", MONDO_LOGFILE);
+    //  paranoid_system (tmp);
+    //  unlink ("/tmp/mondo-verify.err");
+    paranoid_free(command);
+    paranoid_free(outlog);
+    paranoid_free(tmp);
     return (0);
 }
@@ -577 +604 @@
 
     /*@ buffers ********************************************************** */
-    char *tmp = NULL;
-    char *tarball_fname = NULL;
+    char *tmp;
+    char *tarball_fname;
 
     /*@ pointers ********************************************************* */
     char *p;
 
+    malloc_string(tmp);
+    malloc_string(tarball_fname);
     assert(bkpinfo != NULL);
     assert_string_is_neither_NULL_nor_zerolength(orig_fname);
@@ -592 +621 @@
         p++;
     }
-    mr_asprintf(tmp, "mkdir -p %s/tmpfs", bkpinfo->tmpdir);
+    sprintf(tmp, "mkdir -p %s/tmpfs", bkpinfo->tmpdir);
     paranoid_system(tmp);
-    mr_free(tmp);
-
-    mr_asprintf(tarball_fname, "%s/tmpfs/temporary-%s", bkpinfo->tmpdir, p);
+    sprintf(tarball_fname, "%s/tmpfs/temporary-%s", bkpinfo->tmpdir, p);
+    sprintf(tmp, "Temporarily copying file from tape to '%s'",
+            tarball_fname);
+/*  log_it(tmp); */
     read_file_from_stream_to_file(tarball_fname, size);
     res = verify_a_tarball(tarball_fname);
     if (res) {
-        log_msg(0, "Afioball '%s' no longer matches your live filesystem", p);
+        sprintf(tmp,
+                "Afioball '%s' no longer matches your live filesystem", p);
+        log_msg(0, tmp);
         retval++;
     }
     unlink(tarball_fname);
-    mr_free(tarball_fname);
+    paranoid_free(tmp);
+    paranoid_free(tarball_fname);
     return (retval);
 }
@@ -627 +660 @@
 
     /*@ char ************************************************************ */
-    char *test_file = NULL;
-    char *biggie_cksum = NULL;
-    char *orig_cksum = NULL;
-    char *tmp = NULL;
-    char *slice_fnam = NULL;
+    char *test_file;
+    char *biggie_cksum;
+    char *orig_cksum;
+    char *tmp;
+    char *slice_fnam;
 
     /*@ pointers ******************************************************** */
@@ -639 +672 @@
     long long slice_siz;
 
+    malloc_string(test_file);
+    malloc_string(biggie_cksum);
+    malloc_string(orig_cksum);
+    malloc_string(tmp);
     malloc_string(slice_fnam);
     assert(bkpinfo != NULL);
@@ -649 +686 @@
         p++;
     }
-    mr_asprintf(test_file, "%s/temporary-%s", bkpinfo->tmpdir, p);
+    sprintf(test_file, "%s/temporary-%s", bkpinfo->tmpdir, p);
+    sprintf(tmp,
+            "Temporarily copying biggiefile %s's slices from tape to '%s'",
+            p, test_file);
+/*  log_it(tmp); */
     for (res =
          read_header_block_from_stream(&slice_siz, slice_fnam, &ctrl_chr);
          ctrl_chr != BLK_STOP_A_BIGGIE;
          res =
-         read_header_block_from_stream(&slice_siz, slice_fnam, &ctrl_chr)) {
+         read_header_block_from_stream(&slice_siz, slice_fnam,
+                                       &ctrl_chr)) {
         if (ctrl_chr != BLK_START_AN_AFIO_OR_SLICE) {
             wrong_marker(BLK_START_AN_AFIO_OR_SLICE, ctrl_chr);
@@ -661 +703 @@
         unlink(test_file);
         res =
-            read_header_block_from_stream(&slice_siz, slice_fnam, &ctrl_chr);
+            read_header_block_from_stream(&slice_siz, slice_fnam,
+                                          &ctrl_chr);
         if (ctrl_chr != BLK_STOP_AN_AFIO_OR_SLICE) {
             log_msg(2, "test_file = %s", test_file);
@@ -669 +712 @@
         retval += res;
     }
-    mr_asprintf(biggie_cksum, "%s", slice_fnam);
+    strcpy(biggie_cksum, slice_fnam);
     if (biggie_cksum[0] != '\0') {
-        mr_asprintf(orig_cksum, "%s", calc_checksum_of_file(biggie_fname));
+        strcpy(orig_cksum, calc_checksum_of_file(biggie_fname));
         if (strcmp(biggie_cksum, orig_cksum)) {
-            log_msg(2, "orig cksum=%s; curr cksum=%s", biggie_cksum, orig_cksum);
-            log_to_screen("%s has changed on live filesystem", biggie_fname);
-
-            mr_asprintf(tmp, "echo \"%s\" >> %s/biggies.changed", biggie_fname, bkpinfo->tmpdir);
+            sprintf(tmp, "orig cksum=%s; curr cksum=%s", biggie_cksum,
+                    orig_cksum);
+            log_msg(2, tmp);
+            sprintf(tmp, "%s has changed on live filesystem",
+                    biggie_fname);
+            log_to_screen(tmp);
+            sprintf(tmp, "echo \"%s\" >> %s/biggies.changed",
+                    biggie_fname, bkpinfo->tmpdir);
             paranoid_system(tmp);
-            mr_free(tmp);
-        }
-        mr_free(orig_cksum);
-    }
-    mr_free(biggie_cksum);
-    mr_free(test_file);
+        }
+    }
+    paranoid_free(test_file);
+    paranoid_free(biggie_cksum);
+    paranoid_free(orig_cksum);
+    paranoid_free(tmp);
     paranoid_free(slice_fnam);
     return (retval);
@@ -692 +739 @@
  * Verify all afioballs from the opened tape/CD stream.
  * @param bkpinfo The backup information structure. Fields used:
+ * - @c bkpinfo->restore_path
  * - @c bkpinfo->tmpdir
  *
@@ -706 +754 @@
 
     /*@ buffers ***************************************************** */
-    char *tmp = NULL;
+    char *tmp;
     char *fname;
     char *curr_xattr_list_fname;
@@ -715 +763 @@
 
     assert(bkpinfo != NULL);
+    malloc_string(tmp);
     malloc_string(fname);
     malloc_string(curr_xattr_list_fname);
@@ -767 +816 @@
             wrong_marker(BLK_START_AN_AFIO_OR_SLICE, ctrl_chr);
         }
-        mr_asprintf(tmp, "Verifying fileset #%ld", current_afioball_number);
+        sprintf(tmp, "Verifying fileset #%ld", current_afioball_number);
+        /*log_it(tmp); */
         update_progress_form(tmp);
-        mr_free(tmp);
-
         res = verify_an_afioball_from_stream(fname, size);
         if (res) {
-            log_to_screen("Afioball %ld differs from live filesystem", current_afioball_number);
+            sprintf(tmp, "Afioball %ld differs from live filesystem",
+                    current_afioball_number);
+            log_to_screen(tmp);
         }
         retval += res;
@@ -785 +835 @@
     log_msg(1, "All done with afioballs");
     close_progress_form();
+    paranoid_free(tmp);
     paranoid_free(fname);
     paranoid_free(curr_xattr_list_fname);
@@ -812 +863 @@
 
     /*@ buffers ******************************************************** */
-    char *orig_fname;
-    char *logical_fname = NULL;
-    char *comment = NULL;
-    char *curr_xattr_list_fname = NULL;
-    char *curr_acl_list_fname = NULL;
+    char *tmp;
+    char *orig_fname, *logical_fname;
+    char *comment;
+    char *curr_xattr_list_fname;
+    char *curr_acl_list_fname;
     /*@ pointers ******************************************************* */
     char *p;
@@ -824 +875 @@
 
     assert(bkpinfo != NULL);
+    malloc_string(tmp);
     malloc_string(orig_fname);
+    malloc_string(logical_fname);
+    malloc_string(comment);
     malloc_string(curr_xattr_list_fname);
     malloc_string(curr_acl_list_fname);
@@ -836 +890 @@
             bkpinfo->tmpdir);
     }
-    mr_asprintf(comment, "Verifying all bigfiles.");
+    sprintf(comment, "Verifying all bigfiles.");
     log_to_screen(comment);
+    sprintf(tmp, "%s/biggielist.txt", bkpinfo->tmpdir);
+//  noof_biggiefiles = count_lines_in_file (tmp); // pointless
     res = read_header_block_from_stream(&size, orig_fname, &ctrl_chr);
     if (ctrl_chr != BLK_START_BIGGIEFILES) {
@@ -855 +911 @@
                        "Please wait. This may take some time.", "",
                        noof_biggiefiles);
-    mr_free(comment);
-
     for (res = read_header_block_from_stream(&size, orig_fname, &ctrl_chr);
          ctrl_chr != BLK_STOP_BIGGIEFILES;
@@ -871 +925 @@
             p++;
         }
-        mr_asprintf(comment, "Verifying bigfile #%ld (%ld K)", current_biggiefile_number, (long) size >> 10);
+        sprintf(comment, "Verifying bigfile #%ld (%ld K)",
+                current_biggiefile_number, (long) size >> 10);
         update_progress_form(comment);
-        mr_free(comment);
-
-        if (bkpinfo->restore_path) {
-            mr_asprintf(logical_fname, "%s/%s", bkpinfo->restore_path, orig_fname);
-            res = verify_a_biggiefile_from_stream(logical_fname, size);
-            mr_free(logical_fname);
-            retval += res;
-        } else {
-            log_it("Unable to verify bigfile as restore_path is NULL");
-        }
-
+        sprintf(logical_fname, "%s/%s", bkpinfo->restore_path, orig_fname);
+        res =
+            verify_a_biggiefile_from_stream(logical_fname, size);
+        retval += res;
         current_biggiefile_number++;
         g_current_progress++;
@@ -889 +937 @@
     close_progress_form();
     paranoid_free(orig_fname);
+    paranoid_free(logical_fname);
     paranoid_free(curr_xattr_list_fname);
     paranoid_free(curr_acl_list_fname);
+    paranoid_free(comment);
+    paranoid_free(tmp);
     return (retval);
 }
@@ -900 +951 @@
  * Verify the USB device
  * @param bkpinfo The backup information structure. Fields used:
+ * - @c bkpinfo->isodir
  * - @c bkpinfo->media_device
  * - @c bkpinfo->tmpdir
@@ -929 +981 @@
     assert(bkpinfo != NULL);
 
-    if (bkpinfo->media_device == NULL) {
-        return(1);
-    }
-
     mr_asprintf(fname, "%s1", bkpinfo->media_device);
     if (is_this_device_mounted(fname)) {
@@ -984 +1032 @@
 #endif
     {
-        log_to_screen("%s failed; unable to unmount USB device\n", tmp1);
+        mr_asprintf(tmp, "%s failed; unable to unmount USB device\n", tmp1);
+        log_to_screen(tmp);
+        paranoid_free(tmp);
         retval++;
     } else {
         log_msg(2, "OK, I've unmounted the USB device\n");
     }
-    mr_free(tmp1);
-    mr_free(mountpoint);
+    paranoid_free(tmp1);
+    paranoid_free(mountpoint);
     return (retval);
 }
@@ -1016 +1066 @@
 
     /*@ buffers ******************************************************** */
-    char *mountpoint = NULL;
-    char *command = NULL;
-    char *tmp = NULL;
-    char *fname = NULL;
+    char *mountpoint;
+    char *command;
+    char *tmp;
+    char *fname;
 #ifdef __FreeBSD__
     char mdd[32];
@@ -1029 +1079 @@
 #endif
 
+    command = malloc(2000);
+    malloc_string(mountpoint);
+    malloc_string(tmp);
+    malloc_string(fname);
+
     assert(bkpinfo != NULL);
 
-    if (bkpinfo->media_device == NULL) {
-        return(1);
-    }
-
-    mr_asprintf(mountpoint, "%s/cdrom", bkpinfo->tmpdir);
-    if (((bkpinfo->isodir == NULL) && (bkpinfo->netfs_remote_dir == NULL)) || (bkpinfo->prefix == NULL)) {
-        fatal_error("No iso filename preparation possible");
-    }
-    if (bkpinfo->netfs_remote_dir) {
-        // NETFS
-        mr_asprintf(fname, "%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->netfs_remote_dir, bkpinfo->prefix, g_current_media_number);
-    } else {
-        // ISO
-        mr_asprintf(fname, "%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->prefix, g_current_media_number);
-    }
+    sprintf(mountpoint, "%s/cdrom", bkpinfo->tmpdir);
+    sprintf(fname, "%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->netfs_remote_dir,
+            bkpinfo->prefix, g_current_media_number);
 
     mkdir(mountpoint, 1777);
     sync();
     if (!does_file_exist(fname)) {
-        log_msg(2, "%s not found; assuming you backed up to CD; verifying CD...", fname);
+        sprintf(tmp,
+                "%s not found; assuming you backed up to CD; verifying CD...",
+                fname);
+        log_msg(2, tmp);
         if (bkpinfo->manual_cd_tray) {
             popup_and_OK("Please push CD tray closed.");
@@ -1056 +1102 @@
         if (find_and_mount_actual_cd(mountpoint)) {
             log_to_screen("failed to mount actual CD");
-            mr_free(mountpoint);
-            mr_free(fname);
             return (1);
         }
     } else {
-        log_msg(2, "%s found; verifying ISO...", fname);
+        sprintf(tmp, "%s found; verifying ISO...", fname);
 #ifdef __FreeBSD__
         ret = 0;
@@ -1067 +1111 @@
         mddevice = make_vn(fname);
         if (ret) {
-            log_to_screen("make_vn of %s failed; unable to verify ISO\n", fname);
-            mr_free(mountpoint);
-            mr_free(fname);
+            sprintf(tmp, "make_vn of %s failed; unable to verify ISO\n",
+                    fname);
+            log_to_screen(tmp);
             return (1);
         }
-        mr_asprintf(command, "mount_cd9660 %s %s", mddevice, mountpoint);
+        sprintf(command, "mount_cd9660 %s %s", mddevice, mountpoint);
 #else
-        mr_asprintf(command, "mount -o loop,ro -t iso9660 %s %s", fname, mountpoint);
+        sprintf(command, "mount -o loop,ro -t iso9660 %s %s", fname,
+                mountpoint);
 #endif
         if (run_program_and_log_output(command, FALSE)) {
-            log_to_screen("%s failed; unable to mount ISO image\n", command);
-            mr_free(mountpoint);
-            mr_free(command);
-            mr_free(fname);
+            sprintf(tmp, "%s failed; unable to mount ISO image\n",
+                    command);
+            log_to_screen(tmp);
             return (1);
         }
-        mr_free(command);
     }
     log_msg(2, "OK, I've mounted the ISO/CD\n");
-    mr_asprintf(tmp, "%s/archives/NOT-THE-LAST", mountpoint);
+    sprintf(tmp, "%s/archives/NOT-THE-LAST", mountpoint);
     if (!does_file_exist(tmp)) {
         log_msg
@@ -1098 +1141 @@
 */
     }
-    mr_free(tmp);
-
     verify_afioballs_on_CD(mountpoint);
     log_it("before verify_all_slices");
@@ -1106 +1147 @@
 #ifdef __FreeBSD__
     ret = 0;
-    mr_asprintf(command, "umount -d %s", mountpoint);
+    sprintf(command, "umount -d %s", mountpoint);
     ret += system(command);
     ret += kick_vn(mddevice);
-    if (ret) {
+    if (ret)
 #else
-    mr_asprintf(command, "umount -d %s", mountpoint);
-    if (system(command)) {
+    sprintf(command, "umount -d %s", mountpoint);
+    if (system(command))
 #endif
-        log_to_screen("%s failed; unable to unmount ISO image\n", command);
-
+    {
+        sprintf(tmp, "%s failed; unable to unmount ISO image\n", command);
+        log_to_screen(tmp);
         retval++;
     } else {
         log_msg(2, "OK, I've unmounted the ISO file\n");
     }
-    mr_free(mountpoint);
-    mr_free(command);
-
     if (!does_file_exist(fname)) {
-        mr_asprintf(command, "umount -d %s", bkpinfo->media_device);
+        sprintf(command, "umount -d %s", bkpinfo->media_device);
         run_program_and_log_output(command, 2);
-        mr_free(command);
-
-        if (!bkpinfo->please_dont_eject && eject_device(bkpinfo->media_device)) {
+        if (!bkpinfo->please_dont_eject
+            && eject_device(bkpinfo->media_device)) {
             log_msg(2, "Failed to eject CD-ROM drive");
         }
     }
-    mr_free(fname);
+    paranoid_free(command);
+    paranoid_free(mountpoint);
+    paranoid_free(tmp);
+    paranoid_free(fname);
     return (retval);
 }
@@ -1150 +1191 @@
 
     /*@ buffers ******************************************************** */
-    char *tmp = NULL;
-    char *changed_files_fname = NULL;
+    char tmp[MAX_STR_LEN];
+    char changed_files_fname[MAX_STR_LEN];
 
     /*@ long *********************************************************** */
@@ -1165 +1206 @@
     retval += verify_biggiefiles_from_stream();
 /* find the final blocks */
-    sync();
+    paranoid_system("sync");
     sleep(2);
     closein_tape();
 /* close tape; exit */
 //  fclose(g_tape_stream); <-- not needed; is handled by closein_tape()
-    mr_asprintf(tmp, "rm -f %s/biggies.changed %s/changed.files 2> /dev/null", bkpinfo->tmpdir, bkpinfo->tmpdir);
+    sprintf(tmp, "rm -f %s/biggies.changed %s/changed.files 2> /dev/null", bkpinfo->tmpdir, bkpinfo->tmpdir);
     paranoid_system(tmp);
-    mr_free(tmp);
-
-    mr_asprintf(changed_files_fname, "%s/changed.files", bkpinfo->tmpdir);
-    mr_asprintf(tmp, "grep -E '^%s:.*$' %s | cut -d'\"' -f2 | sort -u | awk '{print \"/\"$0;};' | tr -s '/' '/' | grep -v \"(total of\" | grep -v \"incheckentry.*xwait\" | grep -vE '^/afio:.*$' | grep -vE '^dev/.*$'  > %s", (bkpinfo->use_star) ? "star" : "afio", MONDO_LOGFILE, changed_files_fname);
+    sprintf(changed_files_fname, "%s/changed.files", bkpinfo->tmpdir);
+    sprintf(tmp,
+            "grep -E '^%s:.*$' %s | cut -d'\"' -f2 | sort -u | awk '{print \"/\"$0;};' | tr -s '/' '/' | grep -v \"(total of\" | grep -v \"incheckentry.*xwait\" | grep -vE '^/afio:.*$' | grep -vE '^dev/.*$'  > %s",
+            (bkpinfo->use_star) ? "star" : "afio", MONDO_LOGFILE, 
+            changed_files_fname);
     log_msg(2, "Running command to derive list of changed files");
     log_msg(2, tmp);
     if (system(tmp)) {
-        if (does_file_exist(changed_files_fname) && length_of_file(changed_files_fname) > 2) {
-            log_to_screen("Warning - unable to check logfile to derive list of changed files");
+        if (does_file_exist(changed_files_fname)
+            && length_of_file(changed_files_fname) > 2) {
+            log_to_screen
+                ("Warning - unable to check logfile to derive list of changed files");
         } else {
-            log_to_screen("No differences found. Therefore, no 'changed.files' text file.");
-        }
-    }
-    mr_free(tmp);
-
-    mr_asprintf(tmp, "cat %s/biggies.changed >> %s", bkpinfo->tmpdir, changed_files_fname);
+            log_to_screen
+                ("No differences found. Therefore, no 'changed.files' text file.");
+        }
+    }
+    sprintf(tmp, "cat %s/biggies.changed >> %s", bkpinfo->tmpdir, changed_files_fname);
     paranoid_system(tmp);
-    mr_free(tmp);
 
     diffs = count_lines_in_file(changed_files_fname);
     if (diffs > 0) {
-        mr_asprintf(tmp, "cp -f %s %s/changed.files", changed_files_fname, MONDO_CACHE);
+        sprintf(tmp, "cp -f %s %s/changed.files", changed_files_fname,
+                MONDO_CACHE);
         run_program_and_log_output(tmp, FALSE);
-        mr_free(tmp);
-
-        log_msg(0, "%ld files differed from live filesystem; type less %s or less %s/changed.files to see", diffs, changed_files_fname, MONDO_CACHE);
+        sprintf(tmp,
+                "%ld files differed from live filesystem; type less %s or less %s/changed.files to see",
+                diffs, changed_files_fname, MONDO_CACHE);
+        log_msg(0, tmp);
         log_to_screen("See "MONDO_CACHE"/changed.files for a list of nonmatching files.");
         log_to_screen("The files probably changed on filesystem, not on backup media.");
-    }
-    mr_free(changed_files_fname);
+        //      retval++;
+    }
     return (retval);
 }

branches/3.0/mondo/src/common/mondostructures.h

@@ -412 +412 @@
     bool use_gzip;
 
-/**
-   * If TRUE, then use @c lzma to compress data.
-   * This is used mainly in estimates. The backup/restore may or may
-   * not work if you do not set this. You should also set @p zip_exe
-   * and @p zip_suffix.
-   */
-    bool use_lzma;
+  /**
+   * A filename containing a list of extensions, one per line, to not
+   * compress. If this is set to "", afio will still exclude a set of well-known
+   * compressed files from compression, but biggiefiles that are compressed
+   * will be recompressed again.
+   */
+    char do_not_compress_these[MAX_STR_LEN / 2];
 
   /**
@@ -492 +492 @@
    */
     t_bkptype backup_media_type;
+//  bool blank_dvd_first;
 
   /**
@@ -505 +506 @@
    * If you do nothing, "/" will be used.
    */
-    char *include_paths;
+    char include_paths[MAX_STR_LEN*4];
 
   /**
@@ -559 +560 @@
    * address form. (Domain names will be resolved in post_param_configuration().)
    */
-    char *netfs_mount;
+    char netfs_mount[MAX_STR_LEN];
 
   /**
@@ -565 +566 @@
    * the backups in.
    */
-    char *netfs_remote_dir;
+    char netfs_remote_dir[MAX_STR_LEN];
 
   /**
@@ -673 +674 @@
    */
     bool expanded;
+};
+
+
+
+/**
+ * A structure to wrap a FIFO device for writing to a tape/CD stream.
+ * @bug Is this structure used (w/the move to a standalone @c buffer and all)?
+ */
+struct s_wrapfifo {
+        /**
+     * The device we write to or read from (a FIFO).
+     */
+    char public_device[MAX_STR_LEN / 4];
+
+        /**
+     * The actual device that data from the FIFO should be buffered and written to.
+     */
+    char private_device[MAX_STR_LEN / 4];
+
+        /**
+     * A buffer for holding data read from the FIFO.
+     */
+    char internal_buffer_IN_fifo[MAX_STR_LEN / 4];
+
+        /**
+     * A buffer for holding data to be written to the FIFO.
+     */
+    char internal_buffer_OUT_fifo[MAX_STR_LEN / 4];
+
+        /**
+     * If TRUE, then we're writing directly to the tape streamer; if FALSE, we're writing to the FIFO.
+     */
+    bool writing_to_private_device;
 };
 

branches/3.0/mondo/src/common/newt-specific.c

@@ -97 +97 @@
     extern int g_current_media_number;
     pid_t g_main_pid = 0;       ///< The PID of the main Mondo process.
-    long g_maximum_progress = 999L; ///< The maximum amount of progress (100%) for the currently opened progress form.
+    long g_maximum_progress = 999;  ///< The maximum amount of progress (100%) for the currently opened progress form.
     long g_current_progress = -999; ///< The current amount of progress (filelist #, etc.) for the currently opened progress form.
-    long g_start_time = 0L;     ///< The time (in seconds since the epoch) that the progress form was opened.
+    long g_start_time = 0;      ///< The time (in seconds since the epoch) that the progress form was opened.
     bool g_text_mode = TRUE;    ///< If FALSE, use a newt interface; if TRUE, use an ugly (but more compatible) dumb terminal interface.
+    char g_xmondo_stdin[MAX_NEWT_COMMENT_LEN],  ///< ... @bug Unneeded w/current XMondo.
+     g_xmondo_stdout[MAX_NEWT_COMMENT_LEN]; ///< .... @bug Unneeded w/current XMondo.
+    bool g_called_by_xmondo = FALSE;    ///< @bug Unneeded w/current XMondo.
     char *g_selfmounted_isodir; ///< Holds the NETFS mountpoint if mounted via mondoarchive.
 
 /* @} - end of globalGroup */
+
+//int g_fd_in=-1, g_fd_out=-1;
 
     void popup_and_OK(char *);
@@ -120 +125 @@
 
         /*@ buffers ********************************************************** */
-        int i = 0;
-        char *tmp = NULL;
+        int i;
+        char *p;
 
         assert_string_is_neither_NULL_nor_zerolength(prompt);
@@ -131 +136 @@
         }
         if (g_text_mode) {
+
+            char *tmp;
+            tmp = malloc(MAX_NEWT_COMMENT_LEN);
+
             while (1) {
-                sync();
-                printf("---promptdialogYN---1--- %s\n---promptdialogYN---Q--- [yes] [no] ---\n--> ", prompt);
-                mr_getline(tmp, stdin);
+                paranoid_system("sync");
+                printf
+                    ("---promptdialogYN---1--- %s\n---promptdialogYN---Q--- [yes] [no] ---\n--> ",
+                     prompt);
+                p= fgets(tmp, MAX_NEWT_COMMENT_LEN, stdin);
+                if (!p) {
+                    //FIXME
+                }
                 if (tmp[strlen(tmp) - 1] == '\n')
                     tmp[strlen(tmp) - 1] = '\0';
@@ -143 +157 @@
                 }
                 if (strstr("yesYES", tmp)) {
-                    mr_free(tmp);
+                    paranoid_free(tmp);
                     return (TRUE);
                 } else if (strstr("NOno", tmp)) {
-                    mr_free(tmp);
+                    paranoid_free(tmp);
                     return (FALSE);
                 } else {
-                    sync();
-                    printf("Please enter either YES or NO (or yes or no, or y or n, or...)\n");
+                    paranoid_system("sync");
+                    printf
+                        ("Please enter either YES or NO (or yes or no, or y or n, or...)\n");
                 }
             }
@@ -168 +183 @@
 
         /*@ buffer *********************************************************** */
-        char *tmp = NULL;
+        char *tmp;
+        char *p;
         int i;
 
@@ -177 +193 @@
             finish(1);
         }
-
+        tmp = malloc(MAX_NEWT_COMMENT_LEN);
         if (g_text_mode) {
-            sync();
-            printf("---promptdialogOKC---1--- %s\n---promptdialogOKC---Q--- [OK] [Cancel] ---\n--> ", prompt);
-            mr_getline(tmp, stdin);
+            paranoid_system("sync");
+            printf
+                ("---promptdialogOKC---1--- %s\n---promptdialogOKC---Q--- [OK] [Cancel] ---\n--> ",
+                 prompt);
+            p = fgets(tmp, MAX_NEWT_COMMENT_LEN, stdin);
+            if (!p) {
+                // FIXME
+            }
             if (tmp[strlen(tmp) - 1] == '\n')
                 tmp[strlen(tmp) - 1] = '\0';
@@ -190 +211 @@
             }
             if (strstr("okOKOkYESyes", tmp)) {
-                mr_free(tmp);
+                paranoid_free(tmp);
                 return (TRUE);
             } else {
-                mr_free(tmp);
+                paranoid_free(tmp);
                 return (FALSE);
             }
         } else {
+            paranoid_free(tmp);
             return (popup_with_buttons(prompt, " Okay ", "Cancel"));
         }
@@ -242 +264 @@
         }
         if (g_current_progress == -999) {
-            log_msg(2, "Trying to close the progress form when it ain't open!");
+            log_msg(2,
+                    "Trying to close the progress form when it ain't open!");
             return;
         }
@@ -278 +301 @@
         mr_asprintf(tmp1,"kill `%s`", tmp);
         run_program_and_log_output(tmp1, TRUE);
-        mr_free(tmp1);
-    }
-    mr_free(tmp);
+        paranoid_free(tmp1);
+    }
+    paranoid_free(tmp);
 }
 
@@ -289 +312 @@
  * @note This function never returns.
  */
-void fatal_error(char *error_string) {
-
+    void
+     fatal_error(char *error_string) {
         /*@ buffers ***************************************************** */
-        char *command = NULL;
+        char fatalstr[MAX_NEWT_COMMENT_LEN] =
+            "-------FATAL ERROR---------";
+        char *tmp;
+        char *command;
         static bool already_exiting = FALSE;
 
         /*@ end vars **************************************************** */
 
+        malloc_string(command);
+        tmp = malloc(MAX_NEWT_COMMENT_LEN);
         set_signals(FALSE);     // link to external func
         g_exiting = TRUE;
@@ -304 +332 @@
             log_msg(2, "mastermind %d is exiting", (int) getpid());
             kill(g_main_pid, SIGTERM);
+            paranoid_free(tmp);
             finish(1);
         }
@@ -311 +340 @@
                 log_msg(2, "non-m/m %d is exiting", (int) getpid());
                 kill(g_main_pid, SIGTERM);
+                paranoid_free(tmp);
                 finish(1);
             }
@@ -318 +348 @@
         if (already_exiting) {
             log_msg(3, "...I'm already exiting. Give me time, Julian!");
+            paranoid_free(tmp);
             finish(1);
         }
@@ -328 +359 @@
         kill_anything_like_this("ntfsclone");
         sync();
+        /*
+        sprintf(tmp, "umount %s", g_tmpfs_mountpt);
+        for (i = 0; i < 10 && run_program_and_log_output(tmp, 5); i++) {
+            log_msg(2, "Waiting for child processes to terminate");
+            sleep(1);
+            run_program_and_log_output(tmp, 5);
+        }
+        */
 
         if (chdir("/")) {
@@ -333 +372 @@
         }
         if (g_selfmounted_isodir) {
-            mr_asprintf(command, "umount -d %s", g_selfmounted_isodir);
+            sprintf(command, "umount -d %s", g_selfmounted_isodir);
             run_program_and_log_output(command, 5);
-            mr_free(command);
-            mr_asprintf(command, "rmdir %s", g_selfmounted_isodir);
+            sprintf(command, "rmdir %s", g_selfmounted_isodir);
             run_program_and_log_output(command, 5);
-            mr_free(command);
         }
 
         if (!g_text_mode) {
-            log_msg(0, "-------FATAL ERROR---------");
+            log_msg(0, fatalstr);
             log_msg(0, error_string);
+            //      popup_and_OK (error_string);
+            newtFinished();
         }
 
         printf("---FATALERROR--- %s\n", error_string);
-        printf("If you require technical support, please contact the mailing list.\n");
+        printf
+                ("If you require technical support, please contact the mailing list.\n");
         printf("See http://www.mondorescue.org for details.\n");
-        printf("The list's members can help you, if you attach that file to your e-mail.\n");
+        printf
+                ("The list's members can help you, if you attach that file to your e-mail.\n");
         printf("Log file: %s\n", MONDO_LOGFILE);
         printf("Mondo has aborted.\n");
@@ -355 +396 @@
             log_msg(3, "FYI - g_main_pid is blank");
         }
+        paranoid_free(tmp);
+        paranoid_free(command);
         finish(254);
     }
@@ -377 +420 @@
  * @note This function never returns.
  */
-void finish(int signal) {
-
+    void
+     finish(int signal) {
         char *command = NULL;
+
+        /*  if (signal==0) { popup_and_OK("Please press <enter> to quit."); } */
+
+        /* newtPopHelpLine(); */
 
         /*  Before removing dir, make sure we're out of them */
@@ -389 +436 @@
             mr_asprintf(command, "umount -d %s", g_selfmounted_isodir);
             run_program_and_log_output(command, 1);
-            mr_free(command);
-
+            paranoid_free(command);
             mr_asprintf(command, "rmdir %s", g_selfmounted_isodir);
             run_program_and_log_output(command, 1);
-            mr_free(command);
-        }
+            paranoid_free(command);
+        }
+        if (!g_text_mode) {
+            if (does_file_exist("/THIS-IS-A-RAMDISK")) {
+                log_msg(1, "Calling newtFinished()");
+                newtFinished();
+            } else {
+                log_msg(1, "Calling newtSuspend()");
+                newtSuspend();
+            }
+        }
+        printf("Execution run ended; result=%d\n", signal);
+        printf("Type 'less %s' to see the output log\n", MONDO_LOGFILE);
         if (bkpinfo->tmpdir) {
             log_msg(8,"tempdir is %s",bkpinfo->tmpdir);
@@ -419 +476 @@
         mr_free(bkpinfo->exclude_paths);
         mr_free(bkpinfo->subdir);
+
         /* Then free the structure */
         paranoid_free(bkpinfo);
-
         free_libmondo_global_strings();
         free_newt_stuff();
-        if (!g_text_mode) {
-            if (does_file_exist("/THIS-IS-A-RAMDISK")) {
-                log_msg(1, "Calling newtFinished()");
-                newtFinished();
-            } else {
-                log_msg(1, "Calling newtSuspend()");
-                newtSuspend();
-            }
-        }
-        printf("Execution run ended; result=%d\n", signal);
-        printf("Type 'less %s' to see the output log\n", MONDO_LOGFILE);
         exit(signal);
     }
+
+
+
 
 
@@ -445 +494 @@
  * @param grep_for_me If not "", then only give lines in @p filename that match this regular expression.
  */
-void log_file_end_to_screen(char *filename, char *grep_for_me) {
+    void
+     log_file_end_to_screen(char *filename, char *grep_for_me) {
 
         /*@ buffers ********************************************************** */
@@ -465 +515 @@
         }
         if (grep_for_me[0] != '\0') {
-            mr_asprintf(command, "grep '%s' %s | tail -n%d", grep_for_me, filename, g_noof_log_lines);
-        } else {
-            mr_asprintf(command, "tail -n%d %s", g_noof_log_lines, filename);
+            mr_asprintf(command, "grep '%s' %s | tail -n%d",
+                    grep_for_me, filename, g_noof_log_lines);
+        } else {
+            mr_asprintf(command, "tail -n%d %s", g_noof_log_lines,
+                    filename);
         }
         fin = popen(command, "r");
@@ -505 +557 @@
  * @note The message is also written to the logfile.
  */
-void log_to_screen(const char *fmt, ...) {
+    void
+     log_to_screen(const char *fmt, ...) {
 
         /*@ int ************************************************************** */
@@ -561 +614 @@
  * @param output The string to write.
  */
-void mvaddstr_and_log_it(int y, int x, char *output) {
-
+    void
+     mvaddstr_and_log_it(int y, int x, char *output) {
         assert_string_is_neither_NULL_nor_zerolength(output);
         log_msg(0, output);
@@ -580 +633 @@
  * @param ttl The title to use for the evalcall form.
  */
-void open_evalcall_form(char *ttl) {
+    void
+     open_evalcall_form(char *ttl) {
 
         /*@ buffers ********************************************************* */
-        char *tmp = NULL;
+        char *title;
+        char *tmp;
 
         /*@ initialize ****************************************************** */
         g_isoform_old_progress = -1;
         g_mysterious_dot_counter = 0;
+        malloc_string(title);
+        malloc_string(tmp);
 
         assert(ttl != NULL);
-        malloc_string(tmp);
-        strcpy(g_isoform_header_str, ttl);
+        strcpy(title, ttl);
+        strcpy(g_isoform_header_str, title);
+//  center_string (title, 80);
         if (g_text_mode) {
-            log_msg(0, ttl);
-        } else {
-            strcpy(tmp, ttl);
+            log_msg(0, title);
+        } else {
+            strcpy(tmp, title);
             center_string(tmp, 80);
             newtPushHelpLine(tmp);
@@ -606 +664 @@
             g_isoform_header = newtLabel(1, 1, g_isoform_header_str);
             g_isoform_scale = newtScale(3, 3, 34, 100);
-            newtCenteredWindow(40, 7, ttl);
+            //      newtOpenWindow (20, 6, 40, 7, title);      // "Please Wait");
+            newtCenteredWindow(40, 7, title);
             g_isoform_main = newtForm(NULL, NULL, 0);
             g_isoform_timeline = newtLabel(1, 5, "                    ");
@@ -618 +677 @@
         update_evalcall_form(0);
         paranoid_free(tmp);
+        paranoid_free(title);
     }
 
@@ -631 +691 @@
  * @param max_val The maximum amount of progress (number of filesets, etc.)
  */
-void open_progress_form(char *title, char *b1, char *b2, char *b3, long max_val) {
+    void
+     open_progress_form(char *title, char *b1, char *b2, char *b3,
+                        long max_val) {
 
         /*@ buffers ********************************************************* */
         char *b1c;
-        char *blurb1 = NULL;
-        char *blurb2 = NULL;
-        char *blurb3 = NULL;
+        char *blurb1;
+        char *blurb2;
+        char *blurb3;
 
         /*@ initialize ****************************************************** */
@@ -643 +705 @@
 
         malloc_string(b1c);
+        malloc_string(blurb1);
+        malloc_string(blurb2);
+        malloc_string(blurb3);
 
         assert(title != NULL);
@@ -649 +714 @@
         assert(b3 != NULL);
 
-        mr_asprintf(blurb1,  "%s", b1);
-        mr_asprintf(blurb2,  "%s", b2);
-        mr_asprintf(blurb3,  "%s", b3);
-
+        strcpy(blurb1, b1);
+        strcpy(blurb2, b2);
+        strcpy(blurb3, b3);
         strcpy(b1c, b1);
         center_string(b1c, 80);
@@ -673 +737 @@
             g_blurb2 = newtLabel(2, 2, blurb3);
             g_blurb3 = newtLabel(2, 4, blurb2);
+            //      newtOpenWindow (10, 4, 60, 11, title);
             newtCenteredWindow(60, 11, title);
-            g_scale = newtScale(3, 6, 54, (long long)g_maximum_progress);
+            g_scale = newtScale(3, 6, 54, g_maximum_progress);
             g_progressForm = newtForm(NULL, NULL, 0);
             g_percentline = newtLabel(10, 9, "                       ");
             g_timeline = newtLabel(10, 8, "                    ");
-            newtFormAddComponents(g_progressForm, g_percentline, g_timeline, g_scale, g_blurb1, g_blurb3, g_blurb2, NULL);
+            newtFormAddComponents(g_progressForm, g_percentline,
+                                  g_timeline, g_scale, g_blurb1, g_blurb3,
+                                  g_blurb2, NULL);
             newtPushHelpLine(b1c);
             newtDrawForm(g_progressForm);
@@ -685 +752 @@
         update_progress_form_full(blurb1, blurb2, blurb3);
         paranoid_free(b1c);
-        mr_free(blurb1);
-        mr_free(blurb2);
-        mr_free(blurb3);
+        paranoid_free(blurb1);
+        paranoid_free(blurb2);
+        paranoid_free(blurb3);
     }
 
@@ -694 +761 @@
  * @param prompt The message.
  */
-void popup_and_OK(char *prompt) {
-
+    void
+     popup_and_OK(char *prompt) {
         char ch;
 
@@ -702 +769 @@
         log_msg(0, prompt);
         if (g_text_mode) {
-            printf("---promptpopup---1--- %s\n---promptpopup---Q--- [OK] ---\n--> ", prompt);
+            printf
+                ("---promptpopup---1--- %s\n---promptpopup---Q--- [OK] ---\n--> ",
+                 prompt);
             while (((ch = getchar()) != '\n') && (ch != EOF));
         } else {
@@ -717 +786 @@
  * @return TRUE if the user pressed OK, FALSE if they pressed Cancel.
  */
-    bool popup_and_get_string(char *title, char *b, char *output, int maxsize) {
+    bool popup_and_get_string(char *title, char *b, char *output,
+                              int maxsize) {
 
         /*@ newt ************************************************************ */
@@ -731 +801 @@
 
         /*@ buffers ********************************************************** */
-        char *blurb = NULL;
+        char *blurb;
         char *p;
-        char *original_contents = NULL;
-
+        char *original_contents;
+
+        blurb = malloc(MAX_NEWT_COMMENT_LEN);
+        original_contents = malloc(MAX_NEWT_COMMENT_LEN);
         assert_string_is_neither_NULL_nor_zerolength(title);
         assert(b != NULL);
@@ -740 +812 @@
 
         if (g_text_mode) {
-            printf("---promptstring---1--- %s\n---promptstring---2--- %s\n---promptstring---Q---\n-->  ", title, b);
+            printf
+                ("---promptstring---1--- %s\n---promptstring---2--- %s\n---promptstring---Q---\n-->  ",
+                 title, b);
             p = fgets(output, maxsize, stdin);
             if (!p) {
@@ -747 +821 @@
             if (output[strlen(output) - 1] == '\n')
                 output[strlen(output) - 1] = '\0';
+            paranoid_free(blurb);
+            paranoid_free(original_contents);
             return (TRUE);
         }
-        
-        blurb = malloc(MAX_NEWT_COMMENT_LEN);
         strcpy(blurb, b);
         text = newtTextboxReflowed(2, 1, blurb, 48, 5, 5, 0);
-        mr_asprintf(original_contents, "%s", output);
+        strcpy(original_contents, output);
         output[0] = '\0';
-        type_here = newtEntry(2, newtTextboxGetNumLines(text) + 2, original_contents, 50,
+        type_here =
+            newtEntry(2, newtTextboxGetNumLines(text) + 2,
+                      original_contents, 50,
 #ifdef __cplusplus
                       0, NEWT_FLAG_RETURNEXIT
@@ -764 +840 @@
         b_1 = newtButton(6, newtTextboxGetNumLines(text) + 4, "  OK  ");
         b_2 = newtButton(18, newtTextboxGetNumLines(text) + 4, "Cancel");
+        //  newtOpenWindow (8, 5, 54, newtTextboxGetNumLines (text) + 9, title);
         newtCenteredWindow(54, newtTextboxGetNumLines(text) + 9, title);
         myForm = newtForm(NULL, NULL, 0);
@@ -774 +851 @@
         newtFormDestroy(myForm);
         newtPopWindow();
-        paranoid_free(blurb);
-
         if (b_res == b_2) {
             strcpy(output, original_contents);
-            mr_free(original_contents);
+            paranoid_free(blurb);
+            paranoid_free(original_contents);
             return (FALSE);
         } else {
-            mr_free(original_contents);
+            paranoid_free(blurb);
+            paranoid_free(original_contents);
             return (TRUE);
         }
@@ -794 +871 @@
  * @return TRUE if @p button1 was pushed, FALSE otherwise.
  */
-bool popup_with_buttons(char *p, char *button1, char *button2) {
+    bool popup_with_buttons(char *p, char *button1, char *button2) {
 
         /*@ buffers *********************************************************** */
-        char *prompt = NULL;
+        char *prompt;
+        char *q;
 
         /*@ newt ************************************************************** */
@@ -809 +887 @@
         assert(button1 != NULL);
         assert(button2 != NULL);
+        prompt = malloc(MAX_NEWT_COMMENT_LEN);
         if (g_text_mode) {
             if (strlen(button2) == 0) {
@@ -815 +894 @@
                 printf("%s (%s or %s) --> ", p, button1, button2);
             }
-            mr_getline(prompt, stdin);
-            while (strcmp(prompt, button1) && (strlen(button2) == 0 || strcmp(prompt, button2))) {
+            for (prompt[0] = '\0';
+                 strcmp(prompt, button1) && (strlen(button2) == 0
+                                          || strcmp(prompt, button2));) {
                 printf("--> ");
-                mr_free(prompt);
-                mr_getline(prompt, stdin);
+                q = fgets(prompt, MAX_NEWT_COMMENT_LEN, stdin);
+                if (!q) {
+                    // FIXME
+                }
             }
             if (!strcmp(prompt, button1)) {
-                mr_free(prompt);
+                paranoid_free(prompt);
                 return (TRUE);
             } else {
-                mr_free(prompt);
+                paranoid_free(prompt);
                 return (FALSE);
             }
         }
 
-        prompt = malloc(MAX_NEWT_COMMENT_LEN);
         strncpy(prompt, p, MAX_NEWT_COMMENT_LEN - 1);
         prompt[MAX_NEWT_COMMENT_LEN - 1] = '\0';
         text = newtTextboxReflowed(1, 1, prompt, 40, 5, 5, 0);
-        b_1 = newtButton(20 - ((button2[0] != '\0') ? strlen(button1) + 2 : strlen(button1) / 2), newtTextboxGetNumLines(text) + 3, button1);
+        b_1 =
+            newtButton(20 -
+                       ((button2[0] !=
+                         '\0') ? strlen(button1) +
+                        2 : strlen(button1) / 2),
+                       newtTextboxGetNumLines(text) + 3, button1);
         if (button2[0] != '\0') {
-            b_2 = newtButton(24, newtTextboxGetNumLines(text) + 3, button2);
+            b_2 =
+                newtButton(24, newtTextboxGetNumLines(text) + 3, button2);
         } else {
             b_2 = NULL;
         }
+        //  newtOpenWindow (25, 5, 46, newtTextboxGetNumLines (text) + 7, "Alert");
         newtCenteredWindow(46, newtTextboxGetNumLines(text) + 7, "Alert");
         myForm = newtForm(NULL, NULL, 0);
@@ -865 +953 @@
  * on the screen.
  */
-void refresh_log_screen() {
+    void
+     refresh_log_screen() {
 
         /*@ int *********************************************************** */
@@ -892 +981 @@
  * only allocate some memory.
  */
-void setup_newt_stuff() {
+    void
+     setup_newt_stuff() {
 
         /*@ int *********************************************************** */
@@ -901 +991 @@
             newtInit();
             newtCls();
-            newtPushHelpLine("Welcome to Mondo Rescue, by Dev Team and the Internet. All rights reversed.");
+            newtPushHelpLine
+                ("Welcome to Mondo Rescue, by Dev Team and the Internet. All rights reversed.");
+            /*  newtDrawRootText(28,0,"Welcome to Mondo Rescue"); */
             newtDrawRootText(18, 0, WELCOME_STRING);
             newtRefresh();
@@ -908 +1000 @@
         }
 
-        err_log_lines = (char **) mr_malloc(sizeof(char *) * g_noof_log_lines);
+        err_log_lines =
+            (char **) malloc(sizeof(char *) * g_noof_log_lines);
+        if (!err_log_lines) {
+            fatal_error("Out of memory");
+        }
 
         for (i = 0; i < g_noof_log_lines; i++) {
-            err_log_lines[i] = (char *) mr_malloc(MAX_NEWT_COMMENT_LEN);
+            err_log_lines[i] = (char *) malloc(MAX_NEWT_COMMENT_LEN);
+            if (!err_log_lines[i]) {
+                fatal_error("Out of memory");
+            }
         }
 
@@ -925 +1024 @@
  * @param denom The denomenator of the ratio.
  */
-void update_evalcall_form_ratio(int num, int denom) {
+    void
+     update_evalcall_form_ratio(int num, int denom) {
 
         /*@ long ************************************************************ */
-        long current_time = 0L;
-        long time_taken = 0L;
-        long time_total_est = 0L;
-        long time_remaining = 0L;
+        long current_time = 0;
+        long time_taken = 0;
+        long time_total_est = 0;
+        long time_remaining = 0;
 
         /*@ buffers ********************************************************** */
-        char *timeline_str = NULL;
+        char *timeline_str;
         char *pcline_str = NULL;
         char *taskprogress = NULL;
@@ -943 +1043 @@
         int j = 0;
 
+        malloc_string(timeline_str);
+        timeline_str[0] = '\0';
+//  log_it("update_eval_call_form called");
         if (num * 100 < denom) {
             percentage = 1;
@@ -955 +1058 @@
             time_remaining = time_total_est - time_taken;
         } else {
-            time_remaining = 0L;
+            time_remaining = 0;
         }
         if (!g_text_mode) {
@@ -966 +1069 @@
             || percentage > g_isoform_old_progress) {
             g_isoform_old_progress = percentage;
-            mr_asprintf(timeline_str, "%2ld:%02ld taken            %2ld:%02ld remaining", (long) time_taken / 60, (long) time_taken % 60, (long) time_remaining / 60, (long) time_remaining % 60);
+            sprintf(timeline_str,
+                    "%2ld:%02ld taken            %2ld:%02ld remaining",
+                    (long) time_taken / 60, (long) time_taken % 60, (long) time_remaining / 60,
+                    (long) time_remaining % 60);
             if (percentage < 3) {
                 mr_asprintf(pcline_str, " Working");
@@ -977 +1083 @@
                 mr_strcat(pcline_str, " %c", special_dot_char(g_mysterious_dot_counter));
             } else {
-                mr_asprintf(pcline_str, " %3d%% done              %3d%% to go", percentage, 100 - percentage);
+                mr_asprintf(pcline_str, " %3d%% done              %3d%% to go",
+                        percentage, 100 - percentage);
             }
             if (g_text_mode) {
@@ -988 +1095 @@
                 }
                 if (percentage >= 3) {
-                    mr_strcat(taskprogress, "] %3d%% done; %2ld:%02ld to go", percentage, (long) time_remaining / 60, (long) time_remaining % 60);
-                    printf("---evalcall---1--- %s\n", g_isoform_header_str);
+                    mr_strcat(taskprogress, "] %3d%% done; %2ld:%02ld to go", percentage,
+                            (long) time_remaining / 60, (long) time_remaining % 60);
+                    printf("---evalcall---1--- %s\n",
+                           g_isoform_header_str);
                     printf("---evalcall---2--- %s\n", taskprogress);
                     printf("---evalcall---E---\n");
                 }
-                mr_free(taskprogress);
+                paranoid_free(taskprogress);
             } else {
-                newtScaleSet(g_isoform_scale, (unsigned long long) percentage);
+                newtScaleSet(g_isoform_scale,
+                             (unsigned long long) percentage);
                 if (g_isoform_pcline) {
                     newtLabelSetText(g_isoform_pcline, pcline_str);
@@ -1003 +1113 @@
                 }
             }
-            mr_free(pcline_str);
-            mr_free(timeline_str);
+            paranoid_free(pcline_str);
         }
         if (!g_text_mode) {
+//      log_it("refreshing");
             newtDrawForm(g_isoform_main);
             newtRefresh();
         }
+        paranoid_free(timeline_str);
     }
 
@@ -1018 +1129 @@
  * @param curr The current amount of progress (percentage) in the evalcall form.
  */
-void update_evalcall_form(int curr) {
-
+    void
+     update_evalcall_form(int curr) {
         update_evalcall_form_ratio(curr, 100);
-}
+    }
 
 
@@ -1030 +1141 @@
  * @param blurb3 The new third line of the blurb; use @p g_blurb_str_2 (no, that's not a typo) to keep it the same.
  */
-void update_progress_form(char *blurb3) {
-
+    void
+     update_progress_form(char *blurb3) {
+        /*  log_it("update_progress_form --- called"); */
         if (g_current_progress == -999) {
+            /* log_it("You're trying to update progress form when it ain't open. Aww, that's OK. I'll let it go. It's a bit naughty but it's a nonfatal error. No prob, Bob."); */
             return;
         }
         strcpy(g_blurb_str_2, blurb3);
-        update_progress_form_full(g_blurb_str_1, g_blurb_str_2, g_blurb_str_3);
-}
+        update_progress_form_full(g_blurb_str_1, g_blurb_str_2,
+                                  g_blurb_str_3);
+    }
 
 
@@ -1046 +1160 @@
  * @param blurb3 The third line of the blurb. Use @p g_blurb_str_2 (no, that's not a typo either) to keep it the same.
  */
-void update_progress_form_full(char *blurb1, char *blurb2, char *blurb3) {
-
+    void
+     update_progress_form_full(char *blurb1, char *blurb2, char *blurb3) {
         /*@ long ***************************************************** */
         long current_time = 0L;
@@ -1059 +1173 @@
 
         /*@ buffers *************************************************** */
-        char *percentline_str = NULL;
-        char *timeline_str = NULL;
+        char *percentline_str;
+        char *timeline_str;
         char *taskprogress = NULL;
-
+        char *tmp;
+
+//  log_msg(1, "'%s' '%s' '%s'", blurb1, blurb2, blurb3);
+        percentline_str = malloc(MAX_NEWT_COMMENT_LEN);
+        timeline_str = malloc(MAX_NEWT_COMMENT_LEN);
+        malloc_string(tmp);
         if (!g_text_mode) {
             assert(blurb1 != NULL);
@@ -1070 +1189 @@
         }
 
+        percentline_str[0] = '\0';
+
         current_time = get_time();
         time_taken = current_time - g_start_time;
@@ -1076 +1197 @@
         } else {
             if (g_current_progress > g_maximum_progress) {
-                log_msg(0, "update_progress_form_full(%s,%s,%s) --- g_current_progress=%ld; g_maximum_progress=%ld", blurb1, blurb2, blurb3, g_current_progress, g_maximum_progress);
+                sprintf(tmp,
+                        "update_progress_form_full(%s,%s,%s) --- g_current_progress=%ld; g_maximum_progress=%ld",
+                        blurb1, blurb2, blurb3, g_current_progress,
+                        g_maximum_progress);
+                log_msg(0, tmp);
                 g_current_progress = g_maximum_progress;
             }
-            percentage = (int) ((g_current_progress * 100L) / g_maximum_progress);
+            percentage =
+                (int) ((g_current_progress * 100L) / g_maximum_progress);
         }
         if (percentage < 1) {
@@ -1088 +1214 @@
         }
         if (g_current_progress) {
-            time_total_est = time_taken * (long) g_maximum_progress / (long) g_current_progress;
+            time_total_est =
+                time_taken * (long) g_maximum_progress /
+                (long) (g_current_progress);
             time_remaining = time_total_est - time_taken;
         } else {
@@ -1094 +1222 @@
         }
         g_mysterious_dot_counter = (g_mysterious_dot_counter + 1) % 27;
+        sprintf(timeline_str,
+                "%2ld:%02ld taken               %2ld:%02ld remaining  ",
+                (long) time_taken / 60, time_taken % 60, time_remaining / 60,
+                time_remaining % 60);
+        sprintf(percentline_str, " %3d%% done                 %3d%% to go",
+                percentage, 100 - percentage);
+
         if (g_text_mode) {
             printf("---progress-form---1--- %s\n", blurb1);
@@ -1109 +1244 @@
                 log_msg(2, "percentage = %d", percentage);
             }
-            mr_strcat(taskprogress, "] %3d%% done; %2ld:%02ld to go", percentage, (long) time_remaining / 60, (long) time_remaining % 60);
+            mr_strcat(taskprogress, "] %3d%% done; %2ld:%02ld to go", percentage,
+                            (long) time_remaining / 60, (long) time_remaining % 60);
             printf("---progress-form---4--- %s\n", taskprogress);
             paranoid_free(taskprogress);
         } else {
-            mr_asprintf(timeline_str, "%2ld:%02ld taken               %2ld:%02ld remaining  ", (long) time_taken / 60, (long) time_taken % 60, (long) time_remaining / 60, (long) time_remaining % 60);
-            mr_asprintf(percentline_str, " %3d%% done                 %3d%% to go", percentage, 100 - percentage);
-
             center_string(blurb1, 54);
             center_string(blurb2, 54);
@@ -1132 +1265 @@
                 newtLabelSetText(g_timeline, timeline_str);
             }
-            mr_free(timeline_str);
-
             if (g_percentline) {
                 newtLabelSetText(g_percentline, percentline_str);
             }
-            mr_free(percentline_str);
-
             newtDrawForm(g_progressForm);
             newtRefresh();
         }
-    }
+        paranoid_free(percentline_str);
+        paranoid_free(timeline_str);
+        paranoid_free(tmp);
+    }
+
+
+
+
+
+
+
+
+
+
+
+
 
 
@@ -1153 +1297 @@
  * @return The backup type chosen, or @c none if the user chose "Exit to shell".
  */
-t_bkptype which_backup_media_type(bool restoring) {
+    t_bkptype which_backup_media_type(bool restoring) {
 
         /*@ char ************************************************************ */
@@ -1160 +1304 @@
 
         /*@ newt ************************************************************ */
-        char *title_sz = NULL;
-        char *minimsg_sz = NULL;
-        static t_bkptype possible_bkptypes[] = { none, cdr, cdrw, dvd, tape, cdstream, udev, netfs, iso };
-        static char *possible_responses[] = { "none", "cdr", "cdrw", "dvd", "tape", "cdstream", "udev", "netfs", "iso", NULL };
-        char *outstr = NULL;
+        char *title_sz;
+        char *minimsg_sz;
+        static t_bkptype possible_bkptypes[] =
+            { none, cdr, cdrw, dvd, tape, cdstream, udev, netfs, iso };
+        static char *possible_responses[] =
+            { "none", "cdr", "cdrw", "dvd", "tape", "cdstream", "udev",
+"netfs", "iso", NULL };
+        char *outstr;
+        char *p;
         t_bkptype backup_type;
         int i;
@@ -1179 +1327 @@
         newtComponent myForm;
 
+        title_sz = malloc(MAX_NEWT_COMMENT_LEN);
+        minimsg_sz = malloc(MAX_NEWT_COMMENT_LEN);
+        outstr = malloc(MAX_NEWT_COMMENT_LEN);
         if (g_text_mode) {
             for (backup_type = none; backup_type == none;) {
@@ -1187 +1338 @@
                 }
                 printf(")\n--> ");
-                mr_getline(outstr, stdin);
-                mr_strip_spaces(outstr);
+                p = fgets(outstr, MAX_NEWT_COMMENT_LEN, stdin);
+                if (!p) {
+                    // FIXME
+                }
+                strip_spaces(outstr);
                 for (i = 0; possible_responses[i]; i++) {
                     if (!strcmp(possible_responses[i], outstr)) {
@@ -1194 +1348 @@
                     }
                 }
-                mr_free(outstr);
-            }
+            }
+            paranoid_free(title_sz);
+            paranoid_free(minimsg_sz);
+            paranoid_free(outstr);
             return (backup_type);
         }
         newtDrawRootText(18, 0, WELCOME_STRING);
         if (restoring) {
-            mr_asprintf(title_sz, "Please choose the backup media from which you want to read data.");
-            mr_asprintf(minimsg_sz, "Read from:");
-        } else {
-            mr_asprintf(title_sz, "Please choose the backup media to which you want to archive data.");
-            mr_asprintf(minimsg_sz, "Backup to:");
+            strcpy(title_sz,
+                   "Please choose the backup media from which you want to read data.");
+            strcpy(minimsg_sz, "Read from:");
+        } else {
+            strcpy(title_sz,
+                   "Please choose the backup media to which you want to archive data.");
+            strcpy(minimsg_sz, "Backup to:");
         }
         newtPushHelpLine(title_sz);
+        //  newtOpenWindow (23, 3, 34, 17, minimsg_sz);
         newtCenteredWindow(34, 17, minimsg_sz);
         b1 = newtButton(1, 1, "CD-R disks ");
@@ -1240 +1399 @@
         }
         newtPopHelpLine();
-        mr_free(title_sz);
-        mr_free(minimsg_sz);
+        paranoid_free(title_sz);
+        paranoid_free(minimsg_sz);
+        paranoid_free(outstr);
         return (output);
     }
@@ -1263 +1423 @@
         newtComponent b2;
         newtComponent b3;
-        newtComponent b4;
+        //newtComponent b4;
         newtComponent b5;
         newtComponent b_res;
@@ -1275 +1435 @@
         b2 = newtButton(18, 1, "gzip");
         b3 = newtButton(4, 5, "lzo");
-        b4 = newtButton(18, 5, "lzma");
+        //b4 = newtButton(18, 5, "lzma");
         b5 = newtButton(4, 9, "         Exit        ");
         myForm = newtForm(NULL, NULL, 0);
@@ -1288 +1448 @@
         } else if (b_res == b3) {
             mr_asprintf(output, "%s", "lzo");
-        } else if (b_res == b4) {
-            mr_asprintf(output, "%s", "lzma");
+        //} else if (b_res == b4) {
+            //mr_asprintf(output, "%s", "lzma");
         }
         newtPopHelpLine();
@@ -1301 +1461 @@
  * @return The compression level (0-9) chosen, or -1 for "Exit".
  */
-int which_compression_level() {
+    int
+     which_compression_level() {
 
         /*@ char ************************************************************ */
@@ -1318 +1479 @@
 
         newtDrawRootText(18, 0, WELCOME_STRING);
-        newtPushHelpLine("   Please specify the level of compression that you want.");
+        newtPushHelpLine
+            ("   Please specify the level of compression that you want.");
+        //  newtOpenWindow (23, 3, 34, 13, "How much compression?");
         newtCenteredWindow(34, 13, "How much compression?");
         b1 = newtButton(4, 1, "Maximum (9)");
@@ -1355 +1518 @@
  * @param source_file The file containing a list of filenames to load into @p filelist.
  */
-int load_filelist_into_array(struct s_filelist *filelist, char *source_file) {
-
+    int load_filelist_into_array(struct s_filelist *filelist,
+                                 char *source_file) {
         int i;
         int j = 0;
         bool done;
-        char *tmp = NULL;
+        char *tmp;
+        char *p;
         char *tmp1 = NULL;
         FILE *fin, *fout;
@@ -1379 +1543 @@
         if (!(fout = fopen(tmp1, "a"))) {
             log_msg(2, "Can't write to %s", tmp1);
-            mr_free(tmp1);
             return(1);
             }
 
+        malloc_string(tmp);
         log_msg(2, "Loading %s", source_file);
-        for (filelist->entries = 0; filelist->entries <= ARBITRARY_MAXIMUM; ) {
-            mr_free(tmp);
+        for (filelist->entries = 0; filelist->entries <= ARBITRARY_MAXIMUM;
+             filelist->entries++) {
+          god_i_hate_gotos:
             if (feof(fin)) {
                 break;
             }
-            mr_getline(tmp, fin);
+            p = fgets(tmp, MAX_NEWT_COMMENT_LEN, fin);
+            if (!p) {
+                // FIXME
+            }
             i = (int) strlen(tmp);
             if (i < 2) {
-                continue;
+                goto god_i_hate_gotos;
             }
             if (tmp[i - 1] < 32) {
@@ -1398 +1566 @@
             }
             if (i < 2) {
-                continue;
+                goto god_i_hate_gotos;
             }
             if (!does_file_exist(tmp) && !feof(fin)) {
                 j++;
                 fprintf(fout, "%s\n", tmp);
-                continue;
-            }
-            filelist->el[filelist->entries].severity = severity_of_difference(tmp, NULL);
+
+                goto god_i_hate_gotos;
+            }
+            filelist->el[filelist->entries].severity =
+                severity_of_difference(tmp, NULL);
             strcpy(filelist->el[filelist->entries].filename, tmp);
             if (feof(fin)) {
                 break;
             }
-            filelist->entries++;
-        }
-        mr_free(tmp);
+        }
         paranoid_fclose(fin);
         paranoid_fclose(fout);
@@ -1418 +1586 @@
             log_to_screen("%d files listed in %s/changed.files have been deleted since backup was made\nand are referenced in %s", j, bkpinfo->tmpdir,tmp1);
         }
-        mr_free(tmp1);
+        paranoid_free(tmp1);
         if (filelist->entries >= ARBITRARY_MAXIMUM) {
             log_to_screen("Arbitrary limits suck, man!");
+            paranoid_free(tmp);
             return (1);
         }
@@ -1448 +1617 @@
             }
         }
+        paranoid_free(tmp);
         log_it("leaving");
         return (0);
     }
+
 
 
@@ -1459 +1630 @@
  * @note The returned value points to static storage that will be overwritten with each call.
  */
-char *filelist_entry_to_string(struct s_filelist_entry *flentry) {
+    char *filelist_entry_to_string(struct s_filelist_entry *flentry) {
         static char comment[100];
         char *tmp = NULL;
 
-        log_msg(8, "entering");
+        log_it("entering");
         assert(flentry != NULL);
         if (flentry->severity == 0) {
@@ -1477 +1648 @@
         mr_strcat(tmp, flentry->filename);
         strncpy(comment, tmp, 99);
-        mr_free(tmp);
+        paranoid_free(tmp);
 
         log_it("leaving");
         return (comment);
     }
+
+
+
 
 
@@ -1489 +1663 @@
  * @param source_file The file containing a list of changed files.
  */
-void popup_changelist_from_file(char *source_file) {
-
-        char *reason = NULL;
+    void popup_changelist_from_file(char *source_file) {
+        char *reason;
         newtComponent myForm;
         newtComponent bClose;
@@ -1512 +1685 @@
 
         /*@ buffers ********************************************************* */
-        char *tmp = NULL;
-        char *differ_sz = NULL;
+        char *tmp;
+        char *differ_sz;
 
         struct s_filelist *filelist;
+        malloc_string(reason);
+        tmp = malloc(5000);
+        malloc_string(differ_sz);
         assert_string_is_neither_NULL_nor_zerolength(source_file);
         if (g_text_mode) {
             log_msg(2, "Text mode. Therefore, no popup list.");
-            return;
+            goto free_to_go;
         }
         log_msg(2, "Examining file %s", source_file);
@@ -1526 +1702 @@
         if (lng < 1) {
             log_msg(2, "No lines in file. Therefore, no popup list.");
-            return;
+            paranoid_free(reason);
+            goto free_to_go;
         } else if (lng >= ARBITRARY_MAXIMUM) {
             log_msg(2, "Too many files differ for me to list.");
-            return;
+            goto free_to_go;
         }
 
@@ -1538 +1715 @@
 
         if (load_filelist_into_array(filelist, source_file)) {
-            log_msg(2, "Can't open %s; therefore, cannot popup list", source_file);
+            log_msg(2, "Can't open %s; therefore, cannot popup list",
+                    source_file);
+            paranoid_free(reason);
             return;
         }
-        log_msg(2, "%d files loaded into filelist array", filelist->entries);
+        log_msg(2, "%d files loaded into filelist array",
+                filelist->entries);
         for (i = 0; i < filelist->entries; i++) {
             keylist[i] = (void *) i;
@@ -1550 +1730 @@
                                    keylist[i]);
         }
-        mr_asprintf(differ_sz, "  %ld files differ. Hit 'Select' to pick a file. Hit 'Close' to quit the list.", i);
+        sprintf(differ_sz,
+                "  %ld files differ. Hit 'Select' to pick a file. Hit 'Close' to quit the list.",
+                i);
         newtPushHelpLine(differ_sz);
-        mr_free(differ_sz);
-
         bClose = newtCompactButton(10, 15, " Close  ");
         bSelect = newtCompactButton(30, 15, " Select ");
-        mr_asprintf(tmp, "%-10s               %-20s", "Priority", "Filename");
+        sprintf(tmp, "%-10s               %-20s", "Priority", "Filename");
         headerMsg = newtLabel(2, 1, tmp);
-        mr_free(tmp);
-
         newtOpenWindow(5, 4, 70, 16, "Non-matching files");
         myForm = newtForm(NULL, NULL, 0);
-        newtFormAddComponents(myForm, headerMsg, fileListbox, bClose, bSelect, NULL);
-
+        newtFormAddComponents(myForm, headerMsg, fileListbox, bClose,
+                              bSelect, NULL);
         while (!finished) {
             b_res = newtRunForm(myForm);
@@ -1578 +1756 @@
                     currline = i;
                     if (filelist->entries > 0) {
-                        malloc_string(reason);
-                        severity_of_difference(filelist->el[currline].  filename, &reason);
-                        mr_asprintf(tmp, "%s --- %s", filelist->el[currline].filename, reason);
-
+                        severity_of_difference(filelist->el[currline].
+                                               filename, reason);
+                        sprintf(tmp, "%s --- %s",
+                                filelist->el[currline].filename, reason);
                         popup_and_OK(tmp);
-                        mr_free(tmp);
-                        paranoid_free(reason);
                     }
                 }
@@ -1592 +1768 @@
         newtPopWindow();
         newtPopHelpLine();
+      free_to_go:
+        paranoid_free(reason);
+        paranoid_free(tmp);
+        paranoid_free(differ_sz);
         return;
     }

branches/3.0/mondo/src/include/my-stuff.h

@@ -77 +77 @@
  * The location where mindi media images are stored.
  */
-#define MINDI_CACHE_REL "var/cache/mindi"   /* Should be coherent with mindi */
-#define MINDI_CACHE "/"MINDI_CACHE_REL
+#define MINDI_CACHE "/var/cache/mindi"
 
 /**
@@ -89 +88 @@
  */
 #define MDSTAT_FILE "/proc/mdstat"
-
-#ifdef __FreeBSD__
-#define CMDLINE "/tmp/cmdline"
-#else
-// Default Linux
-#define CMDLINE "/proc/cmdline"
-#endif
 
 #undef assert

branches/3.0/mondo/src/lib/mr_err.c

@@ -16 +16 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include "mr_msg.h"
 
 /* Pointer to the right cleanup function provided by each main */
-extern void (*mr_cleanup)(int);
+extern void (*mr_cleanup)(void);
 
 /*
@@ -27 +26 @@
 
     if (mr_cleanup != NULL) {
-        mr_cleanup(errorcode);
+        mr_cleanup();
     }
     if (message != NULL) {
         fprintf(stderr,"%s\n",message);
     }
-    mr_msg_close();
     exit(errorcode);
 }