Changeset 1118 in MondoRescue

Timestamp:

Feb 9, 2007, 2:07:01 AM (18 years ago)

Author:

Bruno Cornec

Message:

Memory management improvements for libmondo-archive.c (trunk merge again) TBC

File:

• branches/stable/mondo/src/common/libmondo-archive.c (modified) (53 diffs)

branches/stable/mondo/src/common/libmondo-archive.c

@@ -28 +28 @@
 #include "libmondo-devices-EXT.h"
 #include "libmondo-tools-EXT.h"
-#include "libmondo-gui-EXT.h"
+#include "newt-specific-EXT.h"
 #include "libmondo-fork-EXT.h"
 #include "libmondo-files-EXT.h"
@@ -208 +208 @@
     unsigned int res = 0;
     int tries = 0;
-    char *command;
-    char *zipparams;
-    char *tmp;
-    char *p;
-
-    malloc_string(command);
-    malloc_string(zipparams);
-    malloc_string(tmp);
+    char *command = NULL;
+    char *tmp = NULL;
+    char *p =NULL;
+    char *tmp1 = NULL;
+
+    malloc_string(tmp1);
 
     if (!does_file_exist(filelist)) {
-        sprintf(tmp, "(archive_this_fileset) - filelist %s does not exist",
-                filelist);
+        mr_asprintf(&tmp,
+                 "(archive_this_fileset) - filelist %s does not exist",
+                 filelist);
         log_to_screen(tmp);
+        mr_free(tmp);
         return (1);
     }
 
-    sprintf(tmp, "echo hi > %s 2> /dev/null", fname);
+    mr_asprintf(&tmp, "echo hi > %s 2> /dev/null", fname);
     if (system(tmp)) {
         fatal_error("Unable to write tarball to scratchdir");
     }
-
-    sprintf(command, "star H=star list=%s -c " STAR_ACL_SZ " file=%s",
-            filelist, fname);
+    mr_free(tmp);
+
+    mr_asprintf(&command, "star H=star list=%s -c " STAR_ACL_SZ " file=%s",
+             filelist, fname);
     if (bkpinfo->use_lzo) {
         fatal_error("Can't use lzop");
     }
     if (bkpinfo->compression_level > 0) {
-        strcat(command, " -bz");
-    }
-    sprintf(command + strlen(command), " 2>> %s", MONDO_LOGFILE);
+        mr_asprintf(&tmp, "%s -bz", command);
+        mr_free(command);
+        command = tmp;
+    }
+    mr_asprintf(&tmp, "%s 2>> %s", command, MONDO_LOGFILE);
+    mr_free(command);
+    command = tmp;
     mr_msg(4, "command = '%s'", command);
 
@@ -243 +248 @@
         mr_msg(5, "command='%s'", command);
         res = system(command);
-        strcpy(tmp, last_line_of_file(MONDO_LOGFILE));
+        strcpy(tmp1, last_line_of_file(MONDO_LOGFILE));
         mr_msg(1, "res=%d; tmp='%s'", res, tmp);
         if (bkpinfo->use_star && (res == 254 || res == 65024)
@@ -265 +270 @@
         }
     }
+    mr_free(command);
+
     retval += res;
     if (retval) {
@@ -273 +280 @@
     }
 
-    mr_free(command);
-    mr_free(zipparams);
-    mr_free(tmp);
     return (retval);
 }
@@ -301 +305 @@
 {
 
-    /*@ int *************************************************************** */
+    /*@ int ************************************************************ */
     int retval = 0;
     int res = 0;
@@ -308 +312 @@
     static int free_ramdisk_space = 9999;
 
-    /*@ buffers ************************************************************ */
-    char *command;
-    char *zipparams;
-    char *tmp;
+    /*@ buffers ******************************************************** */
+    char *command = NULL;
+    char *zipparams = NULL;
+    char *tmp = NULL;
+    char *tmp1 = NULL;
 
     assert(bkpinfo != NULL);
@@ -322 +327 @@
     }
 
-    malloc_string(command);
-    malloc_string(zipparams);
-    malloc_string(tmp);
-
     if (!does_file_exist(filelist)) {
-        sprintf(tmp, "(archive_this_fileset) - filelist %s does not exist",
-                filelist);
+        mr_asprintf(&tmp,
+                 "(archive_this_fileset) - filelist %s does not exist",
+                 filelist);
         log_to_screen(tmp);
+        mr_free(tmp);
         return (1);
     }
-    sprintf(tmp, "echo hi > %s 2> /dev/null", fname);
+    mr_asprintf(&tmp, "echo hi > %s 2> /dev/null", fname);
     if (system(tmp)) {
         fatal_error("Unable to write tarball to scratchdir");
     }
+    mr_free(tmp);
 
 
     if (bkpinfo->compression_level > 0) {
-        sprintf(tmp, "%s/do-not-compress-these", g_mondo_home);
+        mr_asprintf(&tmp, "%s/do-not-compress-these", g_mondo_home);
         //       -b %ld, TAPE_BLOCK_SIZE
-        sprintf(zipparams, "-Z -P %s -G %d -T 3k", bkpinfo->zip_exe,
-                bkpinfo->compression_level);
+        mr_asprintf(&zipparams, "-Z -P %s -G %d -T 3k", bkpinfo->zip_exe,
+                 bkpinfo->compression_level);
         if (does_file_exist(tmp)) {
-            strcat(zipparams, " -E ");
-            strcat(zipparams, tmp);
+            mr_asprintf(&tmp1, "%s -E %s", zipparams, tmp);
+            mr_free(zipparams);
+            zipparams = tmp1;
         } else {
             mr_msg(3, "%s not found. Cannot exclude zipfiles, etc.", tmp);
         }
-    } else {
-        zipparams[0] = '\0';
+        mr_free(tmp);
+    } else {
+        mr_asprintf(&zipparams, " ");
     }
 
@@ -363 +369 @@
         fatal_error("scratchdir not found");
     }
-    sprintf(command, "rm -f %s %s. %s.gz %s.%s", fname, fname, fname,
-            fname, bkpinfo->zip_suffix);
+    mr_asprintf(&command, "rm -f %s %s. %s.gz %s.%s", fname, fname, fname,
+             fname, bkpinfo->zip_suffix);
     paranoid_system(command);
-
-    sprintf(command, "afio -o -b %ld -M 16m %s %s < %s 2>> %s",
-            TAPE_BLOCK_SIZE, zipparams, fname, filelist, MONDO_LOGFILE);
-
-    sprintf(tmp, "echo hi > %s 2> /dev/null", fname);
+    mr_free(command);
+
+    mr_asprintf(&command, "afio -o -b %ld -M 16m %s %s < %s 2>> %s",
+             TAPE_BLOCK_SIZE, zipparams, fname, filelist, MONDO_LOGFILE);
+    mr_free(zipparams);
+
+    mr_asprintf(&tmp, "echo hi > %s 2> /dev/null", fname);
     if (system(tmp)) {
         fatal_error("Unable to write tarball to scratchdir");
     }
+    mr_free(tmp);
 
     for (res = 99, tries = 0; tries < 3 && res != 0; tries++) {
@@ -386 +395 @@
         }
     }
+    mr_free(command);
+
     retval += res;
     if (retval) {
@@ -409 +420 @@
         }
     }
-    mr_free(command);
-    mr_free(zipparams);
-    mr_free(tmp);
     return (retval);
 }
-
-
-
-
 
 
@@ -435 +439 @@
 {
     int retval = 0, res = 0;
-    char *tmp;
+    char *tmp = NULL;
 
     assert(bkpinfo != NULL);
     set_g_cdrom_and_g_dvd_to_bkpinfo_value(bkpinfo);
-    malloc_string(tmp);
+
     if (bkpinfo->backup_media_type == dvd) {
 #ifdef DVDRWFORMAT
@@ -460 +464 @@
     }
 
-/*
-      sprintf(tmp, "wc -l %s/archives/filelist.full > %s/archives/filelist.count",bkpinfo->scratchdir, bkpinfo->scratchdir);
-      if (run_program_and_log_output(tmp, 2))
-        { fatal_error("Failed to count filelist.full"); }
-*/
-    sprintf(tmp, "gzip -9 %s/archives/filelist.full", bkpinfo->scratchdir);
+    mr_asprintf(&tmp, "gzip -9 %s/archives/filelist.full",
+             bkpinfo->scratchdir);
     if (run_program_and_log_output(tmp, 2)) {
         fatal_error("Failed to gzip filelist.full");
     }
-    sprintf(tmp, "cp -f %s/archives/*list*.gz %s", bkpinfo->scratchdir,
-            bkpinfo->tmpdir);
+    mr_free(tmp);
+    mr_asprintf(&tmp, "cp -f %s/archives/*list*.gz %s", bkpinfo->scratchdir,
+             bkpinfo->tmpdir);
     if (run_program_and_log_output(tmp, 2)) {
         fatal_error("Failed to copy to tmpdir");
     }
+    mr_free(tmp);
 
     copy_mondo_and_mindi_stuff_to_scratchdir(bkpinfo);  // payload, too, if it exists
@@ -493 +495 @@
     }
     retval += do_that_initial_phase(bkpinfo);   // prepare
-    sprintf(tmp, "rm -f %s/images/*.iso", bkpinfo->scratchdir);
+    mr_asprintf(&tmp, "rm -f %s/images/*.iso", bkpinfo->scratchdir);
     run_program_and_log_output(tmp, 1);
+    mr_free(tmp);
     retval += make_those_afios_phase(bkpinfo);  // backup regular files
     retval += make_those_slices_phase(bkpinfo); // backup BIG files
@@ -502 +505 @@
         sleep(2);
     }
-    mr_free(tmp);
     return (retval);
 }
-
-
 
 
@@ -525 +525 @@
  * - @c media_size
  * - @c nonbootable_backup
- * - @c scratchdir
  * - @c tmpdir
  * - @c use_lzo
@@ -538 +537 @@
 {
     /*@ buffer ************************************************************ */
-    char *tmp;
-    char *scratchdir;
-    char *command;
-    char *bootldr_str;
-    char *last_filelist_number;
-    char *tape_size_sz;
-    char *devs_to_exclude;
-    char *value;
-    char *bootdev;
+    char *tmp = NULL;
+    char *command = NULL;
+    char *use_lzo_sz = NULL;
+    char *use_gzip_sz = NULL;
+    char *use_comp_sz = NULL;
+    char *use_star_sz = NULL;
+    char *bootldr_str = NULL;
+    char *tape_device = NULL;
+    char *last_filelist_number = NULL;
+    char *broken_bios_sz = NULL;
+    char *cd_recovery_sz = NULL;
+    char *tape_size_sz = NULL;
+    char *devs_to_exclude = NULL;
+    char *use_lilo_sz = NULL;
+    char *bootdev = NULL;
 
     /*@ char ************************************************************** */
@@ -554 +559 @@
     long lines_in_filelist = 0;
 
-    /*@ int     ************************************************************* */
+    /*@ int         ************************************************************* */
     int res = 0;
     long estimated_total_noof_slices = 0;
@@ -562 +567 @@
 
     assert(bkpinfo != NULL);
-    command = mr_malloc(1200);
-    malloc_string(tmp);
-    malloc_string(scratchdir);
     malloc_string(bootldr_str);
     malloc_string(last_filelist_number);
-    malloc_string(tape_size_sz);
     malloc_string(devs_to_exclude);
-    malloc_string(value);
     malloc_string(bootdev);
 
-    strcpy(scratchdir, bkpinfo->scratchdir);
-    sprintf(tmp,
+    mr_asprintf(&tmp,
             "echo '%s' | tr -s ' ' '\n' | grep -E '^/dev/.*$' | tr -s '\n' ' ' | awk '{print $0\"\\n\";}'",
             bkpinfo->exclude_paths);
+
     strcpy(devs_to_exclude, call_program_and_get_last_line_of_output(tmp));
+    mr_free(tmp);
+
+    mr_asprintf(&tmp, "devs_to_exclude = '%s'", devs_to_exclude);
     mr_msg(2, tmp);
+    mr_free(tmp);
     mvaddstr_and_log_it(g_currentY, 0,
                         "Calling MINDI to create boot+data disks");
-    sprintf(tmp, "%s/filelist.full", bkpinfo->tmpdir);
+    mr_asprintf(&tmp, "%s/filelist.full", bkpinfo->tmpdir);
     if (!does_file_exist(tmp)) {
-        sprintf(tmp, "%s/tmpfs/filelist.full", bkpinfo->tmpdir);
+        mr_free(tmp);
+        mr_asprintf(&tmp, "%s/tmpfs/filelist.full", bkpinfo->tmpdir);
         if (!does_file_exist(tmp)) {
             fatal_error
@@ -590 +595 @@
     lines_in_filelist = count_lines_in_file(tmp);
     strcpy(last_filelist_number, last_line_of_file(tmp));
+    mr_free(tmp);
+
+    if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
+        mr_asprintf(&tape_size_sz, "%ld", bkpinfo->media_size[1]);
+        mr_asprintf(&tape_device, bkpinfo->media_device);
+    } else {
+        mr_asprintf(&tape_size_sz, " ");
+        mr_asprintf(&tape_device, " ");
+    }
+    /* BERLIOS: This parameter is not used after? */
+    mr_free(tape_size_sz);
+    if (bkpinfo->use_lzo) {
+        mr_asprintf(&use_lzo_sz, "yes");
+    } else {
+        mr_asprintf(&use_lzo_sz, "no");
+    }
+    if (bkpinfo->use_gzip) {
+        mr_asprintf(&use_gzip_sz, "yes");
+    } else {
+        mr_asprintf(&use_gzip_sz, "no");
+    }
+    if (bkpinfo->use_star) {
+        mr_asprintf(&use_star_sz, "yes");
+    } else {
+        mr_asprintf(&use_star_sz, "no");
+    }
+
+    if (bkpinfo->compression_level > 0) {
+        mr_asprintf(&use_comp_sz, "yes");
+    } else {
+        mr_asprintf(&use_comp_sz, "no");
+    }
+
+    mr_asprintf(&broken_bios_sz, "yes");    /* assume so */
+    if (g_cd_recovery) {
+        mr_asprintf(&cd_recovery_sz, "yes");
+    } else {
+        mr_asprintf(&cd_recovery_sz, "no");
+    }
+    /* Field shared between LILO/ELILO */
+    if (bkpinfo->make_cd_use_lilo) {
+        mr_asprintf(&use_lilo_sz, "yes");
+    } else {
+        mr_asprintf(&use_lilo_sz, "no");
+    }
 
     if (!bkpinfo->nonbootable_backup
@@ -622 +672 @@
         else
             ch = 'U';
+
         if (bkpinfo->boot_loader != '\0') {
-            sprintf(tmp, "User specified boot loader. It is '%c'.",
+            mr_asprintf(&tmp, "User specified boot loader. It is '%c'.",
                     bkpinfo->boot_loader);
             mr_msg(2, tmp);
+            mr_free(tmp);
         } else {
             bkpinfo->boot_loader = ch;
         }
         if (bkpinfo->boot_device[0] != '\0') {
-            sprintf(tmp, "User specified boot device. It is '%s'.",
+            mr_asprintf(&tmp, "User specified boot device. It is '%s'.",
                     bkpinfo->boot_device);
             mr_msg(2, tmp);
+            mr_free(tmp);
         } else {
             strcpy(bkpinfo->boot_device, bootdev);
@@ -646 +699 @@
 #endif
            bkpinfo->boot_loader != 'L' && bkpinfo->boot_loader != 'G'
-           && bkpinfo->boot_loader != 'R'
-           && !bkpinfo->nonbootable_backup) {
+           && bkpinfo->boot_loader != 'R' && !bkpinfo->nonbootable_backup)
+    {
         fatal_error
-            ("Please specify your boot loader and device, e.g. -l GRUB -f /dev/hda. Type 'man mondoarchive' to read the manual.");
+            ("Please specify your boot loader and device, e.g. -l GRUB -f /dev/hda.\nType 'man mondoarchive' to read the manual.");
     }
     if (bkpinfo->boot_loader == 'L') {
@@ -655 +708 @@
         if (!does_file_exist("/etc/lilo.conf")) {
             fatal_error
-                ("The de facto standard location for your boot loader's config file is /etc/lilo.conf but I cannot find it there. What is wrong with your Linux distribution?");
+                ("The de facto standard location for your boot loader's config file is /etc/lilo.conf.\nBut I cannot find it there. What is wrong with your Linux distribution?");
         }
     } else if (bkpinfo->boot_loader == 'G') {
@@ -672 +725 @@
         if (!does_file_exist("/etc/grub.conf")) {
             fatal_error
-                ("The de facto standard location for your boot loader's config file is /etc/grub.conf but I cannot find it there. What is wrong with your Linux distribution? Try 'ln -s /boot/grub/menu.lst /etc/grub.conf'...");
+                ("The de facto standard location for your boot loader's config file is /etc/grub.conf.\nBut I cannot find it there. What is wrong with your Linux distribution?\nTry 'ln -s /boot/grub/menu.lst /etc/grub.conf'...");
         }
     } else if (bkpinfo->boot_loader == 'E') {
         strcpy(bootldr_str, "ELILO");
-        /* BCO: fix it for SuSE, Debian, Mandrake, ... */
+        /* BERLIOS: fix it for SuSE, Debian, Mandrake, ... */
         if (!does_file_exist("/etc/elilo.conf")
             && does_file_exist("/boot/efi/efi/redhat/elilo.conf")) {
@@ -685 +738 @@
         if (!does_file_exist("/etc/elilo.conf")) {
             fatal_error
-                ("The de facto mondo standard location for your boot loader's config file is /etc/elilo.conf but I cannot find it there. What is wrong with your Linux distribution? Try finding it under /boot/efi and do 'ln -s /boot/efi/..../elilo.conf /etc/elilo.conf'");
+                ("The de facto mondo standard location for your boot loader's config file is /etc/elilo.conf\nBut I cannot find it there. What is wrong with your Linux distribution?\nTry finding it under /boot/efi and do 'ln -s /boot/efi/..../elilo.conf /etc/elilo.conf'");
         }
     } else if (bkpinfo->boot_loader == 'R') {
@@ -702 +755 @@
         strcpy(bootldr_str, "unknown");
     }
-    sprintf(tmp, "Your boot loader is %s and it boots from %s",
+    mr_asprintf(&tmp, "Your boot loader is %s and it boots from %s",
             bootldr_str, bkpinfo->boot_device);
     log_to_screen(tmp);
+    mr_free(tmp);
+    mr_asprintf(&tmp, "%s/BOOTLOADER.DEVICE", bkpinfo->tmpdir);
+    if (write_one_liner_data_file(tmp, bkpinfo->boot_device)) {
+        mr_msg(1, "Unable to write one-liner boot device");
+
+    }
 
     estimated_total_noof_slices =
         size_of_all_biggiefiles_K(bkpinfo) / bkpinfo->optimal_set_size + 1;
-/* add nfs stuff here? */
-    sprintf(command, "mkdir -p %s/images", bkpinfo->scratchdir);
+    mr_asprintf(&command, "mkdir -p %s/images", bkpinfo->scratchdir);
     if (system(command)) {
         res++;
         log_OS_error("Unable to make images directory");
     }
-    sprintf(command, "mkdir -p %s%s", bkpinfo->scratchdir, MNT_FLOPPY);
+    mr_free(command);
+
+    mr_asprintf(&command, "mkdir -p %s%s", bkpinfo->scratchdir, MNT_FLOPPY);
     if (system(command)) {
         res++;
         log_OS_error("Unable to make mnt floppy directory");
     }
+    mr_free(command);
 
     /* Prepare interface with mindi through a configuration file
@@ -818 +879 @@
         mr_fprintf(fd1, "use-cdrecovery no\n");
     }
+
     if (bkpinfo->make_cd_use_lilo) {
         mr_fprintf(fd1, "use-lilo yes\n");
@@ -838 +900 @@
     mr_fclose(fd1);
 
-    sprintf(command, "mindi --custom '%s' '%s/images'", 
+    mr_asprintf(&command, "mindi --custom '%s' '%s/images'", 
                 bkpinfo->tmpdir, bkpinfo->scratchdir);
             //bkpinfo->tmpdir,      // parameter #2
@@ -863 +925 @@
 
     res = run_program_and_log_to_screen(command, "Generating boot+data disks");
+    mr_free(command);
     if (bkpinfo->nonbootable_backup) {
         res = 0;
@@ -868 +931 @@
     if (!res) {
         log_to_screen("Boot+data disks were created OK");
-        sprintf(command, "mkdir -p /var/cache/mindi/");
+        mr_asprintf(&command, "mkdir -p /var/cache/mindi/");
         mr_msg(2, command);
         run_program_and_log_output(command, FALSE);
-        sprintf(command,
+        mr_free(command);
+
+        mr_asprintf(&command,
                 "cp -f %s/images/mindi.iso /var/cache/mindi/mondorescue.iso",
                 bkpinfo->scratchdir);
         mr_msg(2, command);
         run_program_and_log_output(command, FALSE);
+        mr_free(command);
+
         if (bkpinfo->nonbootable_backup) {
-            sprintf(command, "cp -f %s/all.tar.gz %s/images",
+            mr_asprintf(&command, "cp -f %s/all.tar.gz %s/images",
                     bkpinfo->tmpdir, bkpinfo->scratchdir);
             if (system(command)) {
                 fatal_error("Unable to create temporary duff tarball");
             }
-        }
+            mr_free(command);
+            
+        }
+/* BERLIOS: Not executed ?
         sprintf(command, "cp -f %s/mindi-*oot*.img %s/images",
                 bkpinfo->tmpdir, bkpinfo->scratchdir);
-        sprintf(tmp, "cp -f %s/images/all.tar.gz %s", bkpinfo->scratchdir,
-                bkpinfo->tmpdir);
+*/
+        mr_asprintf(&tmp, "cp -f %s/images/all.tar.gz %s",
+                 bkpinfo->scratchdir, bkpinfo->tmpdir);
         if (system(tmp)) {
             fatal_error("Cannot find all.tar.gz in tmpdir");
         }
+        mr_free(tmp);
+
         if (res) {
             mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
@@ -897 +970 @@
     } else {
         log_to_screen("Mindi failed to create your boot+data disks.");
-        strcpy(command, "grep 'Fatal error' /var/log/mindi.log");
-        strcpy(tmp, call_program_and_get_last_line_of_output(command));
+        mr_asprintf(&command, "grep 'Fatal error' /var/log/mindi.log");
+        malloc_string(tmp);
+        strcpy(tmp,call_program_and_get_last_line_of_output(command));
+        mr_free(command);
         if (strlen(tmp) > 1) {
             popup_and_OK(tmp);
         }
-    }
-    mr_free(tmp);
-    mr_free(scratchdir);
+        mr_free(tmp);
+    }
     mr_free(bootldr_str);
     mr_free(last_filelist_number);
-    mr_free(tape_size_sz);
     mr_free(devs_to_exclude);
-    mr_free(value);
     mr_free(bootdev);
-    mr_free(command);
     return (res);
 }
-
 
 
@@ -962 +1032 @@
 
     struct s_bkpinfo *bkpinfo;
-    char *tmp;
+    char *tmp = NULL;
     int res = 0, retval = 0;
     int *p_archival_threads_running;
@@ -970 +1040 @@
     int this_thread_no = g_current_thread_no++;
 
-    malloc_string(curr_xattr_list_fname);
-    malloc_string(curr_acl_list_fname);
     malloc_string(archiving_filelist_fname);
     malloc_string(archiving_afioball_fname);
-    malloc_string(tmp);
     p_last_set_archived = (int *) inbuf;
     p_archival_threads_running = (int *) (inbuf + 4);
@@ -1018 +1085 @@
         }
 
-        sprintf(tmp, AFIOBALL_FNAME_RAW_SZ, bkpinfo->tmpdir,
-                archiving_set_no - ARCH_BUFFER_NUM, bkpinfo->zip_suffix);
+        mr_asprintf(&tmp, AFIOBALL_FNAME_RAW_SZ, bkpinfo->tmpdir,
+                 archiving_set_no - ARCH_BUFFER_NUM, bkpinfo->zip_suffix);
         if (does_file_exist(tmp)) {
-            mr_msg(4, "%s[%d:%d] - waiting for storer", FORTY_SPACES,
-                    getpid(), this_thread_no);
+            mr_msg(4, "%s[%d:%d] - waiting for storer",
+                    FORTY_SPACES, getpid(), this_thread_no);
             while (does_file_exist(tmp)) {
                 sleep(1);
@@ -1028 +1095 @@
             mr_msg(4, "[%d] - continuing", getpid());
         }
+        mr_free(tmp);
 
         mr_msg(4, "%s[%d:%d] - EXATing %d...", FORTY_SPACES, getpid(),
                 this_thread_no, archiving_set_no);
         if (g_getfattr) {
-            sprintf(curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ,
+            mr_asprintf(&curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ,
                 bkpinfo->tmpdir, archiving_set_no);
             get_fattr_list(archiving_filelist_fname, curr_xattr_list_fname);
+            mr_free(curr_xattr_list_fname);
         }
         if (g_getfacl) {
-            sprintf(curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ,
+            mr_asprintf(&curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ,
                 bkpinfo->tmpdir, archiving_set_no);
             get_acl_list(archiving_filelist_fname, curr_acl_list_fname);
+            mr_free(curr_acl_list_fname);
         }
 
@@ -1051 +1121 @@
 
         if (res) {
-            sprintf(tmp,
-                    "Errors occurred while archiving set %ld. Please review logs.",
-                    archiving_set_no);
+            mr_asprintf(&tmp,
+                     "Errors occurred while archiving set %ld. Please review logs.",
+                     archiving_set_no);
             log_to_screen(tmp);
+            mr_free(tmp);
         }
         if (!semaphore_p()) {
@@ -1084 +1155 @@
     mr_free(archiving_filelist_fname);
     mr_free(archiving_afioball_fname);
-    mr_free(curr_xattr_list_fname);
-    mr_free(curr_acl_list_fname);
-    mr_free(tmp);
     pthread_exit(NULL);
 }
-
-
-
 
 
@@ -1117 +1182 @@
 
     mr_msg(1, "Closing tape/CD ... ");
-    if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type))
+    if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
         /* write tape/cdstream */
-    {
         closeout_tape(bkpinfo);
-    } else
+    } else {
         /* write final ISO/USB */
-    {
         res = write_final_iso_if_necessary(bkpinfo);
         retval += res;
@@ -1174 +1237 @@
     assert(bkpinfo != NULL);
     malloc_string(command);
-    malloc_string(tmpfile);
-    malloc_string(data_disks_file);
-    sprintf(data_disks_file, "%s/all.tar.gz", bkpinfo->tmpdir);
+
+    mr_asprintf(&data_disks_file, "%s/all.tar.gz", bkpinfo->tmpdir);
 
     snprintf(g_serial_string, MAX_STR_LEN - 1,
@@ -1187 +1249 @@
     assert(strlen(g_serial_string) < MAX_STR_LEN);
 
-    sprintf(tmpfile, "%s/archives/SERIAL-STRING", bkpinfo->scratchdir);
+    mr_asprintf(&tmpfile, "%s/archives/SERIAL-STRING", bkpinfo->scratchdir);
     if (write_one_liner_data_file(tmpfile, g_serial_string)) {
         mr_msg(1, "%ld: Failed to write serial string", __LINE__);
     }
+    mr_free(tmpfile);
 
     mvaddstr_and_log_it(g_currentY, 0, "Preparing to archive your data");
@@ -1207 +1270 @@
         mr_msg(1, "Backing up to CD's");
     }
-
-    sprintf(command, "rm -f %s/%s/%s-[1-9]*.iso", bkpinfo->isodir,
-            bkpinfo->nfs_remote_dir, bkpinfo->prefix);
+    mr_free(data_disks_file);
+
+    mr_asprintf(&command, "rm -f %s/%s/%s-[1-9]*.iso", bkpinfo->isodir,
+             bkpinfo->nfs_remote_dir, bkpinfo->prefix);
     paranoid_system(command);
+    mr_free(command);
+
     wipe_archives(bkpinfo->scratchdir);
     mvaddstr_and_log_it(g_currentY++, 74, "Done.");
@@ -1219 +1285 @@
                                      BLK_START_OF_BACKUP);
     }
-    mr_free(command);
-    mr_free(tmpfile);
-    mr_free(data_disks_file);
     return (retval);
 }
@@ -1247 +1310 @@
 
     /*@ buffers *********************************************************** */
-    char *command;
+    char *command = NULL;
     char *tempfile;
 
@@ -1256 +1319 @@
     assert_string_is_neither_NULL_nor_zerolength(title);
 
-    malloc_string(command);
     malloc_string(tempfile);
 #ifdef __FreeBSD__
@@ -1276 +1338 @@
            call_program_and_get_last_line_of_output
            ("mktemp -q /tmp/mondo.XXXXXXXX"));
-    sprintf(command, "%s >> %s 2>> %s; rm -f %s", cmd, tempfile, tempfile,
-            tempfile);
+    mr_asprintf(&command, "%s >> %s 2>> %s; rm -f %s", cmd, tempfile, tempfile, tempfile);
     mr_msg(3, command);
     open_evalcall_form(title);
@@ -1289 +1350 @@
         maxtracks = 80;
     }
+    mr_free(command);
+
     for (sleep(1); does_file_exist(tempfile); sleep(1)) {
         trackno = get_trackno_from_logfile(tempfile);
@@ -1310 +1373 @@
     }
     unlink(tempfile);
-    mr_free(command);
     mr_free(tempfile);
     return (res);
 }
+
 
 /**
@@ -1336 +1399 @@
     char *title;
 
-
     assert_string_is_neither_NULL_nor_zerolength(device);
-    malloc_string(title);
-    command = mr_malloc(1000);
+
     if (!system("which superformat > /dev/null 2> /dev/null")) {
-        sprintf(command, "superformat %s", device);
+        mr_asprintf(&command, "superformat %s", device);
     } else {
 #ifdef __FreeBSD__
-        sprintf(command, "fdformat -y %s", device);
+        mr_asprintf(&command, "fdformat -y %s", device);
 #else
-        sprintf(command, "fdformat %s", device);
+        mr_asprintf(&command, "fdformat %s", device);
 #endif
     }
-    sprintf(title, "Formatting disk %s", device);
+    mr_asprintf(&title, "Formatting disk %s", device);
     while ((res = format_disk_SUB(command, title))) {
         if (!ask_me_yes_or_no("Failed to format disk. Retry?")) {
@@ -1359 +1420 @@
     return (res);
 }
+
 
 /**
@@ -1383 +1445 @@
     }
 }
-
-
-
-
-
-
-
 
 
@@ -1470 +1525 @@
     log_to_screen("Archiving regular files");
     mr_msg(5, "Go, Shorty. It's your birthday.");
-    open_progress_form("Backing up filesystem",
-                       "I am backing up your live filesystem now.",
-                       "Please wait. This may take a couple of hours.",
-                       "Working...",
+    open_progress_form(_("Backing up filesystem"),
+                       _("I am backing up your live filesystem now."),
+                       _("Please wait. This may take a couple of hours."),
+                       _("Working..."),
                        get_last_filelist_number(bkpinfo) + 1);
 
@@ -1519 +1574 @@
             }
             sleep(1);
-        } else
+        } else {
             // store set N
-        {
             sprintf(storing_filelist_fname, FILELIST_FNAME_RAW_SZ,
                     bkpinfo->tmpdir, storing_set_no);
@@ -1552 +1606 @@
                                                        storing_afioball_fname);
                 iamhere("Writing EXAT files");
-                res +=
-                    write_EXAT_files_to_tape(bkpinfo,
-                                             curr_xattr_list_fname,
-                                             curr_acl_list_fname);
-// archives themselves
+                res += write_EXAT_files_to_tape(bkpinfo,
+                                                curr_xattr_list_fname,
+                                                curr_acl_list_fname);
+                // archives themselves
                 res +=
                     move_files_to_stream(bkpinfo, storing_afioball_fname,