Changeset 2009 in MondoRescue for trunk/mondo/src/mondorestore/mondorestore.c

Timestamp:

Aug 11, 2008, 3:05:15 AM (16 years ago)

Author:

Bruno Cornec

Message:

Commit ald modifs in trunk - just in case

File:

• trunk/mondo/src/mondorestore/mondorestore.c (moved) (moved from trunk/mondo/src/mondorestore/mondo-restore.c ) (86 diffs)

trunk/mondo/src/mondorestore/mondorestore.c

@@ -15 +15 @@
 
 #include "my-stuff.h"
-#include "../common/mondostructures.h"
-#include "../common/libmondo.h"
+#include "mr_mem.h"
+#include "mr_msg.h"
+#include "mr_str.h"
+
+#include "mondostructures.h"
+#include "libmondo.h"
 #include "mr-externs.h"
 #include "mondo-restore.h"
@@ -24 +28 @@
 #include <pthread.h>
 #endif
-#include "mr_mem.h"
 
 extern void twenty_seconds_til_yikes(void);
@@ -41 +44 @@
  **************************************************************************/
 extern char *g_tmpfs_mountpt;   // declared in libmondo-tools.c
-extern struct s_bkpinfo *g_bkpinfo_DONTUSETHIS; // used by finish() to free
-                                                // up global bkpinfo struct
 extern bool g_text_mode;
 extern FILE *g_fprep;
@@ -429 +430 @@
                     }
 
-                    fmt_errs =
-                        format_everything(mountlist, FALSE, raidlist);
+                    fmt_errs = format_everything(mountlist, FALSE, raidlist);
                     if (!fmt_errs) {
                         log_to_screen
@@ -510 +510 @@
             if (filelist) {
               gotos_suck:
-// (NB: %s is where your filesystem is mounted now, by default)", MNT_RESTORING);
+                // (NB: MNT_RESTORING is where your filesystem is mounted now, by default)
                 if (popup_and_get_string
                     (_("Restore path"), _("Restore files to where?"), bkpinfo->restore_path)) {
@@ -558 +558 @@
     }
 
-//  run_program_and_log_output("cp -af /etc/lvm " MNT_RESTORING "/etc/", 1);
     protect_against_braindead_sysadmins();
     retval += unmount_all_devices(mountlist);
@@ -585 +584 @@
             mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
         } else {
-            mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+            mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
         }
         retval += res;
@@ -597 +596 @@
                             ("Warning - errors occurred during the restore phase."));
     }
+    iamhere("Leaving interactive_mode()");
     return(retval);
 }
@@ -619 +619 @@
          struct raidlist_itself *raidlist, bool nuke_me_please)
 {
-    char c;
+    char c = ' ';
     int retval = 0;
 
@@ -647 +647 @@
         paranoid_system("umount " MNT_CDROM);
     }
-//  if (! already_mounted)
-//    {
     if (system("umount /tmp/isodir 2> /dev/null")) {
         log_to_screen
@@ -654 +652 @@
              ("WARNING - unable to unmount device where the ISO files are stored."));
     }
-//    }
     return (retval);
 }
@@ -661 +658 @@
  *END_ISO_MODE                                                            *
  **************************************************************************/
-
-
 static void call_me_after_the_nuke(int retval) {
 
@@ -670 +665 @@
     if (retval) {
         log_to_screen(_("Errors occurred during the nuke phase."));
-        log_to_screen(_("Please visit our website at http://www.mondorescue.org for more information."));
+        log_to_screen(_("Please visit our website at http://www.mondores
+cue.org for more information."));
     } else {
 #ifdef __FreeBSD__
-        tmp1 = call_program_and_get_last_line_of_output("cat /tmp/cmdline");
+    tmp1 = call_program_and_get_last_line_of_output("cat /tmp/cmdline");
 #else
-        tmp1 = call_program_and_get_last_line_of_output("cat /proc/cmdline");
+    tmp1 = call_program_and_get_last_line_of_output("cat /proc/cmdline");
 #endif
         if ((strstr(tmp1,"restore") == NULL) ||
-            (strstr(tmp1,"RESTORE") == NULL)) {
-                /* -H option */
-                mr_asprintf(&tmp,
-                    _
-                    (" Mondo has restored your system. Please 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);
+        (strstr(tmp1,"RESTORE") == NULL)) {
+            /* -H option */
+            mr_asprintf(&tmp,
+                _
+                (" Mondo has restored your system. Please 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);
         }
         mr_free(tmp1);
 
         log_to_screen(_
-             ("Mondo has restored your system. Please remove the backup media and reboot."));
+            ("Mondo has restored your system. Please remove the backup media and reboot."));
         log_to_screen(_
-             ("Thank you for using Mondo Rescue."));
+            ("Thank you for using Mondo Rescue."));
         log_to_screen(_
-             ("Please visit our website at http://www.mondorescue.org for more information."));
+            ("Please visit our website at http://www.mondorescue.org for more information."));
     }
     g_I_have_just_nuked = TRUE;
@@ -750 +747 @@
             mr_free(tmp);
             retval = interactive_mode(bkpinfo, mountlist, raidlist);
-            goto after_the_nuke;
+            call_me_after_the_nuke(retval);
+            return(retval);
         } else {
             mr_free(tmp);
@@ -812 +810 @@
             retval = interactive_mode(bkpinfo, mountlist, raidlist);
             call_me_after_the_nuke(retval);
+            return(retval);
         } else
             if (!ask_me_yes_or_no
                 (_("Would you like to try to proceed anyway?"))) {
-        }
-        return(retval);
+                return(retval);
+        }
     }
     retval = mount_all_devices(mountlist, TRUE);
@@ -834 +833 @@
     }
     protect_against_braindead_sysadmins();
-//  run_program_and_log_output("cp -af /etc/lvm " MNT_RESTORING "/etc/", 1);
     retval += unmount_all_devices(mountlist);
     mvaddstr_and_log_it(g_currentY,
@@ -855 +853 @@
     retval += res;
 
-  after_the_nuke:
-    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"))    // Bruno's thing
-    {
-        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.");
-        if (strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "restore") == NULL) {
-            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.");
-    }
-    g_I_have_just_nuked = TRUE;
-/*
-  if (!boot_loader_installed && !does_file_exist(DO_MBR_PLEASE))
-    {
-      log_to_screen("PLEASE RUN 'mondorestore --mbr' NOW TO INITIALIZE YOUR BOOT SECTOR");
-      write_one_liner_data_file(DO_MBR_PLEASE, "mondorestore --mbr");
-    }
-*/
+    call_me_after_the_nuke(retval);
     return (retval);
 }
+
 /**************************************************************************
  *END_NUKE_MODE                                                           *
@@ -996 +967 @@
     FILE *fout = NULL;
     FILE *fbzip2 = NULL;
+
     char *checksum = NULL;
-    char *outfile_fname = NULL;
-    char *tmp = NULL;
+    char *outfile_fname = NULL;
+    char *tmp = NULL;
     char *tmp0 = NULL;
     char *tmp1 = NULL;
     char *tmp2 = NULL;
     char *tmp3 = NULL;
-    char *bzip2_command = NULL;
+    char *bzip2_command = NULL;
     char *bigblk = NULL;
     char *pathname_of_last_file_restored = NULL;
     int finished = FALSE;
-    long sliceno;
+    long sliceno = 0L;
     long siz;
     long siz1;
@@ -1018 +990 @@
     int res = 0;
     int old_loglevel;
-    char *sz_msg;
+    char *sz_msg = NULL;
     struct s_node *node = NULL;
 
@@ -1046 +1018 @@
 
     if (!checksum[0]) {
-        mr_asprintf(&tmp, "Warning - bigfile %ld does not have a checksum",
+        mr_msg(3, "Warning - bigfile %ld does not have a checksum",
                 bigfileno + 1);
-        mr_msg(3, tmp);
-        mr_free(tmp);
-        /* BERLIOS : Useless ???
-        p = checksum;
-        */
     }
     mr_free(checksum);
@@ -1090 +1057 @@
 
     if (biggiestruct.use_ntfsprog)  // if it's an NTFS device
-//  if (!strncmp ( biggiestruct.filename, "/dev/", 5))
     {
         g_loglevel = 4;
@@ -1112 +1078 @@
                 feed_outfrom_ntfsprog(biggiestruct.filename,
                                       ntfsprog_fifo);
-//          mr_msg(3, "CHILD - fip - exiting");
             exit(res);
             break;
@@ -1120 +1085 @@
                     (long int) (pid));
         }
-        // BERLIOS: Is it the right place ??
-        mr_free(ntfsprog_fifo);
     } else {
         use_ntfsprog_hack = FALSE;
@@ -1131 +1094 @@
     }
 
-    mr_asprintf(&tmp, "Reassembling big file %ld (%s)", bigfileno + 1,
+    mr_msg(2, "Reassembling big file %ld (%s)", bigfileno + 1,
             outfile_fname);
-    mr_msg(2, tmp);
-    mr_free(tmp);
 
     /*
@@ -1146 +1107 @@
     mr_msg(3, "file_to_openout = %s", file_to_openout);
     if (!(fout = fopen(file_to_openout, "w"))) {
-        log_to_screen(_("Cannot openout outfile_fname - hard disk full?"));
+        log_to_screen(_("Cannot openout file_to_openout - hard disk full?"));
         return (pathname_of_last_file_restored);
     }
+    mr_free(ntfsprog_fifo);
     mr_msg(3, "Opened out to %s", outfile_fname);   // CD/DVD --> mondorestore --> ntfsclone --> hard disk itself
 
@@ -1164 +1126 @@
                     g_current_media_number);
             g_current_media_number++;
-            mr_asprintf(&tmp3,
-                    "Asking for %s #%d so that I may read slice #%ld\n",
-                    bkpinfo->backup_media_string,
+            mr_msg(2, "Asking for %s #%d so that I may read slice #%ld\n",
+                    media_descriptor_string(bkpinfo->backup_media_type),
                     g_current_media_number, sliceno);
-            mr_msg(2, tmp3);
-            mr_free(tmp3);
-
-            mr_asprintf(&tmp3, _("Restoring from %s #%d"),
+            log_to_screen(_("Restoring from %s #%d"),
                     bkpinfo->backup_media_string,
                     g_current_media_number);
-            log_to_screen(tmp3);
-            mr_free(tmp3);
-
             insist_on_this_cd_number(bkpinfo, g_current_media_number);
             log_to_screen(_("Continuing to restore."));
@@ -1194 +1149 @@
                         mr_asprintf(&bzip2_command, "bzip2 -dc %s 2>> %s",tmp2, MONDO_LOGFILE);
                 } else if (does_file_exist(tmp)) {
-                        mr_asprintf(&bzip2_command, "%s", "");
+                        mr_asprintf(&bzip2_command, "");
                 } else {
                     log_to_screen(_("OK, that's pretty fsck0red..."));
@@ -1204 +1159 @@
                 mr_asprintf(&bzip2_command, "cat %s 2>> %s", tmp, MONDO_LOGFILE);
             }
-            mr_asprintf(&tmp3, "Working on %s #%d, file #%ld, slice #%ld ",
+            mr_asprintf(&tmp3, "Working on %s #%d, file #%ld, slice #%ld",
                     bkpinfo->backup_media_string,
                     g_current_media_number, bigfileno + 1, sliceno);
@@ -1216 +1171 @@
 
             if (!(fbzip2 = popen(bzip2_command, "r"))) {
+                mr_free(bzip2_command);
                 fatal_error("Can't run popen command");
             }
@@ -1224 +1180 @@
                 if (siz > 0) {
                     siz1 = fwrite(bigblk, 1, siz, fout);
-                    mr_asprintf(&sz_msg, "Read %ld from fbzip2; written %ld to fout", siz, siz1);
-                    log_it(sz_msg);
-                    mr_free(sz_msg);
                 }
             }
             paranoid_pclose(fbzip2);
-
 
             sliceno++;
@@ -1288 +1240 @@
                                      int use_ntfsprog)
 {
-    FILE *pout;
-    FILE *fin;
+    FILE *pout = NULL;
+    FILE *fin = NULL;
 
   /** mallocs ********/
@@ -1300 +1252 @@
     char *pathname_of_last_file_restored = NULL;
 
-    struct s_node *node;
-
-    int old_loglevel;
+    struct s_node *node = NULL;
+
+    int old_loglevel = 0;
     long current_slice_number = 0;
     int retval = 0;
     int res = 0;
     int ctrl_chr = '\0';
-    long long slice_siz;
+    long long slice_siz = 0L;
     bool dummy_restore = FALSE;
     bool use_ntfsprog_hack = FALSE;
     pid_t pid;
     struct s_filename_and_lstat_info biggiestruct;
-    struct utimbuf the_utime_buf, *ubuf;
+    struct utimbuf the_utime_buf, *ubuf = NULL;
     ubuf = &the_utime_buf;
 
@@ -1380 +1332 @@
                     outfile_fname, ntfsprog_fifo);
             res = feed_outfrom_ntfsprog(outfile_fname, ntfsprog_fifo);
-//          mr_msg(3, "CHILD - fip - exiting");
             exit(res);
             break;
@@ -1388 +1339 @@
                     (long int) (pid));
         }
-        mr_free(ntfsprog_fifo);
     } else {
         if (!strncmp(orig_bf_fname, "/dev/", 5))    // non-NTFS partition
@@ -1404 +1354 @@
             make_hole_for_file(outfile_fname);
         }
-        mr_asprintf(&tmp1, "Reassembling big file %ld (%s)",
+        mr_msg(2, "Reassembling big file %ld (%s)",
                 biggiefile_number + 1, orig_bf_fname);
-        mr_msg(2, tmp1);
-        mr_free(tmp1);
     }
 
@@ -1421 +1369 @@
                 file_to_openout, MONDO_LOGFILE);
     }
-    mr_asprintf(&tmp1, "Pipe command = '%s'", command);
-    mr_msg(3, tmp1);
-    mr_free(tmp1);
+    mr_msg(3, "Pipe command = '%s'", command);
+    mr_free(outfile_fname);
+    mr_free(ntfsprog_fifo);
 
     /* restore biggiefile, one slice at a time */
@@ -1445 +1393 @@
             newtRefresh();
         }
-        strip_spaces(tmp1);
+        mr_strip_spaces(tmp1);
         update_progress_form(tmp1);
         mr_free(tmp1);
@@ -1506 +1454 @@
     }
 
-    mr_free(outfile_fname);
     g_loglevel = old_loglevel;
     return (pathname_of_last_file_restored);
@@ -1533 +1480 @@
 {
     int retval = 0;
-    int res;
-    char *p;
+    int res = 0;
+    char *p = NULL;
 
   /** malloc **/
-    char *command;
+    char *command = NULL;
     char *tmp = NULL;
-    char *filelist_name;
+    char *filelist_name = NULL;
     char *filelist_subset_fname = NULL;
     char *executable = NULL;
     char *temp_log = NULL;
     long matches = 0;
-    bool use_star;
+    bool use_star = FALSE;
     char *xattr_fname = NULL;
     char *acl_fname = NULL;
@@ -1567 +1514 @@
         retval = 0;
         mr_msg(5, "Leaving");
+        mr_free(filelist_name);
         return (retval);
     }
@@ -1573 +1521 @@
         mr_msg(3, "length_of_file(%s) = %llu", tarball_fname,
                 length_of_file(tarball_fname));
-        mr_asprintf(&tmp, "Unable to restore fileset #%ld (CD I/O error)",
+        log_to_screen(_("Unable to restore fileset #%ld (CD I/O error)"),
                 current_tarball_number);
-        log_to_screen(tmp);
-        mr_free(tmp);
         retval = 1;
         mr_msg(5, "Leaving");
+        mr_free(filelist_name);
         return (retval);
     }
@@ -1590 +1537 @@
                                              use_star))
             <= 0) {
-            mr_asprintf(&tmp, "Skipping fileset %ld", current_tarball_number);
-            mr_msg(1, tmp);
-            mr_free(tmp);
+            mr_msg(1, "Skipping fileset %ld", current_tarball_number);
         } else {
             mr_msg(3, "Saved fileset %ld's subset to %s",
                     current_tarball_number, filelist_subset_fname);
         }
-        mr_asprintf(&tmp, "Tarball #%ld --- %ld matches",
+        log_to_screen("Tarball #%ld --- %ld matches",
                 current_tarball_number, matches);
-        log_to_screen(tmp);
-        mr_free(tmp);
-    } else {
-        filelist_subset_fname = NULL;
     }
     mr_free(filelist_name);
@@ -1616 +1557 @@
         }
         if (strstr(tarball_fname, ".bz2")) {
-            mr_asprintf(&executable, "bzip2");
+            mr_asprintf(&executable, "-P bzip2 -Z");
         } else if (strstr(tarball_fname, ".gz")) {
-            strcpy(executable, "gzip");
-        } else if (strstr(tarball_fname, ".gz")) {
-            strcpy(executable, "gzip");
+            mr_asprintf(&executable, "-P gzip -Z");
         } else if (strstr(tarball_fname, ".lzo")) {
-            mr_asprintf(&executable, "lzop");
-        } else {
-            executable = NULL;
+            mr_asprintf(&executable, "-P lzop -Z");
         }
 
@@ -1633 +1570 @@
                     (_
                      ("(compare_a_tarball) Compression program not found - oh no!"));
+                mr_free(tmp);
+                mr_free(executable);
+                mr_free(acl_fname);
+                mr_free(xattr_fname);
+                mr_free(filelist_subset_fname);
                 paranoid_MR_finish(1);
             }
-            mr_free(tmp);
-
-            mr_asprintf(&tmp, executable);
-            mr_asprintf(&executable, "-P %s -Z", tmp);
             mr_free(tmp);
         }
@@ -1647 +1585 @@
 #endif
 
-        mr_asprintf(&temp_log, "/tmp/%d.%d", (int) (random() % 32768),
-            (int) (random() % 32768));
-
         if (use_star) {
+            mr_sprintf(&command,
+                    "star -x -force-remove -U " STAR_ACL_SZ
+                    " errctl= file=%s", tarball_fname);
             if (strstr(tarball_fname, ".bz2")) {
-                mr_asprintf(&tmp, " -bz");
-            } else {
-                mr_asprintf(&tmp, "%s", "");
-            }
-            mr_asprintf(&command,
-                    "star -x -force-remove -U " STAR_ACL_SZ
-                    " errctl= file=%s %s 2>> %s >> %s", tarball_fname, tmp, temp_log, temp_log);
-            mr_free(tmp);
+                mr_strcat(command, " -bz");
+            }
         } else {
             if (filelist_subset_fname != NULL) {
                 mr_asprintf(&command,
-                        "afio -i -M 8m -b %ld -c %ld %s -w '%s' %s 2>> %s >> %s",
+                        "afio -i -M 8m -b %ld -c %ld %s -w '%s' %s",
                         TAPE_BLOCK_SIZE,
                         BUFSIZE, executable, filelist_subset_fname,
-//             files_to_restore_this_time_fname,
-                        tarball_fname, temp_log, temp_log);
+                        tarball_fname);
             } else {
                 mr_asprintf(&command,
-                        "afio -i -b %ld -c %ld -M 8m %s %s 2>> %s >> %s",
+                        "afio -i -b %ld -c %ld -M 8m %s %s",
                         TAPE_BLOCK_SIZE,
-                        BUFSIZE, executable, tarball_fname, temp_log, temp_log);
+                        BUFSIZE, executable, tarball_fname);
             }
         }
@@ -1678 +1609 @@
 
 #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);
         mr_msg(1, "command = '%s'", command);
         unlink(temp_log);
@@ -1732 +1667 @@
         unlink(xattr_fname);
         mr_free(xattr_fname);
+        unlink(acl_fname);
+        mr_free(acl_fname);
+        unlink(temp_log);
+        mr_free(temp_log);
     }
     if (does_file_exist("/PAUSE")) {
@@ -1739 +1678 @@
     }
     unlink(filelist_subset_fname);
-    unlink(acl_fname);
-    unlink(temp_log);
-
     mr_free(filelist_subset_fname);
-    mr_free(acl_fname);
-    mr_free(temp_log);
     mr_msg(5, "Leaving");
     return (retval);
@@ -1789 +1723 @@
     long matches = 0;
     bool restore_this_fileset = FALSE;
-    bool use_star;
+    bool use_star = FALSE;
 
     assert(bkpinfo != NULL);
@@ -1795 +1729 @@
     /* to do it with a file... */
     use_star = (strstr(tarball_fname, ".star")) ? TRUE : FALSE;
-    mr_asprintf(&tmp,
-            "Restoring from fileset #%ld (%ld KB) on %s #%d",
+    mr_msg(2, "Restoring from fileset #%ld (%ld KB) on %s #%d",
             current_tarball_number, (long) size >> 10,
             bkpinfo->backup_media_string,
             g_current_media_number);
-    mr_msg(2, tmp);
-    mr_free(tmp);
     run_program_and_log_output("mkdir -p " MNT_RESTORING "/tmp", FALSE);
 
@@ -1837 +1768 @@
         if (strstr(tarball_fname, ".star.")) {
             use_star = TRUE;
-            mr_asprintf(&command, "star -t file=%s %s > %s 2>> %s", afio_fname, executable, filelist_fname, MONDO_LOGFILE);
+            mr_asprintf(&command, "star -t file=%s %s", afio_fname, executable);
         } else {
             use_star = FALSE;
-            mr_asprintf(&command, "afio -t -M 8m -b %ld %s %s > %s 2>> %s", TAPE_BLOCK_SIZE,
-                    executable, afio_fname, 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);
         mr_msg(1, "command = %s", command);
         if (system(command)) {
@@ -1848 +1780 @@
         }
         mr_free(command);
+
         if ((matches =
              save_filelist_entries_in_common(filelist_fname, filelist,
@@ -1857 +1790 @@
                         current_tarball_number);
             }
-            mr_asprintf(&tmp, "Skipping fileset %ld", current_tarball_number);
-            mr_msg(2, tmp);
-            mr_free(tmp);
+            mr_msg(2, "Skipping fileset %ld", current_tarball_number);
             restore_this_fileset = FALSE;
         } else {
@@ -1875 +1806 @@
         // star
         if (filelist) {
-            mr_asprintf(&command, "star -x file=%s %s list=%s 2>> %s", afio_fname, executable,
-                    filelist_subset_fname,MONDO_LOGFILE);
+            mr_asprintf(&command, "star -x file=%s %s list=%s 2>> %s", afio_fname, executable, filelist_subset_fname, MONDO_LOGFILE);
         } else {
-            mr_asprintf(&command,"star -x file=%s %s 2>> %s", afio_fname, executable,MONDO_LOGFILE);
+            mr_asprintf(&command, "star -x file=%s %s 2>> %s", afio_fname, executable, MONDO_LOGFILE);
         }
     } else {
         // afio
         if (filelist) {
-            mr_asprintf(&command, "afio -i -M 8m -b %ld %s -w %s %s 2>> %s", TAPE_BLOCK_SIZE, executable, filelist_subset_fname,afio_fname,MONDO_LOGFILE);
+            mr_asprintf(&command, "afio -i -M 8m -b %ld %s -w %s %s 2>> %s", TAPE_BLOCK_SIZE, executable, filelist_subset_fname, afio_fname, MONDO_LOGFILE);
         } else {
-            mr_asprintf(&command, "afio -i -M 8m -b %ld %s %s 2>> %s", TAPE_BLOCK_SIZE, executable,afio_fname,MONDO_LOGFILE);
+            mr_asprintf(&command, "afio -i -M 8m -b %ld %s %s 2>> %s", TAPE_BLOCK_SIZE, executable, afio_fname, MONDO_LOGFILE);
         }
     }
@@ -1992 +1922 @@
         return (0);
     }
-    mr_asprintf(&tmp, "OK, there are %ld biggiefiles in the archives",
-            noof_biggiefiles);
-    mr_msg(2, tmp);
-    mr_free(tmp);
+    mr_msg(2, "OK, there are %ld biggiefiles in the archives", noof_biggiefiles);
 
     open_progress_form(_("Reassembling large files"),
@@ -2023 +1950 @@
                 insist_on_this_cd_number(bkpinfo,
                                          ++g_current_media_number);
-                mr_asprintf(&tmp, _("Restoring from %s #%d"),
+                log_to_screen(_("Restoring from %s #%d"),
                         bkpinfo->backup_media_string,
                         g_current_media_number);
-                log_to_screen(tmp);
-                mr_free(tmp);
-
                 just_changed_cds = TRUE;
             } else {
@@ -2051 +1975 @@
             retval += res;
             bigfileno++;
-
-        }
-        mr_free(tmp);
+        }
     }
 
@@ -2088 +2010 @@
     return (retval);
 }
+
 /**************************************************************************
  *END_RESTORE_ALL_BIGGIFILES_FROM_CD                                      *
@@ -2108 +2031 @@
 {
     int retval = 0;
-    int res;
-    int attempts;
+    int res = 0;
+    int attempts = 0;
     long current_tarball_number = 0;
-    long max_val;
+    long max_val = 0L;
   /**malloc ***/
-    char *tmp;
-    char *tmp1;
-    char *tarball_fname;
-    char *progress_str;
-    char *comment;
+    char *tmp = NULL;
+    char *tmp1 = NULL;
+    char *tarball_fname = NULL;
+    char *progress_str = NULL;
+    char *comment = NULL;
 
     assert(bkpinfo != NULL);
@@ -2144 +2067 @@
         insist_on_this_cd_number(bkpinfo, g_current_media_number);
         update_progress_form(progress_str);
-
         mr_asprintf(&tarball_fname, MNT_CDROM "/archives/%ld.afio.bz2",
                 current_tarball_number);
@@ -2178 +2100 @@
                     (_
                      ("No tarballs. Strange. Maybe you only backed up freakin' big files?"));
+                mr_free(progress_str);
                 return (0);
             }
@@ -2184 +2107 @@
                           "/archives/slice* > /dev/null 2> /dev/null") ==
                 0) {
+                mr_free(tarball_fname);
+                mr_free(progress_str);
                 break;
             }
             g_current_media_number++;
             mr_free(progress_str);
+
             mr_asprintf(&progress_str, _("Restoring from %s #%d"),
                     bkpinfo->backup_media_string,
@@ -2199 +2125 @@
                     bkpinfo->backup_media_string,
                     g_current_media_number);
-//    mr_msg(3, "progress_str = %s", progress_str);
             for (res = 999, attempts = 0; attempts < 3 && res != 0;
                  attempts++) {
@@ -2207 +2132 @@
                                               filelist);
             }
+            mr_asprintf(&tmp, _("%s #%d, fileset #%ld - restore "),
+                    media_descriptor_string(bkpinfo->backup_media_type),
+                    g_current_media_number, current_tarball_number);
             if (res) {
-                mr_asprintf(&tmp1, _("reported errors"));
+                mr_strcat(tmp, _("reported errors"));
             } else {
-                mr_asprintf(&tmp1, _("succeeded"));
-            }
-            mr_asprintf(&tmp, _("%s #%d, fileset #%ld - restore %s"),
-                    bkpinfo->backup_media_string,
-                    g_current_media_number, current_tarball_number,tmp1);
-            mr_free(tmp1);
-            
+                mr_strcat(tmp, _("succeeded"));
+            }
             if (attempts > 1) {
-                mr_asprintf(&tmp1, _(" (%d attempts) - review logs"), attempts);
-            }
-            mr_asprintf(&comment, "%s%s", tmp, tmp1);
+                mr_strcat(tmp, _(" (%d attempts) - review logs"), attempts);
+            }
+            if (attempts > 1) {
+                log_to_screen(tmp);
+            }
             mr_free(tmp);
-            mr_free(tmp1);
-            if (attempts > 1) {
-                log_to_screen(comment);
-            }
-            mr_free(comment);
 
             retval += res;
@@ -2242 +2162 @@
         mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     }
-
     return (retval);
 }
@@ -2262 +2181 @@
                                     struct s_node *filelist)
 {
-    long noof_biggiefiles;
-    long current_bigfile_number = 0;
-    long total_slices;
+    long noof_biggiefiles = 0L;
+    long current_bigfile_number = 0L;
+    long total_slices = 0L;
 
     int retval = 0;
     int res = 0;
-    int ctrl_chr;
+    int ctrl_chr = 0;
 
   /** malloc add ****/
@@ -2302 +2221 @@
                 biggies_whose_EXATs_we_should_set);
     }
-// get xattr and acl files if they're there
+    // get xattr and acl files if they're there
     res =
         read_header_block_from_stream(&biggie_size, biggie_fname,
@@ -2313 +2232 @@
 
     noof_biggiefiles = atol(biggie_fname);
-    mr_asprintf(&tmp, "OK, there are %ld biggiefiles in the archives",
+    mr_msg(2, "OK, there are %ld biggiefiles in the archives",
             noof_biggiefiles);
-    mr_msg(2, tmp);
-    mr_free(tmp);
-
     open_progress_form(_("Reassembling large files"),
                        _("I am now reassembling all the large files."),
@@ -2363 +2279 @@
     if (current_bigfile_number != noof_biggiefiles
         && noof_biggiefiles != 0) {
-        mr_asprintf(&tmp, "Warning - bigfileno=%ld but noof_biggiefiles=%ld\n",
+        mr_msg(1, "Warning - bigfileno=%ld but noof_biggiefiles=%ld\n",
                 current_bigfile_number, noof_biggiefiles);
     } else {
-        mr_asprintf(&tmp,
-                "%ld biggiefiles in biggielist.txt; %ld biggiefiles processed today.",
+        mr_msg(1, "%ld biggiefiles in biggielist.txt; %ld biggiefiles processed today.",
                 noof_biggiefiles, current_bigfile_number);
     }
-    mr_msg(1, tmp);
-    mr_free(tmp);
 
     if (fbw) {
@@ -2437 +2350 @@
 {
     int retval = 0;
-    int res;
+    int res = 0;
     long current_afioball_number = 0;
-    int ctrl_chr;
-    long max_val /*, total_noof_files */ ;
+    int ctrl_chr = 0;
+    long max_val = 0L /*, total_noof_files */ ;
 
   /** malloc **/
@@ -2449 +2362 @@
     char *acl_fname = NULL;
 
-    long long tmp_size;
+    long long tmp_size = 0L;
 
     assert(bkpinfo != NULL);
@@ -2515 +2428 @@
         retval += res;
         if (res) {
-            mr_asprintf(&tmp, _("Fileset %ld - errors occurred"),
+            log_to_screen("Fileset %ld - errors occurred",
                     current_afioball_number);
-            log_to_screen(tmp);
-            mr_free(tmp);
         }
         res =
@@ -2609 +2520 @@
     mr_free(tmp);
 
-    mvaddstr_and_log_it(g_currentY, 0,
-                        _("Preparing to read your archives"));
+    mvaddstr_and_log_it(g_currentY, 0, _("Preparing to read your archives"));
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
         mount_cdrom(bkpinfo);
@@ -2785 +2695 @@
 void welcome_to_mondorestore()
 {
-    mr_msg(0, "-------------- Mondo Restore v%s -------------",
-            PACKAGE_VERSION);
+    mr_msg(0, "-------------- Mondo Restore v%s -------------", PACKAGE_VERSION);
     mr_msg(0,
             "DON'T PANIC! Mondorestore logs almost everything, so please ");
@@ -2837 +2746 @@
     bool run_postnuke = FALSE;
 
-  /**************************************************************************
-   * hugo-                                                                  *
-   * busy stuff here - it needs some comments -stan                           *
-   *                                                                        *
-   **************************************************************************/
-
 #ifdef ENABLE_NLS
     setlocale(LC_ALL, "");
@@ -2869 +2772 @@
     mr_free(tmp);
 
-    bkpinfo = g_bkpinfo_DONTUSETHIS = mr_malloc(sizeof(struct s_bkpinfo));
+    bkpinfo = mr_malloc(sizeof(struct s_bkpinfo));
     mountlist = mr_malloc(sizeof(struct mountlist_itself));
     raidlist = mr_malloc(sizeof(struct raidlist_itself));
@@ -2927 +2830 @@
     run_program_and_log_output("rm -Rf /tmp/tmpfs/mondo.tmp.*", FALSE);
 
-/* Init GUI */
+    /* Init GUI */
     malloc_libmondo_global_strings();
     setup_newt_stuff();         /* call newtInit and setup screen log */
@@ -2939 +2842 @@
     iamhere("what time is it");
 
-/* Process command-line parameters */
+    /* Process command-line parameters */
     if (argc == 2 && strcmp(argv[1], "--edit-mountlist") == 0) {
 #ifdef __FreeBSD__
@@ -2998 +2901 @@
         // 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);
         mr_asprintf(&a, argv[3]);
         mr_asprintf(&b, argv[4]);
@@ -3073 +2973 @@
                  ("Live mode doesn't support command-line parameters yet."));
             paranoid_MR_finish(1);
-//    return(1);
         }
         mr_msg(1, "I am in normal, live mode.");
@@ -3225 +3124 @@
             if (!bkpinfo->please_dont_eject) {
                 res = eject_device("/dev/cdrom");
-/*
-              if (res) 
-        {
-          log_to_screen( "WARNING - failed to eject CD-ROM disk" ); 
-        }
-*/
             }
             mvaddstr_and_log_it(g_currentY++,
@@ -3239 +3132 @@
     }
 
-// g_I_have_just_nuked is set true by nuke_mode() just before it returns
+    // g_I_have_just_nuked is set true by nuke_mode() just before it returns
     if (!system("which post-nuke > /dev/null 2> /dev/null")) {
       mr_msg(1, "post-nuke found; find out whether we should run it...");
@@ -3262 +3155 @@
       } else {
         mr_msg(1, "Re-mounted partitions for post-nuke stuff");
-        sprintf(tmp, "post-nuke %s %d", bkpinfo->restore_path,
+        mr_asprintf(&tmp, "post-nuke %s %d", bkpinfo->restore_path,
             retval);
         mr_msg(2, "Calling '%s'", tmp);
@@ -3268 +3161 @@
           log_OS_error(tmp);
         }
+        mr_free(tmp);
         mr_msg(1, "post-nuke returned w/ res=%d", res);
       }
@@ -3274 +3168 @@
     }
 
-/*  
-  log_to_screen("If you are REALLY in a hurry, hit Ctrl-Alt-Del now.");
-  log_to_screen("Otherwise, please wait until the RAID disks are done.");
-  wait_until_software_raids_are_prepped("/proc/mdstat", 100);
-  log_to_screen("Thank you.");
-*/
     unlink("/tmp/mondo-run-prog.tmp");
     set_signals(FALSE);
@@ -3289 +3177 @@
         (_
          ("Restore log copied to /tmp/mondo-restore.log on your hard disk"));
-    mr_asprintf(&tmp,
-            _
-            ("Mondo-restore is exiting (retval=%d)                                      "),
-            retval);
-    log_to_screen(tmp);
-    mr_free(tmp);
+    log_to_screen(_("Mondo-restore is exiting (retval=%d)"), retval);
 
     mr_asprintf(&tmp, "umount %s", bkpinfo->isodir);