Changeset 1199 in MondoRescue

Timestamp:

Feb 25, 2007, 12:43:27 AM (17 years ago)

Author:

Bruno Cornec

Message:

merge trunk memory management for mondorestore.c

File:

• branches/stable/mondo/src/mondorestore/mondorestore.c (modified) (164 diffs)

branches/stable/mondo/src/mondorestore/mondorestore.c

@@ -12 +12 @@
  * #include statements                                                    *
  **************************************************************************/
-#include <pthread.h>
+#include <unistd.h>
+
 #include "my-stuff.h"
 #include "mr_mem.h"
@@ -74 +75 @@
  * The device to mount to get at the ISO images. Ignored unless @p g_ISO_restore_mode.
  */
-char *g_isodir_device;
+char *g_isodir_device = NULL;
 
 /**
  * The format of @p g_isodir_device. Ignored unless @p g_ISO_restore_mode.
  */
-char *g_isodir_format;
+char *g_isodir_format = NULL;
 
 /**
  * The location of 'biggielist.txt', containing the biggiefiles on the current archive set.
  */
-char *g_biggielist_txt;
+char *g_biggielist_txt = NULL;
 
 /**
@@ -90 +91 @@
  * the current archive set.
  */
-char *g_filelist_full;
+char *g_filelist_full = NULL;
 
 /**
@@ -96 +97 @@
  * as images, not as individual files.
  */
-char *g_filelist_imagedevs;
+char *g_filelist_imagedevs = NULL;
 
 /**
@@ -102 +103 @@
  * @see g_filelist_imagedevs
  */
-char *g_imagedevs_restthese;
+char *g_imagedevs_restthese = NULL;
 
 /**
@@ -108 +109 @@
  * information for this backup.
  */
-char *g_mondo_cfg_file;
+char *g_mondo_cfg_file = NULL;
 
 /**
@@ -114 +115 @@
  * user's partitions and hard drives.
  */
-char *g_mountlist_fname;
+char *g_mountlist_fname = NULL;
 
 /**
@@ -120 +121 @@
  * to avoid link errors.
  */
-char *g_mondo_home;
+char *g_mondo_home = NULL;
 
 /* Busybox ps has no option and PID in first pos */
@@ -131 +132 @@
 /* @} - end of "Restore-Time Globals" in globalGroup */
 
-
-
 extern int copy_from_src_to_dest(FILE * f_orig, FILE * f_archived,
                                  char direction);
-
-
 
 /**************************************************************************
@@ -145 +142 @@
  * The message to display if we detect that the user is using a Compaq Proliant.
  */
-#define COMPAQ_PROLIANTS_SUCK "Partition and format your disk using Compaq's disaster recovery CD. After you've done that, please reboot with your Mondo CD/floppy in Interactive Mode."
-
-
+#define COMPAQ_PROLIANTS_SUCK _("Partition and format your disk using Compaq's disaster recovery CD. After you've done that, please reboot with your Mondo CD/floppy in Interactive Mode.")
 
 
@@ -175 +170 @@
     if (!does_file_exist(g_mountlist_fname)) {
         log_to_screen(g_mountlist_fname);
-        log_to_screen("does not exist");
+        log_to_screen(_("does not exist"));
         return (1);
     }
@@ -183 +178 @@
     if (retval) {
         log_to_screen
-            ("Warning - load_raidtab_into_raidlist returned an error");
+            (_("Warning - load_raidtab_into_raidlist returned an error"));
     }
     res = edit_mountlist(g_mountlist_fname, mountlist, raidlist);
@@ -193 +188 @@
     save_raidlist_to_raidtab(raidlist, RAIDTAB_FNAME);
 
-    log_to_screen("I have finished editing the mountlist for you.");
+    log_to_screen(_("I have finished editing the mountlist for you."));
 
     return (retval);
 }
-
-
-
 
 
@@ -242 +234 @@
     popup_and_OK(COMPAQ_PROLIANTS_SUCK);
     if (ask_me_yes_or_no
-        ("Would you like to reboot and use your Compaq CD to prep your hard drive?"))
+        (_
+         ("Would you like to reboot and use your Compaq CD to prep your hard drive?")))
     {
-        fatal_error
-            ("Aborting. Please reboot and prep your hard drive with your Compaq CD.");
+        fatal_error(_
+                    ("Aborting. Please reboot and prep your hard drive with your Compaq CD."));
     }
 }
@@ -252 +245 @@
  *END_OFFER_TO_ABORT_BECAUSE_COMPAQ_PROLIANTS_SUCK                        *
  **************************************************************************/
-
 
 
@@ -275 +267 @@
     assert(mountlist != NULL);
     assert(raidlist != NULL);
-    malloc_string(tmp);
     iamhere("pre wrm");
     c = which_restore_mode();
@@ -282 +273 @@
         interactively_obtain_media_parameters_from_user(bkpinfo, FALSE);
     } else {
-        popup_and_OK("No restoring or comparing will take place today.");
+        popup_and_OK(_
+                     ("No restoring or comparing will take place today."));
         if (is_this_device_mounted("/mnt/cdrom")) {
             run_program_and_log_output("umount /mnt/cdrom", FALSE);
         }
         if (g_ISO_restore_mode) {
-            sprintf(tmp, "umount %s", bkpinfo->isodir);
+            mr_asprintf(&tmp, "umount %s", bkpinfo->isodir);
             run_program_and_log_output(tmp, FALSE);
+            mr_free(tmp);
         }
         paranoid_MR_finish(0);
@@ -315 +308 @@
         retval += compare_mode(bkpinfo, mountlist, raidlist);
     }
-    mr_free(tmp);
     return (retval);
 }
@@ -326 +318 @@
  *END_  EXTRACT_CONFIG_FILE_FROM_RAMDISK                                  *
  **************************************************************************/
-
-
-/**
- * Locate an executable in the directory structure rooted at @p restg.
- * @param out_path Where to put the executable.
- * @param fname The basename of the executable.
- * @param restg The directory structure to look in.
- * @note If it could not be found in @p restg then @p fname is put in @p out_path.
- * @ingroup restoreUtilityGroup
- */
-void
-find_pathname_of_executable_preferably_in_RESTORING(char *out_path,
-                                                    char *fname,
-                                                    char *restg)
-{
-    assert(out_path != NULL);
-    assert_string_is_neither_NULL_nor_zerolength(fname);
-
-    sprintf(out_path, "%s/sbin/%s", restg, fname);
-    if (does_file_exist(out_path)) {
-        sprintf(out_path, "%s/usr/sbin/%s", restg, fname);
-        if (does_file_exist(out_path)) {
-            sprintf(out_path, "%s/bin/%s", restg, fname);
-            if (does_file_exist(out_path)) {
-                sprintf(out_path, "%s/usr/bin/%s", restg, fname);
-                if (does_file_exist(out_path)) {
-                    strcpy(out_path, fname);
-                }
-            }
-        }
-    }
-}
-
-/**************************************************************************
- *END_FIND_PATHNAME_OF_EXECUTABLE_PREFERABLY_IN_RESTORING                 *
- **************************************************************************/
-
-
 
 
@@ -392 +346 @@
     bool restore_all;
 
-  /** needs malloc **********/
-    char *tmp;
-    char *fstab_fname;
-    char *old_restpath;
-
-    struct s_node *filelist;
+    char *tmp = NULL;
+    char *tmp1 = NULL;
+    char *fstab_fname = NULL;
+    char *old_restpath = NULL;
+
+    struct s_node *filelist = NULL;
 
     /* try to partition and format */
@@ -403 +357 @@
     mr_msg(2, "interactive_mode --- starting (great, assertions OK)");
 
-    malloc_string(tmp);
-    malloc_string(fstab_fname);
-    malloc_string(old_restpath);
     assert(bkpinfo != NULL);
     assert(mountlist != NULL);
@@ -414 +365 @@
     if (g_text_mode) {
         if (!ask_me_yes_or_no
-            ("Interactive Mode + textonly = experimental! Proceed anyway?"))
+            (_
+             ("Interactive Mode + textonly = experimental! Proceed anyway?")))
         {
             fatal_error("Wise move.");
@@ -442 +394 @@
         if (g_text_mode) {
             save_mountlist_to_disk(mountlist, g_mountlist_fname);
-            sprintf(tmp, "%s %s", find_my_editor(), g_mountlist_fname);
+            mr_asprintf(&tmp, "%s %s", find_my_editor(), g_mountlist_fname);
             res = system(tmp);
+            mr_free(tmp);
             load_mountlist(mountlist, g_mountlist_fname);
         } else {
@@ -455 +408 @@
         save_mountlist_to_disk(mountlist, g_mountlist_fname);
         save_raidlist_to_raidtab(raidlist, RAIDTAB_FNAME);
-        mvaddstr_and_log_it(1, 30, "Restoring Interactively");
+        mvaddstr_and_log_it(1, 30, _("Restoring Interactively"));
         if (bkpinfo->differential) {
-            log_to_screen("Because this is a differential backup, disk");
-            log_to_screen
-                (" partitioning and formatting will not take place.");
+            log_to_screen(_
+                          ("Because this is a differential backup, disk"));
+            log_to_screen(_
+                          (" partitioning and formatting will not take place."));
             done = TRUE;
         } else {
             if (ask_me_yes_or_no
-                ("Do you want to erase and partition your hard drives?")) {
+                (_
+                 ("Do you want to erase and partition your hard drives?")))
+            {
                 if (partition_table_contains_Compaq_diagnostic_partition
                     (mountlist)) {
@@ -474 +430 @@
                     if (ptn_errs) {
                         log_to_screen
-                            ("Warning. Errors occurred during disk partitioning.");
+                            (_
+                             ("Warning. Errors occurred during disk partitioning."));
                     }
 
@@ -480 +437 @@
                     if (!fmt_errs) {
                         log_to_screen
-                            ("Errors during disk partitioning were handled OK.");
-                        log_to_screen
-                            ("Partitions were formatted OK despite those errors.");
+                            (_
+                             ("Errors during disk partitioning were handled OK."));
+                        log_to_screen(_
+                                      ("Partitions were formatted OK despite those errors."));
                         ptn_errs = 0;
                     }
@@ -492 +450 @@
             } else {
                 mvaddstr_and_log_it(g_currentY++, 0,
-                                    "User opted not to partition the devices");
+                                    _
+                                    ("User opted not to partition the devices"));
                 if (ask_me_yes_or_no
-                    ("Do you want to format your hard drives?")) {
-                    fmt_errs = format_everything(mountlist, TRUE, raidlist);
+                    (_("Do you want to format your hard drives?"))) {
+                    fmt_errs =
+                        format_everything(mountlist, TRUE, raidlist);
                     if (!fmt_errs) {
                         done = TRUE;
@@ -507 +467 @@
                 mvaddstr_and_log_it(g_currentY++,
                                     0,
-                                    "Errors occurred. Please repartition and format drives manually.");
+                                    _
+                                    ("Errors occurred. Please repartition and format drives manually."));
                 done = FALSE;
             }
@@ -513 +474 @@
                 mvaddstr_and_log_it(g_currentY++,
                                     0,
-                                    "Errors occurred during partitioning. Formatting, however, went OK.");
+                                    _
+                                    ("Errors occurred during partitioning. Formatting, however, went OK."));
                 done = TRUE;
             }
             if (!done) {
-                if (!ask_me_yes_or_no("Re-edit the mountlist?")) {
+                if (!ask_me_yes_or_no(_("Re-edit the mountlist?"))) {
                     retval++;
-                    goto end_of_func;
+                    iamhere("Leaving interactive_mode()");
+                    return (retval);
                 }
             }
@@ -529 +492 @@
         unmount_all_devices(mountlist);
         retval++;
-        goto end_of_func;
+        iamhere("Leaving interactive_mode()");
+        return (retval);
     }
     /* restore */
     if ((restore_all =
-         ask_me_yes_or_no("Do you want me to restore all of your data?")))
+         ask_me_yes_or_no(_
+                          ("Do you want me to restore all of your data?"))))
     {
         mr_msg(1, "Restoring all data");
         retval += restore_everything(bkpinfo, NULL);
-    } else
-        if ((restore_all =
+    } 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);
+             (_("Do you want me to restore _some_ of your data?")))) {
+        mr_asprintf(&old_restpath,bkpinfo->restore_path);
         for (done = FALSE; !done;) {
             unlink("/tmp/filelist.full");
@@ -549 +513 @@
              */
             if (filelist) {
+                malloc_string(tmp1);
               gotos_suck:
-                strcpy(tmp, old_restpath);
-// (NB: %s is where your filesystem is mounted now, by default)", MNT_RESTORING);
+                strcpy(tmp1, old_restpath);
+                // (NB: MNT_RESTORING is where your filesystem is mounted now, by default)
                 if (popup_and_get_string
-                    ("Restore path", "Restore files to where?", tmp,
+                    (_("Restore path"), _("Restore files to where?"), tmp1,
                      MAX_STR_LEN / 4)) {
-                    if (!strcmp(tmp, "/")) {
-                        if (!ask_me_yes_or_no("Are you sure?")) {
+                    if (!strcmp(tmp1, "/")) {
+                        if (!ask_me_yes_or_no(_("Are you sure?"))) {
                             goto gotos_suck;
                         }
-                        tmp[0] = '\0';  // so we restore to [blank]/file/name :)
+                        tmp1[0] = '\0'; // so we restore to [blank]/file/name :)
                     }
-                    strcpy(bkpinfo->restore_path, tmp);
+                    strcpy(bkpinfo->restore_path, tmp1);
                     mr_msg(1, "Restoring subset");
                     retval += restore_everything(bkpinfo, filelist);
@@ -570 +535 @@
                 }
                 if (!ask_me_yes_or_no
-                    ("Restore another subset of your backup?")) {
+                    (_("Restore another subset of your backup?"))) {
                     done = TRUE;
                 }
+                mr_free(tmp1);
             } else {
                 done = TRUE;
             }
         }
-        strcpy(old_restpath, bkpinfo->restore_path);
+        mr_free(old_restpath);
     } else {
         mvaddstr_and_log_it(g_currentY++,
                             0,
-                            "User opted not to restore any data.                                  ");
+                            _
+                            ("User opted not to restore any data.                                  "));
     }
     if (retval) {
         mvaddstr_and_log_it(g_currentY++,
                             0,
-                            "Errors occurred during the restore phase.            ");
-    }
-
-    if (ask_me_yes_or_no("Initialize the boot loader?")) {
+                            _
+                            ("Errors occurred during the restore phase.            "));
+    }
+
+    if (ask_me_yes_or_no(_("Initialize the boot loader?"))) {
         run_boot_loader(TRUE);
     } else {
         mvaddstr_and_log_it(g_currentY++,
                             0,
-                            "User opted not to initialize the boot loader.");
-    }
-
-//  run_program_and_log_output("cp -af /etc/lvm " MNT_RESTORING "/etc/", 1);
+                            _
+                            ("User opted not to initialize the boot loader."));
+    }
+
     protect_against_braindead_sysadmins();
-    //  modify_rclocal_one_time( MNT_RESTORING "/etc" );
     retval += unmount_all_devices(mountlist);
     /*  if (restore_some || restore_all || */
     if (ask_me_yes_or_no
-        ("Label your ext2 and ext3 partitions if necessary?")) {
+        (_("Label your ext2 and ext3 partitions if necessary?"))) {
         mvaddstr_and_log_it(g_currentY, 0,
-                            "Using e2label to label your ext2,3 partitions");
+                            _
+                            ("Using e2label to label your ext2,3 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,
+            mr_asprintf(&fstab_fname, "/tmp/fstab");
+        }
+        mr_asprintf(&tmp,
                 "label-partitions-as-necessary %s < %s >> %s 2>> %s",
                 g_mountlist_fname, fstab_fname, MONDO_LOGFILE,
                 MONDO_LOGFILE);
+        mr_free(fstab_fname);
+
         res = system(tmp);
+        mr_free(tmp);
         if (res) {
             log_to_screen
-                ("label-partitions-as-necessary returned an error");
-            mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
+                (_("label-partitions-as-necessary returned an error"));
+            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;
@@ -630 +601 @@
         mvaddstr_and_log_it(g_currentY++,
                             0,
-                            "Warning - errors occurred during the restore phase.");
-    }
-  end_of_func:
-    mr_free(tmp);
-    mr_free(fstab_fname);
-    mr_free(old_restpath);
+                            _
+                            ("Warning - errors occurred during the restore phase."));
+    }
     iamhere("Leaving interactive_mode()");
-    return (retval);
+    return(retval);
 }
 
@@ -643 +611 @@
  *END_INTERACTIVE_MODE                                                    *
  **************************************************************************/
-
 
 
@@ -660 +627 @@
          struct raidlist_itself *raidlist, bool nuke_me_please)
 {
-    char c;
+    char c = ' ';
     int retval = 0;
 
@@ -682 +649 @@
             retval += compare_mode(bkpinfo, mountlist, raidlist);
         } else {
-            log_to_screen("OK, I shan't restore/compare any files.");
+            log_to_screen(_("OK, I shan't restore/compare any files."));
         }
     }
@@ -688 +655 @@
         paranoid_system("umount " MNT_CDROM);
     }
-//  if (! already_mounted)
-//    {
     if (system("umount /tmp/isodir 2> /dev/null")) {
         log_to_screen
-            ("WARNING - unable to unmount device where the ISO files are stored.");
-    }
-//    }
+            (_
+             ("WARNING - unable to unmount device where the ISO files are stored."));
+    }
     return (retval);
 }
@@ -701 +666 @@
  *END_ISO_MODE                                                            *
  **************************************************************************/
-
-
-/*            MONDO - saving your a$$ since Feb 18th, 2000            */
-
-
+static void call_me_after_the_nuke(int retval) {
+
+    char *tmp = NULL;
+    char *tmp1 = NULL;
+
+    if (retval) {
+        log_to_screen(_("Errors occurred during the nuke phase."));
+        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");
+#else
+    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);
+        }
+
+        log_to_screen(_
+            ("Mondo has restored your system. Please remove the backup media and reboot."));
+        log_to_screen(_
+            ("Thank you for using Mondo Rescue."));
+        log_to_screen(_
+            ("Please visit our website at http://www.mondorescue.org for more information."));
+    }
+    g_I_have_just_nuked = TRUE;
+    return;
+}
 
 
@@ -725 +721 @@
     int res = 0;
     bool boot_loader_installed = FALSE;
-  /** malloc **/
-    char tmp[MAX_STR_LEN], tmpA[MAX_STR_LEN], tmpB[MAX_STR_LEN],
+    char *tmp = NULL;
+    char tmpA[MAX_STR_LEN], tmpB[MAX_STR_LEN],
         tmpC[MAX_STR_LEN];
 
@@ -738 +734 @@
     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"))
+    tmp = call_program_and_get_last_line_of_output("cat /tmp/cmdline");
 #else
-    if (strstr
-        (call_program_and_get_last_line_of_output("cat /proc/cmdline"),
-         "noresize"))
+    tmp = call_program_and_get_last_line_of_output("cat /proc/cmdline");
 #endif
-    {
+    if (strstr(tmp,"noresize")) {
         mr_msg(2, "Not resizing mountlist.");
     } else {
@@ -752 +744 @@
     }
     if (!evaluate_mountlist(mountlist, tmpA, tmpB, tmpC)) {
-        sprintf(tmp,
-                "Mountlist analyzed. Result: \"%s %s %s\" Switch to Interactive Mode?",
+        mr_asprintf(&tmp,
+                _
+                ("Mountlist analyzed. Result: \"%s %s %s\" Switch to Interactive Mode?"),
                 tmpA, tmpB, tmpC);
         if (ask_me_yes_or_no(tmp)) {
+            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);
             fatal_error("Nuke Mode aborted. ");
         }
     }
     save_mountlist_to_disk(mountlist, g_mountlist_fname);
-    mvaddstr_and_log_it(1, 30, "Restoring Automatically");
+    mvaddstr_and_log_it(1, 30, _("Restoring Automatically"));
     if (bkpinfo->differential) {
-        log_to_screen("Because this is a differential backup, disk");
-        log_to_screen("partitioning and formatting will not take place.");
+        log_to_screen(_("Because this is a differential backup, disk"));
+        log_to_screen(_
+                      ("partitioning and formatting will not take place."));
         res = 0;
     } else {
@@ -776 +773 @@
             g_fprep = fopen("/tmp/prep.sh", "w");
 #ifdef __FreeBSD__
-            if (strstr
-                (call_program_and_get_last_line_of_output
-                 ("cat /tmp/cmdline"), "nopart"))
+            tmp = call_program_and_get_last_line_of_output("cat /tmp/cmdline");
 #else
-            if (strstr
-                (call_program_and_get_last_line_of_output
-                 ("cat /proc/cmdline"), "nopart"))
+            tmp = call_program_and_get_last_line_of_output("cat /proc/cmdline");
 #endif
-            {
+            if (strstr(tmp,"nopart")) {
                 mr_msg(2,
                         "Not partitioning drives due to 'nopart' option.");
@@ -792 +785 @@
                 if (res) {
                     log_to_screen
-                        ("Warning. Errors occurred during partitioning.");
+                        (_
+                         ("Warning. Errors occurred during partitioning."));
                     res = 0;
                 }
@@ -798 +792 @@
             retval += res;
             if (!res) {
-                log_to_screen("Preparing to format your disk(s)");
+                log_to_screen(_("Preparing to format your disk(s)"));
                 sleep(1);
-                system("sync");
-                log_to_screen("Please wait. This may take a few minutes.");
+                sync();
+                log_to_screen(_
+                              ("Please wait. This may take a few minutes."));
                 res += format_everything(mountlist, FALSE, raidlist);
             }
@@ -811 +806 @@
         mvaddstr_and_log_it(g_currentY++,
                             0,
-                            "Failed to partition and/or format your hard drives.");
-
-        if (ask_me_yes_or_no("Try in interactive mode instead?")) {
+                            _
+                            ("Failed to partition and/or format your hard drives."));
+
+        if (ask_me_yes_or_no(_("Try in interactive mode instead?"))) {
             retval = interactive_mode(bkpinfo, mountlist, raidlist);
-            goto after_the_nuke;
+            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);
+                (_("Would you like to try to proceed anyway?"))) {
+                return(retval);
         }
     }
@@ -826 +823 @@
         unmount_all_devices(mountlist);
         log_to_screen
-            ("Unable to mount all partitions. Sorry, I cannot proceed.");
+            (_
+             ("Unable to mount all partitions. Sorry, I cannot proceed."));
         return (retval);
     }
@@ -837 +835 @@
     }
     protect_against_braindead_sysadmins();
-//  run_program_and_log_output("cp -af /etc/lvm " MNT_RESTORING "/etc/", 1);
-    //  modify_rclocal_one_time( MNT_RESTORING "/etc" );
     retval += unmount_all_devices(mountlist);
     mvaddstr_and_log_it(g_currentY,
                         0,
-                        "Using e2label to label your ext2,3 partitions");
-
-    sprintf(tmp, "label-partitions-as-necessary %s < /tmp/fstab",
+                        _
+                        ("Using e2label to label your ext2,3 partitions"));
+
+    mr_asprintf(&tmp, "label-partitions-as-necessary %s < /tmp/fstab",
             g_mountlist_fname);
     res = run_program_and_log_output(tmp, TRUE);
+    mr_free(tmp);
+
     if (res) {
-        log_to_screen("label-partitions-as-necessary returned an error");
-        mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
+        log_to_screen(_
+                      ("label-partitions-as-necessary returned an error"));
+        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;
 
-  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);
 }
@@ -890 +862 @@
  *END_NUKE_MODE                                                           *
  **************************************************************************/
-
 
 
@@ -903 +874 @@
     int retval = 0;
 
-  /** malloc **/
-    char *old_restpath;
-
-    struct mountlist_itself *mountlist;
-//  static
-    struct raidlist_itself *raidlist;
-    struct s_node *filelist;
+    char *old_restpath = NULL;
+
+    struct mountlist_itself *mountlist = NULL;
+    struct raidlist_itself *raidlist = NULL;
+    struct s_node *filelist = NULL;
 
     mr_msg(1, "restore_to_live_filesystem() - starting");
     assert(bkpinfo != NULL);
-    malloc_string(old_restpath);
+
     mountlist = mr_malloc(sizeof(struct mountlist_itself));
     raidlist = mr_malloc(sizeof(struct raidlist_itself));
@@ -920 +889 @@
     if (!g_restoring_live_from_cd) {
         popup_and_OK
-            ("Please insert tape/CD/boot floppy, then hit 'OK' to continue.");
+            (_
+             ("Please insert tape/CD/boot floppy, then hit 'OK' to continue."));
         sleep(1);
     }
     interactively_obtain_media_parameters_from_user(bkpinfo, FALSE);
-    mr_msg(2, "bkpinfo->media_device = %s", bkpinfo->media_device);
     if (!bkpinfo->media_device[0]) {
         mr_msg(2, "Warning - failed to find media dev");
+    } else {
+        mr_msg(2, "bkpinfo->media_device = %s", bkpinfo->media_device);
     }
 
@@ -932 +903 @@
     mr_msg(2, "bkpinfo->isodir = %s", bkpinfo->isodir);
 
-    open_evalcall_form("Thinking...");
+    open_evalcall_form(_("Thinking..."));
 
     get_cfg_file_from_archive_or_bust(bkpinfo);
@@ -944 +915 @@
     if (filelist) {
         save_filelist(filelist, "/tmp/selected-files.txt");
-        strcpy(old_restpath, bkpinfo->restore_path);
-        if (popup_and_get_string("Restore path",
-                                 "Restore files to where? )",
-                                 bkpinfo->restore_path, MAX_STR_LEN / 4)) {
+        mr_asprintf(&old_restpath,bkpinfo->restore_path);
+        if (popup_and_get_string(_("Restore path"),
+                                 _("Restore files to where? )"),
+                                 bkpinfo->restore_path)) {
             iamhere("Restoring everything");
             retval += restore_everything(bkpinfo, filelist);
-            free_filelist(filelist);
-            strcpy(bkpinfo->restore_path, old_restpath);
-        } else {
-            free_filelist(filelist);
-        }
+        }
+        free_filelist(filelist);
         strcpy(bkpinfo->restore_path, old_restpath);
+        mr_free(old_restpath);
     }
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
@@ -962 +931 @@
     }
     run_program_and_log_output("umount " MNT_CDROM, FALSE);
-    if (!bkpinfo->please_dont_eject) {
+    if ((!bkpinfo->please_dont_eject) && (bkpinfo->media_device != NULL)) {
         eject_device(bkpinfo->media_device);
     }
-    mr_free(old_restpath);
     mr_free(mountlist);
     mr_free(raidlist);
@@ -1000 +968 @@
                              char *pathname_of_last_file_restored)
 {
-    FILE *fin;
-    FILE *fout;
-    FILE *fbzip2;
-
-  /** malloc ***/
-    char *checksum, *outfile_fname, *tmp, *bzip2_command,
-        *ntfsprog_command, *suffix, *sz_devfile;
-    char *bigblk;
-    char *p;
+    FILE *fin = NULL;
+    FILE *fout = NULL;
+    FILE *fbzip2 = NULL;
+
+    char *checksum = NULL;
+    char *outfile_fname = NULL;
+    char *tmp = NULL;
+    char *bzip2_command = NULL;
+    char *suffix = NULL;
+    char *bigblk = NULL;
     int retval = 0;
     int finished = FALSE;
-    long sliceno;
+    long sliceno = 0L;
     long siz;
-    char ntfsprog_fifo[MAX_STR_LEN];
+    char *ntfsprog_fifo = NULL;
     char *file_to_openout = NULL;
     struct s_filename_and_lstat_info biggiestruct;
-    struct utimbuf the_utime_buf, *ubuf;
+    struct utimbuf the_utime_buf, *ubuf = NULL;
     bool use_ntfsprog_hack = FALSE;
     pid_t pid;
     int res = 0;
     int old_loglevel;
-    char sz_msg[MAX_STR_LEN];
-    struct s_node *node;
+    char *sz_msg = NULL;
+    struct s_node *node = NULL;
 
     old_loglevel = g_loglevel;
     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';
@@ -1052 +1013 @@
     paranoid_fclose(fin);
 
-    strcpy(checksum, biggiestruct.checksum);
+    mr_asprintf(&checksum, biggiestruct.checksum);
 
     if (!checksum[0]) {
-        sprintf(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);
-        p = checksum;
-    }
+    }
+    mr_free(checksum);
 
     if (!strncmp(biggiestruct.filename, "/dev/", 5))    // Whether NTFS or not :)
     {
-        strcpy(outfile_fname, biggiestruct.filename);
+        mr_asprintf(&outfile_fname, biggiestruct.filename);
     } else {
-        sprintf(outfile_fname, "%s/%s", bkpinfo->restore_path,
+        mr_asprintf(&outfile_fname, "%s/%s", bkpinfo->restore_path,
                 biggiestruct.filename);
     }
@@ -1075 +1035 @@
             mr_msg(0, "Skipping %s (name isn't in filelist)",
                     biggiestruct.filename);
-            pathname_of_last_file_restored[0] = '\0';
             return (0);
         } else if (!(node->selected)) {
             mr_msg(1, "Skipping %s (name isn't in biggielist subset)",
                     biggiestruct.filename);
-            pathname_of_last_file_restored[0] = '\0';
             return (0);
         }
@@ -1097 +1055 @@
 
     if (biggiestruct.use_ntfsprog)  // if it's an NTFS device
-//  if (!strncmp ( biggiestruct.filename, "/dev/", 5))
     {
         g_loglevel = 4;
@@ -1104 +1061 @@
                 "Calling ntfsclone in background because %s is an NTFS /dev entry",
                 outfile_fname);
-        sprintf(sz_devfile, "/tmp/%d.%d.000", (int) (random() % 32768),
+        mr_asprintf(&ntfsprog_fifo, "/tmp/%d.%d.000", (int) (random() % 32768),
                 (int) (random() % 32768));
-        mkfifo(sz_devfile, 0x770);
-        strcpy(ntfsprog_fifo, sz_devfile);
+        mkfifo(ntfsprog_fifo, 0x770);
+
         file_to_openout = ntfsprog_fifo;
         switch (pid = fork()) {
@@ -1118 +1075 @@
             res =
                 feed_outfrom_ntfsprog(biggiestruct.filename,
-                                       ntfsprog_fifo);
-//          mr_msg(3, "CHILD - fip - exiting");
+                                      ntfsprog_fifo);
             exit(res);
             break;
@@ -1129 +1085 @@
     } 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
@@ -1137 +1092 @@
     }
 
-    sprintf(tmp, "Reassembling big file %ld (%s)", bigfileno + 1,
+    mr_msg(2, "Reassembling big file %ld (%s)", bigfileno + 1,
             outfile_fname);
-    mr_msg(2, tmp);
 
     /*
@@ -1153 +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 (1);
     }
+
+    mr_free(ntfsprog_fifo);
     mr_msg(3, "Opened out to %s", outfile_fname);   // CD/DVD --> mondorestore --> ntfsclone --> hard disk itself
 
@@ -1174 +1130 @@
                     g_current_media_number);
             g_current_media_number++;
-            sprintf(tmp,
-                    "Asking for %s #%d so that I may read slice #%ld\n",
+            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, tmp);
-            sprintf(tmp, "Restoring from %s #%d",
-                    media_descriptor_string(bkpinfo->backup_media_type),
+            log_to_screen(_("Restoring from %s #%d"),
+                    bkpinfo->backup_media_string,
                     g_current_media_number);
-            log_to_screen(tmp);
             insist_on_this_cd_number(bkpinfo, g_current_media_number);
-            log_to_screen("Continuing to restore.");
+            log_to_screen(_("Continuing to restore."));
         } else {
-            strcpy(tmp,
+            mr_asprintf(&tmp,
                    slice_fname(bigfileno, sliceno, ARCHIVES_PATH, ""));
             if (does_file_exist(tmp) && length_of_file(tmp) == 0) {
@@ -1193 +1146 @@
                         bigfileno + 1, sliceno);
                 finished = TRUE;
+                mr_free(tmp);
                 continue;
             } else {
+                mr_free(tmp);
                 if (does_file_exist
                     (slice_fname
                      (bigfileno, sliceno, ARCHIVES_PATH, "lzo"))) {
-                    strcpy(bzip2_command, "lzop");
-                    strcpy(suffix, "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");
+                    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");
+                    mr_asprintf(&bzip2_command, "bzip2");
+                    mr_asprintf(&suffix, "bz2");
                 } else
                     if (does_file_exist
                         (slice_fname
                          (bigfileno, sliceno, ARCHIVES_PATH, ""))) {
-                    strcpy(bzip2_command, "");
-                    strcpy(suffix, "");
+                    mr_asprintf(&bzip2_command, "");
+                    mr_asprintf(&suffix, "");
                 } else {
-                    log_to_screen("OK, that's pretty fsck0red...");
+                    log_to_screen(_("OK, that's pretty fsck0red..."));
                     return (1);
                 }
             }
             if (bzip2_command[0] != '\0') {
-                sprintf(bzip2_command + strlen(bzip2_command),
+                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",
+                mr_free(bzip2_command);
+                mr_asprintf(&bzip2_command, "cat %s 2>> %s",
                         slice_fname(bigfileno, sliceno, ARCHIVES_PATH,
                                     suffix), MONDO_LOGFILE);
             }
-            sprintf(tmp, "Working on %s #%d, file #%ld, slice #%ld    ",
-                    media_descriptor_string(bkpinfo->backup_media_type),
+            mr_asprintf(&tmp, "Working on %s #%d, file #%ld, slice #%ld",
+                    bkpinfo->backup_media_string,
                     g_current_media_number, bigfileno + 1, sliceno);
             mr_msg(2, tmp);
-
             if (!g_text_mode) {
                 newtDrawRootText(0, g_noof_rows - 2, tmp);
                 newtRefresh();
-                mr_strip_spaces(tmp);
                 update_progress_form(tmp);
             }
+            mr_free(tmp);
+
             if (!(fbzip2 = popen(bzip2_command, "r"))) {
+                mr_free(bzip2_command);
+                mr_free(suffix);
                 fatal_error("Can't run popen command");
             }
+            mr_free(bzip2_command);
+            mr_free(suffix);
+
             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);
-//        mr_msg(2. sz_msg);
                 }
             }
             paranoid_pclose(fbzip2);
-
 
             sliceno++;
@@ -1264 +1220 @@
         }
     }
-/*
-  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;
@@ -1276 +1225 @@
     if (use_ntfsprog_hack) {
         mr_msg(3, "Waiting for ntfsclone to finish");
-        sprintf(tmp,
+        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");
     }
@@ -1292 +1242 @@
         utime(outfile_fname, ubuf);
     }
+    mr_free(outfile_fname);
     mr_free(bigblk);
-    mr_free(checksum);
-    mr_free(outfile_fname);
-    mr_free(tmp);
-    mr_free(bzip2_command);
-    mr_free(ntfsprog_command);
-    mr_free(suffix);
-    mr_free(sz_devfile);
 
     return (retval);
 }
+
 
 /**************************************************************************
  *END_ RESTORE_A_BIGGIEFILE_FROM_CD                                       *
  **************************************************************************/
-
 
 
@@ -1317 +1261 @@
  * @param orig_bf_fname The original filename of the biggiefile.
  * @param biggiefile_number The number of the biggiefile (starting from 0).
- * @param orig_checksum Unused.
- * @param biggiefile_size Unused.
  * @param filelist The node structure containing the list of files to be restored.
  * If @p orig_bf_fname is not in the list, it will be ignored.
  * @return 0 for success (or skip), nonzero for failure.
- * @bug orig_checksum and biggiefile_size are unused (except to check that they are non-NULL).
  */
 int restore_a_biggiefile_from_stream(struct s_bkpinfo *bkpinfo, char *orig_bf_fname, long biggiefile_number, char *orig_checksum,   //UNUSED
@@ -1330 +1271 @@
                                      char *pathname_of_last_file_restored)
 {
-    FILE *pout;
-    FILE *fin;
+    FILE *pout = NULL;
+    FILE *fin = NULL;
 
   /** 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 *ntfsprog_fifo = NULL;
     char *file_to_openout = 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;
 
-    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);
@@ -1404 +1338 @@
     if (use_ntfsprog) {
         if (strncmp(orig_bf_fname, "/dev/", 5)) {
-            mr_msg(1,
-                    "I was in error when I set use_ntfsprog to TRUE.");
+            mr_msg(1, "I was in error when I set use_ntfsprog to TRUE.");
             mr_msg(1, "%s isn't even in /dev", orig_bf_fname);
             use_ntfsprog = FALSE;
@@ -1413 +1346 @@
     if (use_ntfsprog) {
         g_loglevel = 4;
-        strcpy(outfile_fname, orig_bf_fname);
+        mr_asprintf(&outfile_fname, orig_bf_fname);
         use_ntfsprog_hack = TRUE;
         mr_msg(2,
                 "Calling ntfsclone in background because %s is a /dev entry",
                 outfile_fname);
-        sprintf(sz_devfile, "%s/%d.%d.000", 
+        mr_asprintf(&ntfsprog_fifo, "%s/%d.%d.000", 
                 bkpinfo->tmpdir,
                 (int) (random() % 32768),
                 (int) (random() % 32768));
-        mkfifo(sz_devfile, 0x770);
-        strcpy(ntfsprog_fifo, sz_devfile);
+        mkfifo(ntfsprog_fifo, 0x770);
+
         file_to_openout = ntfsprog_fifo;
         switch (pid = fork()) {
@@ -1432 +1365 @@
                     "CHILD - fip - calling feed_outfrom_ntfsprog(%s, %s)",
                     outfile_fname, ntfsprog_fifo);
-            res =
-                feed_outfrom_ntfsprog(outfile_fname, ntfsprog_fifo);
-//          mr_msg(3, "CHILD - fip - exiting");
+            res = feed_outfrom_ntfsprog(outfile_fname, ntfsprog_fifo);
             exit(res);
             break;
@@ -1445 +1376 @@
         if (!strncmp(orig_bf_fname, "/dev/", 5))    // non-NTFS partition
         {
-            strcpy(outfile_fname, orig_bf_fname);
+            mr_asprintf(&outfile_fname, orig_bf_fname);
         } else                  // biggiefile
         {
-            sprintf(outfile_fname, "%s/%s", bkpinfo->restore_path,
+            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
@@ -1458 +1388 @@
             make_hole_for_file(outfile_fname);
         }
-        sprintf(tmp, "Reassembling big file %ld (%s)",
+        mr_msg(2, "Reassembling big file %ld (%s)",
                 biggiefile_number + 1, orig_bf_fname);
-        mr_msg(2, tmp);
     }
 
     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);
+        mr_asprintf(&command, "cat > \"%s\"", file_to_openout);
     } else {
-        sprintf(command, "%s -dc > \"%s\" 2>> %s", bkpinfo->zip_exe,
+        mr_asprintf(&command, "%s -dc > \"%s\" 2>> %s", bkpinfo->zip_exe,
                 file_to_openout, MONDO_LOGFILE);
     }
-    sprintf(tmp, "Pipe command = '%s'", command);
-    mr_msg(3, tmp);
+    mr_msg(3, "Pipe command = '%s'", command);
+    mr_free(outfile_fname);
+    mr_free(ntfsprog_fifo);
 
     /* restore biggiefile, one slice at a time */
@@ -1480 +1411 @@
         fatal_error("Cannot pipe out");
     }
-    for (res = read_header_block_from_stream(&slice_siz, tmp, &ctrl_chr);
+    mr_free(command);
+
+    malloc_string(tmp1);
+    for (res = read_header_block_from_stream(&slice_siz, tmp1, &ctrl_chr);
          ctrl_chr != BLK_STOP_A_BIGGIE;
-         res = read_header_block_from_stream(&slice_siz, tmp, &ctrl_chr)) {
+         res = read_header_block_from_stream(&slice_siz, tmp1, &ctrl_chr)) {
         if (ctrl_chr != BLK_START_AN_AFIO_OR_SLICE) {
             wrong_marker(BLK_START_AN_AFIO_OR_SLICE, ctrl_chr);
         }
-        sprintf(tmp, "Working on file #%ld, slice #%ld    ",
+        mr_asprintf(&tmp, "Working on file #%ld, slice #%ld    ",
                 biggiefile_number + 1, current_slice_number);
         mr_msg(2, tmp);
@@ -1495 +1429 @@
         mr_strip_spaces(tmp);
         update_progress_form(tmp);
+        mr_free(tmp);
         if (current_slice_number == 0) {
             res =
@@ -1517 +1452 @@
         }
         retval += res;
-        res = read_header_block_from_stream(&slice_siz, tmp, &ctrl_chr);
+        res = read_header_block_from_stream(&slice_siz, tmp1, &ctrl_chr);
         if (ctrl_chr != BLK_STOP_AN_AFIO_OR_SLICE) {
             wrong_marker(BLK_STOP_AN_AFIO_OR_SLICE, ctrl_chr);
@@ -1524 +1459 @@
         g_current_progress++;
     }
+    mr_free(tmp1);
     paranoid_pclose(pout);
 
@@ -1531 +1467 @@
     if (use_ntfsprog_hack) {
         mr_msg(3, "Waiting for ntfsclone to finish");
-        sprintf(tmp,
+        mr_asprintf(&tmp,
                 " ps | grep \" ntfsclone \" | grep -v grep > /dev/null 2> /dev/null");
         while (system(tmp) == 0) {
             sleep(1);
-        }
+        }   
+        mr_free(tmp);
         mr_msg(3, "OK, ntfsclone has really finished");
     }
@@ -1550 +1487 @@
     }
 
-    mr_free(tmp);
-    mr_free(outfile_fname);
-    mr_free(command);
-    mr_free(ntfsprog_command);
-    mr_free(sz_devfile);
-    mr_free(ntfsprog_fifo);
     g_loglevel = old_loglevel;
     return (retval);
@@ -1563 +1494 @@
  *END_RESTORE_A_BIGGIEFILE_FROM_STREAM                                    *
  **************************************************************************/
-
 
 
@@ -1583 +1513 @@
 {
     int retval = 0;
-    int res;
-    char *p;
+    int res = 0;
+    char *p = NULL;
 
   /** malloc **/
-    char *command;
-    char *tmp;
-    char *filelist_name;
-    char *filelist_subset_fname;
-    char *executable;
-    char *temp_log;
-    char screen_message[100];
+    char *command = NULL;
+    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];
+    bool use_star = FALSE;
+    char *xattr_fname = NULL;
+    char *acl_fname = NULL;
 
     assert_string_is_neither_NULL_nor_zerolength(tarball_fname);
-    malloc_string(command);
-    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);
 
     mr_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());
-    sprintf(command, "mkdir -p %s/tmp", MNT_RESTORING);
+    mr_asprintf(&command, "mkdir -p %s/tmp", MNT_RESTORING);
     run_program_and_log_output(command, 9);
-    sprintf(temp_log, "/tmp/%d.%d", (int) (random() % 32768),
-            (int) (random() % 32768));
-
-    sprintf(filelist_name, MNT_CDROM "/archives/filelist.%ld",
+    mr_free(command);
+
+    mr_asprintf(&filelist_name, MNT_CDROM "/archives/filelist.%ld",
             current_tarball_number);
     if (length_of_file(filelist_name) <= 2) {
@@ -1629 +1546 @@
                 "but it's non-critical. It's cosmetic. Don't worry about it.");
         retval = 0;
-        goto leave_sub;
+        mr_msg(5, "Leaving");
+        mr_free(filelist_name);
+        return (retval);
     }
     if (count_lines_in_file(filelist_name) <= 0
@@ -1635 +1554 @@
         mr_msg(3, "length_of_file(%s) = %llu", tarball_fname,
                 length_of_file(tarball_fname));
-        sprintf(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);
         retval = 1;
-        goto leave_sub;
+        mr_msg(5, "Leaving");
+        mr_free(filelist_name);
+        return (retval);
     }
 
     if (filelist) {
-        sprintf(filelist_subset_fname, "/tmp/filelist-subset-%ld.tmp",
+        mr_asprintf(&filelist_subset_fname, "/tmp/filelist-subset-%ld.tmp",
                 current_tarball_number);
         if ((matches =
@@ -1650 +1570 @@
                                              use_star))
             <= 0) {
-            sprintf(tmp, "Skipping fileset %ld", current_tarball_number);
-            mr_msg(1, 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);
         }
-        sprintf(screen_message, "Tarball #%ld --- %ld matches",
+        log_to_screen("Tarball #%ld --- %ld matches",
                 current_tarball_number, matches);
-        log_to_screen(screen_message);
-    } else {
-        filelist_subset_fname[0] = '\0';
-    }
+    }
+    mr_free(filelist_name);
 
     if (filelist == NULL || matches > 0) {
         if (g_getfattr) {
-            sprintf(xattr_fname, XATTR_LIST_FNAME_RAW_SZ,
+            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",
+            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, "-P bzip2 -Z");
         } else if (strstr(tarball_fname, ".gz")) {
-            strcpy(executable, "gzip");
+            mr_asprintf(&executable, "-P gzip -Z");
         } 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);
+            mr_asprintf(&executable, "-P lzop -Z");
+        }
+
+        if (executable == NULL) {
+            mr_asprintf(&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 not found - oh no!");
+                    (_
+                     ("(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);
             }
-            strcpy(tmp, executable);
-            sprintf(executable, "-P %s -Z", tmp);
+            mr_free(tmp);
         }
 #ifdef __FreeBSD__
@@ -1697 +1618 @@
 #endif
 
-//      if (strstr(tarball_fname, ".star."))
         if (use_star) {
-            sprintf(command,
+            mr_sprintf(&command,
                     "star -x -force-remove -U " STAR_ACL_SZ
                     " errctl= file=%s", tarball_fname);
             if (strstr(tarball_fname, ".bz2")) {
-                strcat(command, " -bz");
+                mr_strcat(command, " -bz");
             }
         } else {
-            if (filelist_subset_fname[0] != '\0') {
-                sprintf(command,
+            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,
-//             files_to_restore_this_time_fname,
                         tarball_fname);
             } else {
-                sprintf(command,
+                mr_asprintf(&command,
                         "afio -i -b %ld -c %ld -M 8m %s %s",
                         TAPE_BLOCK_SIZE,
@@ -1720 +1639 @@
             }
         }
+        mr_free(executable);
+
 #undef BUFSIZE
-        sprintf(command + strlen(command), " 2>> %s >> %s", temp_log,
-                temp_log);
+        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);
@@ -1734 +1657 @@
             }
         }
+        mr_free(command);
+
         if (res && length_of_file(temp_log) < 5) {
             res = 0;
@@ -1765 +1690 @@
         }
         if (retval) {
-            sprintf(command, "cat %s >> %s", temp_log, MONDO_LOGFILE);
+            mr_asprintf(&command, "cat %s >> %s", temp_log, MONDO_LOGFILE);
             system(command);
+            mr_free(command);
             mr_msg(2, "Errors occurred while processing fileset #%d",
                     current_tarball_number);
@@ -1772 +1698 @@
             mr_msg(2, "Fileset #%d processed OK", current_tarball_number);
         }
+        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")) {
         popup_and_OK
-            ("Press ENTER to go on. Delete /PAUSE to stop these pauses.");
+            (_
+             ("Press ENTER to go on. Delete /PAUSE to stop these pauses."));
     }
     unlink(filelist_subset_fname);
-    unlink(xattr_fname);
-    unlink(acl_fname);
-    unlink(temp_log);
-
-  leave_sub:
-    mr_free(command);
-    mr_free(tmp);
-    mr_free(filelist_name);
     mr_free(filelist_subset_fname);
-    mr_free(executable);
-    mr_free(temp_log);
-    mr_free(xattr_fname);
-    mr_free(acl_fname);
     mr_msg(5, "Leaving");
     return (retval);
@@ -1827 +1748 @@
 
   /** malloc add ***/
-    char *tmp;
-    char *command;
-    char *afio_fname;
-    char *filelist_fname;
-    char *filelist_subset_fname;
-    char *executable;
+    char *tmp = NULL;
+    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;
-    bool use_star;
+    bool use_star = FALSE;
 
     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;
-    sprintf(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,
-            media_descriptor_string(bkpinfo->backup_media_type),
+            bkpinfo->backup_media_string,
             g_current_media_number);
-    mr_msg(2, tmp);
     run_program_and_log_output("mkdir -p " MNT_RESTORING "/tmp", FALSE);
 
@@ -1861 +1773 @@
    * 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",
+    mr_asprintf(&afio_fname, "/tmp/tmpfs/archive.tmp.%ld",
             current_tarball_number);
-    sprintf(filelist_fname, "%s/filelist.%ld", bkpinfo->tmpdir,
+    mr_asprintf(&filelist_fname, "%s/filelist.%ld", bkpinfo->tmpdir,
             current_tarball_number);
-    sprintf(filelist_subset_fname, "%s/filelist-subset-%ld.tmp",
+    mr_asprintf(&filelist_subset_fname, "%s/filelist-subset-%ld.tmp",
             bkpinfo->tmpdir, current_tarball_number);
-//  sprintf(filelist_fname, "/tmp/tmpfs/temp-filelist.%ld", current_tarball_number);
     res = read_file_from_stream_to_file(bkpinfo, afio_fname, size);
     if (strstr(tarball_fname, ".star")) {
@@ -1876 +1786 @@
         mr_msg(1, "Warning - error reading afioball from tape");
     }
-    if (bkpinfo->compression_level == 0) {
-        executable[0] = '\0';
-    } else {
+    if (bkpinfo->compression_level != 0) {
         if (bkpinfo->use_star) {
-            strcpy(executable, " -bz");
+            mr_asprintf(&executable, " -bz");
         } else {
-            sprintf(executable, "-P %s -Z", bkpinfo->zip_exe);
+            mr_asprintf(&executable, "-P %s -Z", bkpinfo->zip_exe);
         }
     }
@@ -1893 +1801 @@
         if (strstr(tarball_fname, ".star.")) {
             use_star = TRUE;
-            sprintf(command, "star -t file=%s %s", afio_fname, executable);
+            mr_asprintf(&command, "star -t file=%s %s", afio_fname, executable);
         } else {
             use_star = FALSE;
-            sprintf(command, "afio -t -M 8m -b %ld %s %s", TAPE_BLOCK_SIZE,
+            mr_asprintf(&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_strcat(command, " > %s 2>> %s", filelist_fname, MONDO_LOGFILE);
         mr_msg(1, "command = %s", command);
         if (system(command)) {
             mr_msg(4, "Warning - error occurred while retrieving TOC");
         }
+        mr_free(command);
+
         if ((matches =
              save_filelist_entries_in_common(filelist_fname, filelist,
@@ -1914 +1823 @@
                         current_tarball_number);
             }
-            sprintf(tmp, "Skipping fileset %ld", current_tarball_number);
-            mr_msg(2, tmp);
+            mr_msg(2, "Skipping fileset %ld", current_tarball_number);
             restore_this_fileset = FALSE;
         } else {
@@ -1924 +1832 @@
         }
     }
+    unlink(filelist_fname);
+    mr_free(filelist_fname);
 
 // Concoct the call to star/afio to restore files
-    if (strstr(tarball_fname, ".star."))    // star
-    {
-        sprintf(command, "star -x file=%s %s", afio_fname, executable);
+    if (strstr(tarball_fname, ".star.")) {
+        // star
         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_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);
+        }
+    } else {
+        // afio
         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);
-
-// Call if IF there are files to restore (selectively/unconditionally)
+            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_free(executable);
+
+    // Call if IF there are files to restore (selectively/unconditionally)
     if (restore_this_fileset) {
         mr_msg(1, "Calling command='%s'", command);
@@ -1975 +1883 @@
         mr_msg(1, "NOT CALLING '%s'", command);
     }
+    mr_free(command);
 
     if (does_file_exist("/PAUSE") && current_tarball_number >= 50) {
-        log_to_screen("Paused after set %ld", current_tarball_number);
-        popup_and_OK("Pausing. Press ENTER to continue.");
+        log_to_screen(_("Paused after set %ld"), current_tarball_number);
+        popup_and_OK(_("Pausing. Press ENTER to continue."));
     }
 
     unlink(filelist_subset_fname);
-    unlink(filelist_fname);
     unlink(afio_fname);
 
     mr_free(filelist_subset_fname);
-    mr_free(filelist_fname);
     mr_free(afio_fname);
-    mr_free(command);
-    mr_free(tmp);
     return (retval);
 }
@@ -1996 +1901 @@
  *END_RESTORE_A_TARBALL_FROM_STREAM                                       *
  **************************************************************************/
-
-
 
 
@@ -2014 +1917 @@
 {
     int retval = 0;
-    int res;
-    long noof_biggiefiles, bigfileno = 0, total_slices;
-  /** malloc **/
-    char *tmp;
-    bool just_changed_cds = FALSE, finished;
-    char *xattr_fname;
-    char *acl_fname;
-    char *biggies_whose_EXATs_we_should_set;    // EXtended ATtributes
-    char *pathname_of_last_biggie_restored;
+    int res = 0;
+    long noof_biggiefiles = 0L, bigfileno = 0L, total_slices = 0L;
+    char *tmp = NULL;
+    char *tmp1 = NULL;
+    bool just_changed_cds = FALSE, finished = FALSE;
+    char *xattr_fname = NULL;
+    char *acl_fname = NULL;
+    char *biggies_whose_EXATs_we_should_set = NULL; // EXtended ATtributes
+    char *pathname_of_last_biggie_restored = NULL;
     FILE *fbw = NULL;
 
-    malloc_string(xattr_fname);
-    malloc_string(acl_fname);
-    malloc_string(tmp);
-    malloc_string(biggies_whose_EXATs_we_should_set);
+    malloc_string(tmp1);
     malloc_string(pathname_of_last_biggie_restored);
     assert(bkpinfo != NULL);
 
-    sprintf(biggies_whose_EXATs_we_should_set,
+    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"))) {
@@ -2039 +1939 @@
     }
 
-    read_cfg_var(g_mondo_cfg_file, "total-slices", tmp);
-    total_slices = atol(tmp);
-    sprintf(tmp, "Reassembling large files      ");
+    read_cfg_var(g_mondo_cfg_file, "total-slices", tmp1);
+    total_slices = atol(tmp1);
+    mr_free(tmp1);
+
+    mr_asprintf(&tmp, _("Reassembling large files      "));
     mvaddstr_and_log_it(g_currentY, 0, tmp);
+    mr_free(tmp);
+
     if (length_of_file(BIGGIELIST) < 6) {
         mr_msg(1, "OK, no biggielist; not restoring biggiefiles");
@@ -2053 +1957 @@
         return (0);
     }
-    sprintf(tmp, "OK, there are %ld biggiefiles in the archives",
-            noof_biggiefiles);
-    mr_msg(2, tmp);
-
-    open_progress_form("Reassembling large files",
-                       "I am now reassembling all the large files.",
-                       "Please wait. This may take some time.",
+    mr_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."),
+                       _("Please wait. This may take some time."),
                        "", total_slices);
     for (bigfileno = 0, finished = FALSE; !finished;) {
@@ -2068 +1970 @@
             mr_msg(3, "Cannot find bigfile #%ld 's first slice on %s #%d",
                     bigfileno + 1,
-                    media_descriptor_string(bkpinfo->backup_media_type),
+                    bkpinfo->backup_media_string,
                     g_current_media_number);
             mr_msg(3, "Slicename would have been %s",
@@ -2080 +1982 @@
                 insist_on_this_cd_number(bkpinfo,
                                          ++g_current_media_number);
-                sprintf(tmp, "Restoring from %s #%d",
-                        media_descriptor_string(bkpinfo->
-                                                backup_media_type),
+                log_to_screen(_("Restoring from %s #%d"),
+                        bkpinfo->backup_media_string,
                         g_current_media_number);
-                log_to_screen(tmp);
                 just_changed_cds = TRUE;
             } else {
@@ -2094 +1994 @@
         } else {
             just_changed_cds = FALSE;
-            sprintf(tmp, "Restoring big file %ld", bigfileno + 1);
+            mr_asprintf(&tmp, _("Restoring big file %ld"), bigfileno + 1);
             update_progress_form(tmp);
+            mr_free(tmp);
+
             res =
                 restore_a_biggiefile_from_CD(bkpinfo, bigfileno, filelist,
@@ -2105 +2007 @@
             retval += res;
             bigfileno++;
-
         }
     }
@@ -2112 +2013 @@
         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);
@@ -2118 +2019 @@
         }
         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(xattr_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.");
+            (_
+             ("Press ENTER to go on. Delete /PAUSE to stop these pauses."));
     }
     close_progress_form();
     if (retval) {
-        mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
+        mvaddstr_and_log_it(g_currentY++, 74, _("Errors."));
     } else {
-        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
-    }
-    mr_free(xattr_fname);
-    mr_free(acl_fname);
-    mr_free(tmp);
-    mr_free(biggies_whose_EXATs_we_should_set);
+        mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
+    }
     mr_free(pathname_of_last_biggie_restored);
     return (retval);
@@ -2145 +2047 @@
  *END_RESTORE_ALL_BIGGIFILES_FROM_CD                                      *
  **************************************************************************/
-
 
 
@@ -2163 +2064 @@
 {
     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 *tarball_fname;
-    char *progress_str;
-    char *comment;
-
-    malloc_string(tmp);
+    char *tmp = NULL;
+    char *tmp1 = NULL;
+    char *tarball_fname = NULL;
+    char *progress_str = NULL;
+    char *comment = NULL;
+
+    malloc_string(tmp1);
     malloc_string(tarball_fname);
     malloc_string(progress_str);
@@ -2180 +2082 @@
     assert(bkpinfo != NULL);
 
-    mvaddstr_and_log_it(g_currentY, 0, "Restoring from archives");
+    mvaddstr_and_log_it(g_currentY, 0, _("Restoring from archives"));
     mr_msg(2,
             "Insisting on 1st CD, so that I can have a look at LAST-FILELIST-NUMBER");
@@ -2188 +2090 @@
     }
     insist_on_this_cd_number(bkpinfo, g_current_media_number);
-    read_cfg_var(g_mondo_cfg_file, "last-filelist-number", tmp);
-    max_val = atol(tmp) + 1;
-    sprintf(progress_str, "Restoring from %s #%d",
-            media_descriptor_string(bkpinfo->backup_media_type),
+    read_cfg_var(g_mondo_cfg_file, "last-filelist-number", tmp1);
+    max_val = atol(tmp1) + 1;
+    mr_free(tmp1);
+
+    mr_asprintf(&progress_str, _("Restoring from %s #%d"),
+            bkpinfo->backup_media_string,
             g_current_media_number);
     log_to_screen(progress_str);
-    open_progress_form("Restoring from archives",
-                       "Restoring data from the archives.",
-                       "Please wait. This may take some time.",
+    open_progress_form(_("Restoring from archives"),
+                       _("Restoring data from the archives."),
+                       _("Please wait. This may take some time."),
                        progress_str, max_val);
     for (;;) {
         insist_on_this_cd_number(bkpinfo, g_current_media_number);
         update_progress_form(progress_str);
-        sprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.bz2",
+        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",
+            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.afio.lzo",
+            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.",
+            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.bz2",
+            mr_free(tarball_fname);
+            mr_asprintf(&tarball_fname, MNT_CDROM "/archives/%ld.star.bz2",
                     current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
-            sprintf(tarball_fname, MNT_CDROM "/archives/%ld.star.",
+            mr_free(tarball_fname);
+            mr_asprintf(&tarball_fname, MNT_CDROM "/archives/%ld.star.",
                     current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
+            mr_free(tarball_fname);
             if (current_tarball_number == 0) {
                 log_to_screen
-                    ("No tarballs. Strange. Maybe you only backed up freakin' big files?");
+                    (_
+                     ("No tarballs. Strange. Maybe you only backed up freakin' big files?"));
+                mr_free(progress_str);
                 return (0);
             }
@@ -2233 +2145 @@
                           "/archives/slice* > /dev/null 2> /dev/null") ==
                 0) {
+                mr_free(tarball_fname);
+                mr_free(progress_str);
                 break;
             }
             g_current_media_number++;
-            sprintf(progress_str, "Restoring from %s #%d",
-                    media_descriptor_string(bkpinfo->backup_media_type),
+            mr_free(progress_str);
+
+            mr_asprintf(&progress_str, _("Restoring from %s #%d"),
+                    bkpinfo->backup_media_string,
                     g_current_media_number);
             log_to_screen(progress_str);
         } else {
-            sprintf(progress_str, "Restoring from fileset #%ld on %s #%d",
+            mr_free(progress_str);
+            mr_asprintf(&progress_str,
+                    _("Restoring from fileset #%ld on %s #%d"),
                     current_tarball_number,
-                    media_descriptor_string(bkpinfo->backup_media_type),
+                    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++) {
@@ -2253 +2170 @@
                                               filelist, bkpinfo);
             }
-            sprintf(tmp, "%s #%d, fileset #%ld - restore ",
+            mr_asprintf(&tmp, _("%s #%d, fileset #%ld - restore "),
                     media_descriptor_string(bkpinfo->backup_media_type),
                     g_current_media_number, current_tarball_number);
             if (res) {
-                strcat(tmp, "reported errors");
-            } else if (attempts > 1) {
-                strcat(tmp, "succeeded");
+                mr_strcat(tmp, _("reported errors"));
             } else {
-                strcat(tmp, "succeeded");
+                mr_strcat(tmp, _("succeeded"));
             }
             if (attempts > 1) {
-                sprintf(tmp + strlen(tmp), " (%d attempts) - review logs",
-                        attempts);
-            }
-            strcpy(comment, tmp);
+                mr_strcat(tmp, _(" (%d attempts) - review logs"), attempts);
+            }
             if (attempts > 1) {
-                log_to_screen(comment);
-            }
+                log_to_screen(tmp);
+            }
+            mr_free(tmp);
 
             retval += res;
@@ -2276 +2190 @@
             g_current_progress++;
         }
-    }
+        mr_free(tarball_fname);
+    }
+    mr_free(progress_str);
     close_progress_form();
+
     if (retval) {
-        mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
+        mvaddstr_and_log_it(g_currentY++, 74, _("Errors."));
     } else {
-        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
-    }
-    mr_free(tmp);
-    mr_free(tarball_fname);
-    mr_free(progress_str);
-    mr_free(comment);
-
+        mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
+    }
     return (retval);
 }
@@ -2294 +2206 @@
  *END_RESTORE_ALL_TARBALLS_FROM_CD                                        *
  **************************************************************************/
-
 
 
@@ -2308 +2219 @@
                                     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 ****/
-    char *tmp;
-    char *biggie_fname;
-    char *biggie_cksum;
-    char *xattr_fname;
-    char *acl_fname;
-    char *p;
-    char *pathname_of_last_biggie_restored;
-    char *biggies_whose_EXATs_we_should_set;    // EXtended ATtributes
-    long long biggie_size;
-    FILE *fbw = NULL;
+    char *tmp = NULL;
+    char *biggie_fname = NULL;
+    char *biggie_cksum = NULL;
+    char *xattr_fname = NULL;
+    char *acl_fname = NULL;
+    char *pathname_of_last_biggie_restored = NULL;
+    char *biggies_whose_EXATs_we_should_set = NULL; // EXtended ATtributes
+    long long biggie_size = (long long)0;
+    FILE *fbw;
+
+    assert(bkpinfo != NULL);
 
     malloc_string(tmp);
     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);
-
     read_cfg_var(g_mondo_cfg_file, "total-slices", tmp);
-
     total_slices = atol(tmp);
-    sprintf(tmp, "Reassembling large files      ");
+    mr_free(tmp);
+
+    mr_asprintf(&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);
+        mr_asprintf(&acl_fname, ACL_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
     }
     mvaddstr_and_log_it(g_currentY, 0, tmp);
-    sprintf(biggies_whose_EXATs_we_should_set,
+    mr_free(tmp);
+
+    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"))) {
@@ -2354 +2264 @@
                 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,
@@ -2365 +2275 @@
 
     noof_biggiefiles = atol(biggie_fname);
-    sprintf(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);
-    open_progress_form("Reassembling large files",
-                       "I am now reassembling all the large files.",
-                       "Please wait. This may take some time.",
+    open_progress_form(_("Reassembling large files"),
+                       _("I am now reassembling all the large files."),
+                       _("Please wait. This may take some time."),
                        "", total_slices);
 
@@ -2384 +2293 @@
             wrong_marker(BLK_START_A_NORMBIGGIE, ctrl_chr);
         }
+        /* BERLIOS: useless
         p = strrchr(biggie_fname, '/');
         if (!p) {
@@ -2390 +2300 @@
             p++;
         }
-        sprintf(tmp, "Restoring big file %ld (%lld K)",
+        */
+        mr_asprintf(&tmp, _("Restoring big file %ld (%lld K)"),
                 current_bigfile_number + 1, biggie_size / 1024);
         update_progress_form(tmp);
+        mr_free(tmp);
+
         res = restore_a_biggiefile_from_stream(bkpinfo, biggie_fname,
                                                current_bigfile_number,
@@ -2404 +2317 @@
             fprintf(fbw, "%s\n", pathname_of_last_biggie_restored);
         }
+        mr_free(pathname_of_last_biggie_restored);
+
         retval += res;
         current_bigfile_number++;
@@ -2410 +2325 @@
     if (current_bigfile_number != noof_biggiefiles
         && noof_biggiefiles != 0) {
-        sprintf(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 {
-        sprintf(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);
 
     if (fbw) {
@@ -2443 +2356 @@
         }
     }
+    mr_free(xattr_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.");
+            (_
+             ("Press ENTER to go on. Delete /PAUSE to stop these pauses."));
     }
 
     close_progress_form();
     if (retval) {
-        mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
+        mvaddstr_and_log_it(g_currentY++, 74, _("Errors."));
     } else {
-        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
-    }
-    mr_free(biggies_whose_EXATs_we_should_set);
-    mr_free(pathname_of_last_biggie_restored);
+        mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
+    }
     mr_free(biggie_fname);
     mr_free(biggie_cksum);
-    mr_free(xattr_fname);
-    mr_free(acl_fname);
-    mr_free(tmp);
     return (retval);
 }
@@ -2467 +2380 @@
  *END_RESTORE_ALL_BIGGIEFILES_FROM_STREAM                                 *
  **************************************************************************/
-
-
-
-
 
 
@@ -2488 +2397 @@
 {
     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 **/
-    char *tmp;
-    char *progress_str;
-    char *tmp_fname;
-    char *xattr_fname;
-    char *acl_fname;
-
-    long long tmp_size;
-
+    char *tmp = NULL;
+    char *progress_str = NULL;
+    char *tmp_fname = NULL;
+    char *xattr_fname = NULL;
+    char *acl_fname = NULL;
+
+    long long tmp_size = 0L;
+
+    malloc_string(tmp_fname);
     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");
+    mvaddstr_and_log_it(g_currentY, 0, _("Restoring from archives"));
     read_cfg_var(g_mondo_cfg_file, "last-filelist-number", tmp);
     max_val = atol(tmp) + 1;
+    mr_free(tmp);
 
     chdir(bkpinfo->restore_path);   /* I don't know why this is needed _here_ but it seems to be. -HR, 02/04/2002 */
@@ -2516 +2423 @@
     run_program_and_log_output("pwd", 5);
 
-    sprintf(progress_str, "Restoring from media #%d",
+    mr_asprintf(&progress_str, _("Restoring from media #%d"),
             g_current_media_number);
     log_to_screen(progress_str);
-    open_progress_form("Restoring from archives",
-                       "Restoring data from the archives.",
-                       "Please wait. This may take some time.",
+    open_progress_form(_("Restoring from archives"),
+                       _("Restoring data from the archives."),
+                       _("Please wait. This may take some time."),
                        progress_str, max_val);
 
@@ -2539 +2446 @@
         update_progress_form(progress_str);
         if (g_getfattr) {
-            sprintf(xattr_fname, "%s/xattr-subset-%ld.tmp", bkpinfo->tmpdir,
+            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,
+            mr_asprintf(&acl_fname, "%s/acl-subset-%ld.tmp", bkpinfo->tmpdir,
                 current_afioball_number);
             unlink(acl_fname);
@@ -2558 +2465 @@
             wrong_marker(BLK_START_AN_AFIO_OR_SLICE, ctrl_chr);
         }
-        sprintf(tmp,
-                "Restoring from fileset #%ld (name=%s, size=%ld K)",
+        /* BERLIOS: useless ?
+        mr_asprintf(&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(bkpinfo, tmp_fname,
@@ -2568 +2477 @@
         retval += res;
         if (res) {
-            sprintf(tmp, "Fileset %ld - errors occurred",
+            log_to_screen("Fileset %ld - errors occurred",
                     current_afioball_number);
-            log_to_screen(tmp);
         }
         res =
@@ -2580 +2488 @@
         current_afioball_number++;
         g_current_progress++;
-        sprintf(progress_str, "Restoring from fileset #%ld on %s #%d",
+
+        mr_free(progress_str);
+        mr_asprintf(&progress_str, _("Restoring from fileset #%ld on %s #%d"),
                 current_afioball_number,
-                media_descriptor_string(bkpinfo->backup_media_type),
+                bkpinfo->backup_media_string,
                 g_current_media_number);
         res =
@@ -2592 +2502 @@
             unlink(acl_fname);
         }
+        mr_free(xattr_fname);
+        mr_free(acl_fname);
     }                           // next
+    mr_free(progress_str);
+    mr_free(tmp_fname);
+
     mr_msg(1, "All done with afioballs");
     close_progress_form();
     if (retval) {
-        mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
+        mvaddstr_and_log_it(g_currentY++, 74, _("Errors."));
     } else {
-        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
-    }
-    mr_free(tmp);
-    mr_free(progress_str);
-    mr_free(tmp_fname);
-    mr_free(xattr_fname);
-    mr_free(acl_fname);
+        mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
+    }
     return (retval);
 }
@@ -2629 +2539 @@
 
   /** mallco ***/
-    char *cwd;
-    char *newpath;
-    char *tmp;
+    char *cwd = NULL;
+    char *newpath = NULL;
+    char *tmp = NULL;
     assert(bkpinfo != NULL);
 
     malloc_string(cwd);
     malloc_string(newpath);
-    malloc_string(tmp);
     mr_msg(2, "restore_everything() --- starting");
     g_current_media_number = 1;
+    /* BERLIOS: should test return value, or better change the function */
     getcwd(cwd, MAX_STR_LEN - 1);
-    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);
+
     mr_msg(1, "Changing dir to %s", bkpinfo->restore_path);
     chdir(bkpinfo->restore_path);
+    /* BERLIOS: should test return value, or better change the function */
     getcwd(newpath, MAX_STR_LEN - 1);
     mr_msg(1, "path is now %s", newpath);
@@ -2649 +2562 @@
     if (!find_home_of_exe("petris") && !g_text_mode) {
         newtDrawRootText(0, g_noof_rows - 2,
-                         "Press ALT-<left cursor> twice to play Petris :-) ");
+                         _
+                         ("Press ALT-<left cursor> twice to play Petris :-) "));
         newtRefresh();
     }
-    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);
         mvaddstr_and_log_it(g_currentY++, 0,
-                            "Restoring OS and data from streaming media");
+                            _
+                            ("Restoring OS and data from streaming media"));
         if (bkpinfo->backup_media_type == cdstream) {
             openin_cdstream(bkpinfo);
@@ -2673 +2588 @@
     } else {
         mvaddstr_and_log_it(g_currentY++, 0,
-                            "Restoring OS and data from CD       ");
+                            _("Restoring OS and data from CD       "));
         mount_cdrom(bkpinfo);
         resA = restore_all_tarballs_from_CD(bkpinfo, filelist);
@@ -2680 +2595 @@
     chdir(cwd);
     if (resA + resB) {
-        log_to_screen("Errors occurred while data was being restored.");
+        log_to_screen(_("Errors occurred while data was being restored."));
     }
     if (length_of_file("/etc/raidtab") > 0) {
@@ -2691 +2606 @@
     mr_free(cwd);
     mr_free(newpath);
-    mr_free(tmp);
     return (resA + resB);
 }
@@ -2698 +2612 @@
  *END_RESTORE_EVERYTHING                                                  *
  **************************************************************************/
-
 
 
@@ -2820 +2733 @@
 extern void wait_until_software_raids_are_prepped(char *, int);
 
-
 char which_restore_mode(void);
 
@@ -2853 +2765 @@
             "stopped for some reason, chances are it's detailed here.    ");
     mr_msg(0,
-            "More than likely there's a message at the very end of this  ");
+            "More than likely there's a message near the end of this     ");
     mr_msg(0,
             "log that will tell you what is wrong.  Please read it!      ");
@@ -2861 +2773 @@
 
 
-
 /**
  * Restore the user's data.
@@ -2868 +2779 @@
 int main(int argc, char *argv[])
 {
-    FILE *fin;
-    FILE *fout;
+    FILE *fin = NULL;
+    FILE *fout = NULL;
     int retval = 0;
-    int res;
-//  int c;
-    char *tmp;
-
-    struct mountlist_itself *mountlist;
-    struct raidlist_itself *raidlist;
-    struct s_bkpinfo *bkpinfo;
-    struct s_node *filelist;
-    char *a, *b;
+    int res = 0;
+    char *tmp = NULL;
+
+    struct mountlist_itself *mountlist = NULL;
+    struct raidlist_itself *raidlist = NULL;
+    struct s_bkpinfo *bkpinfo = NULL;
+    struct s_node *filelist = NULL;
+    char *a = NULL, *b = NULL;
     bool run_postnuke = FALSE;
 
-  /**************************************************************************
-   * hugo-                                                                  *
-   * busy stuff here - it needs some comments -stan                           *
-   *                                                                        *
-   **************************************************************************/
+#ifdef ENABLE_NLS
+    setlocale(LC_ALL, "");
+    (void) textdomain("mondo");
+#endif
+
     if (getuid() != 0) {
-        fprintf(stderr, "Please run as root.\n");
+        fprintf(stderr, _("Please run as root.\n"));
         exit(127);
     }
 
     g_loglevel = DEFAULT_MR_LOGLEVEL;
-    malloc_string(tmp);
 
 /* Configure global variables */
@@ -2926 +2835 @@
     run_program_and_log_output("mkdir -p /mnt/floppy", FALSE);
 
-    malloc_string(tmp);
     malloc_string(a);
     malloc_string(b);
@@ -2932 +2840 @@
     reset_bkpinfo(bkpinfo);
     bkpinfo->backup_media_type = none;  // in case boot disk was made for one backup type but user wants to restore from another backup type
+    bkpinfo->backup_media_string = NULL;
     bkpinfo->restore_data = TRUE;   // Well, yeah :-)
     if (am_I_in_disaster_recovery_mode()) {
@@ -2950 +2859 @@
 
 /* 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)) {
         mr_msg(2,
@@ -2956 +2865 @@
                 __LINE__, g_mountlist_fname);
     } else if (!does_file_exist(tmp)) {
-        sprintf(tmp, "cp -f %s %s.orig", 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 */
     make_hole_for_dir(bkpinfo->tmpdir);
-    sprintf(tmp, "mkdir -p %s", bkpinfo->tmpdir);
+    mr_asprintf(&tmp, "mkdir -p %s", bkpinfo->tmpdir);
     run_program_and_log_output(tmp, FALSE);
+    mr_free(tmp);
+
     make_hole_for_dir("/var/log");
     make_hole_for_dir("/tmp/tmpfs");    /* just in case... */
@@ -2974 +2887 @@
     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 */
@@ -2986 +2899 @@
     iamhere("what time is it");
 
-/* Process command-line parameters */
+    /* Process command-line parameters */
     if (argc == 2 && strcmp(argv[1], "--edit-mountlist") == 0) {
 #ifdef __FreeBSD__
@@ -3024 +2937 @@
         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.",
+        open_progress_form(_("Reassembling /dev/hda1"),
+                           _("Shark is a bit of a silly person."),
+                           _("Please wait. This may take some time."),
                            "", 1999);
         system("rm -Rf /tmp/*pih*");
 
+        malloc_string(tmp);
         restore_a_biggiefile_from_CD(bkpinfo, 42, NULL, tmp);
+        mr_free(tmp);
     }
 
@@ -3043 +2958 @@
         // 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]);
+        mr_asprintf(&a, argv[3]);
+        mr_asprintf(&b, argv[4]);
 
         res = save_filelist_entries_in_common(a, filelist, b, FALSE);
         free_filelist(filelist);
+        mr_free(a);
+        mr_free(b);
         printf("res = %d", res);
         finish(0);
@@ -3102 +3016 @@
         retval = run_grub(FALSE, "/dev/hda");
         if (retval) {
-            log_to_screen("Failed to write Master Boot Record");
+            log_to_screen(_("Failed to write Master Boot Record"));
         }
         paranoid_MR_finish(0);
@@ -3113 +3027 @@
         if (argc != 1) {
             popup_and_OK
-                ("Live mode doesn't support command-line parameters yet.");
+                (_
+                 ("Live mode doesn't support command-line parameters yet."));
             paranoid_MR_finish(1);
-//    return(1);
         }
         mr_msg(1, "I am in normal, live mode.");
@@ -3135 +3049 @@
         mr_msg(2, "Still here. Yay.");
         if (strlen(bkpinfo->tmpdir) > 0) {
-            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 */
@@ -3145 +3060 @@
         mr_msg(2, "FYI, MOUNTLIST_FNAME = %s ", g_mountlist_fname);
         if (argc == 3 && strcmp(argv[1], "--monitas-memorex") == 0) {
-            log_to_screen("Uh, that hasn't been implemented yet.");
+            log_to_screen(_("Uh, that hasn't been implemented yet."));
             paranoid_MR_finish(1);
         }
@@ -3165 +3080 @@
                 sprintf(bkpinfo->isodir, "/tmp/isodir");
                 run_program_and_log_output("mkdir -p /tmp/isodir", 5);
-                sprintf(tmp, "mount %s -t nfs -o nolock /tmp/isodir",
+                mr_asprintf(&tmp, "mount %s -t nfs -o nolock /tmp/isodir",
                         bkpinfo->nfs_mount);
                 run_program_and_log_output(tmp, 1);
+                mr_free(tmp);
             }
         }
@@ -3174 +3090 @@
         if (retval) {
             log_to_screen
-                ("Warning - load_raidtab_into_raidlist returned an error");
+                (_
+                 ("Warning - load_raidtab_into_raidlist returned an error"));
         }
 
@@ -3228 +3145 @@
             }
             if (retval) {
-                log_to_screen("Failed to write Master Boot Record");
+                log_to_screen(_("Failed to write Master Boot Record"));
             }
         } else if (argc == 2 && strcmp(argv[1], "--isonuke") == 0) {
@@ -3234 +3151 @@
             retval = iso_mode(bkpinfo, mountlist, raidlist, TRUE);
         } else if (argc != 1) {
-            log_to_screen("Invalid paremeters");
+            log_to_screen(_("Invalid paremeters"));
             paranoid_MR_finish(1);
         } else {
@@ -3246 +3163 @@
         if (does_file_exist("/tmp/changed.files")) {
             log_to_screen
-                ("See /tmp/changed.files for list of files that have changed.");
+                (_
+                 ("See /tmp/changed.files for list of files that have changed."));
         }
         mvaddstr_and_log_it(g_currentY++,
                             0,
-                            "Run complete. Errors were reported. Please review the logfile.");
+                            _
+                            ("Run complete. Errors were reported. Please review the logfile."));
     } else {
         if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
             mvaddstr_and_log_it(g_currentY++,
                                 0,
-                                "Run complete. Please remove floppy/CD/media and reboot.");
+                                _
+                                ("Run complete. Please remove floppy/CD/media and reboot."));
         } else {
             run_program_and_log_output("sync", FALSE);
@@ -3267 +3187 @@
             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++,
                                 0,
-                                "Run complete. Please remove media and reboot.");
-        }
-    }
-
-// g_I_have_just_nuked is set true by nuke_mode() just before it returns
+                                _
+                                ("Run complete. Please remove media and reboot."));
+        }
+    }
+
+    // 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...");
@@ -3303 +3218 @@
       } 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);
@@ -3309 +3224 @@
           log_OS_error(tmp);
         }
+        mr_free(tmp);
         mr_msg(1, "post-nuke returned w/ res=%d", res);
       }
@@ -3315 +3231 @@
     }
 
-/*  
-  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);
-    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);
+
     log_to_screen
-        ("Restore log copied to /tmp/mondo-restore.log on your hard disk");
-    sprintf(tmp,
-            "Mondo-restore is exiting (retval=%d)                                      ",
-            retval);
-    log_to_screen(tmp);
-    sprintf(tmp, "umount %s", bkpinfo->isodir);
+        (_
+         ("Restore log copied to /tmp/mondo-restore.log on your hard disk"));
+    log_to_screen(_("Mondo-restore is exiting (retval=%d)"), retval);
+
+    mr_asprintf(&tmp, "umount %s", bkpinfo->isodir);
     run_program_and_log_output(tmp, 5);
+    mr_free(tmp);
+
     mr_free(mountlist);
     mr_free(raidlist);
@@ -3340 +3253 @@
     paranoid_MR_finish(retval); // frees global stuff plus bkpinfo
     free_libmondo_global_strings(); // it's fine to have this here :) really :)
-    mr_free(a);
-    mr_free(b);
-    mr_free(tmp);
 
     unlink("/tmp/filelist.full");
@@ -3355 +3265 @@
 
 
-
-
-
 /**************************************************************************
  *END_MONDO-RESTORE.C                                                     *