Changeset 2280 in MondoRescue

Timestamp:

Jul 20, 2009, 12:27:51 AM (16 years ago)

Author:

Bruno Cornec

Message:

r3275@localhost: bruno | 2009-07-19 23:23:18 +0200

• Replace sprintf by mr_asprintf in mondo-rstr-tools.c

File:

• branches/2.2.10/mondo/src/mondorestore/mondo-rstr-tools.c (modified) (103 diffs)

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

@@ -117 +117 @@
 ************************************************************************/
 char *incoming_ptr;
-char *question_ptr;
+char *question_ptr = NULL;
 
 char incoming[MAX_STR_LEN] = "\0";
-char question[MAX_STR_LEN];
 
 assert_string_is_neither_NULL_nor_zerolength(infname);
@@ -131 +130 @@
 }
 
-question_ptr = malloc(sizeof(question));
-if (question_ptr == NULL) {
-fprintf(stderr, "Out of Memory\n");
-exit(EXIT_FAILURE);
-}
-
 memset(incoming_ptr, '\0', sizeof(incoming));
-memset(question_ptr, '\0', sizeof(question));
-
-
 
 if (!(fin = fopen(infname, "r"))) {
@@ -156 +146 @@
 }
 
-sprintf(question_ptr,
-        "Should I restore the image of %s ?", incoming_ptr);
+mr_asprintf(&question_ptr, "Should I restore the image of %s ?", incoming_ptr);
 
 if (ask_me_yes_or_no(question_ptr)) {
@@ -167 +156 @@
 paranoid_free(incoming_ptr);
 incoming_ptr = NULL;
-paranoid_free(question_ptr);
-question_ptr = NULL;
-
-
+mr_free(question_ptr);
 paranoid_fclose(fout);
 paranoid_fclose(fin);
@@ -223 +209 @@
 
 /** needs malloc **/
-char *command;
+char *command = NULL;
 char *file;
 char *tmp;
 int res;
 
-malloc_string(command);
 malloc_string(file);
 malloc_string(tmp);
@@ -236 +221 @@
 
 if (strncmp(preamble, f, strlen(preamble)) == 0) {
-strcpy(file, f + strlen(preamble));
+    strcpy(file, f + strlen(preamble));
 } else {
-strcpy(file, f);
+    strcpy(file, f);
 }
 if (file[0] == '/' && file[1] == '/') {
-strcpy(tmp, file);
-strcpy(file, tmp + 1);
-}
-sprintf(tmp,
-    "Checking to see if f=%s, file=%s, is in the list of biggiefiles",
-    f, file);
-log_msg(2, tmp);
-sprintf(command, "grep -E '^%s$' %s", file, list_fname);
+    strcpy(tmp, file);
+    strcpy(file, tmp + 1);
+}
+log_msg(2, "Checking to see if f=%s, file=%s, is in the list of biggiefiles", f, file);
+mr_asprintf(&command, "grep -E '^%s$' %s", file, list_fname);
 res = run_program_and_log_output(command, FALSE);
-paranoid_free(command);
+mt_free(command);
 paranoid_free(file);
-paranoid_free(tmp);
+mr_free(tmp);
 if (res) {
-return (FALSE);
+    return (FALSE);
 } else {
-return (TRUE);
+    return (TRUE);
 }
 }
@@ -277 +259 @@
 int iso_fiddly_bits(bool nuke_me_please)
 {
-char *mount_isodir_command = NULL;
-char *tmp, *command;
-char *mds = NULL;
-int retval = 0, i;
-bool already_mounted = FALSE;
+    char *mount_isodir_command = NULL;
+    char *command = NULL;
+    char *mds = NULL;
+    int retval = 0, i;
+    bool already_mounted = FALSE;
 
 assert(bkpinfo != NULL);
-malloc_string(tmp);
-malloc_string(command);
 g_ISO_restore_mode = TRUE;
 read_cfg_var(g_mondo_cfg_file, "iso-dev", g_isodir_device);
@@ -295 +275 @@
     }
     /* End patch */
-    sprintf(command, "mkdir -p %s", bkpinfo->isodir);
+    mr_asprintf(&command, "mkdir -p %s", bkpinfo->isodir);
     run_program_and_log_output(command, 5);
+    mr_free(command);
     log_msg(2, "Setting isodir to %s", bkpinfo->isodir);
 }
@@ -315 +296 @@
     mr_strcat(mount_isodir_command, " -o ro %s", bkpinfo->isodir);
     run_program_and_log_output("df -m", FALSE);
-    sprintf(tmp,
+    log_msg(1, 
         "The 'mount' command is '%s'. PLEASE report this command to be if you have problems, ok?",
         mount_isodir_command);
-    log_msg(1, tmp);
     if (run_program_and_log_output(mount_isodir_command, FALSE)) {
         popup_and_OK
@@ -333 +313 @@
 i = what_number_cd_is_this();   /* has the side-effect of calling mount_media() */
 mds = media_descriptor_string(bkpinfo->backup_media_type);
-sprintf(tmp, "%s #%d has been mounted via loopback mount", mds, i);
 mr_free(mds);
 
-log_msg(1, tmp);
+log_msg(1, "%s #%d has been mounted via loopback mount", mds, i);
 if (i < 0) {
 popup_and_OK
@@ -344 +323 @@
 log_msg(2, "%ld: bkpinfo->isodir is now %s", __LINE__,
     bkpinfo->isodir);
-paranoid_free(tmp);
-paranoid_free(command);
 return (retval);
 }
@@ -377 +354 @@
 
 /** malloc **/
-char *tmp, *command, *mountdir, *mountpoint;
+char *tmp = NULL;
+char *command = NULL;
+char *mountdir = NULL;
+char *mountpoint = NULL;
 char *additional_parameters = NULL;
 
@@ -383 +363 @@
 assert_string_is_neither_NULL_nor_zerolength(mpt);
 assert(format != NULL);
-malloc_string(tmp);
-malloc_string(command);
-malloc_string(mountdir);
-malloc_string(mountpoint);
 
     if (!strcmp(mpt, "/1")) {
-        strcpy(mountpoint, "/");
+        mr_asprintf(&mountpoint, "/");
         log_msg(3, "Mommm! SME is being a dildo!");
     } else {
-        strcpy(mountpoint, mpt);
+        mr_asprintf(&mountpoint, mpt);
     }
 
@@ -401 +377 @@
         return (0);
     }
-    sprintf(tmp, "Mounting device %s   ", device);
+    mr_asprintf(&tmp, "Mounting device %s   ", device);
     log_msg(1, tmp);
     /* Deal with additional params only if not /proc or /sys */
@@ -420 +396 @@
 
     if (!strcmp(mountpoint, "swap")) {
-        sprintf(command, "swapon %s", device);
+        mr_asprintf(&command, "swapon %s", device);
+        mr_asprintf(&mountdir, "swap");
     } else {
         if (!strcmp(mountpoint, "/")) {
-            strcpy(mountdir, MNT_RESTORING);
+            mr_asprintf(&mountdir, "%s", 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);
         log_msg(2, "command='%s'", command);
     }
-    paranoid_free(additional_parameters);
+    mr_free(additional_parameters);
 
     res = run_program_and_log_output(command, TRUE);
     if (res && (strstr(command, "xattr") || strstr(command, "acl"))) {
         log_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);
@@ -450 +430 @@
         } else {
             log_msg(2, "Retrying w/o the '-t' switch");
-            sprintf(command, "mount %s %s 2>> %s", device, mountdir,
-                MONDO_LOGFILE);
+            mr_free(command);
+            mr_asprintf(&command, "mount %s %s 2>> %s", device, mountdir, MONDO_LOGFILE);
             log_msg(2, "2nd command = '%s'", command);
             res = run_program_and_log_output(command, TRUE);
@@ -469 +449 @@
     }
 
-paranoid_free(tmp);
-paranoid_free(command);
-paranoid_free(mountdir);
-paranoid_free(mountpoint);
+mr_free(tmp);
+mr_free(command);
+mr_free(mountdir);
+mr_free(mountpoint);
 
     return (res);
@@ -491 +471 @@
 {
 int retval = 0, lino, res;
-char *tmp;
+char *tmp = NULL;
 char *these_failed = NULL;
 char *format;
 struct mountlist_itself *mountlist = NULL;
 
-malloc_string(tmp);
 malloc_string(format);
 
@@ -518 +497 @@
                 "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",
+            mr_asprintf(&tmp, "%s is already mounted",
                 mountlist->el[lino].device);
             log_to_screen(tmp);
+            mr_free(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);
+            mr_free(tmp);
             strcpy(format, mountlist->el[lino].format);
             res = mount_device(mountlist->el[lino].device,
@@ -548 +529 @@
                 ("format and restore *without* partitioning first. Sorry for the inconvenience.");
         }
-        sprintf(tmp, "Could not mount device(s) %s- shall I abort?", these_failed);
+        mr_asprintf(&tmp, "Could not mount device(s) %s- shall I abort?", these_failed);
 
         if (!ask_me_yes_or_no(tmp)) {
@@ -560 +541 @@
         ("Unable to mount some or all of your partitions.");
         }
+        mr_free(tmp);
     } else {
         log_to_screen("All partitions were mounted OK.");
@@ -571 +553 @@
     run_program_and_log_output("df -m", 3);
     paranoid_free(mountlist);
-    paranoid_free(tmp);
     paranoid_free(format);
     return (retval);
@@ -591 +572 @@
 int mount_media()
 {
-char *mount_cmd;
+char *mount_cmd = NULL;
 int i, res;
 #ifdef __FreeBSD__
@@ -598 +579 @@
 #endif
 
-malloc_string(mount_cmd);
 assert(bkpinfo != NULL);
 
@@ -604 +584 @@
         || bkpinfo->backup_media_type == udev) {
         log_msg(8, "Tape/udev. Therefore, no need to mount a media.");
-        paranoid_free(mount_cmd);
         return 0;
     }
@@ -610 +589 @@
     if (!run_program_and_log_output("mount | grep -F " MNT_CDROM, FALSE)) {
         log_msg(2, "mount_media() - media already mounted. Fair enough.");
-        paranoid_free(mount_cmd);
         return (0);
     }
@@ -623 +601 @@
         }
 #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);
 #else
-        sprintf(mount_cmd, "mount %s/%s/%s-%d.iso -t iso9660 -o loop,ro %s",
-            bkpinfo->isodir, bkpinfo->nfs_remote_dir,
+        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
@@ -635 +613 @@
     } else if (bkpinfo->backup_media_type == iso) {
 #ifdef __FreeBSD__
-        sprintf(mount_cmd, "%s/%s-%d.iso", bkpinfo->isodir,
-            bkpinfo->prefix, g_current_media_number);
+        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);
 #else
-        sprintf(mount_cmd, "mount %s/%s-%d.iso -t iso9660 -o loop,ro %s",
+        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 (bkpinfo->backup_media_type == usb) {
-        sprintf(mount_cmd, "mount -t vfat %s %s", bkpinfo->media_device, MNT_CDROM);
+        mr_asprintf(&mount_cmd, "mount -t vfat %s %s", bkpinfo->media_device, MNT_CDROM);
     } else if (strstr(bkpinfo->media_device, "/dev/")) {
 #ifdef __FreeBSD__
-        sprintf(mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device,
-        MNT_CDROM);
+        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",
-        bkpinfo->media_device, MNT_CDROM);
+        mr_asprintf(&mount_cmd, "mount %s -t iso9660 -o ro %s", bkpinfo->media_device, MNT_CDROM);
 #endif
     } else {
@@ -663 +640 @@
 
 #ifdef __FreeBSD__
-    sprintf(mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device,
-        MNT_CDROM);
+        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",
-        bkpinfo->media_device, MNT_CDROM);
+        mr_asprintf(&mount_cmd, "mount %s -t iso9660 -o ro %s", bkpinfo->media_device, MNT_CDROM);
 #endif
     }
@@ -682 +657 @@
         }
     }
+    mr_free(mount_cmd);
 
     if (res) {
@@ -688 +664 @@
         log_msg(2, "Mounted media drive OK");
     }
-    paranoid_free(mount_cmd);
     return (res);
 }
@@ -694 +669 @@
 *END_MOUNT_CDROM                                                         *
 **************************************************************************/
-
 
 
@@ -743 +717 @@
 char *value = NULL;
 char *tmp = NULL;
+char *tmp1 = NULL;
 char *envtmp1 = NULL;
 char *envtmp2 = NULL;
@@ -752 +727 @@
 t_bkptype media_specified_by_user;
 
-malloc_string(command);
 malloc_string(iso_mnt);
 malloc_string(iso_path);
@@ -850 +824 @@
         }
         sprintf(bkpinfo->media_device, "%s1", value);
-        sprintf(tmp, "Backup medium is USB --- dev=%s", bkpinfo->media_device);
-        log_msg(2, tmp);
+        log_msg(2, "Backup medium is USB --- dev=%s", bkpinfo->media_device);
     } else if (bkpinfo->backup_media_type == tape
             || bkpinfo->backup_media_type == udev) {
@@ -860 +833 @@
         read_cfg_var(cfg_file, "media-size", value);
         bkpinfo->media_size[1] = atol(value);
-        sprintf(tmp, "Backup medium is TAPE --- dev=%s",
-                bkpinfo->media_device);
-        log_msg(2, tmp);
+        log_msg(2, "Backup medium is TAPE --- dev=%s", bkpinfo->media_device);
     } else {
         strcpy(bkpinfo->media_device, "/dev/cdrom");    /* we don't really need this var */
@@ -953 +924 @@
 
 read_cfg_var(g_mondo_cfg_file, "please-dont-eject", tmp);
-if (tmp[0]
-||
-strstr(call_program_and_get_last_line_of_output
-       ("cat /proc/cmdline"), "donteject")) {
-bkpinfo->please_dont_eject = TRUE;
-log_msg(2, "Ok, I shan't eject when restoring! Groovy.");
+if (tmp[0] || strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "donteject")) {
+    bkpinfo->please_dont_eject = TRUE;
+    log_msg(2, "Ok, I shan't eject when restoring! Groovy.");
 }
 
@@ -1018 +986 @@
             log_msg(2, "NB: isodir is already mounted");
             /* Find out where it's mounted */
-            sprintf(command,
-                    "mount | grep -E '^%s' | tail -n1 | cut -d' ' -f3",
-                    g_isodir_device);
+            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",
-                    call_program_and_get_last_line_of_output(command));
+            log_it("res of it = %s", call_program_and_get_last_line_of_output(command));
+            sprintf(iso_mnt, "%s", call_program_and_get_last_line_of_output(command));
+            mr_free(command);
         } else {
             sprintf(iso_mnt, "/tmp/isodir");
-            sprintf(tmp, "mkdir -p %s", iso_mnt);
-            run_program_and_log_output(tmp, 5);
-            sprintf(tmp, "mount %s %s", g_isodir_device, iso_mnt);
-            if (run_program_and_log_output(tmp, 3)) {
+            mr_asprintf(&tmp1, "mkdir -p %s", iso_mnt);
+            run_program_and_log_output(tmp1, 5);
+            mr_free(tmp1);
+
+            mr_asprintf(&tmp1, "mount %s %s", g_isodir_device, iso_mnt);
+            if (run_program_and_log_output(tmp1, 3)) {
                 log_msg(1,
                         "Unable to mount isodir. Perhaps this is really a CD backup?");
@@ -1038 +1005 @@
                 bkpinfo->isodir[0] = iso_mnt[0] = iso_path[0] = '\0';
                 if (mount_media()) {
+                    mr_free(tmp1);
                     fatal_error
                         ("Unable to mount isodir. Failed to mount CD-ROM as well.");
@@ -1045 +1013 @@
                 }
             }
+            mr_free(tmp1);
         }
         /* bkpinfo->isodir should now be the true path to prefix-1.iso etc... */
@@ -1072 +1041 @@
 paranoid_free(value);
 paranoid_free(tmp);
-paranoid_free(command);
 paranoid_free(iso_mnt);
 paranoid_free(iso_path);
@@ -1103 +1071 @@
 
 /** add mallocs**/
-char *command;
+char *command = NULL;
 char *tmp;
 int res = 0;
@@ -1110 +1078 @@
 
 assert(bkpinfo != NULL);
-malloc_string(command);
 malloc_string(tmp);
 
@@ -1134 +1101 @@
     unlink(FILELIST_FULL_STUB);
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-        sprintf(command,
-            "tar -b %ld -zxf %s ./%s ./%s ./%s ./%s ./%s",
+        mr_asprintf(&command, "tar -b %ld -zxf %s ./%s ./%s ./%s ./%s ./%s",
             bkpinfo->internal_tape_block_size,
             bkpinfo->media_device,
@@ -1145 +1111 @@
         log_msg(1, "tarcommand = %s", command);
         run_program_and_log_output(command, 1);
+        mr_free(command);
+
         if (!does_file_exist(FILELIST_FULL_STUB)) {
             /* Doing that allow us to remain compatible with pre-2.2.5 versions */
             log_msg(2, "pre-2.2.4 compatible mode on");
-            sprintf(command,
+            mr_asprintf(&command,
                 "tar -b %ld -zxf %s %s %s %s %s %s",
                 bkpinfo->internal_tape_block_size,
@@ -1159 +1127 @@
             log_msg(1, "tarcommand = %s", command);
             run_program_and_log_output(command, 1);
+            mr_free(command);
         }
     } else {
@@ -1167 +1136 @@
         log_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,
@@ -1178 +1147 @@
         log_msg(1, "tarcommand = %s", command);
         run_program_and_log_output(command, 1);
+        mr_free(command);
+
         if (!does_file_exist(FILELIST_FULL_STUB)) {
             /* Doing that allow us to remain compatible with pre-2.2.5 versions */
             log_msg(2, "pre-2.2.4 compatible mode on");
-            sprintf(command,
+            mr_asprintf(&command,
                 "tar -zxf %s/images/all.tar.gz %s %s %s %s %s",
                 MNT_CDROM,
@@ -1192 +1163 @@
             log_msg(1, "tarcommand = %s", command);
             run_program_and_log_output(command, 1);
+            mr_free(command);
         }
         if (!does_file_exist(BIGGIELIST_TXT_STUB)) {
@@ -1202 +1174 @@
         }
     }
-    sprintf(command, "cp -f %s %s", MONDO_CFG_FILE_STUB,
-        g_mondo_cfg_file);
+    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,
-        BIGGIELIST_TXT_STUB, g_biggielist_txt);
+    mr_free(command);
+
+    mr_asprintf(&command, "cp -f %s/%s %s", bkpinfo->tmpdir, BIGGIELIST_TXT_STUB, g_biggielist_txt);
     log_msg(1, "command = %s", command);
     paranoid_system(command);
-    sprintf(command, "ln -sf %s/%s %s", bkpinfo->tmpdir,
-        FILELIST_FULL_STUB, g_filelist_full);
+    mr_free(command);
+
+    mr_asprintf(&command, "ln -sf %s/%s %s", bkpinfo->tmpdir, FILELIST_FULL_STUB, g_filelist_full);
     log_msg(1, "command = %s", command);
     paranoid_system(command);
-    }
-
-    if (am_I_in_disaster_recovery_mode()
+    mr_free(command);
+}
+
+if (am_I_in_disaster_recovery_mode()
     &&
     /* If it was there, do not overwrite it */
     (extract_mountlist_stub) 
     &&
-    ask_me_yes_or_no("Do you want to retrieve the mountlist as well?"))
-    {
-        sprintf(command, "ln -sf %s/%s /tmp", MOUNTLIST_FNAME_STUB,
+    ask_me_yes_or_no("Do you want to retrieve the mountlist as well?")) {
+        mr_asprintf(&command, "ln -sf %s/%s /tmp", MOUNTLIST_FNAME_STUB,
             bkpinfo->tmpdir);
-    paranoid_system(command);
+        paranoid_system(command);
+        mr_free(command);
     }
 
@@ -1248 +1221 @@
         log_to_screen("Pre-processing filelist");
         if (!does_file_exist(g_biggielist_txt)) {
-            sprintf(command, "echo -n > %s", g_biggielist_txt);
+            mr_asprintf(&command, "echo -n > %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;
@@ -1301 +1276 @@
     }
 
-    paranoid_free(command);
     paranoid_free(tmp);
     return (filelist);
@@ -1322 +1296 @@
 int backup_crucial_file(char *path_root, char *filename)
 {
-    char *tmp;
-    char *command;
+    char *tmp = NULL;
+    char *command = NULL;
     int res;
 
-    malloc_string(tmp);
-    malloc_string(command);
     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(&tmp, "%s/%s", path_root, filename);
+    mr_asprintf(&command, "cp -f %s %s.pristine", tmp, tmp);
+    mr_free(tmp);
 
     res = run_program_and_log_output(command, 5);
-    paranoid_free(tmp);
-    paranoid_free(command);
+    mr_free(command);
     return (res);
 }
@@ -1402 +1374 @@
     read_cfg_var(g_mondo_cfg_file, "bootloader.device", device);
     read_cfg_var(g_mondo_cfg_file, "bootloader.name", name);
-    mr_asprintf(&tmp, "run_boot_loader: device='%s', name='%s'", device, name);
-    log_msg(2, tmp);
-    paranoid_free(tmp);
+    log_msg(2, "run_boot_loader: device='%s', name='%s'", device, name);
     system("sync");
 
@@ -1425 +1395 @@
         mr_asprintf(&tmp, "ls /dev | grep -Eq '^%ss[1-4].*'", device);
         if (!system(tmp)) {
-            paranoid_free(tmp);
+            mr_free(tmp);
             mr_asprintf(&tmp, MNT_RESTORING "/sbin/fdisk -B %s", device);
             res = run_program_and_log_output(tmp, 3);
         } else {
-            log_msg(1,
-                    "I'm not running any boot loader. You have a DD boot drive. It's already loaded up.");
-        }
-        paranoid_free(tmp);
+            log_msg(1, "I'm not running any boot loader. You have a DD boot drive. It's already loaded up.");
+        }
+        mr_free(tmp);
     }
 #else
@@ -1493 +1462 @@
 {
   /** malloc **/
-    char *command;
+    char *command = NULL;
     char *boot_device;
     char *rootdev;
     char *rootdrive;
     char *conffile;
-    char *tmp;
+    char *tmp = NULL;
     char *editor;
 
@@ -1504 +1473 @@
     int done;
 
-    malloc_string(command);
     malloc_string(boot_device);
-    malloc_string(tmp);
     malloc_string(editor);
     malloc_string(rootdev);
@@ -1515 +1482 @@
     strcpy(boot_device, bd);
 
-    if (!run_program_and_log_output("which grub-MR", FALSE)) {
-        log_msg(1, "Yay! grub-MR found...");
-        sprintf(command, "grub-MR %s /tmp/mountlist.txt", boot_device);
-        log_msg(1, "command = %s", command);
-    } else {
-        sprintf(command, "chroot " MNT_RESTORING " grub-install %s",
-                boot_device);
-        log_msg(1, "WARNING - grub-MR not found; using grub-install");
-    }
     if (offer_to_run_stabgrub
         && ask_me_yes_or_no("Did you change the mountlist or cloned the system ?"))
@@ -1535 +1493 @@
                                  "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);
+            mr_asprintf(&command, "stabgrub-me %s", boot_device);
             res = run_program_and_log_output(command, 1);
+            mr_free(command);
+
             if (res) {
                 popup_and_OK
@@ -1551 +1511 @@
                 newtSuspend();
             }
-            sprintf(tmp, "chroot %s %s /etc/fstab", MNT_RESTORING, editor);
+            mr_asprintf(&tmp, "chroot %s %s /etc/fstab", MNT_RESTORING, editor);
             paranoid_system(tmp);
-            sprintf(tmp, "chroot %s %s /etc/mtab", MNT_RESTORING, editor);
+            mr_free(tmp);
+
+            mr_asprintf(&tmp, "chroot %s %s /etc/mtab", MNT_RESTORING, editor);
             paranoid_system(tmp);
-            sprintf(tmp, "chroot %s %s /boot/grub/menu.lst", MNT_RESTORING, editor);
+            mr_free(tmp);
+
+            mr_asprintf(&tmp, "chroot %s %s /boot/grub/menu.lst", MNT_RESTORING, editor);
             paranoid_system(tmp);
-            sprintf(tmp, "chroot %s %s /boot/grub/device.map", MNT_RESTORING, editor);
+            mr_free(tmp);
+
+            mr_asprintf(&tmp, "chroot %s %s /boot/grub/device.map", MNT_RESTORING, editor);
             paranoid_system(tmp);
+            mr_free(tmp);
+
             if (!g_text_mode) {
                 newtResume();
@@ -1566 +1534 @@
         /* nuke mode */
     {
+        if (!run_program_and_log_output("which grub-MR", FALSE)) {
+            log_msg(1, "Yay! grub-MR found...");
+            mr_asprintf(&command, "grub-MR %s /tmp/mountlist.txt", boot_device);
+            log_msg(1, "command = %s", command);
+        } else {
+            mr_asprintf(&command, "chroot " MNT_RESTORING " grub-install %s", boot_device);
+            log_msg(1, "WARNING - grub-MR not found; using grub-install");
+        }
         mvaddstr_and_log_it(g_currentY,
                             0,
@@ -1571 +1547 @@
         log_it("%s",command);
         res = run_program_and_log_output(command, 1);
+        mr_free(command);
+
         if (res) {
             popup_and_OK
@@ -1599 +1577 @@
     paranoid_free(rootdrive);
     paranoid_free(conffile);
-    paranoid_free(command);
     paranoid_free(boot_device);
-    paranoid_free(tmp);
     paranoid_free(editor);
 
@@ -1620 +1596 @@
 {
   /** malloc **/
-    char *command;
-    char *tmp;
+    char *command = NULL;
+    char *tmp = NULL;
     char *editor;
 
@@ -1627 +1603 @@
     int done;
 
-    malloc_string(command);
-    malloc_string(tmp);
     malloc_string(editor);
     strcpy(editor, find_my_editor());
@@ -1639 +1613 @@
                             0,
                             "Modifying fstab and elilo.conf...                             ");
-        sprintf(command, "stabelilo-me");
+        mr_asprintf(&command, "stabelilo-me");
         res = run_program_and_log_output(command, 3);
+        mr_free(command);
+
         if (res) {
             popup_and_OK
@@ -1648 +1624 @@
                     newtSuspend();
                 }
-                sprintf(tmp, "chroot %s %s /etc/fstab", MNT_RESTORING, editor);
+                mr_asprintf(&tmp, "chroot %s %s /etc/fstab", MNT_RESTORING, editor);
                 paranoid_system(tmp);
-                sprintf(tmp, "chroot %s %s /etc/elilo.conf", MNT_RESTORING, editor);
+                mr_free(tmp);
+
+                mr_asprintf(&tmp, "chroot %s %s /etc/elilo.conf", MNT_RESTORING, editor);
                 paranoid_system(tmp);
+                mr_free(tmp);
+
                 if (!g_text_mode) {
                     newtResume();
@@ -1669 +1649 @@
         res = TRUE;
     }
-    paranoid_free(command);
-    paranoid_free(tmp);
     paranoid_free(editor);
     return (res);
@@ -1688 +1666 @@
 {
   /** malloc **/
-    char *command;
-    char *tmp;
+    char *command = NULL;
+    char *tmp = NULL;
     char *editor;
 
@@ -1695 +1673 @@
     int done;
     bool run_lilo_M = FALSE;
-    malloc_string(command);
-    malloc_string(tmp);
     malloc_string(editor);
 
@@ -1713 +1689 @@
                             0,
                             "Modifying fstab and lilo.conf, and running LILO...                             ");
-        sprintf(command, "stablilo-me");
+        mr_asprintf(&command, "stablilo-me");
         res = run_program_and_log_output(command, 3);
+        mr_free(command);
+
         if (res) {
             popup_and_OK
@@ -1722 +1700 @@
                     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();
@@ -1780 +1762 @@
                                    " lilo -M /dev/sda", 3);
     }
-    paranoid_free(command);
-    paranoid_free(tmp);
     paranoid_free(editor);
     return (res);
@@ -1800 +1780 @@
 {
   /** malloc **/
-    char *command;
+    char *command = NULL;
     char *boot_device;
-    char *tmp;
+    char *tmp = NULL;
     char *editor;
     int res;
     int done;
 
-    malloc_string(command);
     malloc_string(boot_device);
-    malloc_string(tmp);
     malloc_string(editor);
     assert_string_is_neither_NULL_nor_zerolength(bd);
@@ -1815 +1793 @@
     strcpy(editor, find_my_editor());
     strcpy(boot_device, bd);
-    sprintf(command, "raw-MR %s /tmp/mountlist.txt", boot_device);
-    log_msg(2, "run_raw_mbr() --- command='%s'", command);
 
     if (offer_to_hack_scripts
@@ -1830 +1806 @@
                     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);
+            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?");
@@ -1851 +1829 @@
         /* nuke mode */
     {
+        mr_asprintf(&command, "raw-MR %s /tmp/mountlist.txt", boot_device);
+        log_msg(2, "run_raw_mbr() --- command='%s'", command);
+
         mvaddstr_and_log_it(g_currentY, 0,
                             "Restoring MBR...                                               ");
         res = run_program_and_log_output(command, 3);
-    }
+        mr_free(command);
+    }
+
     if (res) {
         mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
@@ -1862 +1845 @@
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     }
-    paranoid_free(command);
     paranoid_free(boot_device);
-    paranoid_free(tmp);
     paranoid_free(editor);
     return (res);
@@ -1894 +1875 @@
     malloc_string(g_mountlist_fname);
     malloc_string(g_mondo_home);
-    /*
-    malloc_string(g_tmpfs_mountpt);
-    */
     malloc_string(g_isodir_device);
     malloc_string(g_isodir_format);
@@ -1905 +1883 @@
     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);
+    sprintf(g_imagedevs_restthese, "%s/tmp/imagedevs.restore-these", temppath);
     if (bkpinfo->disaster_recovery) {
         sprintf(g_mondo_cfg_file, "/%s", MONDO_CFG_FILE_STUB);
@@ -1913 +1889 @@
     } else {
         sprintf(g_mondo_cfg_file, "%s/%s", temppath, MONDO_CFG_FILE_STUB);
-        sprintf(g_mountlist_fname, "%s/%s", temppath,
-                MOUNTLIST_FNAME_STUB);
+        sprintf(g_mountlist_fname, "%s/%s", temppath, MOUNTLIST_FNAME_STUB);
     }
 }
@@ -1975 +1950 @@
     int i;
     /* MALLOC * */
-    char *tmp;
-
-    malloc_string(tmp);
+    char *tmp = NULL;
+
     if (does_file_exist("/tmp/NOPAUSE")) {
         return;
@@ -1987 +1961 @@
     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();
-    paranoid_free(tmp);
 }
 
@@ -2010 +1984 @@
     struct mountlist_itself *mountlist;
     int retval = 0, lino, res = 0, i;
-    char *command;
+    char *command = NULL;
     char *tmp = NULL;
 
-    malloc_string(command);
     assert(p_external_copy_of_mountlist != NULL);
 
@@ -2065 +2038 @@
         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);
                     log_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);
 
@@ -2086 +2059 @@
             log_msg(10, "The 'umount' command is '%s'", command);
             res = run_program_and_log_output(command, 3);
+            mr_free(command);
         } else {
             mr_strcat(tmp, "...not mounted anyway :-) OK");
@@ -2112 +2086 @@
     }
     free(mountlist);
-    paranoid_free(command);
     return (retval);
 }
@@ -2130 +2103 @@
 int extract_cfg_file_and_mountlist_from_tape_dev(char *dev)
 {
-    char *command;
+    char *command = NULL;
     int res = 0;
-
-    malloc_string(command);
 
     if (bkpinfo->use_obdr) {
@@ -2142 +2113 @@
     }
 
-    sprintf(command,
+    mr_asprintf(&command,
             "dd if=%s bs=%ld count=%ld 2> /dev/null | tar -zx ./%s ./%s ./%s ./%s ./%s",
             dev,
@@ -2151 +2122 @@
     log_msg(2, "command = '%s'", command);
     res = run_program_and_log_output(command, -1);
+    mr_free(command);
+
     if (res != 0) {
         if (does_file_exist(MONDO_CFG_FILE_STUB)) {
@@ -2157 +2130 @@
             /* Doing that allow us to remain compatible with pre-2.2.5 versions */
             log_msg(2, "pre-2.2.4 compatible mode on");
-            sprintf(command,
+            mr_asprintf(&command,
                     "dd if=%s bs=%ld count=%ld 2> /dev/null | tar -zx %s %s %s %s %s",
                     dev,
@@ -2166 +2139 @@
             log_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;
@@ -2171 +2146 @@
         }
     }
-    paranoid_free(command);
     return (res);
 }
@@ -2191 +2165 @@
    /** malloc *****/
     char *device;
-    char *command;
-    char *cfg_file;
+    char *command = NULL;
+    char *cfg_file = NULL;
     char *mounted_cfgf_path;
-    char *tmp;
-    char *mountpt;
+    char *tmp = NULL;
+    char *mountpt = NULL;
     char *ramdisk_fname;
-    char *mountlist_file;
+    char *mountlist_file = NULL;
     bool extract_mountlist_stub = FALSE;
     bool extract_i_want_my_lvm = FALSE;
@@ -2204 +2178 @@
 
     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);
     log_msg(2, "gcffa --- starting");
     log_to_screen("I'm thinking...");
-    sprintf(mountpt, "%s/mount.bootdisk", bkpinfo->tmpdir);
+    mr_asprintf(&mountpt, "%s/mount.bootdisk", bkpinfo->tmpdir);
     device[0] = '\0';
     chdir(bkpinfo->tmpdir);
-    strcpy(cfg_file, MONDO_CFG_FILE_STUB);
+    mr_asprintf(cfg_file, "%s", MONDO_CFG_FILE_STUB);
     unlink(cfg_file);           // cfg_file[] is missing the '/' at the start, FYI, by intent
+    mr_free(cfg_file);
+
     unlink(FILELIST_FULL_STUB);
     unlink(BIGGIELIST_TXT_STUB);
-    sprintf(command, "mkdir -p %s", mountpt);
+    mr_asprintf(&command, "mkdir -p %s", mountpt);
     run_program_and_log_output(command, FALSE);
-
-    sprintf(cfg_file, "%s/%s", bkpinfo->tmpdir, MONDO_CFG_FILE_STUB);
-    sprintf(mountlist_file, "%s/%s", bkpinfo->tmpdir, MOUNTLIST_FNAME_STUB);
-    //   make_hole_for_file( cfg_file );
-    //   make_hole_for_file( mountlist_file);
+    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);
     log_msg(2, "mountpt = %s; cfg_file=%s", mountpt, cfg_file);
+    mr_free(mountpt);
 
     if (!does_file_exist(cfg_file)) {
@@ -2256 +2227 @@
                 log_msg(2, "media_device is blank; assuming %s");
             }
-            strcpy(tmp, bkpinfo->media_device);
+            mr_asprintf(&tmp, bkpinfo->media_device);
             if (extract_cfg_file_and_mountlist_from_tape_dev
                 (bkpinfo->media_device)) {
@@ -2275 +2246 @@
                 }
             }
+            mr_free(tmp);
 
             if (!does_file_exist("tmp/mondo-restore.cfg")) {
@@ -2294 +2266 @@
                 log_msg(2,
                         "gcffa --- Plan B, 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, IWANTMYLVM_STUB);    // 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, IWANTMYLVM_STUB);   // 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)) {
                     /* Doing that allow us to remain compatible with pre-2.2.5 versions */
                     log_msg(2, "pre-2.2.4 compatible mode on");
-                    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, IWANTMYLVM_STUB);  // 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, IWANTMYLVM_STUB); // 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
@@ -2310 +2286 @@
     if (does_file_exist(MONDO_CFG_FILE_STUB)) {
         log_msg(1, "gcffa --- great! We've got the config file");
-        sprintf(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(&tmp, "%s/%s", call_program_and_get_last_line_of_output("pwd"), MONDO_CFG_FILE_STUB);
+        mr_asprintf(&command, "cp -f %s %s", tmp, cfg_file);
         log_it("%s",command);
-        if (strcmp(tmp, cfg_file)
-            && run_program_and_log_output(command, 1)) {
-            log_msg(1,
-                    "... but an error occurred when I tried to move it to %s",
-                    cfg_file);
+        if (strcmp(tmp, cfg_file) && run_program_and_log_output(command, 1)) {
+            log_msg(1, "... but an error occurred when I tried to move it to %s", cfg_file);
         } else {
             log_msg(1, "... and I moved it successfully to %s", cfg_file);
         }
-        sprintf(command, "cp -f %s/%s %s",
-            call_program_and_get_last_line_of_output("pwd"),
+        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);
         log_it("%s",command);
         if (extract_mountlist_stub) {
-            if (strcmp(tmp, cfg_file)
-                && run_program_and_log_output(command, 1)) {
+            if (strcmp(tmp, cfg_file) && run_program_and_log_output(command, 1)) {
                 log_msg(1, "Failed to get mountlist");
             } else {
                 log_msg(1, "Got mountlist too");
-                sprintf(command, "cp -f %s %s", mountlist_file,
-                        g_mountlist_fname);
+
+                mr_free(command);
+                mr_asprintf(&command, "cp -f %s %s", mountlist_file, g_mountlist_fname);
                 if (run_program_and_log_output(command, 1)) {
                     log_msg(1, "Failed to copy mountlist to /tmp");
                 } else {
                     log_msg(1, "Copied mountlist to /tmp as well OK");
-                    sprintf(command, "cp -f %s /tmp/",IWANTMYLVM_STUB);
+                    mr_free(command);
+                    mr_asprintf(&command, "cp -f %s /tmp/",IWANTMYLVM_STUB);
                     run_program_and_log_output(command, 1);
                 }
             }
         }
+        mr_free(tmp);
+        mr_free(command);
     }
     run_program_and_log_output("umount " MNT_CDROM, FALSE);
@@ -2361 +2336 @@
             /* Is this code really useful ??? */
         if (extract_mountlist_stub) {
-            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);
-        }
-    }
-
-    sprintf(command, "cp -f %s /%s", cfg_file, MONDO_CFG_FILE_STUB);
+            mr_free(command);
+        }
+    }
+
+    mr_asprintf(&command, "cp -f %s /%s", cfg_file, MONDO_CFG_FILE_STUB);
+    mr_free(cfg_file);
+
     run_program_and_log_output(command, FALSE);
+    mr_free(command);
+
     if (extract_mountlist_stub) {
-        sprintf(command, "cp -f %s /%s", mountlist_file, MOUNTLIST_FNAME_STUB);
+        mr_asprintf(&command, "cp -f %s /%s", mountlist_file, MOUNTLIST_FNAME_STUB);
         run_program_and_log_output(command, FALSE);
-    }
-    sprintf(command, "cp -f etc/raidtab /etc/");
+        mr_free(command);
+    }
+    mr_free(mountlist_file);
+
+    mr_asprintf(&command, "cp -f etc/raidtab /etc/");
     run_program_and_log_output(command, FALSE);
+    mr_free(command);
+
     if (extract_i_want_my_lvm) {
-        sprintf(command, "cp -f %s /tmp/",IWANTMYLVM_STUB);
+        mr_asprintf(&command, "cp -f %s /tmp/",IWANTMYLVM_STUB);
         run_program_and_log_output(command, FALSE);
+        mr_free(command);
     }
     g_backup_media_type = bkpinfo->backup_media_type;
     paranoid_free(device);
-    paranoid_free(command);
-    paranoid_free(tmp);
-    paranoid_free(cfg_file);
     paranoid_free(mounted_cfgf_path);
-    paranoid_free(mountpt);
     paranoid_free(ramdisk_fname);
-    paranoid_free(mountlist_file);
     return (retval);
 }
@@ -2416 +2397 @@
     struct raidlist_itself *raidlist;
     int unfinished_mdstat_devices = 9999, i;
-    char *screen_message;
-
-    malloc_string(screen_message);
+    char *screen_message = NULL;
+
     raidlist = malloc(sizeof(struct raidlist_itself));
 
@@ -2438 +2418 @@
                 }
                 log_msg(1,"Sync'ing %s (i=%d)", raidlist->el[i].raid_device, i);
-                sprintf(screen_message, "Sync'ing %s",
-                        raidlist->el[i].raid_device);
+                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) {
                     log_msg(1,"Percentage sync'ed: %d", raidlist->el[i].progress);
@@ -2454 +2435 @@
         }
     }
-    paranoid_free(screen_message);
     paranoid_free(raidlist);
 }