Changeset 1219 in MondoRescue for branches/stable/mondo/src/mondorestore/mondo-rstr-tools.c

Timestamp:

Feb 28, 2007, 9:36:10 AM (17 years ago)

Author:

Bruno Cornec

Message:

Integrates trunk memory mngt for mondo-rstr-tools.c
This ends the first round of modifications for memory management.

File:

• branches/stable/mondo/src/mondorestore/mondo-rstr-tools.c (modified) (96 diffs)

branches/stable/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -380 +380 @@
     int res = 0;
 
-    char *tmp = NULL;
     char *command = NULL;
     char *mountdir = NULL;
     char *mountpoint = NULL;
     char *additional_parameters = NULL;
-    char *p1 = NULL;
-    char *p2 = NULL;
-    char *p3 = NULL;
-
+ 
     assert_string_is_neither_NULL_nor_zerolength(device);
     assert_string_is_neither_NULL_nor_zerolength(mpt);
     assert(format != NULL);
-    malloc_string(tmp);
-    malloc_string(command);
-    malloc_string(mountdir);
-    malloc_string(additional_parameters);
 
     if (!strcmp(mpt, "/1")) {
@@ -412 +404 @@
         return (0);
     }
-    sprintf(tmp, "Mounting device %s   ", device);
-    mr_msg(1, tmp);
+    mr_msg(1, "Mounting device %s   ", device);
     if (writeable) {
-        strcpy(additional_parameters, "-o rw");
-    } else {
-        strcpy(additional_parameters, "-o ro");
+        mr_asprintf(&additional_parameters, "-o rw");
+    } else {
+        mr_asprintf(&additional_parameters, "-o ro");
     }
     if (find_home_of_exe("setfattr")) {
-        strcat(additional_parameters, ",user_xattr");
+        mr_strcat(additional_parameters, ",user_xattr");
     }
     if (find_home_of_exe("setfacl")) {
-        strcat(additional_parameters, ",acl");
+        mr_strcat(additional_parameters, ",acl");
     }
 
     if (!strcmp(mountpoint, "swap")) {
-        sprintf(command, "swapon %s", device);
+        mr_asprintf(&command, "swapon %s", device);
     } else {
         if (!strcmp(mountpoint, "/")) {
-            strcpy(mountdir, MNT_RESTORING);
+            mr_asprintf(&mountdir, MNT_RESTORING);
         } else {
-            sprintf(mountdir, "%s%s", MNT_RESTORING, mountpoint);
-        }
-        sprintf(command, "mkdir -p %s", mountdir);
+            mr_asprintf(&mountdir, "%s%s", MNT_RESTORING, mountpoint);
+        }
+        mr_asprintf(&command, "mkdir -p %s", mountdir);
         run_program_and_log_output(command, FALSE);
-        sprintf(command, "mount -t %s %s %s %s 2>> %s", format, device,
+        mr_free(command);
+
+        mr_asprintf(&command, "mount -t %s %s %s %s 2>> %s", format, device,
                 additional_parameters, mountdir, MONDO_LOGFILE);
         mr_msg(2, "command='%s'", command);
     }
+    mr_free(additional_parameters);
+
     res = run_program_and_log_output(command, TRUE);
     if (res && (strstr(command, "xattr") || strstr(command, "acl"))) {
         mr_msg(1, "Re-trying without the fancy extra parameters");
-        sprintf(command, "mount -t %s %s %s 2>> %s", format, device,
+        mr_free(command);
+
+        mr_asprintf(&command, "mount -t %s %s %s 2>> %s", format, device,
                 mountdir, MONDO_LOGFILE);
         res = run_program_and_log_output(command, TRUE);
@@ -452 +449 @@
         mr_msg(1, "command was '%s'", command);
         if (!strcmp(mountpoint, "swap")) {
-            log_to_screen(tmp);
+            log_to_screen("Unable to mount device %s (type %s) at %s", device,
+                format, mountdir);
         } else {
             mr_msg(2, "Retrying w/o the '-t' switch");
-            sprintf(command, "mount %s %s 2>> %s", device, mountdir,
+            mr_free(command);
+
+            mr_asprintf(&command, "mount %s %s 2>> %s", device, mountdir,
                     MONDO_LOGFILE);
             mr_msg(2, "2nd command = '%s'", command);
@@ -467 +467 @@
         }
     }
+    mr_free(command);
+    mr_free(mountdir);
+
     if (res && !strcmp(mountpoint, "swap")) {
         mr_msg(2, "That's ok. It's just a swap partition.");
@@ -472 +475 @@
         res = 0;
     }
-
-    mr_free(tmp);
-    mr_free(command);
-    mr_free(mountdir);
     mr_free(mountpoint);
-    mr_free(additional_parameters);
 
     return (res);
 }
-
 /**************************************************************************
  *END_MOUNT_DEVICE                                                        *
  **************************************************************************/
-
-
 
 
@@ -498 +493 @@
                       *p_external_copy_of_mountlist, bool writeable)
 {
-    int retval = 0, lino, res;
-    char *tmp, *these_failed, *format;
-    struct mountlist_itself *mountlist;
-
-    malloc_string(tmp);
-    malloc_string(format);
-    malloc_string(these_failed);
+    int retval = 0;
+    int lino = 0;
+    int res = 0;
+    char *tmp = NULL;
+    char *these_failed = NULL;
+    char *format = NULL;
+    struct mountlist_itself *mountlist = NULL;
+
     assert(p_external_copy_of_mountlist != NULL);
     mountlist = (struct mountlist_itself *)mr_malloc(sizeof(struct mountlist_itself));
@@ -511 +507 @@
     sort_mountlist_by_mountpoint(mountlist, 0);
 
-  /** menset **/
-    these_failed[0] = '\0';
-
-    mvaddstr_and_log_it(g_currentY, 0, "Mounting devices         ");
-    open_progress_form("Mounting devices",
-                       "I am now mounting all the drives.",
-                       "This should not take long.",
+    mvaddstr_and_log_it(g_currentY, 0, _("Mounting devices         "));
+    open_progress_form(_("Mounting devices"),
+                       _("I am now mounting all the drives."),
+                       _("This should not take long."),
                        "", mountlist->entries);
 
@@ -525 +518 @@
                     "Again with the /proc - why is this in your mountlist?");
         } else if (is_this_device_mounted(mountlist->el[lino].device)) {
-            sprintf(tmp, "%s is already mounted",
+            log_to_screen(_("%s is already mounted"),
                     mountlist->el[lino].device);
-            log_to_screen(tmp);
         } else if (strcmp(mountlist->el[lino].mountpoint, "none")
                    && strcmp(mountlist->el[lino].mountpoint, "lvm")
                    && strcmp(mountlist->el[lino].mountpoint, "raid")
                    && strcmp(mountlist->el[lino].mountpoint, "image")) {
-            sprintf(tmp, "Mounting %s", mountlist->el[lino].device);
+            mr_asprintf(&tmp, "Mounting %s", mountlist->el[lino].device);
             update_progress_form(tmp);
-            strcpy(format, mountlist->el[lino].format);
+            mr_free(tmp);
+
+            mr_asprintf(&format, mountlist->el[lino].format);
             if (!strcmp(format, "ext3")) {
-                strcpy(format, "ext2");
+                mr_free(format);
+                mr_asprintf(&format, "ext2");
             }
             res = mount_device(mountlist->el[lino].device,
@@ -543 +538 @@
             retval += res;
             if (res) {
-                strcat(these_failed, mountlist->el[lino].device);
-                strcat(these_failed, " ");
-            }
+                if (these_failed != NULL) { /* not the first time */
+                    mr_strcat(these_failed, " %s", mountlist->el[lino].device);
+                } else { /* The first time */
+                    mr_asprintf(&these_failed, "%s", mountlist->el[lino].device);
+                }
+            }
+            mr_free(format);
         }
         g_current_progress++;
@@ -554 +553 @@
         if (g_partition_table_locked_up > 0) {
             log_to_screen
-                ("fdisk's ictol() call to refresh its copy of the partition table causes the kernel to");
-            log_to_screen
-                ("lock up the partition table. You might have to reboot and use Interactive Mode to");
-            log_to_screen
-                ("format and restore *without* partitioning first. Sorry for the inconvenience.");
-        }
-        sprintf(tmp, "Could not mount devices %s- shall I abort?",
+                (_
+                 ("fdisk's ioctl() call to refresh its copy of the partition table causes the kernel to"));
+            log_to_screen(_
+                          ("lock up the partition table. You might have to reboot and use Interactive Mode to"));
+            log_to_screen(_
+                          ("format and restore *without* partitioning first. Sorry for the inconvenience."));
+        }
+        mr_asprintf(&tmp, _("Could not mount devices %s- shall I abort?"),
                 these_failed);
+        mr_free(these_failed);
+
         if (!ask_me_yes_or_no(tmp)) {
             retval = 0;
             log_to_screen
-                ("Continuing, although some devices failed to be mounted");
-            mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+                (_
+                 ("Continuing, although some devices failed to be mounted"));
+            mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
         } else {
-            mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
+            mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
             log_to_screen
-                ("Unable to mount some or all of your partitions.");
-        }
-    } else {
-        log_to_screen("All partitions were mounted OK.");
-        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+                (_("Unable to mount some or all of your partitions."));
+        }
+        mr_free(tmp);
+    } else {
+        log_to_screen(_("All partitions were mounted OK."));
+        mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     }
     run_program_and_log_output("df -m", 3);
     mr_free(mountlist);
-    mr_free(tmp);
-    mr_free(format);
-    mr_free(these_failed);
     return (retval);
 }
-
  /**************************************************************************
   *END_MOUNT_ALL_DEVICES                                                   *
@@ -600 +600 @@
 int mount_cdrom(struct s_bkpinfo *bkpinfo)
 {
-    char *mount_cmd;
-    int i, res;
+    char *mount_cmd = NULL;
+    int i = 0, res = 0;
 #ifdef __FreeBSD__
-    char mdd[32];
-    char *mddev = mdd;
+    char *mddev = NULL;
 #endif
 
-    malloc_string(mount_cmd);
     assert(bkpinfo != NULL);
 
@@ -613 +611 @@
         || bkpinfo->backup_media_type == udev) {
         mr_msg(8, "Tape/udev. Therefore, no need to mount CDROM.");
-        mr_free(mount_cmd);
         return 0;
     }
@@ -619 +616 @@
     if (!run_program_and_log_output("mount | grep -F " MNT_CDROM, FALSE)) {
         mr_msg(2, "mount_cdrom() - CD already mounted. Fair enough.");
-        mr_free(mount_cmd);
         return (0);
     }
@@ -632 +628 @@
         }
 #ifdef __FreeBSD__
-        sprintf(mount_cmd, "/mnt/isodir/%s/%s/%s-%d.iso", bkpinfo->isodir,
-                bkpinfo->nfs_remote_dir, bkpinfo->prefix, g_current_media_number);
+        mr_asprintf(&mount_cmd, "/mnt/isodir/%s/%s/%s-%d.iso", bkpinfo->isodir,
+                bkpinfo->nfs_remote_dir, bkpinfo->prefix,
+                g_current_media_number);
         mddev = make_vn(mount_cmd);
-        sprintf(mount_cmd, "mount_cd9660 -r %s " MNT_CDROM, mddev);
+        mr_free(mount_cmd);
+
+        mr_asprintf(&mount_cmd, "mount_cd9660 -r %s " MNT_CDROM, mddev);
+        mr_free(mddev);
 #else
-        sprintf(mount_cmd, "mount %s/%s/%s-%d.iso -t iso9660 -o loop,ro %s",
-                bkpinfo->isodir, bkpinfo->nfs_remote_dir,
-                bkpinfo->prefix, g_current_media_number, MNT_CDROM);
+        mr_asprintf(&mount_cmd,
+                "mount %s/%s/%s-%d.iso -t iso9660 -o loop,ro %s",
+                bkpinfo->isodir, bkpinfo->nfs_remote_dir, bkpinfo->prefix,
+                g_current_media_number, MNT_CDROM);
 #endif
 
-    } else
-     if (bkpinfo->backup_media_type == iso) {
+    } else if (bkpinfo->backup_media_type == iso) {
 #ifdef __FreeBSD__
-        sprintf(mount_cmd, "%s/%s-%d.iso", bkpinfo->isodir,
+        mr_asprintf(&mount_cmd, "%s/%s-%d.iso", bkpinfo->isodir,
                 bkpinfo->prefix, g_current_media_number);
         mddev = make_vn(mount_cmd);
-        sprintf(mount_cmd, "mount_cd9660 -r %s %s", mddev, MNT_CDROM);
+        mr_free(mount_cmd);
+
+        mr_asprintf(&mount_cmd, "mount_cd9660 -r %s %s", mddev, MNT_CDROM);
+        mr_free(mddev);
 #else
-        sprintf(mount_cmd, "mount %s/%s-%d.iso -t iso9660 -o loop,ro %s",
-                bkpinfo->isodir, bkpinfo->prefix, g_current_media_number, MNT_CDROM);
+        mr_asprintf(&mount_cmd, "mount %s/%s-%d.iso -t iso9660 -o loop,ro %s",
+                bkpinfo->isodir, bkpinfo->prefix, g_current_media_number,
+                MNT_CDROM);
 #endif
     } else if (strstr(bkpinfo->media_device, "/dev/"))
 #ifdef __FreeBSD__
     {
-        sprintf(mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device,
+        mr_asprintf(&mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device,
                 MNT_CDROM);
     }
 #else
     {
-        sprintf(mount_cmd, "mount %s -t iso9660 -o ro %s",
+        mr_asprintf(&mount_cmd, "mount %s -t iso9660 -o ro %s",
                 bkpinfo->media_device, MNT_CDROM);
     }
@@ -676 +680 @@
 
 #ifdef __FreeBSD__
-        sprintf(mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device,
+        mr_asprintf(&mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device,
                 MNT_CDROM);
 #else
-        sprintf(mount_cmd, "mount %s -t iso9660 -o ro %s",
+        mr_asprintf(&mount_cmd, "mount %s -t iso9660 -o ro %s",
                 bkpinfo->media_device, MNT_CDROM);
 #endif
@@ -695 +699 @@
         }
     }
+    mr_free(mount_cmd);
+
     if (res) {
         mr_msg(2, "Failed, despite %d attempts", i);
@@ -700 +706 @@
         mr_msg(2, "Mounted CD-ROM drive OK");
     }
-    mr_free(mount_cmd);
     return (res);
 }
-
-
-
-
-
 /**************************************************************************
  *END_MOUNT_CDROM                                                         *
@@ -739 +739 @@
                                TRUE);
 }
-
 /**************************************************************************
  *END_PROTECT_AGAINST_BRAINDEAD_SYSADMINS                                 *
  **************************************************************************/
-
-
 
 
@@ -756 +753 @@
 int read_cfg_file_into_bkpinfo(char *cfgf, struct s_bkpinfo *bkpinfo)
 {
-  /** add mallocs **/
     char *value = NULL;
     char *tmp = NULL;
@@ -765 +761 @@
     char *iso_path = NULL;
     char *old_isodir = NULL;
-    char cfg_file[100];
+    char *cfg_file = NULL;
     t_bkptype media_specified_by_user;
 
-    malloc_string(command);
-    malloc_string(iso_mnt);
-    malloc_string(iso_path);
-    malloc_string(old_isodir);
     malloc_string(value);
-    malloc_string(tmp);
-//  assert_string_is_neither_NULL_nor_zerolength(cfg_file);
     assert(bkpinfo != NULL);
 
     if (!cfgf) {
-        strcpy(cfg_file, g_mondo_cfg_file);
-    } else {
-        strcpy(cfg_file, cfgf);
+        cfg_file = g_mondo_cfg_file;
+    } else {
+        cfg_file = cfgf;
     }
 
@@ -795 +785 @@
             bkpinfo->backup_media_type = dvd;
         } else if (!strcmp(value, "iso")) {
-/*
-      if (am_I_in_disaster_recovery_mode()
-      && !run_program_and_log_output("mount /dev/cdrom "MNT_CDROM, 1)
-      && does_file_exist(MNT_CDROM"/archives/filelist.0"))
-*/
-
-// Patch by Conor Daly - 2004/07/12
+            // Patch by Conor Daly - 2004/07/12
             bkpinfo->backup_media_type = iso;
             if (am_I_in_disaster_recovery_mode()) {
@@ -853 +837 @@
     if (bkpinfo->disaster_recovery) {
         if (bkpinfo->backup_media_type == cdstream) {
-            sprintf(bkpinfo->media_device, "/dev/cdrom");
-//          bkpinfo->media_size[0] = -1;
+            strcpy(bkpinfo->media_device, "/dev/cdrom");
             bkpinfo->media_size[0] = 1999 * 1024;
             bkpinfo->media_size[1] = 650;   /* good guess */
@@ -865 +848 @@
             read_cfg_var(cfg_file, "media-size", value);
             bkpinfo->media_size[1] = atol(value);
-            sprintf(tmp, "Backup medium is TAPE --- dev=%s",
+            mr_msg(2, "Backup medium is TAPE --- dev=%s",
                     bkpinfo->media_device);
-            mr_msg(2, tmp);
         } else {
             strcpy(bkpinfo->media_device, "/dev/cdrom");    /* we don't really need this var */
@@ -995 +977 @@
          * isodir in disaster recovery mode
          */
-        strcpy(old_isodir, bkpinfo->isodir);
+        mr_asprintf(&old_isodir, bkpinfo->isodir);
         read_cfg_var(g_mondo_cfg_file, "iso-mnt", iso_mnt);
         read_cfg_var(g_mondo_cfg_file, "isodir", iso_path);
@@ -1010 +992 @@
             }
         }
+        mr_free(old_isodir);
+
         read_cfg_var(g_mondo_cfg_file, "iso-dev", g_isodir_device);
-        mr_msg(2, "isodir=%s; iso-dev=%s", bkpinfo->isodir,
-                g_isodir_device);
+        mr_msg(2, "isodir=%s; iso-dev=%s", bkpinfo->isodir, g_isodir_device);
         if (bkpinfo->disaster_recovery) {
             if (is_this_device_mounted(g_isodir_device)) {
                 mr_msg(2, "NB: isodir is already mounted");
                 /* Find out where it's mounted */
-                sprintf(command,
+                mr_asprintf(&command,
                         "mount | grep -E '^%s' | tail -n1 | cut -d' ' -f3",
                         g_isodir_device);
                 log_it("command = %s", command);
-                log_it("res of it = %s",
-                       call_program_and_get_last_line_of_output(command));
-                sprintf(iso_mnt, "%s",
+                mr_asprintf(&iso_mnt, "%s",
                         call_program_and_get_last_line_of_output(command));
+                log_it("res of it = %s", iso_mnt);
             } else {
-                sprintf(iso_mnt, "/tmp/isodir");
-                sprintf(tmp, "mkdir -p %s", iso_mnt);
+                mr_asprintf(&iso_mnt, "/tmp/isodir");
+                mr_asprintf(&tmp, "mkdir -p %s", iso_mnt);
                 run_program_and_log_output(tmp, 5);
-                sprintf(tmp, "mount %s %s", g_isodir_device, iso_mnt);
+                mr_free(tmp);
+
+                mr_asprintf(&tmp, "mount %s %s", g_isodir_device, iso_mnt);
                 if (run_program_and_log_output(tmp, 3)) {
                     mr_msg(1,
@@ -1035 +1019 @@
                     bkpinfo->backup_media_type = cdr;
                     strcpy(bkpinfo->media_device, "/dev/cdrom");    /* superfluous */
-                    bkpinfo->isodir[0] = iso_mnt[0] = iso_path[0] = '\0';
+                    bkpinfo->isodir[0] = '\0';
+                    mr_free(iso_mnt);
+                    mr_free(iso_path);
+                    mr_asprintf(&iso_mnt, "");
+                    mr_asprintf(&iso_path, "");
                     if (mount_cdrom(bkpinfo)) {
                         fatal_error
@@ -1044 +1032 @@
                     }
                 }
+                mr_free(tmp);
             }
             /* bkpinfo->isodir should now be the true path to prefix-1.iso etc... */
@@ -1049 +1038 @@
                 sprintf(bkpinfo->isodir, "%s%s", iso_mnt, iso_path);
             }
+            mr_free(iso_mnt);
+            mr_free(iso_path);
         }
     }
@@ -1057 +1048 @@
                 mr_msg(2,
                         "bkpinfo->backup_media_type != media_specified_by_user, so I'd better ask :)");
-                interactively_obtain_media_parameters_from_user(bkpinfo,
-                                                                FALSE);
+                interactively_obtain_media_parameters_from_user(bkpinfo, FALSE);
                 media_specified_by_user = bkpinfo->backup_media_type;
                 get_cfg_file_from_archive(bkpinfo);
-/*
-              if (media_specified_by_user != cdr && media_specified_by_user == cdrw)
-                { g_restoring_live_from_cd = FALSE; }
-*/
             }
         }
@@ -1070 +1056 @@
     }
     g_backup_media_type = bkpinfo->backup_media_type;
+    strcpy(bkpinfo->backup_media_string, bkptype_to_string(bkpinfo->backup_media_type));
+    strcpy(g_backup_media_string, bkpinfo->backup_media_string);
     mr_free(value);
-    mr_free(tmp);
-    mr_free(command);
-    mr_free(iso_mnt);
-    mr_free(iso_path);
-    mr_free(old_isodir);
     return (0);
-
-}
-
+}
 /**************************************************************************
  *END_READ_CFG_FILE_INTO_BKPINFO                                          *
  **************************************************************************/
-
-
 
 
@@ -1100 +1079 @@
 s_node *process_filelist_and_biggielist(struct s_bkpinfo *bkpinfo)
 {
-    struct s_node *filelist;
-
-  /** add mallocs**/
-    char *command;
-    char *tmp;
+    struct s_node *filelist = NULL;
+
+    char *command = NULL;
+    char *tmp = NULL;
     int res = 0;
+    size_t n = 0;
     pid_t pid;
 
     assert(bkpinfo != NULL);
-    malloc_string(command);
     malloc_string(tmp);
 
@@ -1127 +1105 @@
         unlink("/tmp/i-want-my-lvm");
         if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-            sprintf(command,
+            mr_asprintf(&command,
                     "tar -zxf %s %s %s %s %s %s",
                     bkpinfo->media_device,
@@ -1136 +1114 @@
             mr_msg(1, "tarcommand = %s", command);
             run_program_and_log_output(command, 1);
+            mr_free(command);
         } else {
             mr_msg(2,
@@ -1143 +1122 @@
             mr_msg(2, "Back from iotcn");
             run_program_and_log_output("mount", 1);
-            sprintf(command,
+            mr_asprintf(&command,
                     "tar -zxf %s/images/all.tar.gz %s %s %s %s %s",
                     MNT_CDROM,
@@ -1153 +1132 @@
             mr_msg(1, "tarcommand = %s", command);
             run_program_and_log_output(command, 1);
-//    popup_and_OK("Press ENTER to continue");
+            mr_free(command);
+
             if (!does_file_exist(BIGGIELIST_TXT_STUB)) {
                 fatal_error
@@ -1163 +1143 @@
             }
         }
-        sprintf(command, "cp -f %s %s", MONDO_CFG_FILE_STUB,
+        mr_asprintf(&command, "cp -f %s %s", MONDO_CFG_FILE_STUB,
                 g_mondo_cfg_file);
         run_program_and_log_output(command, FALSE);
-
-        sprintf(command, "cp -f %s/%s %s", bkpinfo->tmpdir,
+        mr_free(command);
+
+        mr_asprintf(&command, "cp -f %s/%s %s", bkpinfo->tmpdir,
                 BIGGIELIST_TXT_STUB, g_biggielist_txt);
         mr_msg(1, "command = %s", command);
         paranoid_system(command);
-        sprintf(command, "ln -sf %s/%s %s", bkpinfo->tmpdir,
+        mr_free(command);
+
+        mr_asprintf(&command, "ln -sf %s/%s %s", bkpinfo->tmpdir,
                 FILELIST_FULL_STUB, g_filelist_full);
         mr_msg(1, "command = %s", command);
         paranoid_system(command);
+        mr_free(command);
     }
 
     if (am_I_in_disaster_recovery_mode()
         &&
-        ask_me_yes_or_no("Do you want to retrieve the mountlist as well?"))
+        ask_me_yes_or_no(_
+                         ("Do you want to retrieve the mountlist as well?")))
     {
-//      sprintf(command, "cp -f tmp/mountlist.txt /tmp");
-        sprintf(command, "ln -sf %s/%s /tmp", MOUNTLIST_FNAME_STUB,
+        mr_asprintf(&command, "ln -sf %s/%s /tmp", MOUNTLIST_FNAME_STUB,
                 bkpinfo->tmpdir);
         paranoid_system(command);
+        mr_free(command);
     }
 
     chdir(tmp);
+    mr_free(tmp);
 
     if (!does_file_exist(g_biggielist_txt)) {
@@ -1195 +1181 @@
         mr_msg(1, "Warning - %s does not exist", g_filelist_full);
     }
-//  popup_and_OK("Wonderful.");
 
     mr_msg(2, "Forking");
@@ -1205 +1190 @@
 
     case 0:
-        log_to_screen("Pre-processing filelist");
+        log_to_screen(_("Pre-processing filelist"));
         if (!does_file_exist(g_biggielist_txt)) {
-            sprintf(command, "> %s", g_biggielist_txt);
+            mr_asprintf(&command, "> %s", g_biggielist_txt);
             paranoid_system(command);
-        }
-        sprintf(command, "grep -E '^/dev/.*' %s > %s",
+            mr_free(command);
+        }
+        mr_asprintf(&command, "grep -E '^/dev/.*' %s > %s",
                 g_biggielist_txt, g_filelist_imagedevs);
         paranoid_system(command);
+        mr_free(command);
         exit(0);
         break;
 
     default:
-        open_evalcall_form("Pre-processing filelist");
+        open_evalcall_form(_("Pre-processing filelist"));
         while (!waitpid(pid, (int *) 0, WNOHANG)) {
             usleep(100000);
@@ -1230 +1217 @@
     unlink(g_filelist_full);
     if (g_text_mode) {
-        printf("Restore which directory? --> ");
-        fgets(tmp, sizeof(tmp), stdin);
+        printf(_("Restore which directory? --> "));
+        mr_getline(&tmp, &n, stdin);
         toggle_path_selection(filelist, tmp, TRUE);
         if (strlen(tmp) == 0) {
@@ -1238 +1225 @@
             res = 0;
         }
+        mr_free(tmp);
     } else {
         res = edit_filelist(filelist);
@@ -1259 +1247 @@
                                       TRUE);
     }
-
-    mr_free(command);
-    mr_free(tmp);
     return (filelist);
 }
-
 /**************************************************************************
  *END_ PROCESS_FILELIST_AND_BIGGIELIST                                    *
  **************************************************************************/
-
-
 
 
@@ -1281 +1263 @@
 int backup_crucial_file(char *path_root, char *filename)
 {
-    char *tmp;
-    char *command;
-    int res;
-
-    malloc_string(tmp);
-    malloc_string(command);
+    char *command = NULL;
+    int res = 0;
+
     assert(path_root != NULL);
     assert_string_is_neither_NULL_nor_zerolength(filename);
 
-    sprintf(tmp, "%s/%s", path_root, filename);
-    sprintf(command, "cp -f %s %s.pristine", tmp, tmp);
-
+    mr_asprintf(&command, "cp -f %s/%s %s/%s.pristine", path_root, filename,path_root, filename);
     res = run_program_and_log_output(command, 5);
-    mr_free(tmp);
     mr_free(command);
     return (res);
@@ -1308 +1284 @@
 int run_boot_loader(bool offer_to_hack_scripts)
 {
-    int res;
+    int res = 0;
     int retval = 0;
 
-  /** malloc *******/
-    char *device;
-    char *tmp;
-    char *name;
+    char *device = NULL;
+    char *tmp = NULL;
+    char *name = NULL;
 
     malloc_string(device);
-    malloc_string(tmp);
     malloc_string(name);
     backup_crucial_file(MNT_RESTORING, "/etc/fstab");
@@ -1325 +1299 @@
     read_cfg_var(g_mondo_cfg_file, "bootloader.device", device);
     read_cfg_var(g_mondo_cfg_file, "bootloader.name", name);
-    sprintf(tmp, "run_boot_loader: device='%s', name='%s'", device, name);
-    mr_msg(2, tmp);
-    system("sync");
+    mr_msg(2, "run_boot_loader: device='%s', name='%s'", device, name);
+    sync();
     if (!strcmp(name, "LILO")) {
         res = run_lilo(offer_to_hack_scripts);
@@ -1333 +1306 @@
         res = run_elilo(offer_to_hack_scripts);
     } else if (!strcmp(name, "GRUB")) {
-//      if ( does_file_exist(DO_MBR_PLEASE) || (offer_to_hack_scripts && ask_me_yes_or_no("Because of bugs in GRUB, you're much better off running mondorestore --mbr after this program terminates. Are you sure you want to install GRUB right now?")))
-//        {
         res = run_grub(offer_to_hack_scripts, device);
-//    unlink(DO_MBR_PLEASE);
-//  }
-//      else
-//        {
-//    mr_msg(1, "Not running run_grub(). Was a bad idea anyway.");
-//    res = 1;
-//  }
     } else if (!strcmp(name, "RAW")) {
         res = run_raw_mbr(offer_to_hack_scripts, device);
@@ -1348 +1312 @@
 #ifdef __FreeBSD__
     else if (!strcmp(name, "BOOT0")) {
-        sprintf(tmp, "boot0cfg -B %s", device);
+        mr_asprintf(&tmp, "boot0cfg -B %s", device);
         res = run_program_and_log_output(tmp, FALSE);
-    } else {
-        sprintf(tmp, "ls /dev | grep -Eq '^%ss[1-4].*'", device);
+        mr_free(tmp);
+    } else {
+        mr_asprintf(&tmp, "ls /dev | grep -Eq '^%ss[1-4].*$'", device);
         if (!system(tmp)) {
-            sprintf(tmp, MNT_RESTORING "/sbin/fdisk -B %s", device);
+            mr_free(tmp);
+            mr_asprintf(&tmp, MNT_RESTORING "/sbin/fdisk -B %s", device);
             res = run_program_and_log_output(tmp, 3);
         } else {
@@ -1359 +1325 @@
                     "I'm not running any boot loader. You have a DD boot drive. It's already loaded up.");
         }
+        mr_free(tmp);
     }
 #else
     else {
         log_to_screen
-            ("Unable to determine type of boot loader. Defaulting to LILO.");
+            (_
+             ("Unable to determine type of boot loader. Defaulting to LILO."));
         res = run_lilo(offer_to_hack_scripts);
     }
 #endif
+    mr_free(device);
+    mr_free(name);
+
     retval += res;
     if (res) {
-        log_to_screen("Your boot loader returned an error");
-    } else {
-        log_to_screen("Your boot loader ran OK");
-    }
-    mr_free(device);
-    mr_free(tmp);
-    mr_free(name);
+        log_to_screen(_("Your boot loader returned an error"));
+    } else {
+        log_to_screen(_("Your boot loader ran OK"));
+    }
     return (retval);
 }
-
 /**************************************************************************
  *END_ RUN_BOOT_LOADER                                                    *
@@ -1384 +1351 @@
 
 
-
 /**
  * Attempt to find the user's editor.
@@ -1393 +1359 @@
 {
     static char output[MAX_STR_LEN];
+
     if (find_home_of_exe("pico")) {
         strcpy(output, "pico");
@@ -1419 +1386 @@
 int run_grub(bool offer_to_run_stabgrub, char *bd)
 {
-  /** malloc **/
-    char *command;
-    char *boot_device;
-    char *rootdev;
-    char *rootdrive;
-    char *conffile;
-    char *tmp;
-    char *editor;
-
-    int res;
-    int done;
-
-    malloc_string(command);
+    char *command = NULL;
+    char *boot_device = NULL;
+    char *tmp = NULL;
+    char *editor = NULL;
+
+    int res = 0;
+    int done = 0;
+
     malloc_string(boot_device);
-    malloc_string(tmp);
-    malloc_string(editor);
-    malloc_string(rootdev);
-    malloc_string(rootdrive);
-    malloc_string(conffile);
+    strcpy(boot_device, bd);
     assert_string_is_neither_NULL_nor_zerolength(bd);
-    strcpy(editor, "vi");       // find_my_editor() );
-    strcpy(boot_device, bd);
-
-    if (!run_program_and_log_output("which grub-MR", FALSE)) {
-        mr_msg(1, "Yay! grub-MR found...");
-        sprintf(command, "grub-MR %s /tmp/mountlist.txt", boot_device);
-        mr_msg(1, "command = %s", command);
-    } else {
-        sprintf(command, "chroot " MNT_RESTORING " grub-install %s",
-                boot_device);
-        mr_msg(1, "WARNING - grub-MR not found; using grub-install");
-    }
+    mr_asprintf(&editor, find_my_editor());
+
     if (offer_to_run_stabgrub
-        && ask_me_yes_or_no("Did you change the mountlist?"))
+        && ask_me_yes_or_no(_("Did you change the mountlist?")))
         /* interactive mode */
     {
         mvaddstr_and_log_it(g_currentY,
                             0,
-                            "Modifying fstab and grub.conf, and running GRUB...                             ");
+                            _
+                            ("Modifying fstab and grub.conf, and running GRUB...                             "));
         for (done = FALSE; !done;) {
-            popup_and_get_string("Boot device",
-                                 "Please confirm/enter the boot device. If in doubt, try /dev/hda",
-                                 boot_device, MAX_STR_LEN / 4);
-            sprintf(command, "stabgrub-me %s", boot_device);
+            popup_and_get_string(_("Boot device"),
+                                 _("Please confirm/enter the boot device. If in doubt, try /dev/hda"), boot_device, MAX_STR_LEN / 4);
+            mr_asprintf(&command, "stabgrub-me %s", boot_device);
             res = run_program_and_log_output(command, 1);
+            mr_free(command);
+
             if (res) {
                 popup_and_OK
-                    ("GRUB installation failed. Please install manually using 'grub-install' or similar command. You are now chroot()'ed to your restored system. Please type 'exit' when you are done.");
+                    (_
+                     ("GRUB installation failed. Please install manually using 'grub-install' or similar command. You are now chroot()'ed to your restored system. Please type 'exit' when you are done."));
                 newtSuspend();
                 system("chroot " MNT_RESTORING);
                 newtResume();
-                popup_and_OK("Thank you.");
+                popup_and_OK(_("Thank you."));
             } else {
                 done = TRUE;
             }
-            popup_and_OK("You will now edit fstab and grub.conf");
+            popup_and_OK(_("You will now edit fstab and grub.conf"));
             if (!g_text_mode) {
                 newtSuspend();
             }
-            sprintf(tmp, "%s " MNT_RESTORING "/etc/fstab", editor);
+            mr_asprintf(&tmp, "%s " MNT_RESTORING "/etc/fstab", editor);
             paranoid_system(tmp);
-            sprintf(tmp, "%s " MNT_RESTORING "/etc/grub.conf", editor);
+            mr_free(tmp);
+
+            mr_asprintf(&tmp, "%s " MNT_RESTORING "/etc/grub.conf", editor);
             paranoid_system(tmp);
+            mr_free(tmp);
+
             if (!g_text_mode) {
                 newtResume();
             }
         }
-    } else
+    } else {
         /* nuke mode */
-    {
+        if (!run_program_and_log_output("which grub-MR", FALSE)) {
+            mr_msg(1, "Yay! grub-MR found...");
+            mr_asprintf(&command, "grub-MR %s /tmp/mountlist.txt", bd);
+            mr_msg(1, "command = %s", command);
+        } else {
+            mr_asprintf(&command, "chroot " MNT_RESTORING " grub-install %s", bd);
+            mr_msg(1, "WARNING - grub-MR not found; using grub-install");
+        }
         mvaddstr_and_log_it(g_currentY,
                             0,
-                            "Running GRUB...                                                 ");
+                            _
+                            ("Running GRUB...                                                 "));
         iamhere(command);
         res = run_program_and_log_output(command, 1);
+        mr_free(command);
+
         if (res) {
             popup_and_OK
-                ("Because of bugs in GRUB's own installer, GRUB was not installed properly. Please install the boot loader manually now, using this chroot()'ed shell prompt. Type 'exit' when you have finished.");
+                (_
+                 ("Because of bugs in GRUB's own installer, GRUB was not installed properly. Please install the boot loader manually now, using this chroot()'ed shell prompt. Type 'exit' when you have finished."));
             newtSuspend();
             system("chroot " MNT_RESTORING);
             newtResume();
-            popup_and_OK("Thank you.");
+            popup_and_OK(_("Thank you."));
         }
     }
     if (res) {
-        mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
+        mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
         log_to_screen
-            ("GRUB ran w/error(s). See /tmp/mondo-restore.log for more info.");
+            (_
+             ("GRUB ran w/error(s). See /tmp/mondo-restore.log for more info."));
         mr_msg(1, "Type:-");
         mr_msg(1, "    mount-me");
@@ -1517 +1484 @@
                 "If you're really stuck, please e-mail the mailing list.");
     } else {
-        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
-    }
-    mr_free(rootdev);
-    mr_free(rootdrive);
-    mr_free(conffile);
-    mr_free(command);
+        mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
+    }
     mr_free(boot_device);
-    mr_free(tmp);
     mr_free(editor);
-
     return (res);
 }
-
 /**************************************************************************
  *END_RUN_GRUB                                                            *
@@ -1542 +1502 @@
 int run_elilo(bool offer_to_run_stabelilo)
 {
-  /** malloc **/
-    char *command;
-    char *tmp;
-    char *editor;
-
-    int res;
-    int done;
-
-    malloc_string(command);
-    malloc_string(tmp);
-    malloc_string(editor);
-    strcpy(editor, find_my_editor());
+    char *command = NULL;
+    char *tmp = NULL;
+    char *editor = NULL;
+
+    int res = 0;
+    int done = 0;
+
+    mr_asprintf(&editor, find_my_editor());
     if (offer_to_run_stabelilo
-        && ask_me_yes_or_no("Did you change the mountlist?"))
+        && ask_me_yes_or_no(_("Did you change the mountlist?")))
 
         /* interactive mode */
@@ -1561 +1517 @@
         mvaddstr_and_log_it(g_currentY,
                             0,
-                            "Modifying fstab and elilo.conf...                             ");
-        sprintf(command, "stabelilo-me");
+                            _
+                            ("Modifying fstab and elilo.conf...                             "));
+        mr_asprintf(&command, "stabelilo-me");
         res = run_program_and_log_output(command, 3);
+        mr_free(command);
+
         if (res) {
             popup_and_OK
-                ("You will now edit fstab and elilo.conf, to make sure they match your new mountlist.");
+                (_
+                 ("You will now edit fstab and elilo.conf, to make sure they match your new mountlist."));
             for (done = FALSE; !done;) {
                 if (!g_text_mode) {
                     newtSuspend();
                 }
-                sprintf(tmp, "%s " MNT_RESTORING "/etc/fstab", editor);
+                mr_asprintf(&tmp, "%s " MNT_RESTORING "/etc/fstab", editor);
                 paranoid_system(tmp);
-                sprintf(tmp, "%s " MNT_RESTORING "/etc/elilo.conf",
-                        editor);
+                mr_free(tmp);
+
+                mr_asprintf(&tmp, "%s " MNT_RESTORING "/etc/elilo.conf", editor);
                 paranoid_system(tmp);
+                mr_free(tmp);
+
                 if (!g_text_mode) {
                     newtResume();
                 }
 //              newtCls();
-                if (ask_me_yes_or_no("Edit them again?")) {
+                if (ask_me_yes_or_no(_("Edit them again?"))) {
                     continue;
                 }
@@ -1586 +1549 @@
             }
         } else {
-            log_to_screen("elilo.conf and fstab were modified OK");
+            log_to_screen(_("elilo.conf and fstab were modified OK"));
         }
     } else
@@ -1593 +1556 @@
         res = TRUE;
     }
-    mr_free(command);
-    mr_free(tmp);
     mr_free(editor);
     return (res);
 }
-
 /**************************************************************************
  *END_RUN_ELILO                                                            *
@@ -1612 +1572 @@
 {
   /** malloc **/
-    char *command;
-    char *tmp;
-    char *editor;
-
-    int res;
-    int done;
+    char *command = NULL;
+    char *tmp = NULL;
+    char *editor = NULL;
+
+    int res = 0;
+    int done = 0;
     bool run_lilo_M = FALSE;
-    malloc_string(command);
-    malloc_string(tmp);
-    malloc_string(editor);
 
     if (!run_program_and_log_output
@@ -1628 +1585 @@
     }
 
-    strcpy(editor, find_my_editor());
+    mr_asprintf(&editor, find_my_editor());
     if (offer_to_run_stablilo
-        && ask_me_yes_or_no("Did you change the mountlist?"))
-
+        && ask_me_yes_or_no(_("Did you change the mountlist?"))) {
         /* interactive mode */
-    {
         mvaddstr_and_log_it(g_currentY,
                             0,
-                            "Modifying fstab and lilo.conf, and running LILO...                             ");
-        sprintf(command, "stablilo-me");
+                            _
+                            ("Modifying fstab and lilo.conf, and running LILO...                             "));
+        mr_asprintf(&command, "stablilo-me");
         res = run_program_and_log_output(command, 3);
+        mr_free(command);
+
         if (res) {
             popup_and_OK
-                ("You will now edit fstab and lilo.conf, to make sure they match your new mountlist.");
+                (_
+                 ("You will now edit fstab and lilo.conf, to make sure they match your new mountlist."));
             for (done = FALSE; !done;) {
                 if (!g_text_mode) {
                     newtSuspend();
                 }
-                sprintf(tmp, "%s " MNT_RESTORING "/etc/fstab", editor);
+                mr_asprintf(&tmp, "%s " MNT_RESTORING "/etc/fstab", editor);
                 paranoid_system(tmp);
-                sprintf(tmp, "%s " MNT_RESTORING "/etc/lilo.conf", editor);
+                mr_free(tmp);
+
+                mr_asprintf(&tmp, "%s " MNT_RESTORING "/etc/lilo.conf", editor);
                 paranoid_system(tmp);
+                mr_free(tmp);
+
                 if (!g_text_mode) {
                     newtResume();
                 }
-//              newtCls();
-                if (ask_me_yes_or_no("Edit them again?")) {
+                if (ask_me_yes_or_no(_("Edit them again?"))) {
                     continue;
                 }
@@ -1668 +1630 @@
                     done =
                         ask_me_yes_or_no
-                        ("LILO failed. Re-edit system files?");
+                        (_("LILO failed. Re-edit system files?"));
                 } else {
                     done = TRUE;
@@ -1674 +1636 @@
             }
         } else {
-            log_to_screen("lilo.conf and fstab were modified OK");
-        }
-    } else
+            log_to_screen(_("lilo.conf and fstab were modified OK"));
+        }
+    } else {
         /* nuke mode */
-    {
         mvaddstr_and_log_it(g_currentY,
                             0,
-                            "Running LILO...                                                 ");
+                            _
+                            ("Running LILO...                                                 "));
         res =
             run_program_and_log_output("chroot " MNT_RESTORING " lilo -L",
@@ -1691 +1653 @@
         }
         if (res) {
-            mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
+            mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
             log_to_screen
-                ("Failed to re-jig fstab and/or lilo. Edit/run manually, please.");
+                (_
+                 ("Failed to re-jig fstab and/or lilo. Edit/run manually, please."));
         } else {
-            mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+            mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
         }
     }
@@ -1704 +1667 @@
                                    " lilo -M /dev/sda", 3);
     }
-    mr_free(command);
-    mr_free(tmp);
     mr_free(editor);
     return (res);
@@ -1723 +1684 @@
 int run_raw_mbr(bool offer_to_hack_scripts, char *bd)
 {
-  /** malloc **/
-    char *command;
-    char *boot_device;
-    char *tmp;
-    char *editor;
-    int res;
-    int done;
-
-    malloc_string(command);
+    char *command = NULL;
+    char *boot_device = NULL;
+    char *tmp = NULL;
+    char *editor = NULL;
+    int res = 0;
+    int done = 0;
+
+    assert_string_is_neither_NULL_nor_zerolength(bd);
+
     malloc_string(boot_device);
-    malloc_string(tmp);
-    malloc_string(editor);
-    assert_string_is_neither_NULL_nor_zerolength(bd);
-
-    strcpy(editor, find_my_editor());
+    mr_asprintf(&editor, find_my_editor());
     strcpy(boot_device, bd);
-    sprintf(command, "raw-MR %s /tmp/mountlist.txt", boot_device);
-    mr_msg(2, "run_raw_mbr() --- command='%s'", command);
-
     if (offer_to_hack_scripts
-        && ask_me_yes_or_no("Did you change the mountlist?"))
+        && ask_me_yes_or_no(_("Did you change the mountlist?"))) {
         /* interactive mode */
-    {
         mvaddstr_and_log_it(g_currentY, 0,
-                            "Modifying fstab and restoring MBR...                           ");
+                            _
+                            ("Modifying fstab and restoring MBR...                           "));
         for (done = FALSE; !done;) {
             if (!run_program_and_log_output("which vi", FALSE)) {
-                popup_and_OK("You will now edit fstab");
+                popup_and_OK(_("You will now edit fstab"));
                 if (!g_text_mode) {
                     newtSuspend();
                 }
-                sprintf(tmp, "%s " MNT_RESTORING "/etc/fstab", editor);
+                mr_asprintf(&tmp, "%s " MNT_RESTORING "/etc/fstab", editor);
                 paranoid_system(tmp);
+                mr_free(tmp);
+
                 if (!g_text_mode) {
                     newtResume();
                 }
-//              newtCls();
-            }
-            popup_and_get_string("Boot device",
-                                 "Please confirm/enter the boot device. If in doubt, try /dev/hda",
-                                 boot_device, MAX_STR_LEN / 4);
-            sprintf(command, "stabraw-me %s", boot_device);
+            }
+            popup_and_get_string(_("Boot device"),
+                                 _("Please confirm/enter the boot device. If in doubt, try /dev/hda"), boot_device, MAX_STR_LEN / 4);
+            mr_asprintf(&command, "stabraw-me %s", boot_device);
             res = run_program_and_log_output(command, 3);
+            mr_free(command);
+
             if (res) {
-                done = ask_me_yes_or_no("Modifications failed. Re-try?");
+                done =
+                    ask_me_yes_or_no(_("Modifications failed. Re-try?"));
             } else {
                 done = TRUE;
             }
         }
-    } else
+    } else {
         /* nuke mode */
-    {
         mvaddstr_and_log_it(g_currentY, 0,
-                            "Restoring MBR...                                               ");
+                            _("Restoring MBR...                                               "));
+        mr_asprintf(&command, "raw-MR %s /tmp/mountlist.txt", boot_device);
+        mr_msg(2, "run_raw_mbr() --- command='%s'", command);
         res = run_program_and_log_output(command, 3);
+        mr_free(command);
     }
     if (res) {
-        mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
+        mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
         log_to_screen
-            ("MBR+fstab processed w/error(s). See /tmp/mondo-restore.log for more info.");
-    } else {
-        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
-    }
-    mr_free(command);
+            (_
+             ("MBR+fstab processed w/error(s). See /tmp/mondo-restore.log for more info."));
+    } else {
+        mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
+    }
     mr_free(boot_device);
-    mr_free(tmp);
     mr_free(editor);
     return (res);
 }
-
 /**************************************************************************
  *END_RUN_RAW_MBR                                                         *
@@ -1798 +1755 @@
 
 
-
-
-
 /**
  * Turn signal trapping on or off.
@@ -1810 +1764 @@
     int signals[] =
         { SIGKILL, SIGPIPE, SIGTERM, SIGHUP, SIGTRAP, SIGABRT, SIGINT,
-SIGSTOP, 0 };
+        SIGSTOP, 0
+    };
     int i;
     for (i = 0; signals[i]; i++) {
@@ -1853 +1808 @@
     sprintf(g_filelist_full, "%s/%s", temppath, FILELIST_FULL_STUB);
     sprintf(g_filelist_imagedevs, "%s/tmp/filelist.imagedevs", temppath);
-//  sprintf(g_imagedevs_pot, "%s/tmp/imagedevs.pot", temppath);
     sprintf(g_imagedevs_restthese, "%s/tmp/imagedevs.restore-these",
             temppath);
@@ -1881 +1835 @@
     FILE *fin;
     FILE *fout;
-  /** malloc **/
-    char *incoming;
+    char *incoming = NULL;
+    size_t n = 0;
 
     assert_string_is_neither_NULL_nor_zerolength(output_file);
     assert_string_is_neither_NULL_nor_zerolength(input_file);
-    malloc_string(incoming);
 
     if (!(fin = fopen(input_file, "r"))) {
@@ -1895 +1848 @@
         fatal_error("cannot open output_file");
     }
-    for (fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin);
-         fgets(incoming, MAX_STR_LEN - 1, fin)) {
+    for (mr_getline(&incoming, &n, fin); !feof(fin);
+         mr_getline(&incoming, &n, fin)) {
         if (strncmp(incoming, "etc/adjtime", 11)
             && strncmp(incoming, "etc/mtab", 8)
@@ -1906 +1859 @@
             fprintf(fout, "%s", incoming);  /* don't need \n here, for some reason.. */
     }
+    mr_free(incoming);
     paranoid_fclose(fout);
     paranoid_fclose(fin);
-    mr_free(incoming);
-}
-
+}
 /**************************************************************************
  *END_STREAMLINE_CHANGES_FILE                                             *
@@ -1923 +1875 @@
 {
     log_to_screen
-        ("Mondorestore is terminating in response to a signal from the OS");
+        (_("Mondorestore is terminating in response to a signal from the OS"));
     free_MR_global_filenames();
     finish(254);
 }
-
 /**************************************************************************
  *END_TERMINATE_DAEMON                                                    *
@@ -1939 +1890 @@
 {
     int i;
-    /* MALLOC * */
-    char *tmp;
-
-    malloc_string(tmp);
+    char *tmp = NULL;
+
     if (does_file_exist("/tmp/NOPAUSE")) {
         return;
     }
-    open_progress_form("CAUTION",
-                       "Be advised: I am about to ERASE your hard disk(s)!",
-                       "You may press Ctrl+Alt+Del to abort safely.",
+    open_progress_form(_("CAUTION"),
+                       _
+                       ("Be advised: I am about to ERASE your hard disk(s)!"),
+                       _("You may press Ctrl+Alt+Del to abort safely."),
                        "", 20);
     for (i = 0; i < 20; i++) {
         g_current_progress = i;
-        sprintf(tmp, "You have %d seconds left to abort.", 20 - i);
+        mr_asprintf(&tmp, _("You have %d seconds left to abort."), 20 - i);
         update_progress_form(tmp);
+        mr_free(tmp);
         sleep(1);
     }
     close_progress_form();
-    mr_free(tmp);
-}
-
+}
 /**************************************************************************
  *END_TWENTY_SECONDS_TIL_YIKES                                            *
@@ -1965 +1914 @@
 
 
-
-
-
 /**
  * Exit due to a signal (no cleanup).
@@ -1978 +1924 @@
     pthread_exit(0);
 }
-
 /**************************************************************************
  *END_TERMINATION_IN_PROGRESS                                             *
@@ -1984 +1929 @@
 
 
-
 /**
  * Unmount all devices in @p p_external_copy_of_mountlist.
@@ -1994 +1938 @@
 {
     struct mountlist_itself *mountlist;
-    int retval = 0, lino, res = 0, i;
-    char *command;
-    char *tmp;
-
-    malloc_string(command);
-    malloc_string(tmp);
+    int retval = 0;
+    int lino = 0;
+    int res = 0;
+    int i = 0;
+    char *command = NULL;
+    char *tmp = NULL;
+
     assert(p_external_copy_of_mountlist != NULL);
 
@@ -2008 +1953 @@
 
     run_program_and_log_output("df -m", 3);
-    mvaddstr_and_log_it(g_currentY, 0, "Unmounting devices      ");
-    open_progress_form("Unmounting devices",
-                       "Unmounting all devices that were mounted,",
-                       "in preparation for the post-restoration reboot.",
+    mvaddstr_and_log_it(g_currentY, 0, _("Unmounting devices      "));
+    open_progress_form(_("Unmounting devices"),
+                       _("Unmounting all devices that were mounted,"),
+                       _
+                       ("in preparation for the post-restoration reboot."),
                        "", mountlist->entries);
     chdir("/");
@@ -2024 +1970 @@
     }
 
-    paranoid_system("sync");
+    sync();
 
     if (run_program_and_log_output
@@ -2044 +1990 @@
             continue;
         }
-        sprintf(tmp, "Unmounting device %s  ", mountlist->el[lino].device);
+        mr_asprintf(&tmp, _("Unmounting device %s  "),
+                mountlist->el[lino].device);
 
         update_progress_form(tmp);
+
         if (is_this_device_mounted(mountlist->el[lino].device)) {
             if (!strcmp(mountlist->el[lino].mountpoint, "swap")) {
-                sprintf(command, "swapoff %s", mountlist->el[lino].device);
+                mr_asprintf(&command, "swapoff %s", mountlist->el[lino].device);
             } else {
                 if (!strcmp(mountlist->el[lino].mountpoint, "/1")) {
-                    sprintf(command, "umount %s/", MNT_RESTORING);
+                    mr_asprintf(&command, "umount %s/", MNT_RESTORING);
                     mr_msg(3,
                             "Well, I know a certain kitty-kitty who'll be sleeping with Mommy tonight...");
                 } else {
-                    sprintf(command, "umount " MNT_RESTORING "%s",
+                    mr_asprintf(&command, "umount " MNT_RESTORING "%s",
                             mountlist->el[lino].mountpoint);
                 }
@@ -2062 +2010 @@
             mr_msg(10, "The 'umount' command is '%s'", command);
             res = run_program_and_log_output(command, 3);
+            mr_free(command);
         } else {
-            strcat(tmp, "...not mounted anyway :-) OK");
+            mr_strcat(tmp, _("...not mounted anyway :-) OK"));
             res = 0;
         }
         g_current_progress++;
         if (res) {
-            strcat(tmp, "...Failed");
+            mr_strcat(tmp, _("...Failed"));
             retval++;
             log_to_screen(tmp);
@@ -2074 +2023 @@
             mr_msg(2, tmp);
         }
+        mr_free(tmp);
     }
     close_progress_form();
     if (retval) {
-        mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
-    } else {
-        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+        mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
+    } else {
+        mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     }
     if (retval) {
-        log_to_screen("Unable to unmount some of your partitions.");
-    } else {
-        log_to_screen("All partitions were unmounted OK.");
+        log_to_screen(_("Unable to unmount some of your partitions."));
+    } else {
+        log_to_screen(_("All partitions were unmounted OK."));
     }
     mr_free(mountlist);
-    mr_free(command);
-    mr_free(tmp);
     return (retval);
 }
-
 /**************************************************************************
  *END_UNMOUNT_ALL_DEVICES                                                 *
  **************************************************************************/
-
 
 
@@ -2106 +2052 @@
 int extract_cfg_file_and_mountlist_from_tape_dev(char *dev)
 {
-    char *command;
+    char *command = NULL;
     int res = 0;
-    // BCO: below 32KB seems to block at least on RHAS 2.1 and MDK 10.0
+    // BERLIOS: below 32KB seems to block at least on RHAS 2.1 and MDK 10.0
     long tape_block_size = 32768;
 
-    malloc_string(command);
-
     // tar -zxvf-
-    sprintf(command,
+    mr_asprintf(&command,
             "dd if=%s bs=%ld count=%ld 2> /dev/null | tar -zx %s %s %s %s %s",
             dev,
@@ -2123 +2067 @@
     mr_msg(2, "command = '%s'", command);
     res = run_program_and_log_output(command, -1);
+    mr_free(command);
+
     if (res != 0 && does_file_exist(MONDO_CFG_FILE_STUB)) {
         res = 0;
     }
-    mr_free(command);
     return (res);
 }
-
 
 
@@ -2143 +2087 @@
 {
     int retval = 0;
-
-   /** malloc *****/
-    char *device;
-    char *command;
-    char *cfg_file;
-    char *mounted_cfgf_path;
-    char *tmp;
-    char *mountpt;
-    char *ramdisk_fname;
-    char *mountlist_file;
-    int res;
-
-    bool try_plan_B;
+    char *command = NULL;
+    char *cfg_file = NULL;
+    char *mounted_cfgf_path = NULL;
+    char *tmp = NULL;
+    char *mountpt = NULL;
+    char *ramdisk_fname = NULL;
+    char *mountlist_file = NULL;
+    int res = 0;
+
+    bool try_plan_B = FALSE;
 
     assert(bkpinfo != NULL);
-    malloc_string(cfg_file);
-    malloc_string(mounted_cfgf_path);
-    malloc_string(mountpt);
-    malloc_string(ramdisk_fname);
-    malloc_string(mountlist_file);
-    malloc_string(device);
-    malloc_string(command);
-    malloc_string(tmp);
     mr_msg(2, "gcffa --- starting");
-    log_to_screen("I'm thinking...");
-    sprintf(mountpt, "%s/mount.bootdisk", bkpinfo->tmpdir);
-    device[0] = '\0';
+    log_to_screen(_("I'm thinking..."));
+    mr_asprintf(&mountpt, "%s/mount.bootdisk", bkpinfo->tmpdir);
     chdir(bkpinfo->tmpdir);
-    strcpy(cfg_file, MONDO_CFG_FILE_STUB);
-    unlink(cfg_file);           // cfg_file[] is missing the '/' at the start, FYI, by intent
+    // MONDO_CFG_FILE_STUB is missing the '/' at the start, FYI, by intent
+    unlink(MONDO_CFG_FILE_STUB);
+
     unlink(FILELIST_FULL_STUB);
     unlink(BIGGIELIST_TXT_STUB);
     unlink("tmp/i-want-my-lvm");
-    sprintf(command, "mkdir -p %s", mountpt);
+    mr_asprintf(&command, "mkdir -p %s", mountpt);
     run_program_and_log_output(command, FALSE);
-
-//   unlink( "tmp/mondo-restore.cfg" ); // superfluous, surely?
-
-    sprintf(cfg_file, "%s/%s", bkpinfo->tmpdir, MONDO_CFG_FILE_STUB);
-    sprintf(mountlist_file, "%s/%s", bkpinfo->tmpdir,
+    mr_free(command);
+
+    mr_asprintf(&cfg_file, "%s/%s", bkpinfo->tmpdir, MONDO_CFG_FILE_STUB);
+    mr_asprintf(&mountlist_file, "%s/%s", bkpinfo->tmpdir,
             MOUNTLIST_FNAME_STUB);
-    //   make_hole_for_file( cfg_file );
-    //   make_hole_for_file( mountlist_file);
     mr_msg(2, "mountpt = %s; cfg_file=%s", mountpt, cfg_file);
 
     /* Floppy? */
-    sprintf(tmp, "mkdir -p %s", mountpt);
+    mr_asprintf(&tmp, "mkdir -p %s", mountpt);
     run_program_and_log_output(tmp, FALSE);
-    sprintf(tmp, "mkdir -p %s/tmp", bkpinfo->tmpdir);
+    mr_free(tmp);
+
+    mr_asprintf(&tmp, "mkdir -p %s/tmp", bkpinfo->tmpdir);
     run_program_and_log_output(tmp, FALSE);
-
-    sprintf(command, "mount /dev/fd0u1722 %s", mountpt);
-    sprintf(tmp,
+    mr_free(tmp);
+
+    mr_asprintf(&command, "mount /dev/fd0u1722 %s", mountpt);
+    mr_asprintf(&tmp,
             "(sleep 15; kill `ps | grep \"%s\" | cut -d' ' -f1` 2> /dev/null) &",
             command);
     mr_msg(1, "tmp = '%s'", tmp);
     system(tmp);
+    mr_free(tmp);
+
     res = run_program_and_log_output(command, FALSE);
+    mr_free(command);
+
     if (res) {
-        sprintf(command, "mount /dev/fd0H1440 %s", mountpt);
+        mr_asprintf(&command, "mount /dev/fd0H1440 %s", mountpt);
         res = run_program_and_log_output(command, FALSE);
+        mr_free(command);
     }
     if (res) {
@@ -2211 +2149 @@
         mr_msg(2,
                 "Mounted floppy OK but I don't trust it because the archives might contain more up-to-date config file than the floppy does.");
-// NB: If busybox does not support 'mount -o loop' then Plan A WILL NOT WORK.
+        // NB: If busybox does not support 'mount -o loop' then Plan A WILL NOT WORK.
         mr_msg(2, "Processing floppy (plan A?)");
-        sprintf(ramdisk_fname, "%s/mindi.rdz", mountpt);
+        mr_asprintf(&ramdisk_fname, "%s/mindi.rdz", mountpt);
         if (!does_file_exist(ramdisk_fname)) {
-            sprintf(ramdisk_fname, "%s/initrd.img", mountpt);
+            mr_free(ramdisk_fname);
+            mr_asprintf(&ramdisk_fname, "%s/initrd.img", mountpt);
         }
         if (!does_file_exist(ramdisk_fname)) {
@@ -2226 +2165 @@
                     "Warning - failed to extract config file from ramdisk. I think this boot disk is mangled.");
         }
-        sprintf(command, "umount %s", mountpt);
+        mr_asprintf(&command, "umount %s", mountpt);
         run_program_and_log_output(command, 5);
+        mr_free(command);
+
         unlink(ramdisk_fname);
+        mr_free(ramdisk_fname);
     }
     if (!does_file_exist(cfg_file)) {
@@ -2255 +2197 @@
             if (strlen(bkpinfo->media_device) == 0) {
                 strcpy(bkpinfo->media_device, "/dev/st0");
-                mr_msg(2, "media_device is blank; assuming %s");
-            }
-            strcpy(tmp, bkpinfo->media_device);
+                mr_msg(2, "media_device is blank; assuming %s",
+                        bkpinfo->media_device);
+            }
+            mr_asprintf(&tmp, bkpinfo->media_device);
             if (extract_cfg_file_and_mountlist_from_tape_dev
                 (bkpinfo->media_device)) {
@@ -2276 +2219 @@
                 }
             }
+            mr_free(tmp);
 
             if (!does_file_exist("tmp/mondo-restore.cfg")) {
-                log_to_screen("Cannot find config info on tape/CD/floppy");
+                log_to_screen(_
+                              ("Cannot find config info on tape/CD/floppy"));
                 return (1);
             }
@@ -2284 +2229 @@
             mr_msg(2,
                     "gcffa --- looking at mounted CD for mindi-boot.2880.img");
-            sprintf(command,
+            /* BERLIOS : Useless ?
+            mr_asprintf(&command,
                     "mount " MNT_CDROM
                     "/images/mindi-boot.2880.img -o loop %s", mountpt);
-            sprintf(mounted_cfgf_path, "%s/%s", mountpt, cfg_file);
+                    */
+            mr_asprintf(&mounted_cfgf_path, "%s/%s", mountpt, cfg_file);
             if (!does_file_exist(mounted_cfgf_path)) {
                 mr_msg(2,
                         "gcffa --- Plan C, a.k.a. untarring some file from all.tar.gz");
-                sprintf(command, "tar -zxvf " MNT_CDROM "/images/all.tar.gz %s %s %s %s %s", MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, "tmp/i-want-my-lvm");  // add -b TAPE_BLOCK_SIZE if you _really_ think it's necessary
+                mr_asprintf(&command, "tar -zxvf " MNT_CDROM "/images/all.tar.gz %s %s %s %s %s", MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, "tmp/i-want-my-lvm"); // add -b TAPE_BLOCK_SIZE if you _really_ think it's necessary
                 run_program_and_log_output(command, TRUE);
+                mr_free(command);
+
                 if (!does_file_exist(MONDO_CFG_FILE_STUB)) {
                     fatal_error
@@ -2298 +2247 @@
                 }
             }
-        }
-    }
+            mr_free(mounted_cfgf_path);
+        }
+    }
+    mr_free(mountpt);
+
     if (does_file_exist(MONDO_CFG_FILE_STUB)) {
         mr_msg(1, "gcffa --- great! We've got the config file");
-        sprintf(tmp, "%s/%s",
+        mr_asprintf(&tmp, "%s/%s",
                 call_program_and_get_last_line_of_output("pwd"),
                 MONDO_CFG_FILE_STUB);
-        sprintf(command, "cp -f %s %s", tmp, cfg_file);
+        mr_asprintf(&command, "cp -f %s %s", tmp, cfg_file);
         iamhere(command);
+
         if (strcmp(tmp, cfg_file)
             && run_program_and_log_output(command, 1)) {
@@ -2315 +2268 @@
             mr_msg(1, "... and I moved it successfully to %s", cfg_file);
         }
-        sprintf(command, "cp -f %s/%s %s",
+        mr_free(command);
+
+        mr_asprintf(&command, "cp -f %s/%s %s",
                 call_program_and_get_last_line_of_output("pwd"),
                 MOUNTLIST_FNAME_STUB, mountlist_file);
@@ -2324 +2279 @@
         } else {
             mr_msg(1, "Got mountlist too");
-            sprintf(command, "cp -f %s %s", mountlist_file,
+            mr_free(command);
+            mr_asprintf(&command, "cp -f %s %s", mountlist_file,
                     g_mountlist_fname);
             if (run_program_and_log_output(command, 1)) {
@@ -2330 +2286 @@
             } else {
                 mr_msg(1, "Copied mountlist to /tmp as well OK");
-                sprintf(command, "cp -f tmp/i-want-my-lvm /tmp/");
+                mr_free(command);
+                mr_asprintf(&command, "cp -f tmp/i-want-my-lvm /tmp/");
                 run_program_and_log_output(command, 1);
             }
         }
+        mr_free(command);
+        mr_free(tmp);
     }
     run_program_and_log_output("umount " MNT_CDROM, FALSE);
@@ -2340 +2299 @@
         mr_msg(1, "%s not found", cfg_file);
         log_to_screen
-            ("Oh dear. Unable to recover configuration file from boot disk");
+            (_
+             ("Oh dear. Unable to recover configuration file from boot disk"));
         return (1);
     }
 
-    log_to_screen("Recovered mondo-restore.cfg");
+    log_to_screen(_("Recovered mondo-restore.cfg"));
     if (!does_file_exist(MOUNTLIST_FNAME_STUB)) {
-        log_to_screen("...but not mountlist.txt - a pity, really...");
+        log_to_screen(_("...but not mountlist.txt - a pity, really..."));
     }
 /* start SAH */
     else {
-        sprintf(command, "cp -f %s %s/%s", MOUNTLIST_FNAME_STUB,
+        mr_asprintf(&command, "cp -f %s %s/%s", MOUNTLIST_FNAME_STUB,
                 bkpinfo->tmpdir, MOUNTLIST_FNAME_STUB);
         run_program_and_log_output(command, FALSE);
-    }
-/*--commented out by SAH
-  sprintf( command, "cp -f %s %s/%s", cfg_file, bkpinfo->tmpdir, MONDO_CFG_FILE_STUB );
-  run_program_and_log_output( command, FALSE );
-  sprintf( command, "cp -f %s %s/%s", mountlist_file, bkpinfo->tmpdir, MOUNTLIST_FNAME_STUB );
-  run_program_and_log_output( command, FALSE );
-*/
+        mr_free(command);
+    }
 /* end SAH */
 
-    sprintf(command, "cp -f %s /%s", cfg_file, MONDO_CFG_FILE_STUB);
+    mr_asprintf(&command, "cp -f %s /%s", cfg_file, MONDO_CFG_FILE_STUB);
+    mr_free(cfg_file);
     run_program_and_log_output(command, FALSE);
-    sprintf(command, "cp -f %s /%s", mountlist_file, MOUNTLIST_FNAME_STUB);
+    mr_free(command);
+
+    mr_asprintf(&command, "cp -f %s /%s", mountlist_file, MOUNTLIST_FNAME_STUB);
+    mr_free(mountlist_file);
     run_program_and_log_output(command, FALSE);
-    sprintf(command, "cp -f etc/raidtab /etc/");
+    mr_free(command);
+
+    mr_asprintf(&command, "cp -f etc/raidtab /etc/");
     run_program_and_log_output(command, FALSE);
-    sprintf(command, "cp -f tmp/i-want-my-lvm /tmp/");
+    mr_free(command);
+
+    mr_asprintf(&command, "cp -f tmp/i-want-my-lvm /tmp/");
     run_program_and_log_output(command, FALSE);
+    mr_free(command);
+
     g_backup_media_type = bkpinfo->backup_media_type;
-    mr_free(device);
-    mr_free(command);
-    mr_free(tmp);
-    mr_free(cfg_file);
-    mr_free(mounted_cfgf_path);
-    mr_free(mountpt);
-    mr_free(ramdisk_fname);
-    mr_free(mountlist_file);
+    bkpinfo->backup_media_string = bkptype_to_string(bkpinfo->backup_media_type);
+    g_backup_media_string = bkpinfo->backup_media_string;
     return (retval);
 }
-
 /**************************************************************************
  *END_GET_CFG_FILE_FROM_ARCHIVE                                           *
  **************************************************************************/
-
 /* @} - end restoreUtilityGroup */
-
-
-/***************************************************************************
- * F@                                                                      *
- * () -- Hugo Rabson                                  *
- *                                                                         *
- * Purpose:                                                                *
- *                                                                         *
- * Called by:                                                              *
- * Params:    -                      -                                     *
- * Returns:   0=success; nonzero=failure                                   *
- ***************************************************************************/
-
 
 
@@ -2405 +2349 @@
                                            int wait_for_percentage)
 {
-    struct raidlist_itself *raidlist;
-    int unfinished_mdstat_devices = 9999, i;
-    char *screen_message;
-
-    malloc_string(screen_message);
+    struct raidlist_itself *raidlist = NULL;
+    int unfinished_mdstat_devices = 9999, i = 0;
+    char *screen_message = NULL;
+
     raidlist = (struct raidlist_itself *)mr_malloc(sizeof(struct raidlist_itself));
 
@@ -2418 +2361 @@
         if (parse_mdstat(raidlist, "/dev/")) {
             log_to_screen("Sorry, cannot read %s", MDSTAT_FILE);
-            mr_msg(1,"Sorry, cannot read %s", MDSTAT_FILE);
+            mr_msg(1, "Sorry, cannot read %s", MDSTAT_FILE);
             return;
         }
@@ -2429 +2372 @@
                 }
                 mr_msg(1,"Sync'ing %s (i=%d)", raidlist->el[i].raid_device, i);
-                sprintf(screen_message, "Sync'ing %s",
+                mr_asprintf(&screen_message, "Sync'ing %s",
                         raidlist->el[i].raid_device);
                 open_evalcall_form(screen_message);
+                mr_free(screen_message);
+
                 while (raidlist->el[i].progress < wait_for_percentage) {
                     mr_msg(1,"Percentage sync'ed: %d", raidlist->el[i].progress);
@@ -2445 +2390 @@
         }
     }
-    mr_free(screen_message);
     mr_free(raidlist);
 }