Changeset 3193 in MondoRescue for branches/3.2/mondo/src/mondorestore/mondorestore.c

Timestamp:

Sep 29, 2013, 9:31:34 AM (11 years ago)

Author:

Bruno Cornec

Message:

• Finish with backports from 3.1 for now. Still some work to do, but we will now make that version compile and work again and serve as a base

so the gettext patch can be added

File:

• branches/3.2/mondo/src/mondorestore/mondorestore.c (modified) (114 diffs)

branches/3.2/mondo/src/mondorestore/mondorestore.c

@@ -253 +253 @@
               struct raidlist_itself *raidlist)
 {
-    char c, *tmp;
+    char c;
+    char *tmp = NULL;
     int retval = 0;
 
@@ -260 +261 @@
     assert(mountlist != NULL);
     assert(raidlist != NULL);
-    malloc_string(tmp);
     log_it("pre wrm");
     c = which_restore_mode();
@@ -274 +274 @@
         }
         if (g_ISO_restore_mode) {
-            sprintf(tmp, "umount -d %s", bkpinfo->isodir);
+            mr_asprintf(tmp, "umount -d %s", bkpinfo->isodir);
             run_program_and_log_output(tmp, FALSE);
+            mr_free(tmp);
         }
         paranoid_MR_finish(0);
@@ -284 +285 @@
     if (bkpinfo->backup_media_type == iso) {
         if (iso_fiddly_bits((c == 'N') ? TRUE : FALSE)) {
-            log_msg(2, "catchall_mode --- iso_fiddly_bits returned w/ error");
+            log_msg(2,
+                    "catchall_mode --- iso_fiddly_bits returned w/ error");
             return (1);
         } else {
@@ -301 +303 @@
         retval += compare_mode(mountlist, raidlist);
     }
-    paranoid_free(tmp);
     return (retval);
 }
@@ -418 +419 @@
  * @return 0 for success, or the number of errors encountered.
  */
-int
-interactive_mode(struct mountlist_itself *mountlist,
-                 struct raidlist_itself *raidlist)
+int interactive_mode(struct mountlist_itself *mountlist, struct raidlist_itself *raidlist)
 {
     int retval = 0;
@@ -432 +431 @@
   /** needs malloc **********/
     char *tmp;
-    char *fstab_fname;
-    char *old_restpath;
+    char *p = NULL;
+    char *tmp1 = NULL;
+    char *fstab_fname = NULL;
+    char *old_restpath = NULL;
 
     struct s_node *filelist;
@@ -442 +443 @@
 
     malloc_string(tmp);
-    malloc_string(fstab_fname);
-    malloc_string(old_restpath);
     assert(bkpinfo != NULL);
     assert(mountlist != NULL);
@@ -451 +450 @@
 
     if (g_text_mode) {
-        if (!ask_me_yes_or_no
-            ("Interactive Mode + textonly = experimental! Proceed anyway?"))
-        {
+        if (!ask_me_yes_or_no("Interactive Mode + textonly = experimental! Proceed anyway?")) {
             fatal_error("Wise move.");
         }
@@ -463 +460 @@
     log_it("Done loading config file; resizing ML");
 
-#ifdef __FreeBSD__
-    if (strstr
-        (call_program_and_get_last_line_of_output("cat /tmp/cmdline"),
-         "noresize"))
-#else
-    if (strstr
-        (call_program_and_get_last_line_of_output("cat /proc/cmdline"),
-         "noresize"))
-#endif
-    {
+    mr_asprintf(tmp1, "%s", call_program_and_get_last_line_of_output("cat " CMDLINE);
+    if (strstr(tmp1, "noresize")) {
         log_msg(1, "Not resizing mountlist.");
     } else {
         resize_mountlist_proportionately_to_suit_new_drives(mountlist);
     }
+    mr_free(tmp1);
+
     for (done = FALSE; !done;) {
         log_it("About to edit mountlist");
         if (g_text_mode) {
             save_mountlist_to_disk(mountlist, g_mountlist_fname);
-            sprintf(tmp, "%s %s", find_my_editor(), g_mountlist_fname);
-            res = system(tmp);
+            mr_asprintf(tmp1, "%s %s", find_my_editor(), g_mountlist_fname);
+            res = system(tmp1);
+            mr_free(tmp1);
             load_mountlist(mountlist, g_mountlist_fname);
         } else {
@@ -571 +563 @@
     }
     /* restore */
-    if ((restore_all =
-         ask_me_yes_or_no("Do you want me to restore all of your data?")))
-    {
+    if ((restore_all = ask_me_yes_or_no("Do you want me to restore all of your data?"))) {
         log_msg(1, "Restoring all data");
         retval += restore_everything(NULL);
-    } else
-        if ((restore_all =
-             ask_me_yes_or_no
-             ("Do you want me to restore _some_ of your data?"))) {
-        strcpy(old_restpath, bkpinfo->restore_path);
+    } else if ((restore_all = ask_me_yes_or_no("Do you want me to restore _some_ of your data?"))) {
+        mr_asprintf(old_restpath, "%s", bkpinfo->restore_path);
         for (done = FALSE; !done;) {
             unlink("/tmp/filelist.full");
@@ -590 +577 @@
               gotos_suck:
                 strcpy(tmp, old_restpath);
-// (NB: %s is where your filesystem is mounted now, by default)", MNT_RESTORING);
+                // (NB: %s is where your filesystem is mounted now, by default)", MNT_RESTORING);
                 if (popup_and_get_string
                     ("Restore path", "Restore files to where?", tmp,
@@ -608 +595 @@
                     free_filelist(filelist);
                 }
-                if (!ask_me_yes_or_no
-                    ("Restore another subset of your backup?")) {
+                if (!ask_me_yes_or_no("Restore another subset of your backup?")) {
                     done = TRUE;
                 }
@@ -616 +602 @@
             }
         }
-        strcpy(old_restpath, bkpinfo->restore_path);
-    } else {
-        mvaddstr_and_log_it(g_currentY++,
-                            0,
-                            "User opted not to restore any data.                                  ");
+        mr_free(old_restpath);
+    } else {
+        mvaddstr_and_log_it(g_currentY++, 0, "User opted not to restore any data.                                  ");
     }
     if (retval) {
-        mvaddstr_and_log_it(g_currentY++,
-                            0,
-                            "Errors occurred during the restore phase.            ");
+        mvaddstr_and_log_it(g_currentY++, 0, "Errors occurred during the restore phase.            ");
     }
 
@@ -647 +629 @@
                             "Using tune2fs/tune4fs to identify your ext2,3,4 partitions");
         if (does_file_exist("/tmp/fstab.new")) {
-            strcpy(fstab_fname, "/tmp/fstab.new");
+            mr_asprintf(fstab_fname, "/tmp/fstab.new");
         } else {
-            strcpy(fstab_fname, "/tmp/fstab");
-        }
-        sprintf(tmp,
-                "label-partitions-as-necessary %s < %s >> %s 2>> %s",
-                g_mountlist_fname, fstab_fname, MONDO_LOGFILE,
-                MONDO_LOGFILE);
-        res = system(tmp);
+            mr_asprintf(fstab_fname, "/tmp/fstab");
+        }
+        mr_asprintf(tmp1, "label-partitions-as-necessary %s < %s >> %s 2>> %s", g_mountlist_fname, fstab_fname, MONDO_LOGFILE, MONDO_LOGFILE);
+        mr_free(fstab_fname);
+
+        res = system(tmp1);
+        mr_free(tmp1);
         if (res) {
             log_to_screen
@@ -674 +656 @@
   end_of_func:
     paranoid_free(tmp);
-    paranoid_free(fstab_fname);
-    paranoid_free(old_restpath);
     log_it("Leaving interactive_mode()");
     return (retval);
@@ -759 +739 @@
     int retval = 0;
     int res = 0;
-  /** malloc **/
-    char tmp[MAX_STR_LEN];
+    char *tmp = NULL;
+    char *tmp1 = NULL;
     char *flaws_str = NULL;
 
@@ -772 +752 @@
     load_mountlist(mountlist, g_mountlist_fname);   // in case read_cfg_file_into_bkpinfo updated the mountlist
 #ifdef __FreeBSD__
-    if (strstr
-        (call_program_and_get_last_line_of_output("cat /tmp/cmdline"),
-         "noresize"))
+    if (strstr(call_program_and_get_last_line_of_output("cat /tmp/cmdline"), "noresize"))
 #else
-    if (strstr
-        (call_program_and_get_last_line_of_output("cat /proc/cmdline"),
-         "noresize"))
+    if (strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "noresize"))
 #endif
     {
@@ -812 +788 @@
             twenty_seconds_til_yikes();
             g_fprep = fopen("/tmp/prep.sh", "w");
-#ifdef __FreeBSD__
-            if (strstr
-                (call_program_and_get_last_line_of_output
-                 ("cat /tmp/cmdline"), "nopart"))
-#else
-            if (strstr
-                (call_program_and_get_last_line_of_output
-                 ("cat /proc/cmdline"), "nopart"))
-#endif
-            {
-                log_msg(2,
-                        "Not partitioning drives due to 'nopart' option.");
+            mr_asprintf(tmp1, "%s", call_program_and_get_last_line_of_output("cat " CMDLINE,TRUE));
+            if (strstr(tmp1, "nopart")) {
+                log_msg(2, "Not partitioning drives due to 'nopart' option.");
                 res = 0;
             } else {
                 res = partition_everything(mountlist);
                 if (res) {
-                    log_to_screen
-                        ("Warning. Errors occurred during partitioning.");
+                    log_to_screen("Warning. Errors occurred during partitioning.");
                     res = 0;
                 }
             }
+            mr_free(tmp1);
+
             retval += res;
             if (!res) {
                 log_to_screen("Preparing to format your disk(s)");
                 sleep(1);
-                paranoid_system("sync");
+                sync();
                 log_to_screen("Please wait. This may take a few minutes.");
                 res += format_everything(mountlist, FALSE, raidlist);
@@ -880 +848 @@
                         "Using tune2fs/tune4fs to identify your ext2,3,4 partitions");
 
-    sprintf(tmp, "label-partitions-as-necessary %s < /tmp/fstab >> %s 2>> %s", g_mountlist_fname, MONDO_LOGFILE, MONDO_LOGFILE);
+    mr_asprintf(tmp1, "label-partitions-as-necessary %s < /tmp/fstab >> %s 2>> %s", MINDI_CACHE"/mountlist.txt", MONDO_LOGFILE, MONDO_LOGFILE);
     res = run_program_and_log_output(tmp, TRUE);
+    mr_free(tmp1);
     if (res) {
         log_to_screen("label-partitions-as-necessary returned an error");
@@ -891 +860 @@
 
   after_the_nuke:
+    mr_asprintf(tmp1, "%s", call_program_and_get_last_line_of_output("cat " CMDLINE,TRUE));
     if (retval) {
         log_to_screen("Errors occurred during the nuke phase.");
-    } else if (strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "RESTORE")) {
-        log_to_screen
-            ("PC was restored successfully. Thank you for using Mondo Rescue.");
-        log_to_screen
-            ("Please visit our website at http://www.mondorescue.org for more information.");
-    } else {
-        strcpy(tmp,"Mondo has restored your system.\n\nPlease wait for the command prompt. Then remove the backup media and reboot.\n\nPlease visit our website at http://www.mondorescue.org for more information.");
-            popup_and_OK(tmp);
-        log_to_screen
-          ("Mondo has restored your system. Please wait for the command prompt.");
-        log_to_screen
-            ("Then remove the backup media and reboot.");
-        log_to_screen
-            ("Please visit our website at http://www.mondorescue.org for more information.");
-    }
+    } else if (strstr(tmp1, "RESTORE")) {
+        log_to_screen("PC was restored successfully. Thank you for using Mondo Rescue.");
+        log_to_screen("Please visit our website at http://www.mondorescue.org for more information.");
+    } else {
+        mr_asprintf(tmp,"%s","Mondo has restored your system.\n\nPlease wait for the command prompt. Then remove the backup media and reboot.\n\nPlease visit our website at http://www.mondorescue.org for more information.");
+        popup_and_OK(tmp);
+        mr_free(tmp);
+        log_to_screen("Mondo has restored your system. Please wait for the command prompt.");
+        log_to_screen("Then remove the backup media and reboot.");
+        log_to_screen("Please visit our website at http://www.mondorescue.org for more information.");
+    }
+    mr_free(tmp1);
+
     g_I_have_just_nuked = TRUE;
     return (retval);
@@ -928 +896 @@
     int retval = 0;
 
-  /** malloc **/
-    char *old_restpath;
+    char *old_restpath = NULL;
 
     struct mountlist_itself *mountlist = NULL;
-//  static
     struct raidlist_itself *raidlist = NULL;
     struct s_node *filelist = NULL;
@@ -938 +904 @@
     log_msg(1, "restore_to_live_filesystem() - starting");
     assert(bkpinfo != NULL);
-    malloc_string(old_restpath);
     mountlist = malloc(sizeof(struct mountlist_itself));
     raidlist = malloc(sizeof(struct raidlist_itself));
@@ -974 +939 @@
     if (!g_restoring_live_from_netfs && (filelist = process_filelist_and_biggielist())) {
         save_filelist(filelist, "/tmp/selected-files.txt");
-        strcpy(old_restpath, bkpinfo->restore_path);
+        mr_asprintf(old_restpath, "%s", bkpinfo->restore_path);
         if (popup_and_get_string("Restore path",
                                  "Restore files to where? )",
@@ -986 +951 @@
         }
         strcpy(bkpinfo->restore_path, old_restpath);
+        mr_free(old_restpath);
     } else {
         if (filelist != NULL) {
@@ -1004 +970 @@
         eject_device(bkpinfo->media_device);
     }
-    paranoid_free(old_restpath);
     free(mountlist);
     free(raidlist);
@@ -1043 +1008 @@
 
   /** malloc ***/
-    char *checksum, *outfile_fname, *tmp, *bzip2_command,
-        *ntfsprog_command, *suffix, *sz_devfile;
+    char *checksum = NULL;
+    char *outfile_fname = NULL;
+    char *tmp = NULL;
+    char *bzip2_command = NULL;
+    char *suffix = NULL;
+    char *sz_devfile = NULL;
     char *bigblk;
     char *mds = NULL;
@@ -1051 +1020 @@
     long sliceno;
     long siz;
-    char ntfsprog_fifo[MAX_STR_LEN];
+    char *ntfsprog_fifo = NULL;
     char *file_to_openout = NULL;
     struct s_filename_and_lstat_info biggiestruct;
@@ -1059 +1028 @@
     int res = 0;
     int old_loglevel;
-    char sz_msg[MAX_STR_LEN];
     struct s_node *node;
 
@@ -1065 +1033 @@
     ubuf = &the_utime_buf;
     assert(bkpinfo != NULL);
-
-    malloc_string(checksum);
-    malloc_string(outfile_fname);
-    malloc_string(tmp);
-    malloc_string(bzip2_command);
-    malloc_string(ntfsprog_command);
-    malloc_string(suffix);
-    malloc_string(sz_devfile);
 
     pathname_of_last_file_restored[0] = '\0';
@@ -1092 +1052 @@
     paranoid_fclose(fin);
 
-    strcpy(checksum, biggiestruct.checksum);
-
+    mr_asprintf(checksum, "%s", biggiestruct.checksum);
     if (!checksum[0]) {
-        sprintf(tmp, "Warning - bigfile %ld does not have a checksum",
-                bigfileno + 1);
-        log_msg(3, tmp);
-    }
+        log_msg(3, "Warning - bigfile %ld does not have a checksum", bigfileno + 1);
+    }
+    mr_free(checksum);
 
     if (!strncmp(biggiestruct.filename, "/dev/", 5))    // Whether NTFS or not :)
     {
-        strcpy(outfile_fname, biggiestruct.filename);
-    } else {
-        sprintf(outfile_fname, "%s/%s", bkpinfo->restore_path,
-                biggiestruct.filename);
+        mr_asprintf(outfile_fname, "%s", biggiestruct.filename);
+    } else {
+        mr_asprintf(outfile_fname, "%s/%s", bkpinfo->restore_path, biggiestruct.filename);
     }
 
@@ -1112 +1069 @@
         node = find_string_at_node(filelist, biggiestruct.filename);
         if (!node) {
-            log_msg(0, "Skipping %s (name isn't in filelist)",
-                    biggiestruct.filename);
+            log_msg(0, "Skipping %s (name isn't in filelist)", biggiestruct.filename);
             pathname_of_last_file_restored[0] = '\0';
             return (0);
         } else if (!(node->selected)) {
-            log_msg(1, "Skipping %s (name isn't in biggielist subset)",
-                    biggiestruct.filename);
+            log_msg(1, "Skipping %s (name isn't in biggielist subset)", biggiestruct.filename);
             pathname_of_last_file_restored[0] = '\0';
             return (0);
         }
     }
+
     /* otherwise, continue */
-
     log_msg(1, "DEFINITELY restoring %s", biggiestruct.filename);
     if (biggiestruct.use_ntfsprog) {
         if (strncmp(biggiestruct.filename, "/dev/", 5)) {
-            log_msg(1,
-                    "I was in error when I set biggiestruct.use_ntfsprog to TRUE.");
+            log_msg(1, "I was in error when I set biggiestruct.use_ntfsprog to TRUE.");
             log_msg(1, "%s isn't even in /dev", biggiestruct.filename);
             biggiestruct.use_ntfsprog = FALSE;
@@ -1136 +1090 @@
 
     if (biggiestruct.use_ntfsprog)  // if it's an NTFS device
-//  if (!strncmp ( biggiestruct.filename, "/dev/", 5))
     {
         g_loglevel = 4;
         use_ntfsprog_hack = TRUE;
-        log_msg(2,
-                "Calling ntfsclone in background because %s is an NTFS /dev entry",
-                outfile_fname);
-        sprintf(sz_devfile, "/tmp/%d.%d.000", (int) (random() % 32768),
-                (int) (random() % 32768));
+        log_msg(2, "Calling ntfsclone in background because %s is an NTFS /dev entry", outfile_fname);
+        mr_asprintf(sz_devfile, "/tmp/%d.%d.000", (int) (random() % 32768), (int) (random() % 32768));
         mkfifo(sz_devfile, 0x770);
-        strcpy(ntfsprog_fifo, sz_devfile);
+        mr_asprintf(ntfsprog_fifo, "%s", sz_devfile);
+        mr_free(sz_devfile);
         file_to_openout = ntfsprog_fifo;
         switch (pid = fork()) {
@@ -1152 +1103 @@
             fatal_error("Fork failure");
         case 0:
-            log_msg(3,
-                    "CHILD - fip - calling feed_outfrom_ntfsprog(%s, %s)",
-                    biggiestruct.filename, ntfsprog_fifo);
-            res =
-                feed_outfrom_ntfsprog(biggiestruct.filename,
-                                       ntfsprog_fifo);
-//          log_msg(3, "CHILD - fip - exiting");
+            log_msg(3, "CHILD - fip - calling feed_outfrom_ntfsprog(%s, %s)", biggiestruct.filename, ntfsprog_fifo);
+            res = feed_outfrom_ntfsprog(biggiestruct.filename, ntfsprog_fifo);
+            mr_free(ntfsprog_fifo);
             exit(res);
             break;
         default:
-            log_msg(3,
-                    "feed_into_ntfsprog() called in background --- pid=%ld",
-                    (long int) (pid));
-        }
+            log_msg(3, "feed_into_ntfsprog() called in background --- pid=%ld", (long int) (pid));
+        }
+        mr_free(ntfsprog_fifo);
     } else {
         use_ntfsprog_hack = FALSE;
-        ntfsprog_fifo[0] = '\0';
         file_to_openout = outfile_fname;
         if (!does_file_exist(outfile_fname))    // yes, it looks weird with the '!' but it's correct that way
@@ -1176 +1121 @@
     }
 
-    sprintf(tmp, "Reassembling big file %ld (%s)", bigfileno + 1,
-            outfile_fname);
-    log_msg(2, tmp);
+    log_msg(2, "Reassembling big file %ld (%s)", bigfileno + 1, outfile_fname);
 
     /*
@@ -1186 +1129 @@
      */
 
-    strncpy(pathname_of_last_file_restored, biggiestruct.filename,
-            MAX_STR_LEN - 1);
+    strncpy(pathname_of_last_file_restored, biggiestruct.filename, MAX_STR_LEN - 1);
     pathname_of_last_file_restored[MAX_STR_LEN - 1] = '\0';
 
@@ -1198 +1140 @@
 
     for (sliceno = 1, finished = FALSE; !finished;) {
-        if (!does_file_exist
-            (slice_fname(bigfileno, sliceno, ARCHIVES_PATH, ""))
-            &&
-            !does_file_exist(slice_fname
-                             (bigfileno, sliceno, ARCHIVES_PATH, "lzo"))
-            &&
-            !does_file_exist(slice_fname
-                             (bigfileno, sliceno, ARCHIVES_PATH, "gz"))
-            &&
-            !does_file_exist(slice_fname
-                             (bigfileno, sliceno, ARCHIVES_PATH, "bz2"))) {
-            log_msg(3,
-                    "Cannot find a data slice or terminator slice on CD %d",
-                    g_current_media_number);
+        if (!does_file_exist(slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "")) &&
+            !does_file_exist(slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "lzo")) &&
+            !does_file_exist(slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "gz")) &&
+            !does_file_exist(slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "lzma")) &&
+            !does_file_exist(slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "bz2"))) {
+            log_msg(3, "Cannot find a data slice or terminator slice on CD %d", g_current_media_number);
             g_current_media_number++;
             mds = media_descriptor_string(bkpinfo->backup_media_type);
-            sprintf(tmp,
-                    "Asking for %s #%d so that I may read slice #%ld\n", mds, 
-                    g_current_media_number, sliceno);
-            log_msg(2, tmp);
-            sprintf(tmp, "Restoring from %s #%d", mds, g_current_media_number);
+            log_msg(2, "Asking for %s #%d so that I may read slice #%ld\n", mds, g_current_media_number, sliceno);
             mr_free(mds);
 
-            log_to_screen(tmp);
+            log_to_screen("Restoring from %s #%d", mds, g_current_media_number);
+
             insist_on_this_cd_number(g_current_media_number);
             log_to_screen("Continuing to restore.");
         } else {
-            strcpy(tmp,
-                   slice_fname(bigfileno, sliceno, ARCHIVES_PATH, ""));
+            mr_asprintf(tmp, "%s", slice_fname(bigfileno, sliceno, ARCHIVES_PATH, ""));
             if (does_file_exist(tmp) && length_of_file(tmp) == 0) {
-                log_msg(2,
-                        "End of bigfile # %ld (slice %ld is the terminator)",
-                        bigfileno + 1, sliceno);
+                log_msg(2, "End of bigfile # %ld (slice %ld is the terminator)", bigfileno + 1, sliceno);
                 finished = TRUE;
+                mr_free(tmp);
                 continue;
             } else {
-                if (does_file_exist
-                    (slice_fname
-                     (bigfileno, sliceno, ARCHIVES_PATH, "lzo"))) {
-                    strcpy(bzip2_command, "lzop");
-                    strcpy(suffix, "lzo");
+                if (does_file_exist(slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "lzo"))) {
+                    mr_asprintf(bzip2_command, "lzop");
+                    mr_asprintf(suffix, "lzo");
                 } else
-                    if (does_file_exist
-                        (slice_fname
-                         (bigfileno, sliceno, ARCHIVES_PATH, "gz"))) {
-                    strcpy(bzip2_command, "gzip");
-                    strcpy(suffix, "gz");
+                    if (does_file_exist(slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "gz"))) {
+                    mr_asprintf(bzip2_command, "gzip");
+                    mr_asprintf(suffix, "gz");
                 } else
-                    if (does_file_exist
-                        (slice_fname
-                         (bigfileno, sliceno, ARCHIVES_PATH, "bz2"))) {
-                    strcpy(bzip2_command, "bzip2");
-                    strcpy(suffix, "bz2");
+                    if (does_file_exist(slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "lzma"))) {
+                    mr_asprintf(bzip2_command, "lzma");
+                    mr_asprintf(suffix, "lzma");
                 } else
-                    if (does_file_exist
-                        (slice_fname
-                         (bigfileno, sliceno, ARCHIVES_PATH, ""))) {
-                    strcpy(bzip2_command, "");
-                    strcpy(suffix, "");
+                    if (does_file_exist(slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "bz2"))) {
+                    mr_asprintf(bzip2_command, "bzip2");
+                    mr_asprintf(suffix, "bz2");
+                } else
+                    if (does_file_exist(slice_fname(bigfileno, sliceno, ARCHIVES_PATH, ""))) {
+                    mr_asprintf(bzip2_command, "");
+                    mr_asprintf(suffix, "");
                 } else {
                     log_to_screen("OK, that's pretty fsck0red...");
+                    mr_free(tmp);
                     return (1);
                 }
             }
-            if (bzip2_command[0] != '\0') {
-                sprintf(bzip2_command + strlen(bzip2_command),
-                        " -dc %s 2>> %s",
-                        slice_fname(bigfileno, sliceno, ARCHIVES_PATH,
-                                    suffix), MONDO_LOGFILE);
+            mr_free(tmp);
+            if (bzip2_command != NULL) {
+                mr_strcat(bzip2_command, " -dc %s 2>> %s", slice_fname(bigfileno, sliceno, ARCHIVES_PATH, suffix), MONDO_LOGFILE);
             } else {
-                sprintf(bzip2_command, "cat %s 2>> %s",
-                        slice_fname(bigfileno, sliceno, ARCHIVES_PATH,
-                                    suffix), MONDO_LOGFILE);
-            }
+                mr_asprintf(bzip2_command, "cat %s 2>> %s", slice_fname(bigfileno, sliceno, ARCHIVES_PATH, suffix), MONDO_LOGFILE);
+            }
+            mr_free(suffix);
+
             mds = media_descriptor_string(bkpinfo->backup_media_type);
-            sprintf(tmp, "Working on %s #%d, file #%ld, slice #%ld    ", mds,
-                    g_current_media_number, bigfileno + 1, sliceno);
+            mr_asprintf(tmp, "Working on %s #%d, file #%ld, slice #%ld    ", mds, g_current_media_number, bigfileno + 1, sliceno);
             mr_free(mds);
             log_msg(2, tmp);
@@ -1284 +1207 @@
                 update_progress_form(tmp);
             }
+            mr_free(tmp);
+
             if (!(fbzip2 = popen(bzip2_command, "r"))) {
                 fatal_error("Can't run popen command");
             }
+            mr_free(bzip2_command);
+
             while (!feof(fbzip2)) {
                 siz = fread(bigblk, 1, TAPE_BLOCK_SIZE, fbzip2);
                 if (siz > 0) {
-                    sprintf(sz_msg, "Read %ld from fbzip2", siz);
                     siz = fwrite(bigblk, 1, siz, fout);
-                    sprintf(sz_msg + strlen(sz_msg),
-                            "; written %ld to fout", siz);
-//        log_msg(2. sz_msg);
                 }
             }
@@ -1304 +1227 @@
         }
     }
-/*
-  memset(bigblk, TAPE_BLOCK_SIZE, 1); // This all looks very fishy...
-  fwrite( bigblk, 1, TAPE_BLOCK_SIZE, fout);
-  fwrite( bigblk, 1, TAPE_BLOCK_SIZE, fout);
-  fwrite( bigblk, 1, TAPE_BLOCK_SIZE, fout);
-  fwrite( bigblk, 1, TAPE_BLOCK_SIZE, fout);
-*/
     paranoid_fclose(fout);
     g_loglevel = old_loglevel;
@@ -1316 +1232 @@
     if (use_ntfsprog_hack) {
         log_msg(3, "Waiting for ntfsclone to finish");
-        sprintf(tmp,
-                " ps | grep \" ntfsclone \" | grep -v grep > /dev/null 2> /dev/null");
+        mr_asprintf(tmp, " ps | grep \" ntfsclone \" | grep -v grep > /dev/null 2> /dev/null");
         while (system(tmp) == 0) {
             sleep(1);
         }
+        mr_free(tmp);
         log_it("OK, ntfsclone has really finished");
     }
 
     if (strcmp(outfile_fname, "/dev/null")) {
-        if (chown(outfile_fname, biggiestruct.properties.st_uid,
-              biggiestruct.properties.st_gid)) {
+        if (chown(outfile_fname, biggiestruct.properties.st_uid, biggiestruct.properties.st_gid)) {
             // FIXME
         }
@@ -1334 +1249 @@
         utime(outfile_fname, ubuf);
     }
+    mr_free(outfile_fname);
     paranoid_free(bigblk);
-    paranoid_free(checksum);
-    paranoid_free(outfile_fname);
-    paranoid_free(tmp);
-    paranoid_free(bzip2_command);
-    paranoid_free(ntfsprog_command);
-    paranoid_free(suffix);
-    paranoid_free(sz_devfile);
 
     return (retval);
@@ -1376 +1285 @@
 
   /** mallocs ********/
-    char *tmp;
-    char *command;
-    char *outfile_fname;
-    char *ntfsprog_command;
-    char *sz_devfile;
-    char *ntfsprog_fifo;
+    char *tmp = NULL;
+    char *tmp1 = NULL;
+    char *command = NULL;
+    char *outfile_fname = NULL;
+    char *sz_devfile = NULL;
+    char *ntfsprog_fifo = NULL;
     char *file_to_openout = NULL;
 
@@ -1400 +1309 @@
 
     malloc_string(tmp);
-    malloc_string(ntfsprog_fifo);
-    malloc_string(outfile_fname);
-    malloc_string(command);
-    malloc_string(sz_devfile);
-    malloc_string(ntfsprog_command);
     old_loglevel = g_loglevel;
     assert(bkpinfo != NULL);
@@ -1455 +1359 @@
     if (use_ntfsprog) {
         g_loglevel = 4;
-        strcpy(outfile_fname, orig_bf_fname);
+        mr_asprintf(outfile_fname, "%s", orig_bf_fname);
         use_ntfsprog_hack = TRUE;
-        log_msg(2,
-                "Calling ntfsclone in background because %s is a /dev entry",
-                outfile_fname);
-        sprintf(sz_devfile, "%s/%d.%d.000", 
-                bkpinfo->tmpdir,
-                (int) (random() % 32768),
-                (int) (random() % 32768));
+        log_msg(2, "Calling ntfsclone in background because %s is a /dev entry", outfile_fname);
+        mr_asprintf(sz_devfile, "%s/%d.%d.000", bkpinfo->tmpdir, (int) (random() % 32768), (int) (random() % 32768));
         mkfifo(sz_devfile, 0x770);
-        strcpy(ntfsprog_fifo, sz_devfile);
+        mr_asprintf(ntfsprog_fifo, "%s", sz_devfile);
+        mr_free(sz_devfile);
+
         file_to_openout = ntfsprog_fifo;
         switch (pid = fork()) {
@@ -1471 +1372 @@
             fatal_error("Fork failure");
         case 0:
-            log_msg(3,
-                    "CHILD - fip - calling feed_outfrom_ntfsprog(%s, %s)",
-                    outfile_fname, ntfsprog_fifo);
-            res =
-                feed_outfrom_ntfsprog(outfile_fname, ntfsprog_fifo);
-//          log_msg(3, "CHILD - fip - exiting");
+            log_msg(3, "CHILD - fip - calling feed_outfrom_ntfsprog(%s, %s)", outfile_fname, ntfsprog_fifo);
+            res = feed_outfrom_ntfsprog(outfile_fname, ntfsprog_fifo);
+            mr_free(ntfsprog_fifo);
             exit(res);
             break;
         default:
-            log_msg(3,
-                    "feed_into_ntfsprog() called in background --- pid=%ld",
-                    (long int) (pid));
-        }
-    } else {
-        if (!strncmp(orig_bf_fname, "/dev/", 5))    // non-NTFS partition
-        {
-            strcpy(outfile_fname, orig_bf_fname);
-        } else                  // biggiefile
-        {
-            sprintf(outfile_fname, "%s/%s", bkpinfo->restore_path,
-                    orig_bf_fname);
+            log_msg(3, "feed_into_ntfsprog() called in background --- pid=%ld", (long int) (pid));
+        }
+        mr_free(ntfsprog_fifo);
+    } else {
+        if (!strncmp(orig_bf_fname, "/dev/", 5))    {
+            // non-NTFS partition
+            mr_asprintf(outfile_fname, "%s", orig_bf_fname);
+        } else {
+            // biggiefile
+            mr_asprintf(outfile_fname, "%s/%s", bkpinfo->restore_path, orig_bf_fname);
         }
         use_ntfsprog_hack = FALSE;
-        ntfsprog_fifo[0] = '\0';
         file_to_openout = outfile_fname;
         if (!does_file_exist(outfile_fname))    // yes, it looks weird with the '!' but it's correct that way
@@ -1500 +1395 @@
             make_hole_for_file(outfile_fname);
         }
-        sprintf(tmp, "Reassembling big file %ld (%s)",
-                biggiefile_number + 1, orig_bf_fname);
-        log_msg(2, tmp);
+        log_msg(2, "Reassembling big file %ld (%s)", biggiefile_number + 1, orig_bf_fname);
     }
 
     if (dummy_restore) {
-        sprintf(outfile_fname, "/dev/null");
+        mr_free(outfile_fname);
+        mr_asprintf(outfile_fname, "/dev/null");
     }
 
     if (!bkpinfo->zip_exe[0]) {
-        sprintf(command, "cat > \"%s\"", file_to_openout);
-    } else {
-        sprintf(command, "%s -dc > \"%s\" 2>> %s", bkpinfo->zip_exe,
-                file_to_openout, MONDO_LOGFILE);
+        mr_asprintf(command, "cat > \"%s\"", file_to_openout);
+    } else {
+        mr_asprintf(command, "%s -dc > \"%s\" 2>> %s", bkpinfo->zip_exe, file_to_openout, MONDO_LOGFILE);
         if (strcmp(bkpinfo->zip_exe, "gzip") == 0) {
             /* Ignore SIGPIPE for gzip as it causes errors on big files
-             * Cf: http://trac.mondorescue.org/ticket/244
-             */
+             * Cf: http://trac.mondorescue.org/ticket/244 */
             signal(SIGPIPE,SIG_IGN);
         }
     }
-    sprintf(tmp, "Pipe command = '%s'", command);
-    log_msg(3, tmp);
+    log_msg(3, "Pipe command = '%s'", command);
 
     /* restore biggiefile, one slice at a time */
@@ -1528 +1419 @@
         fatal_error("Cannot pipe out");
     }
+    mr_free(command);
+
     for (res = read_header_block_from_stream(&slice_siz, tmp, &ctrl_chr);
          ctrl_chr != BLK_STOP_A_BIGGIE;
@@ -1534 +1427 @@
             wrong_marker(BLK_START_AN_AFIO_OR_SLICE, ctrl_chr);
         }
-        sprintf(tmp, "Working on file #%ld, slice #%ld    ",
-                biggiefile_number + 1, current_slice_number);
-        log_msg(2, tmp);
+        log_msg(2, "Working on file #%ld, slice #%ld    ", biggiefile_number + 1, current_slice_number);
         if (!g_text_mode) {
             newtDrawRootText(0, g_noof_rows - 2, tmp);
@@ -1575 +1466 @@
     if (bkpinfo->zip_exe[0]) {
         if (strcmp(bkpinfo->zip_exe, "gzip") == 0) {
-            /* Re-enable SIGPIPE for gzip
-             */
+            /* Re-enable SIGPIPE for gzip */
             signal(SIGPIPE, terminate_daemon);
         }
@@ -1586 +1476 @@
     if (use_ntfsprog_hack) {
         log_msg(3, "Waiting for ntfsclone to finish");
-        sprintf(tmp,
-                " ps | grep \" ntfsclone \" | grep -v grep > /dev/null 2> /dev/null");
-        while (system(tmp) == 0) {
+        mr_asprintf(tmp1, " ps | grep \" ntfsclone \" | grep -v grep > /dev/null 2> /dev/null");
+        while (system(tmp1) == 0) {
             sleep(1);
         }
+        mr_free(tmp1);
         log_msg(3, "OK, ntfsclone has really finished");
     }
@@ -1598 +1488 @@
     if (strcmp(outfile_fname, "/dev/null")) {
         chmod(outfile_fname, biggiestruct.properties.st_mode);
-        if (chown(outfile_fname, biggiestruct.properties.st_uid,
-              biggiestruct.properties.st_gid)) {
+        if (chown(outfile_fname, biggiestruct.properties.st_uid, biggiestruct.properties.st_gid)) {
             // FIXME
         }
@@ -1606 +1495 @@
         utime(outfile_fname, ubuf);
     }
+    mr_free(outfile_fname);
 
     paranoid_free(tmp);
-    paranoid_free(outfile_fname);
-    paranoid_free(command);
-    paranoid_free(ntfsprog_command);
-    paranoid_free(sz_devfile);
-    paranoid_free(ntfsprog_fifo);
     g_loglevel = old_loglevel;
     return (retval);
@@ -1645 +1530 @@
   /** malloc **/
     char *command = NULL;
-    char *tmp;
-    char *filelist_name;
-    char *filelist_subset_fname;
-    char *executable;
-    char *temp_log;
-    char screen_message[100];
+    char *tmp = NULL;
+    char *filelist_name = NULL;
+    char *filelist_subset_fname = NULL;
+    char *executable = NULL;
+    char *temp_log = NULL;
     long matches = 0;
     bool use_star;
-    char *xattr_fname;
-    char *acl_fname;
-//  char files_to_restore_this_time_fname[MAX_STR_LEN];
+    char *xattr_fname = NULL;
+    char *acl_fname = NULL;
 
     assert_string_is_neither_NULL_nor_zerolength(tarball_fname);
-    malloc_string(tmp);
-    malloc_string(filelist_name);
-    malloc_string(filelist_subset_fname);
-    malloc_string(executable);
-    malloc_string(temp_log);
-    malloc_string(xattr_fname);
-    malloc_string(acl_fname);
 
     log_msg(5, "Entering");
-    filelist_subset_fname[0] = '\0';
     use_star = (strstr(tarball_fname, ".star")) ? TRUE : FALSE;
-//  sprintf(files_to_restore_this_time_fname, "/tmp/ftrttf.%d.%d", (int)getpid(), (int)random());
     mr_asprintf(command, "mkdir -p %s/tmp", MNT_RESTORING);
     run_program_and_log_output(command, 9);
     paranoid_free(command);
 
-    sprintf(temp_log, "/tmp/%d.%d", (int) (random() % 32768),
-            (int) (random() % 32768));
-
-    sprintf(filelist_name, MNT_CDROM "/archives/filelist.%ld",
-            current_tarball_number);
+    mr_asprintf(filelist_name, MNT_CDROM "/archives/filelist.%ld", current_tarball_number);
     if (length_of_file(filelist_name) <= 2) {
-        log_msg(2, "There are _zero_ files in filelist '%s'",
-                filelist_name);
-        log_msg(2,
-                "This is a bit silly (ask dev-team to fix mondo_makefilelist, please)");
-        log_msg(2,
-                "but it's non-critical. It's cosmetic. Don't worry about it.");
+        log_msg(2, "There are _zero_ files in filelist '%s'", filelist_name);
+        log_msg(2, "This is a bit silly (ask dev-team to fix mondo_makefilelist, please)");
+        log_msg(2, "but it's non-critical. It's cosmetic. Don't worry about it.");
         retval = 0;
-        goto leave_sub;
-    }
-    if (count_lines_in_file(filelist_name) <= 0
-        || length_of_file(tarball_fname) <= 0) {
+        mr_free(filelist_name);
+        log_msg(5, "Leaving");
+        return(0);
+    }
+    if (count_lines_in_file(filelist_name) <= 0 || length_of_file(tarball_fname) <= 0) {
         log_msg(3, "length_of_file(%s) = %llu", tarball_fname, length_of_file(tarball_fname));
         log_msg(3, "count_lines_in_file(%s) = %llu", tarball_fname, count_lines_in_file(tarball_fname));
-        sprintf(tmp, "Unable to restore fileset #%ld (CD I/O error)",
-                current_tarball_number);
-        log_to_screen(tmp);
-        retval = 1;
-        goto leave_sub;
+        log_to_screen("Unable to restore fileset #%ld (CD I/O error)", current_tarball_number);
+        mr_free(filelist_name);
+        log_msg(5, "Leaving");
+        return(1);
     }
 
     if (filelist) {
-        sprintf(filelist_subset_fname, "/tmp/filelist-subset-%ld.tmp",
-                current_tarball_number);
+        mr_asprintf(filelist_subset_fname, "/tmp/filelist-subset-%ld.tmp", current_tarball_number);
         if ((matches =
              save_filelist_entries_in_common(filelist_name, filelist,
                                              filelist_subset_fname,
-                                             use_star))
-            <= 0) {
-            sprintf(tmp, "Skipping fileset %ld", current_tarball_number);
-            log_msg(1, tmp);
+                                             use_star)) <= 0) {
+            log_msg(1, "Skipping fileset %ld", current_tarball_number);
         } else {
-            log_msg(3, "Saved fileset %ld's subset to %s",
-                    current_tarball_number, filelist_subset_fname);
-        }
-        sprintf(screen_message, "Tarball #%ld --- %ld matches",
-                current_tarball_number, matches);
-        log_to_screen(screen_message);
-    } else {
-        filelist_subset_fname[0] = '\0';
-    }
+            log_msg(3, "Saved fileset %ld's subset to %s", current_tarball_number, filelist_subset_fname);
+        }
+        log_to_screen("Tarball #%ld --- %ld matches", current_tarball_number, matches);
+    }
+    mr_free(filelist_name);
 
     if (filelist == NULL || matches > 0) {
         if (g_getfattr) {
-            sprintf(xattr_fname, XATTR_LIST_FNAME_RAW_SZ,
-                MNT_CDROM "/archives", current_tarball_number);
+            mr_asprintf(xattr_fname, XATTR_LIST_FNAME_RAW_SZ, MNT_CDROM "/archives", current_tarball_number);
         }
         if (g_getfacl) {
-            sprintf(acl_fname, ACL_LIST_FNAME_RAW_SZ, MNT_CDROM "/archives",
-                current_tarball_number);
+            mr_asprintf(acl_fname, ACL_LIST_FNAME_RAW_SZ, MNT_CDROM "/archives", current_tarball_number);
         }
         if (strstr(tarball_fname, ".bz2")) {
-            strcpy(executable, "bzip2");
+            mr_asprintf(executable, "bzip2");
+        } else if (strstr(tarball_fname, ".lzma")) {
+            mr_asprintf(executable, "lzma");
         } else if (strstr(tarball_fname, ".gz")) {
-            strcpy(executable, "gzip");
+            mr_asprintf(executable, "gzip");
         } else if (strstr(tarball_fname, ".lzo")) {
-            strcpy(executable, "lzop");
-        } else {
-            executable[0] = '\0';
-        }
-        if (executable[0]) {
-            sprintf(tmp, "which %s > /dev/null 2> /dev/null", executable);
-            if (run_program_and_log_output(tmp, FALSE)) {
-                log_to_screen
-                    ("(compare_a_tarball) Compression program %s not found - oh no!", executable);
+            mr_asprintf(executable, "lzop");
+        }
+        if (executable) {
+            mr_asprintf(tmp, "which %s > /dev/null 2> /dev/null", executable);
+            res = run_program_and_log_output(tmp, FALSE);
+            mr_free(tmp);
+
+            if (res) {
+                log_to_screen("(compare_a_tarball) Compression program %s not found - oh no!", executable);
                 paranoid_MR_finish(1);
             }
-            strcpy(tmp, executable);
-            sprintf(executable, "-P %s -Z", tmp);
+            tmp = executable;
+            mr_asprintf(executable, "-P %s -Z", tmp);
+            mr_free(tmp);
         }
 #ifdef __FreeBSD__
@@ -1755 +1616 @@
 #endif
 
-//      if (strstr(tarball_fname, ".star."))
         if (use_star) {
             mr_asprintf(command, "star -x -force-remove -sparse -U " STAR_ACL_SZ " file=%s", tarball_fname);
@@ -1762 +1622 @@
             }
         } else {
-            if (filelist_subset_fname[0] != '\0') {
-                mr_asprintf(command, "afio -i -M 8m -b %ld -c %ld %s -w '%s' %s", TAPE_BLOCK_SIZE, BUFSIZE, executable, filelist_subset_fname, tarball_fname);
+            if (! executable) {
+                log_msg(2, "Mo executable, this shouldn't happen !");
             } else {
-                mr_asprintf(command, "afio -i -b %ld -c %ld -M 8m %s %s", TAPE_BLOCK_SIZE, BUFSIZE, executable, tarball_fname);
-            }
-        }
+                if (filelist_subset_fname != NULL) {
+                    mr_asprintf(command, "afio -i -M 8m -b %ld -c %ld %s -w '%s' %s", TAPE_BLOCK_SIZE, BUFSIZE, executable, filelist_subset_fname, tarball_fname);
+                } else {
+                    mr_asprintf(command, "afio -i -b %ld -c %ld -M 8m %s %s", TAPE_BLOCK_SIZE, BUFSIZE, executable, tarball_fname);
+                }
+            }
+        }
+        mr_free(executable);
 
 #undef BUFSIZE
+        mr_asprintf(temp_log, "/tmp/%d.%d", (int) (random() % 32768), (int) (random() % 32768));
+
         mr_strcat(command, " 2>> %s >> %s", temp_log, temp_log);
         log_msg(1, "command = '%s'", command);
@@ -1828 +1695 @@
             log_msg(2, "Fileset #%d processed OK", current_tarball_number);
         }
+        unlink(temp_log);
+        mr_free(temp_log);
     }
     if (does_file_exist("/PAUSE")) {
@@ -1834 +1703 @@
     }
     unlink(filelist_subset_fname);
-    unlink(xattr_fname);
-    unlink(acl_fname);
-    unlink(temp_log);
-
-  leave_sub:
-    paranoid_free(tmp);
-    paranoid_free(filelist_name);
-    paranoid_free(filelist_subset_fname);
-    paranoid_free(executable);
-    paranoid_free(temp_log);
-    paranoid_free(xattr_fname);
-    paranoid_free(acl_fname);
+    mr_free(filelist_subset_fname);
+    if (g_getfattr) {
+        unlink(xattr_fname);
+        mr_free(xattr_fname);
+    }
+    if (g_getfacl) {
+        unlink(acl_fname);
+        mr_free(acl_fname);
+    }
+
     log_msg(5, "Leaving");
     return (retval);
@@ -1881 +1748 @@
 
   /** malloc add ***/
-    char *tmp;
     char *mds = NULL;
-    char *command;
-    char *afio_fname;
-    char *filelist_fname;
-    char *filelist_subset_fname;
-    char *executable;
+    char *command = NULL;
+    char *afio_fname = NULL;
+    char *filelist_fname = NULL;
+    char *filelist_subset_fname = NULL;
+    char *executable = NULL;
     long matches = 0;
     bool restore_this_fileset = FALSE;
@@ -1894 +1760 @@
     assert(bkpinfo != NULL);
     assert_string_is_neither_NULL_nor_zerolength(tarball_fname);
-    malloc_string(filelist_subset_fname);
-    malloc_string(filelist_fname);
-    malloc_string(afio_fname);
-    malloc_string(executable);
-    malloc_string(command);
-    malloc_string(tmp);
-    filelist_subset_fname[0] = '\0';
+
     /* to do it with a file... */
     use_star = (strstr(tarball_fname, ".star")) ? TRUE : FALSE;
     mds = media_descriptor_string(bkpinfo->backup_media_type);
-    sprintf(tmp,
-            "Restoring from fileset #%ld (%ld KB) on %s #%d",
+    log_msg(2, "Restoring from fileset #%ld (%ld KB) on %s #%d",
             current_tarball_number, (long) size >> 10, mds, g_current_media_number);
     mr_free(mds);
 
-    log_msg(2, tmp);
     run_program_and_log_output("mkdir -p " MNT_RESTORING "/tmp", FALSE);
 
@@ -1917 +1775 @@
    * in afio or someting; oh darn.. OK, use tmpfs :-)                         *
    ****************************************************************************/
-    filelist_fname[0] = filelist_subset_fname[0] = '\0';
-    sprintf(afio_fname, "/tmp/tmpfs/archive.tmp.%ld",
-            current_tarball_number);
-    sprintf(filelist_fname, "%s/filelist.%ld", bkpinfo->tmpdir,
-            current_tarball_number);
-    sprintf(filelist_subset_fname, "%s/filelist-subset-%ld.tmp",
-            bkpinfo->tmpdir, current_tarball_number);
-//  sprintf(filelist_fname, "/tmp/tmpfs/temp-filelist.%ld", current_tarball_number);
+    mr_asprintf(afio_fname, "/tmp/tmpfs/archive.tmp.%ld", current_tarball_number);
+    mr_asprintf(filelist_fname, "%s/filelist.%ld", bkpinfo->tmpdir, current_tarball_number);
+    mr_asprintf(filelist_subset_fname, "%s/filelist-subset-%ld.tmp", bkpinfo->tmpdir, current_tarball_number);
+
     res = read_file_from_stream_to_file(afio_fname, size);
     if (strstr(tarball_fname, ".star")) {
@@ -1933 +1787 @@
     }
     if (bkpinfo->compression_level == 0) {
-        executable[0] = '\0';
+        mr_asprintf(executable, "%s", "");
     } else {
         if (bkpinfo->use_star) {
-            strcpy(executable, " -bz");
+            mr_asprintf(executable, "%s", " -bz");
         } else {
-            sprintf(executable, "-P %s -Z", bkpinfo->zip_exe);
+            mr_asprintf(executable, "-P %s -Z", bkpinfo->zip_exe);
         }
     }
@@ -1949 +1803 @@
         if (strstr(tarball_fname, ".star.")) {
             use_star = TRUE;
-            sprintf(command, "star -sparse -t file=%s %s", afio_fname, executable);
+            mr_asprintf(command, "star -sparse -t file=%s %s", afio_fname, executable);
         } else {
             use_star = FALSE;
-            sprintf(command, "afio -t -M 8m -b %ld %s %s", TAPE_BLOCK_SIZE,
-                    executable, afio_fname);
-        }
-        sprintf(command + strlen(command), " > %s 2>> %s", filelist_fname,
-                MONDO_LOGFILE);
+            mr_asprintf(command, "afio -t -M 8m -b %ld %s %s", TAPE_BLOCK_SIZE, executable, afio_fname);
+        }
+        mr_strcat(command, " > %s 2>> %s", filelist_fname, MONDO_LOGFILE);
         log_msg(1, "command = %s", command);
         if (system(command)) {
             log_msg(4, "Warning - error occurred while retrieving TOC");
         }
+        mr_free(command);
+
         if ((matches =
              save_filelist_entries_in_common(filelist_fname, filelist,
@@ -1970 +1824 @@
                         current_tarball_number);
             }
-            sprintf(tmp, "Skipping fileset %ld", current_tarball_number);
-            log_msg(2, tmp);
+            log_msg(2, "Skipping fileset %ld", current_tarball_number);
             restore_this_fileset = FALSE;
         } else {
@@ -1982 +1835 @@
 
 // Concoct the call to star/afio to restore files
-    if (strstr(tarball_fname, ".star."))    // star
-    {
-        sprintf(command, "star -sparse -x file=%s %s", afio_fname, executable);
+    if (strstr(tarball_fname, ".star.")) {
+        // star
+        mr_asprintf(command, "star -sparse -x file=%s %s", afio_fname, executable);
         if (filelist) {
-            sprintf(command + strlen(command), " list=%s",
-                    filelist_subset_fname);
-        }
-    } else                      // afio
-    {
-        sprintf(command, "afio -i -M 8m -b %ld %s", TAPE_BLOCK_SIZE,
-                executable);
+            mr_strcat(command, " list=%s", filelist_subset_fname);
+        }
+    } else {
+        // afio
+        mr_asprintf(command, "afio -i -M 8m -b %ld %s", TAPE_BLOCK_SIZE, executable);
         if (filelist) {
-            sprintf(command + strlen(command), " -w %s",
-                    filelist_subset_fname);
-        }
-        sprintf(command + strlen(command), " %s", afio_fname);
-    }
-    sprintf(command + strlen(command), " 2>> %s", MONDO_LOGFILE);
+            mr_strcat(command, " -w %s", filelist_subset_fname);
+        }
+        mr_strcat(command, " %s", afio_fname);
+    }
+    mr_strcat(command, " 2>> %s", MONDO_LOGFILE);
+    mr_free(executable);
 
 // Call if IF there are files to restore (selectively/unconditionally)
@@ -2031 +1882 @@
         log_msg(1, "NOT CALLING '%s'", command);
     }
+    mr_free(command);
 
     if (does_file_exist("/PAUSE") && current_tarball_number >= 50) {
@@ -2038 +1890 @@
 
     unlink(filelist_subset_fname);
+    mr_free(filelist_subset_fname);
     unlink(filelist_fname);
+    mr_free(filelist_fname);
     unlink(afio_fname);
-
-    paranoid_free(filelist_subset_fname);
-    paranoid_free(filelist_fname);
-    paranoid_free(afio_fname);
-    paranoid_free(command);
-    paranoid_free(tmp);
+    mr_free(afio_fname);
+
     return (retval);
 }
@@ -2065 +1915 @@
  * @return 0 for success, nonzero for failure.
  */
-int
-restore_all_biggiefiles_from_CD(struct s_node *filelist)
-{
+int restore_all_biggiefiles_from_CD(struct s_node *filelist) {
+
     int retval = 0;
     int res = 0;
     long noof_biggiefiles, bigfileno = 0, total_slices;
   /** malloc **/
-    char *tmp;
+    char *tmp = NULL;
+    char *tmp1 = NULL;
     char *mds = NULL;
     bool just_changed_cds = FALSE;
-    char *xattr_fname;
-    char *acl_fname;
-    char *biggies_whose_EXATs_we_should_set;    // EXtended ATtributes
+    char *xattr_fname = NULL;
+    char *acl_fname = NULL;
+    char *biggies_whose_EXATs_we_should_set = NULL; // EXtended ATtributes
     char *pathname_of_last_biggie_restored;
     FILE *fbw = NULL;
 
-    malloc_string(xattr_fname);
-    malloc_string(acl_fname);
+    malloc_string(pathname_of_last_biggie_restored);
     malloc_string(tmp);
-    malloc_string(biggies_whose_EXATs_we_should_set);
-    malloc_string(pathname_of_last_biggie_restored);
     assert(bkpinfo != NULL);
 
-    sprintf(biggies_whose_EXATs_we_should_set,
-            "%s/biggies-whose-EXATs-we-should-set", bkpinfo->tmpdir);
+    mr_asprintf(biggies_whose_EXATs_we_should_set, "%s/biggies-whose-EXATs-we-should-set", bkpinfo->tmpdir);
     if (!(fbw = fopen(biggies_whose_EXATs_we_should_set, "w"))) {
-        log_msg(1, "Warning - cannot openout %s",
-                biggies_whose_EXATs_we_should_set);
+        log_msg(1, "Warning - cannot openout %s", biggies_whose_EXATs_we_should_set);
     }
 
     read_cfg_var(g_mondo_cfg_file, "total-slices", tmp);
     total_slices = atol(tmp);
-    sprintf(tmp, "Reassembling large files      ");
-    mvaddstr_and_log_it(g_currentY, 0, tmp);
+    mr_free(tmp);
+
+    mr_asprintf(tmp1, "Reassembling large files      ");
+    mvaddstr_and_log_it(g_currentY, 0, tmp1);
+    mr_free(tmp1);
+
     if (length_of_file(BIGGIELIST) < 6) {
         log_msg(1, "OK, no biggielist; not restoring biggiefiles");
@@ -2105 +1954 @@
     noof_biggiefiles = count_lines_in_file(BIGGIELIST);
     if (noof_biggiefiles <= 0) {
-        log_msg(2,
-                "OK, no biggiefiles in biggielist; not restoring biggiefiles");
+        log_msg(2, "OK, no biggiefiles in biggielist; not restoring biggiefiles");
         return (0);
     }
-    sprintf(tmp, "OK, there are %ld biggiefiles in the archives",
-            noof_biggiefiles);
-    log_msg(2, tmp);
+    log_msg(2, "OK, there are %ld biggiefiles in the archives", noof_biggiefiles);
 
     open_progress_form("Reassembling large files",
@@ -2120 +1966 @@
         log_msg(2, "Thinking about restoring bigfile %ld", bigfileno + 1);
         if (!does_file_exist(slice_fname(bigfileno, 0, ARCHIVES_PATH, ""))) {
-            log_msg(3,
-                    "...but its first slice isn't on this CD. Perhaps this was a selective restore?");
+            log_msg(3, "...but its first slice isn't on this CD. Perhaps this was a selective restore?");
             mds = media_descriptor_string(bkpinfo->backup_media_type);
-            log_msg(3, "Cannot find bigfile #%ld 's first slice on %s #%d",
-                    bigfileno + 1, mds,
-                    g_current_media_number);
+            log_msg(3, "Cannot find bigfile #%ld 's first slice on %s #%d", bigfileno + 1, mds, g_current_media_number);
             log_msg(3, "Slicename would have been %s",
                     slice_fname(bigfileno, 0, ARCHIVES_PATH, ""));
@@ -2131 +1974 @@
             if (just_changed_cds) {
                 just_changed_cds = FALSE;
-                log_msg(3,
-                        "I'll continue to scan this CD for bigfiles to be restored.");
+                log_msg(3, "I'll continue to scan this CD for bigfiles to be restored.");
             } else if (does_file_exist(MNT_CDROM "/archives/NOT-THE-LAST")) {
                 insist_on_this_cd_number(++g_current_media_number);
-                sprintf(tmp, "Restoring from %s #%d", mds,
-                        g_current_media_number);
-                log_to_screen(tmp);
+                log_to_screen("Restoring from %s #%d", mds, g_current_media_number);
                 just_changed_cds = TRUE;
             } else {
                 /* That big file doesn't exist, but the followings may */
                 /* So we need to continue looping */
-                log_msg(2, "There was no bigfile #%ld. That's OK.",
-                    bigfileno + 1);
+                log_msg(2, "There was no bigfile #%ld. That's OK.", bigfileno + 1);
                 log_msg(2, "I'm going to stop restoring bigfiles now.");
                 retval++;
@@ -2151 +1990 @@
         } else {
             just_changed_cds = FALSE;
-            sprintf(tmp, "Restoring big file %ld", bigfileno + 1);
-            update_progress_form(tmp);
-            res =
-                restore_a_biggiefile_from_CD(bigfileno, filelist, pathname_of_last_biggie_restored);
+            mr_asprintf(tmp1, "Restoring big file %ld", bigfileno + 1);
+            update_progress_form(tmp1);
+            mr_free(tmp1);
+            res = restore_a_biggiefile_from_CD(bigfileno, filelist, pathname_of_last_biggie_restored);
             log_it("%s",pathname_of_last_biggie_restored);
             if (fbw && pathname_of_last_biggie_restored[0]) {
@@ -2168 +2007 @@
         fclose(fbw);
         if (g_getfattr) {
-            sprintf(xattr_fname, XATTR_BIGGLST_FNAME_RAW_SZ, ARCHIVES_PATH);
+            mr_asprintf(xattr_fname, XATTR_BIGGLST_FNAME_RAW_SZ, ARCHIVES_PATH);
             if (length_of_file(xattr_fname) > 0) {
                 set_fattr_list(biggies_whose_EXATs_we_should_set, xattr_fname);
             }
+            mr_free(xattr_fname);
         }
         if (g_getfacl) {
-            sprintf(acl_fname, ACL_BIGGLST_FNAME_RAW_SZ, ARCHIVES_PATH);
+            mr_asprintf(acl_fname, ACL_BIGGLST_FNAME_RAW_SZ, ARCHIVES_PATH);
             if (length_of_file(acl_fname) > 0) {
                 set_acl_list(biggies_whose_EXATs_we_should_set, acl_fname);
             }
-        }
-    }
+            mr_free(acl_fname);
+        }
+    }
+    mr_free(biggies_whose_EXATs_we_should_set);
+
     if (does_file_exist("/PAUSE")) {
-        popup_and_OK
-            ("Press ENTER to go on. Delete /PAUSE to stop these pauses.");
+        popup_and_OK("Press ENTER to go on. Delete /PAUSE to stop these pauses.");
     }
     close_progress_form();
@@ -2190 +2032 @@
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     }
-    paranoid_free(xattr_fname);
-    paranoid_free(acl_fname);
-    paranoid_free(tmp);
-    paranoid_free(biggies_whose_EXATs_we_should_set);
     paranoid_free(pathname_of_last_biggie_restored);
     return (retval);
@@ -2220 +2058 @@
     int res;
     int attempts;
-    long current_tarball_number = 0;
+    long current_tarball_number = 0L;
     long max_val;
   /**malloc ***/
+    char *mds = NULL;
     char *tmp = NULL;
-    char *mds = NULL;
     char *tmp1 = NULL;
-    char *tarball_fname;
-    char *progress_str;
-    char *comment;
+    char *tarball_fname = NULL;
+    char *progress_str = NULL;
+
+    assert(bkpinfo != NULL);
 
     malloc_string(tmp);
-    malloc_string(tarball_fname);
-    malloc_string(progress_str);
-    malloc_string(comment);
-
-    assert(bkpinfo != NULL);
-
     mvaddstr_and_log_it(g_currentY, 0, "Restoring from archives");
-    log_msg(2,
-            "Insisting on 1st media, so that I can have a look at LAST-FILELIST-NUMBER");
+    log_msg(2, "Insisting on 1st media, so that I can have a look at LAST-FILELIST-NUMBER");
     if (g_current_media_number != 1) {
         log_msg(3, "OK, that's jacked up.");
@@ -2250 +2082 @@
 
     mds = media_descriptor_string(bkpinfo->backup_media_type);
-    sprintf(progress_str, "Restoring from %s #%d", mds, g_current_media_number);
+    mr_asprintf(progress_str, "Restoring from %s #%d", mds, g_current_media_number);
 
     log_to_screen(progress_str);
@@ -2260 +2092 @@
         insist_on_this_cd_number(g_current_media_number);
         update_progress_form(progress_str);
-        sprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.bz2",
-                current_tarball_number);
+        mr_free(progress_str);
+
+        mr_asprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.bz2", current_tarball_number);
         if (!does_file_exist(tarball_fname)) {
-            sprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.gz",
-                current_tarball_number);
+            mr_free(tarball_fname);
+            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.gz", current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
-            sprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.lzo",
-                    current_tarball_number);
+            mr_free(tarball_fname);
+            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.lzma", current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
-            sprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.",
-                    current_tarball_number);
+            mr_free(tarball_fname);
+            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.lzo", current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
-            sprintf(tarball_fname, MNT_CDROM "/archives/%ld.star.bz2",
-                    current_tarball_number);
+            mr_free(tarball_fname);
+            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.", current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
-            sprintf(tarball_fname, MNT_CDROM "/archives/%ld.star.",
-                    current_tarball_number);
+            mr_free(tarball_fname);
+            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%ld.star.bz2", current_tarball_number);
+        }
+        if (!does_file_exist(tarball_fname)) {
+            mr_free(tarball_fname);
+            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%ld.star.", current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
@@ -2286 +2123 @@
                 log_to_screen
                     ("No tarballs. Strange. Maybe you only backed up freakin' big files?");
+                mr_free(tarball_fname);
                 return (0);
             }
@@ -2295 +2133 @@
             }
             g_current_media_number++;
-            sprintf(progress_str, "Restoring from %s #%d",
-                    media_descriptor_string(bkpinfo->backup_media_type),
-                    g_current_media_number);
+            mr_asprintf(progress_str, "Restoring from %s #%d", media_descriptor_string(bkpinfo->backup_media_type), g_current_media_number);
             log_to_screen(progress_str);
         } else {
-            sprintf(progress_str, "Restoring from fileset #%ld on %s #%d",
-                    current_tarball_number, mds, g_current_media_number);
-//    log_msg(3, "progress_str = %s", progress_str);
-            for (res = 999, attempts = 0; attempts < 3 && res != 0;
-                 attempts++) {
-                res =
-                    restore_a_tarball_from_CD(tarball_fname,
-                                              current_tarball_number,
-                                              filelist);
-            }
-            mr_asprintf(tmp1, "%s #%d, fileset #%ld - restore ",
-                    mds, g_current_media_number, current_tarball_number);
+            mr_asprintf(progress_str, "Restoring from fileset #%ld on %s #%d", current_tarball_number, mds, g_current_media_number);
+            for (res = 999, attempts = 0; attempts < 3 && res != 0; attempts++) {
+                res = restore_a_tarball_from_CD(tarball_fname, current_tarball_number, filelist);
+            }
+            mr_asprintf(tmp1, "%s #%d, fileset #%ld - restore ", mds, g_current_media_number, current_tarball_number);
             if (res) {
                 mr_strcat(tmp1, "reported errors");
@@ -2322 +2151 @@
                 mr_strcat(tmp1, " (%d attempts) - review logs", attempts);
             }
-            strcpy(comment, tmp1);
-            paranoid_free(tmp1);
             if (attempts > 1) {
-                log_to_screen(comment);
-            }
+                log_to_screen(tmp1);
+            }
+            mr_free(tmp1);
 
             retval += res;
@@ -2332 +2160 @@
             g_current_progress++;
         }
+        mr_free(tarball_fname);
+
         /* Now we need to umount the current media to have the next mounted by insist_on_this_cd_number */
         /*   run_program_and_log_output("umount " MNT_CDROM, FALSE); */
     }
     mr_free(mds);
+    mr_free(progress_str);
 
     close_progress_form();
@@ -2343 +2174 @@
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     }
-    paranoid_free(tarball_fname);
-    paranoid_free(progress_str);
-    paranoid_free(comment);
 
     return (retval);
@@ -2375 +2203 @@
 
   /** malloc add ****/
-    char *tmp;
+    char *tmp = NULL;
     char *biggie_fname;
     char *biggie_cksum;
-    char *xattr_fname;
-    char *acl_fname;
+    char *xattr_fname = NULL;
+    char *acl_fname = NULL;
     char *p;
     char *pathname_of_last_biggie_restored;
-    char *biggies_whose_EXATs_we_should_set;    // EXtended ATtributes
+    char *biggies_whose_EXATs_we_should_set = NULL; // EXtended ATtributes
     long long biggie_size;
     FILE *fbw = NULL;
@@ -2389 +2217 @@
     malloc_string(biggie_fname);
     malloc_string(biggie_cksum);
-    malloc_string(xattr_fname);
-    malloc_string(acl_fname);
-    malloc_string(biggies_whose_EXATs_we_should_set);
     malloc_string(pathname_of_last_biggie_restored);
     assert(bkpinfo != NULL);
@@ -2398 +2223 @@
 
     total_slices = atol(tmp);
-    sprintf(tmp, "Reassembling large files      ");
+
     if (g_getfattr) {
-        sprintf(xattr_fname, XATTR_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
+        mr_asprintf(xattr_fname, XATTR_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
     }
     if (g_getfacl) {
-        sprintf(acl_fname, ACL_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
-    }
-    mvaddstr_and_log_it(g_currentY, 0, tmp);
-    sprintf(biggies_whose_EXATs_we_should_set,
-            "%s/biggies-whose-EXATs-we-should-set", bkpinfo->tmpdir);
+        mr_asprintf(acl_fname, ACL_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
+    }
+    mr_asprintf(tmp1, "Reassembling large files      ");
+    mvaddstr_and_log_it(g_currentY, 0, tmp1);
+    mr_free(tmp1);
+
+    mr_asprintf(biggies_whose_EXATs_we_should_set, "%s/biggies-whose-EXATs-we-should-set", bkpinfo->tmpdir);
     if (!(fbw = fopen(biggies_whose_EXATs_we_should_set, "w"))) {
-        log_msg(1, "Warning - cannot openout %s",
-                biggies_whose_EXATs_we_should_set);
-    }
-// get xattr and acl files if they're there
-    res =
-        read_header_block_from_stream(&biggie_size, biggie_fname,
-                                      &ctrl_chr);
+        log_msg(1, "Warning - cannot openout %s", biggies_whose_EXATs_we_should_set);
+    }
+
+    // get xattr and acl files if they're there
+    res = read_header_block_from_stream(&biggie_size, biggie_fname, &ctrl_chr);
     if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) {
-        res = read_EXAT_files_from_tape(&biggie_size, biggie_fname,
-                                      &ctrl_chr, xattr_fname, acl_fname);
+        res = read_EXAT_files_from_tape(&biggie_size, biggie_fname, &ctrl_chr, xattr_fname, acl_fname);
     }
 
     noof_biggiefiles = atol(biggie_fname);
-    sprintf(tmp, "OK, there are %ld biggiefiles in the archives",
-            noof_biggiefiles);
-    log_msg(2, tmp);
+    log_msg(2, "OK, there are %ld biggiefiles in the archives", noof_biggiefiles);
     open_progress_form("Reassembling large files",
                        "I am now reassembling all the large files.",
@@ -2447 +2269 @@
             p++;
         }
-        sprintf(tmp, "Restoring big file %ld (%lld K)",
-                current_bigfile_number + 1, biggie_size / 1024);
-        update_progress_form(tmp);
+        mr_asprintf(tmp1, "Restoring big file %ld (%lld K)", current_bigfile_number + 1, biggie_size / 1024);
+        update_progress_form(tmp1);
+        mr_free(tmp1);
         res = restore_a_biggiefile_from_stream(biggie_fname,
                                                current_bigfile_number,
@@ -2467 +2289 @@
     if (current_bigfile_number != noof_biggiefiles
         && noof_biggiefiles != 0) {
-        sprintf(tmp, "Warning - bigfileno=%ld but noof_biggiefiles=%ld\n",
-                current_bigfile_number, noof_biggiefiles);
-    } else {
-        sprintf(tmp,
-                "%ld biggiefiles in biggielist.txt; %ld biggiefiles processed today.",
-                noof_biggiefiles, current_bigfile_number);
-    }
-    log_msg(1, tmp);
+        log_msg(1, "Warning - bigfileno=%ld but noof_biggiefiles=%ld\n", current_bigfile_number, noof_biggiefiles);
+    } else {
+        log_msg(1, "%ld biggiefiles in biggielist.txt; %ld biggiefiles processed today.", noof_biggiefiles, current_bigfile_number);
+    }
 
     if (fbw) {
@@ -2482 +2300 @@
             if (g_getfattr) {
                 if (length_of_file(xattr_fname) > 0) {
-                    log_msg(1, "set_fattr_List(%s,%s)",
-                        biggies_whose_EXATs_we_should_set, xattr_fname);
-                    set_fattr_list(biggies_whose_EXATs_we_should_set,
-                               xattr_fname);
+                    log_msg(1, "set_fattr_List(%s,%s)", biggies_whose_EXATs_we_should_set, xattr_fname);
+                    set_fattr_list(biggies_whose_EXATs_we_should_set, xattr_fname);
                 }
             }
             if (g_getfacl) {
                 if (length_of_file(acl_fname) > 0) {
-                    log_msg(1, "set_acl_list(%s,%s)",
-                            biggies_whose_EXATs_we_should_set, acl_fname);
+                    log_msg(1, "set_acl_list(%s,%s)", biggies_whose_EXATs_we_should_set, acl_fname);
                     set_acl_list(biggies_whose_EXATs_we_should_set, acl_fname);
                 }
@@ -2499 +2314 @@
         }
     }
+    mr_free(xattr_fname);
+    mr_free(acl_fname);
+    mr_free(biggies_whose_EXATs_we_should_set);
+
     if (does_file_exist("/PAUSE")) {
         popup_and_OK
@@ -2510 +2329 @@
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     }
-    paranoid_free(biggies_whose_EXATs_we_should_set);
     paranoid_free(pathname_of_last_biggie_restored);
     paranoid_free(biggie_fname);
     paranoid_free(biggie_cksum);
-    paranoid_free(xattr_fname);
-    paranoid_free(acl_fname);
     paranoid_free(tmp);
     return (retval);
@@ -2539 +2355 @@
  * @return 0 for success, or the number of filesets that failed.
  */
-int
-restore_all_tarballs_from_stream(struct s_node *filelist)
+int restore_all_tarballs_from_stream(struct s_node *filelist)
 {
     int retval = 0;
@@ -2549 +2364 @@
 
   /** malloc **/
-    char *tmp;
+    char *tmp = NULL;
     char *mds = NULL;
-    char *progress_str;
+    char *progress_str = NULL;
     char *tmp_fname;
-    char *xattr_fname;
-    char *acl_fname;
+    char *xattr_fname = NULL;
+    char *acl_fname = NULL;
 
     long long tmp_size;
 
     malloc_string(tmp);
-    malloc_string(progress_str);
     malloc_string(tmp_fname);
     assert(bkpinfo != NULL);
-    malloc_string(xattr_fname);
-    malloc_string(acl_fname);
     mvaddstr_and_log_it(g_currentY, 0, "Restoring from archives");
     read_cfg_var(g_mondo_cfg_file, "last-filelist-number", tmp);
@@ -2574 +2386 @@
     run_program_and_log_output("pwd", 5);
 
-    sprintf(progress_str, "Restoring from media #%d",
-            g_current_media_number);
+    mr_asprintf(progress_str, "Restoring from media #%d", g_current_media_number);
     log_to_screen(progress_str);
     open_progress_form("Restoring from archives",
@@ -2597 +2408 @@
         update_progress_form(progress_str);
         if (g_getfattr) {
-            sprintf(xattr_fname, "%s/xattr-subset-%ld.tmp", bkpinfo->tmpdir,
-                current_afioball_number);
+            mr_asprintf(xattr_fname, "%s/xattr-subset-%ld.tmp", bkpinfo->tmpdir, current_afioball_number);
             unlink(xattr_fname);
         }
         if (g_getfacl) {
-            sprintf(acl_fname, "%s/acl-subset-%ld.tmp", bkpinfo->tmpdir,
-                current_afioball_number);
+            mr_asprintf(acl_fname, "%s/acl-subset-%ld.tmp", bkpinfo->tmpdir, current_afioball_number);
             unlink(acl_fname);
         }
         if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) {
             log_it("Reading EXAT files from tape");
-            res = read_EXAT_files_from_tape(&tmp_size, tmp_fname,
-                                          &ctrl_chr, xattr_fname,
-                                          acl_fname);
+            res = read_EXAT_files_from_tape(&tmp_size, tmp_fname, &ctrl_chr, xattr_fname, acl_fname);
         }
         if (ctrl_chr != BLK_START_AN_AFIO_OR_SLICE) {
             wrong_marker(BLK_START_AN_AFIO_OR_SLICE, ctrl_chr);
         }
-        sprintf(tmp,
-                "Restoring from fileset #%ld (name=%s, size=%ld K)",
-                current_afioball_number, tmp_fname, (long) tmp_size >> 10);
-        res =
-            restore_a_tarball_from_stream(tmp_fname,
-                                          current_afioball_number,
-                                          filelist, tmp_size, xattr_fname,
-                                          acl_fname);
+        log_msg(4, "Restoring from fileset #%ld (name=%s, size=%ld K)", current_afioball_number, tmp_fname, (long) tmp_size >> 10);
+        res = restore_a_tarball_from_stream(tmp_fname, current_afioball_number, filelist, tmp_size, xattr_fname, acl_fname);
         retval += res;
         if (res) {
-            sprintf(tmp, "Fileset %ld - errors occurred",
-                    current_afioball_number);
-            log_to_screen(tmp);
+            log_to_screen("Fileset %ld - errors occurred", current_afioball_number);
         }
         res =
@@ -2638 +2437 @@
         g_current_progress++;
         mds = media_descriptor_string(bkpinfo->backup_media_type),
-        sprintf(progress_str, "Restoring from fileset #%ld on %s #%d",
-                current_afioball_number, mds,
-                g_current_media_number);
+
+        mr_free(progress_str);
+        mr_asprintf(progress_str, "Restoring from fileset #%ld on %s #%d", current_afioball_number, mds, g_current_media_number);
         mr_free(mds);
-        res =
-            read_header_block_from_stream(&tmp_size, tmp_fname, &ctrl_chr);
+        res = read_header_block_from_stream(&tmp_size, tmp_fname, &ctrl_chr);
         if (g_getfattr) {
             unlink(xattr_fname);
@@ -2651 +2449 @@
         }
     }                           // next
+    mr_free(progress_str);
+    if (g_getfattr) {
+        mr_free(xattr_fname);
+    }
+    if (g_getfacl) {
+        mr_free(acl_fname);
+    }
+
     log_msg(1, "All done with afioballs");
     close_progress_form();
@@ -2659 +2465 @@
     }
     paranoid_free(tmp);
-    paranoid_free(progress_str);
     paranoid_free(tmp_fname);
-    paranoid_free(xattr_fname);
-    paranoid_free(acl_fname);
     return (retval);
 }
@@ -2689 +2492 @@
     char *cwd;
     char *newpath;
-    char *tmp;
+    char *tmp = NULL;
     assert(bkpinfo != NULL);
 
     malloc_string(cwd);
     malloc_string(newpath);
-    malloc_string(tmp);
     log_msg(2, "restore_everything() --- starting");
     g_current_media_number = 1;
@@ -2700 +2502 @@
         // FIXME
     }
-    sprintf(tmp, "mkdir -p %s", bkpinfo->restore_path);
+    mr_asprintf(tmp, "mkdir -p %s", bkpinfo->restore_path);
     run_program_and_log_output(tmp, FALSE);
+    mr_free(tmp);
+
     log_msg(1, "Changing dir to %s", bkpinfo->restore_path);
     if (chdir(bkpinfo->restore_path)) {
@@ -2755 +2559 @@
     paranoid_free(cwd);
     paranoid_free(newpath);
-    paranoid_free(tmp);
     return (resA + resB);
 }
@@ -2776 +2579 @@
 {
     log_msg(0, "-------------- Mondo Restore v%s -------------", PACKAGE_VERSION);
-    log_msg(0,
-            "DON'T PANIC! Mondorestore logs almost everything, so please ");
-    log_msg(0,
-            "don't break out in a cold sweat just because you see a few  ");
-    log_msg(0,
-            "error messages in the log. Read them; analyze them; see if  ");
-    log_msg(0,
-            "they are significant; above all, verify your backups! Please");
-    log_msg(0,
-            "attach a compressed copy of this log to any e-mail you send ");
-    log_msg(0,
-            "to the Mondo mailing list when you are seeking technical    ");
-    log_msg(0,
-            "support. Without it, we can't help you.            - DevTeam");
-    log_msg(0,
-            "------------------------------------------------------------");
-    log_msg(0,
-            "BTW, despite (or perhaps because of) the wealth of messages,");
-    log_msg(0,
-            "some users are inclined to stop reading this log.  If Mondo ");
-    log_msg(0,
-            "stopped for some reason, chances are it's detailed here.    ");
-    log_msg(0,
-            "More than likely there's a message at the very end of this  ");
-    log_msg(0,
-            "log that will tell you what is wrong.  Please read it!      ");
-    log_msg(0,
-            "------------------------------------------------------------");
+    log_msg(0, "DON'T PANIC! Mondorestore logs almost everything, so please ");
+    log_msg(0, "don't break out in a cold sweat just because you see a few  ");
+    log_msg(0, "error messages in the log. Read them; analyze them; see if  ");
+    log_msg(0, "they are significant; above all, verify your backups! Please");
+    log_msg(0, "attach a compressed copy of this log to any e-mail you send ");
+    log_msg(0, "to the Mondo mailing list when you are seeking technical    ");
+    log_msg(0, "support. Without it, we can't help you.            - DevTeam");
+    log_msg(0, "------------------------------------------------------------");
+    log_msg(0, "BTW, despite (or perhaps because of) the wealth of messages,");
+    log_msg(0, "some users are inclined to stop reading this log.  If Mondo ");
+    log_msg(0, "stopped for some reason, chances are it's detailed here.    ");
+    log_msg(0, "More than likely there's a message at the very end of this  ");
+    log_msg(0, "log that will tell you what is wrong.  Please read it!      ");
+    log_msg(0, "------------------------------------------------------------");
 }
 
@@ -2818 +2607 @@
     int retval = 0;
     int res;
-//  int c;
-    char *tmp;
+    char *tmp = NULL;
 
     struct mountlist_itself *mountlist;
     struct raidlist_itself *raidlist;
     struct s_node *filelist;
-    char *a, *b;
+    char *tmp1 = NULL;
+    char *tmp2 = NULL;
     bool run_postnuke = FALSE;
 
@@ -2838 +2627 @@
 
     g_loglevel = DEFAULT_MR_LOGLEVEL;
-    malloc_string(tmp);
 
 /* Configure global variables */
@@ -2863 +2651 @@
     }
 
+    /* Init GUI */
+    setup_newt_stuff();         /* call newtInit and setup screen log */
+
     malloc_libmondo_global_strings();
 
     strcpy(g_mondo_home,
            call_program_and_get_last_line_of_output("which mondorestore"));
-    /*
-    sprintf(g_tmpfs_mountpt, "/tmp/tmpfs");
-    make_hole_for_dir(g_tmpfs_mountpt);
-    */
     g_current_media_number = 1; // precaution
 
     run_program_and_log_output("mkdir -p " MNT_CDROM, FALSE);
 
-    malloc_string(a);
-    malloc_string(b);
     setup_MR_global_filenames();    // malloc() and set globals, using bkpinfo->tmpdir etc.
     bkpinfo->backup_media_type = none;  // in case boot disk was made for one backup type but user wants to restore from another backup type
@@ -2897 +2682 @@
 
     /* Backup original mountlist.txt */
-    sprintf(tmp, "%s.orig", g_mountlist_fname);
+    mr_asprintf(tmp, "%s.orig", g_mountlist_fname);
     if (!does_file_exist(g_mountlist_fname)) {
-        log_msg(2,
-                "%ld: Warning - g_mountlist_fname (%s) does not exist yet",
-                __LINE__, g_mountlist_fname);
+        log_msg(2, "%ld: Warning - g_mountlist_fname (%s) does not exist yet", __LINE__, g_mountlist_fname);
     } else if (!does_file_exist(tmp)) {
-        sprintf(tmp, "cp -f %s %s.orig", g_mountlist_fname,
-                g_mountlist_fname);
+        mr_free(tmp);
+        mr_asprintf(tmp, "cp -f %s %s.orig", g_mountlist_fname, g_mountlist_fname);
         run_program_and_log_output(tmp, FALSE);
     }
+    mr_free(tmp);
 
     /* Init directories */
@@ -2912 +2696 @@
     make_hole_for_dir("/tmp/tmpfs");    /* just in case... */
     run_program_and_log_output("umount -d " MNT_CDROM, FALSE);
-    /*
-    run_program_and_log_output("ln -sf /var/log/mondo-archive.log /tmp/mondorestore.log",
-         FALSE);
-         */
 
     run_program_and_log_output("rm -Rf /tmp/tmpfs/mondo.tmp.*", FALSE);
 
-    /* Init GUI */
-    setup_newt_stuff();         /* call newtInit and setup screen log */
     welcome_to_mondorestore();
     if (bkpinfo->disaster_recovery) {
@@ -2954 +2732 @@
     }
 
-    if (argc >= 2 && strcmp(argv[1], "--pih") == 0) {
-        if (system("mount | grep cdrom 2> /dev/null > /dev/null")) {
-            paranoid_system("mount " MNT_CDROM);
-        }
-        bkpinfo->compression_level = 1;
-        g_current_media_number = 2;
-        strcpy(bkpinfo->restore_path, "/tmp/TESTING");
-        bkpinfo->backup_media_type = dvd;
-        open_progress_form("Reassembling /dev/hda1",
-                           "Shark is a bit of a silly person.",
-                           "Please wait. This may take some time.",
-                           "", 1999);
-        paranoid_system("rm -Rf /tmp/*pih*");
-
-        restore_a_biggiefile_from_CD(42, NULL, tmp);
-    }
-
     if (argc == 5 && strcmp(argv[1], "--common") == 0) {
         g_loglevel = 6;
@@ -2981 +2742 @@
         // BERLIOS: /usr/lib ???
         toggle_path_selection(filelist, "/usr/share", TRUE);
-//      show_filelist(filelist);
         save_filelist(filelist, "/tmp/out.txt");
-//      finish(0);
-//      toggle_path_selection (filelist, "/root/stuff", TRUE);
-        strcpy(a, argv[3]);
-        strcpy(b, argv[4]);
-
-        res = save_filelist_entries_in_common(a, filelist, b, FALSE);
+        mr_asprintf(tmp1, "%s", argv[3]);
+        mr_asprintf(tmp2, "%s", argv[4]);
+
+        res = save_filelist_entries_in_common(tmp1, filelist, tmp2, FALSE);
+        mr_free(tmp1);
+        mr_free(tmp2);
+
         free_filelist(filelist);
         printf("res = %d", res);
@@ -3096 +2857 @@
         log_msg(2, "Still here. Yay.");
         if ((strlen(bkpinfo->tmpdir) > 0) && (strstr(bkpinfo->tmpdir,"mondo.tmp.") != NULL)) {
-            sprintf(tmp, "rm -Rf %s/*", bkpinfo->tmpdir);
+            mr_asprintf(tmp, "rm -Rf %s/*", bkpinfo->tmpdir);
             run_program_and_log_output(tmp, FALSE);
+            mr_free(tmp);
         }
         unmount_boot_if_necessary();    /* for Gentoo users */
@@ -3115 +2877 @@
         // BCO:To be reviewed
         if ((bkpinfo->restore_mode == compare) || (bkpinfo->restore_mode == nuke)) {
-            if (bkpinfo->backup_media_type == netfs
-                && !is_this_device_mounted(bkpinfo->netfs_mount)) {
+            if ((bkpinfo->backup_media_type == netfs) && bkpinfo->netfs_mount && !is_this_device_mounted(bkpinfo->netfs_mount)) {
                 log_msg(1, "Mounting remote %s dir", bkpinfo->netfs_proto);
                 sprintf(bkpinfo->isodir, "/tmp/isodir");
@@ -3122 +2883 @@
                 if (strstr(bkpinfo->netfs_proto, "sshfs")) {
                     if (bkpinfo->netfs_user) {
-                        sprintf(tmp, "sshfs -o ro %s@%s /tmp/isodir",
-                            bkpinfo->netfs_user,bkpinfo->netfs_mount);
+                        mr_asprintf(tmp, "sshfs -o ro %s@%s /tmp/isodir", bkpinfo->netfs_user,bkpinfo->netfs_mount);
                     } else {
-                        sprintf(tmp, "sshfs -o ro %s /tmp/isodir",
-                            bkpinfo->netfs_mount);
+                        mr_asprintf(tmp, "sshfs -o ro %s /tmp/isodir", bkpinfo->netfs_mount);
                     }
                 } else  {
                     if (strstr(bkpinfo->netfs_proto, "smbfs")) {
                         if (bkpinfo->netfs_user) {
-                            sprintf(tmp, "mount -t cifs %s /tmp/isodir -o user=%s,nolock,ro ",
-                                bkpinfo->netfs_mount,bkpinfo->netfs_user);
+                            mr_asprintf(tmp, "mount -t cifs %s /tmp/isodir -o user=%s,nolock,ro ", bkpinfo->netfs_mount,bkpinfo->netfs_user);
                         } else {
-                            sprintf(tmp, "mount -t cifs %s /tmp/isodir -o nolock,ro ",
-                                bkpinfo->netfs_mount);
+                            mr_asprintf(tmp, "mount -t cifs %s /tmp/isodir -o nolock,ro ", bkpinfo->netfs_mount);
                         }
                     } else {
                         if (bkpinfo->netfs_user) {
-                            sprintf(tmp, "mount %s@%s -o nolock,ro /tmp/isodir",
-                                bkpinfo->netfs_user,bkpinfo->netfs_mount);
+                            mr_asprintf(tmp, "mount %s@%s -o nolock,ro /tmp/isodir", bkpinfo->netfs_user,bkpinfo->netfs_mount);
                         } else {
-                            sprintf(tmp, "mount %s -o nolock,ro /tmp/isodir",
-                                bkpinfo->netfs_mount);
+                            mr_asprintf(tmp, "mount %s -o nolock,ro /tmp/isodir", bkpinfo->netfs_mount);
                         }
                     }
                 }
                 run_program_and_log_output(tmp, 1);
+                mr_free(tmp);
             }
         }
 
         if (retval) {
-            log_to_screen
-                ("Warning - load_raidtab_into_raidlist returned an error");
+            log_to_screen("Warning - load_raidtab_into_raidlist returned an error");
         }
 
@@ -3205 +2960 @@
                                 "Run complete. Please remove media and reboot.");
         } else {
-            run_program_and_log_output("sync", FALSE);
+            sync();
             if (is_this_device_mounted(MNT_CDROM)) {
                 run_program_and_log_output("umount -d " MNT_CDROM, FALSE);
@@ -3242 +2997 @@
       } else {
         log_msg(1, "Re-mounted partitions for post-nuke stuff");
-        sprintf(tmp, "post-nuke %s %d", bkpinfo->restore_path,
-            retval);
+        mr_asprintf(tmp, "post-nuke %s %d", bkpinfo->restore_path, retval);
         log_msg(2, "Calling '%s'", tmp);
         if ((res = run_program_and_log_output(tmp, 0))) {
           log_OS_error(tmp);
         }
+        mr_free(tmp);
         log_msg(1, "post-nuke returned w/ res=%d", res);
       }
@@ -3263 +3018 @@
     set_signals(FALSE);
     log_to_screen("Restore log (%s) copied to /var/log on your hard disk", MONDO_LOGFILE);
-    sprintf(tmp,
-            "Mondo-restore is exiting (retval=%d)                                      ",
-            retval);
-    log_to_screen(tmp);
-    sprintf(tmp, "umount -d %s", bkpinfo->isodir);
+    log_to_screen("Mondo-restore is exiting (retval=%d)                                      ", retval);
+
+    mr_asprintf(tmp, "umount -d %s", bkpinfo->isodir);
     run_program_and_log_output(tmp, 5);
+    mr_free(tmp);
+
     paranoid_free(mountlist);
     paranoid_free(raidlist);
@@ -3275 +3030 @@
     }                           // for b0rken distros
     if (strstr(bkpinfo->tmpdir,"mondo.tmp.") != NULL) {
-        sprintf(tmp, "rm -Rf %s", bkpinfo->tmpdir);
+        mr_asprintf(tmp, "rm -Rf %s", bkpinfo->tmpdir);
         paranoid_system(tmp);
+        mr_free(tmp);
     }
     paranoid_MR_finish(retval); // frees global stuff plus bkpinfo
     free_libmondo_global_strings(); // it's fine to have this here :) really :)
-    paranoid_free(a);
-    paranoid_free(b);
-    paranoid_free(tmp);
 
     unlink("/tmp/filelist.full");