Changeset 2211 in MondoRescue for branches/2.2.9/mondo/src/common/libmondo-archive.c

Timestamp:

Jun 3, 2009, 7:10:19 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3089@localhost: bruno | 2009-05-18 06:41:05 +0200

• move call to asprintf to call to mr_asprintf (suppress a compiler warning)
• remove all the most obvious bad call to strcat and replace by mr_strcat as appropriate

File:

• branches/2.2.9/mondo/src/common/libmondo-archive.c (modified) (75 diffs)

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

@@ -12 +12 @@
 
 #include "my-stuff.h"
+#include "mr_mem.h"
 #include "mondostructures.h"
 #include "libmondo-string-EXT.h"
@@ -192 +193 @@
     unsigned int res = 0;
     int tries = 0;
-    char *command;
-    char *zipparams;
-    char *tmp;
+    char *command = NULL;
+    char *tmp = NULL;
     char *p;
 
-    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);
+        paranoid_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)) {
+        paranoid_free(tmp);
         fatal_error("Unable to write tarball to scratchdir");
     }
-
-    sprintf(command, "star H=star list=%s -c " STAR_ACL_SZ " file=%s",
+    paranoid_free(tmp);
+
+    mr_asprintf(&command, "star H=star list=%s -c " STAR_ACL_SZ " file=%s",
             filelist, fname);
     if (bkpinfo->use_lzo) {
@@ -219 +218 @@
     }
     if (bkpinfo->compression_level > 0) {
-        strcat(command, " -bz");
-    }
-    sprintf(command + strlen(command), " 2>> %s", MONDO_LOGFILE);
+        mr_strcat(command, " -bz");
+    }
+    mr_strcat(command, " 2>> %s", MONDO_LOGFILE);
     log_msg(4, "command = '%s'", command);
 
@@ -227 +226 @@
         log_msg(5, "command='%s'", command);
         res = system(command);
-        strcpy(tmp, last_line_of_file(MONDO_LOGFILE));
+        mr_asprintf(&tmp, last_line_of_file(MONDO_LOGFILE));
         log_msg(1, "res=%d; tmp='%s'", res, tmp);
         if (bkpinfo->use_star && (res == 254 || res == 65024)
@@ -235 +234 @@
             res = 0;
         }
+        paranoid_free(tmp);
+
         if (res) {
             log_OS_error(command);
@@ -249 +250 @@
         }
     }
+    paranoid_free(command);
+
     retval += res;
     if (retval) {
@@ -256 +259 @@
                 tries);
     }
-
-    paranoid_free(command);
-    paranoid_free(zipparams);
-    paranoid_free(tmp);
     return (retval);
 }
@@ -294 +293 @@
 
     /*@ buffers ************************************************************ */
-    char *command;
-    char *zipparams;
-    char *tmp;
+    char *command = NULL;
+    char *zipparams = NULL;
+    char *tmp = NULL;
 
     assert(bkpinfo != NULL);
@@ -306 +305 @@
     }
 
-    malloc_string(command);
-    malloc_string(zipparams);
-    malloc_string(tmp);
-
     if (!does_file_exist(filelist)) {
-        sprintf(tmp, "(archive_this_fileset) - filelist %s does not exist",
+        mr_asprintf(&tmp, "(archive_this_fileset) - filelist %s does not exist",
                 filelist);
         log_to_screen(tmp);
+        paranoid_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)) {
+        paranoid_free(tmp);
         fatal_error("Unable to write tarball to scratchdir");
     }
+    paranoid_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,
+        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_strcat(zipparams, " -E %s",tmp);
         } else {
             log_msg(3, "%s not found. Cannot exclude zipfiles, etc.", tmp);
         }
+        paranoid_free(tmp);
     } else {
-        zipparams[0] = '\0';
+        mr_asprintf(&zipparams, "");
     }
 
@@ -347 +345 @@
         fatal_error("scratchdir not found");
     }
-    sprintf(command, "rm -f %s %s. %s.gz %s.%s", fname, fname, fname,
+    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",
+    paranoid_free(command);
+
+    mr_asprintf(&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);
+    paranoid_free(zipparams);
+
+    mr_asprintf(&tmp, "echo hi > %s 2> /dev/null", fname);
     if (system(tmp)) {
+        paranoid_free(tmp);
         fatal_error("Unable to write tarball to scratchdir");
     }
+    paranoid_free(tmp);
 
     for (res = 99, tries = 0; tries < 3 && res != 0; tries++) {
@@ -370 +372 @@
         }
     }
+    paranoid_free(command);
+
     retval += res;
     if (retval) {
@@ -378 +382 @@
     }
 
-    paranoid_free(command);
-    paranoid_free(zipparams);
-    paranoid_free(tmp);
     return (retval);
 }
@@ -511 +512 @@
     char *tmp2 = NULL;
     char *scratchdir;
-    char *command;
+    char *command = NULL;
     char *use_lzo_sz;
     char *use_gzip_sz;
@@ -541 +542 @@
 
     assert(bkpinfo != NULL);
-    command = malloc(1200);
     tmp = malloc(9*MAX_STR_LEN);
     malloc_string(scratchdir);
@@ -803 +803 @@
     }
     if (bkpinfo->backup_media_type == usb) {
-        (void)asprintf(&tmp2, "--usb %s", bkpinfo->media_device);
+        mr_asprintf(&tmp2, "--usb %s", bkpinfo->media_device);
     } else {
-        (void)asprintf(&tmp2," ");
+        mr_asprintf(&tmp2," ");
     }
 
@@ -828 +828 @@
 
     if (g_getfattr) {
-        (void)asprintf(&tmp1, "%s/XATTR", bkpinfo->tmpdir);
+        mr_asprintf(&tmp1, "%s/XATTR", bkpinfo->tmpdir);
         if (write_one_liner_data_file(tmp1, "TRUE")) {
             log_msg(1, "%ld: Unable to write one-liner XATTR",
@@ -836 +836 @@
     }
     if (g_getfacl) {
-        (void)asprintf(&tmp1, "%s/ACL", bkpinfo->tmpdir);
+        mr_asprintf(&tmp1, "%s/ACL", bkpinfo->tmpdir);
         if (write_one_liner_data_file(tmp1, "TRUE")) {
             log_msg(1, "%ld: Unable to write one-liner ACL",
@@ -844 +844 @@
     }
     if (bkpinfo->use_obdr) {
-        (void)asprintf(&tmp1, "%s/OBDR", bkpinfo->tmpdir);
+        mr_asprintf(&tmp1, "%s/OBDR", bkpinfo->tmpdir);
         if (write_one_liner_data_file(tmp1, "TRUE")) {
             log_msg(1, "%ld: Unable to write one-liner OBDR",
@@ -855 +855 @@
         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");
     }
+    paranoid_free(command);
     sprintf(tmp, "BTW, I'm telling Mindi your kernel is '%s'",
             bkpinfo->kernel_path);
@@ -865 +866 @@
     log_msg(1, "lines_in_filelist = %ld", lines_in_filelist);
 
-    sprintf(command,
+    mr_asprintf(&command,
 /*     "mindi --custom 2=%s 3=%s/images 4=\"%s\" 5=\"%s\" \
 6=\"%s\" 7=%ld 8=\"%s\" 9=\"%s\" 10=\"%s\" \
@@ -891 +892 @@
             use_gzip_sz);       // parameter #20 (STRING)
 
-// Watch it! This next line adds a parameter...
     if (bkpinfo->nonbootable_backup) {
-        strcat(command, " NONBOOTABLE");
+        mr_strcat(command, " NONBOOTABLE");
     }
     log_msg(2, command);
@@ -899 +899 @@
 //  popup_and_OK("Pausing");
 
-    res =
-        run_program_and_log_to_screen(command,
-                                      "Generating boot+data disks");
+    res = run_program_and_log_to_screen(command, "Generating boot+data disks");
+    paranoid_free(command);
+
     if (bkpinfo->nonbootable_backup) {
         res = 0;
@@ -907 +907 @@
     if (!res) {
         log_to_screen("Boot+data disks were created OK");
-        sprintf(command, "cp -f %s/images/mindi.iso %s/mondorescue.iso",
+        mr_asprintf(&command, "cp -f %s/images/mindi.iso %s/mondorescue.iso",
                 bkpinfo->scratchdir, MINDI_CACHE);
         log_msg(2, command);
         run_program_and_log_output(command, FALSE);
+        paranoid_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)) {
+                paranoid_free(command);
                 fatal_error("Unable to create temporary all tarball");
             }
+            paranoid_free(command);
         }
         /* For USB we already have everything on the key */
         if (bkpinfo->backup_media_type == usb) {
-            sprintf(command, "rm -rf %s/images", bkpinfo->scratchdir);
+            mr_asprintf(&command, "rm -rf %s/images", bkpinfo->scratchdir);
             run_program_and_log_output(command, FALSE);
+            paranoid_free(command);
         } else {
             sprintf(tmp, "cp -f %s/images/all.tar.gz %s", bkpinfo->scratchdir,
@@ -936 +941 @@
     } else {
         log_to_screen("Mindi failed to create your boot+data disks.");
-        strcpy(command, "grep 'Fatal error' /var/log/mindi.log");
+        mr_asprintf(&command, "grep 'Fatal error' /var/log/mindi.log");
         strcpy(tmp, call_program_and_get_last_line_of_output(command));
+        paranoid_free(command);
+
         if (strlen(tmp) > 1) {
             popup_and_OK(tmp);
@@ -957 +964 @@
     paranoid_free(value);
     paranoid_free(bootdev);
-    paranoid_free(command);
     paranoid_free(use_star_sz);
     return (res);
@@ -1345 +1351 @@
     char *storing_filelist_fname;
     char *storing_afioball_fname;
-    char *tmp;
+    char *tmp = NULL;
     char *media_usage_comment;
     pthread_t archival_thread[ARCH_THREADS];
@@ -1360 +1366 @@
     log_msg(8, "here");
     assert(bkpinfo != NULL);
-    tmp = malloc(MAX_STR_LEN * 2);
     malloc_string(result_str);
     malloc_string(curr_xattr_list_fname);
@@ -1382 +1387 @@
     *p_last_set_archived = -1;
     *p_next_set_to_archive = 0;
-    sprintf(tmp, "%s/archives/filelist.full", bkpinfo->scratchdir);
     log_to_screen("Archiving regular files");
     log_msg(5, "Go, Shorty. It's your birthday.");
@@ -1500 +1504 @@
             update_progress_form(media_usage_comment);
             if (res) {
-                sprintf(tmp,
+                mr_asprintf(&tmp,
                         "Failed to add archive %ld's files to CD dir\n",
                         storing_set_no);
                 log_to_screen(tmp);
+                paranoid_free(tmp);
                 fatal_error
                     ("Is your hard disk full? If not, please send the author the logfile.");
@@ -1513 +1518 @@
     close_progress_form();
 
-    sprintf(tmp, "Your regular files have been archived ");
+    mr_asprintf(&tmp, "Your regular files have been archived ");
     log_msg(2, "Joining background threads to foreground thread");
     for (i = 0; i < noof_threads; i++) {
@@ -1522 +1527 @@
     log_msg(2, "Done.");
     if (retval) {
-        strcat(tmp, "(with errors).");
+        mr_strcat(tmp, "(with errors).");
     } else {
-        strcat(tmp, "successfully.");
+        mr_strcat(tmp, "successfully.");
     }
     log_to_screen(tmp);
+    paranoid_free(tmp);
+
     paranoid_free(transfer_block);
     paranoid_free(result_str);
@@ -1581 +1588 @@
     log_msg(2, "make_usb_fs --- scratchdir=%s", bkpinfo->scratchdir);
     (void) getcwd(old_pwd, MAX_STR_LEN - 1);
-    (void)asprintf(&tmp, "chmod 755 %s", bkpinfo->scratchdir);
+    mr_asprintf(&tmp, "chmod 755 %s", bkpinfo->scratchdir);
     run_program_and_log_output(tmp, FALSE);
     paranoid_free(tmp);
     (void)chdir(bkpinfo->scratchdir);
 
-    (void)asprintf(&message_to_screen, "Copying data to make %s #%d",
+    mr_asprintf(&message_to_screen, "Copying data to make %s #%d",
                 media_descriptor_string(bkpinfo->backup_media_type),
                 g_current_media_number);
     log_msg(1, message_to_screen);
 
-    (void)asprintf(&tmp1, "%s1", bkpinfo->media_device);
+    mr_asprintf(&tmp1, "%s1", bkpinfo->media_device);
     if (is_this_device_mounted(tmp1)) {
         log_msg(1, "USB device mounted. Remounting it at the right place");
-        (void)asprintf(&tmp, "umount %s", tmp1);
+        mr_asprintf(&tmp, "umount %s", tmp1);
         run_program_and_log_output(tmp, FALSE);
         paranoid_free(tmp);
@@ -1601 +1608 @@
 
     log_msg(1, "Mounting USB device.");
-    (void)asprintf(&tmp1, "%s/usb", bkpinfo->tmpdir);
-    (void)asprintf(&tmp, "mkdir -p %s", tmp1);
+    mr_asprintf(&tmp1, "%s/usb", bkpinfo->tmpdir);
+    mr_asprintf(&tmp, "mkdir -p %s", tmp1);
     run_program_and_log_output(tmp, FALSE);
     paranoid_free(tmp);
     /* Mindi always create one single parition on the USB dev */
-    (void)asprintf(&tmp, "mount %s1 %s", bkpinfo->media_device, tmp1);
+    mr_asprintf(&tmp, "mount %s1 %s", bkpinfo->media_device, tmp1);
     run_program_and_log_output(tmp, FALSE);
     paranoid_free(tmp);
@@ -1616 +1623 @@
 
         /* Command to execute */
-        (void)asprintf(&tmp,"mv %s/* %s", bkpinfo->scratchdir, tmp1); 
+        mr_asprintf(&tmp,"mv %s/* %s", bkpinfo->scratchdir, tmp1); 
         res = eval_call_to_make_USB(tmp, message_to_screen);
         if (res) {
-            (void)asprintf(&result_sz, "%s ...failed",tmp);
+            mr_asprintf(&result_sz, "%s ...failed",tmp);
         } else {
-            (void)asprintf(&result_sz, "%s ...OK",tmp);
+            mr_asprintf(&result_sz, "%s ...OK",tmp);
         }
         log_to_screen(result_sz);
@@ -1632 +1639 @@
 
     if (is_this_device_mounted(bkpinfo->media_device)) {
-        (void)asprintf(&tmp, "umount %s1", bkpinfo->media_device);
+        mr_asprintf(&tmp, "umount %s1", bkpinfo->media_device);
         run_program_and_log_output(tmp, FALSE);
         paranoid_free(tmp);
@@ -1672 +1679 @@
     char *tmp;
     char *old_pwd;
-    char *result_sz;
-    char *message_to_screen;
+    char *result_sz = NULL;
+    char *message_to_screen = NULL;
     char *sz_blank_disk;
     char *fnam;
@@ -1681 +1688 @@
 
     malloc_string(old_pwd);
-    malloc_string(result_sz);
-    malloc_string(message_to_screen);
     malloc_string(sz_blank_disk);
     malloc_string(fnam);
@@ -1717 +1722 @@
 
     if (bkpinfo->call_before_iso[0] != '\0') {
-        sprintf(message_to_screen, "Running pre-ISO call for CD#%d",
+        mr_asprintf(&message_to_screen, "Running pre-ISO call for CD#%d",
                 g_current_media_number);
         res =
@@ -1724 +1729 @@
                                   MONDO_LOGFILE, message_to_screen);
         if (res) {
-            strcat(message_to_screen, "...failed");
+            mr_strcat(message_to_screen, "...failed");
         } else {
-            strcat(message_to_screen, "...OK");
+            mr_strcat(message_to_screen, "...OK");
         }
         log_to_screen(message_to_screen);
+        paranoid_free(message_to_screen);
+
         retval += res;
     }
@@ -1735 +1742 @@
         log_msg(2, "bkpinfo->call_make_iso = %s", bkpinfo->call_make_iso);
         sprintf(tmp, "%s/archives/NOT-THE-LAST", bkpinfo->scratchdir);
-        sprintf(message_to_screen, "Making an ISO (%s #%d)",
+        mr_asprintf(&message_to_screen, "Making an ISO (%s #%d)",
                 media_descriptor_string(bkpinfo->backup_media_type),
                 g_current_media_number);
@@ -1830 +1837 @@
             }
         }
+        paranoid_free(message_to_screen);
     } else {
-        sprintf(message_to_screen, "Running mkisofs to make %s #%d",
+        mr_asprintf(&message_to_screen, "Running mkisofs to make %s #%d",
                 media_descriptor_string(bkpinfo->backup_media_type),
                 g_current_media_number);
         log_msg(1, message_to_screen);
-        sprintf(result_sz, "Call to mkisofs to make ISO (%s #%d) ",
+        mr_asprintf(&result_sz, "Call to mkisofs to make ISO (%s #%d) ",
                 media_descriptor_string(bkpinfo->backup_media_type),
                 g_current_media_number);
@@ -1888 +1896 @@
             }
         }
+        paranoid_free(message_to_screen);
+
         if (res) {
-            strcat(result_sz, "...failed");
+            mr_strcat(result_sz, "...failed");
         } else {
-            strcat(result_sz, "...OK");
+            mr_strcat(result_sz, "...OK");
         }
         log_to_screen(result_sz);
+        paranoid_free(result_sz);
         retval += res;
     }
@@ -1910 +1921 @@
     if (bkpinfo->call_burn_iso[0] != '\0') {
         log_msg(2, "bkpinfo->call_burn_iso = %s", bkpinfo->call_burn_iso);
-        sprintf(message_to_screen, "Burning %s #%d",
+        mr_asprintf(&message_to_screen, "Burning %s #%d",
                 media_descriptor_string(bkpinfo->backup_media_type),
                 g_current_media_number);
@@ -1919 +1930 @@
                                   MONDO_LOGFILE, message_to_screen);
         if (res) {
-            strcat(message_to_screen, "...failed");
+            mr_strcat(message_to_screen, "...failed");
         } else {
-            strcat(message_to_screen, "...OK");
+            mr_strcat(message_to_screen, "...OK");
         }
         log_to_screen(message_to_screen);
+        paranoid_free(message_to_screen);
+
         retval += res;
     }
 
     if (bkpinfo->call_after_iso[0] != '\0') {
-        sprintf(message_to_screen, "Running post-ISO call (%s #%d)",
+        mr_asprintf(&message_to_screen, "Running post-ISO call (%s #%d)",
                 media_descriptor_string(bkpinfo->backup_media_type),
                 g_current_media_number);
@@ -1936 +1949 @@
                                   MONDO_LOGFILE, message_to_screen);
         if (res) {
-            strcat(message_to_screen, "...failed");
+            mr_strcat(message_to_screen, "...failed");
         } else {
-            strcat(message_to_screen, "...OK");
+            mr_strcat(message_to_screen, "...OK");
         }
         log_to_screen(message_to_screen);
+        paranoid_free(message_to_screen);
+
         retval += res;
     }
@@ -1949 +1964 @@
     }
     paranoid_free(old_pwd);
-    paranoid_free(result_sz);
-    paranoid_free(message_to_screen);
     paranoid_free(sz_blank_disk);
     paranoid_free(fnam);
@@ -2010 +2023 @@
 
     /*@ buffers ******************************************** */
-    char *tmp;
+    char *tmp = NULL;
     char *bigfile_fname;
     char *sz_devfile;
@@ -2031 +2044 @@
     assert_string_is_neither_NULL_nor_zerolength(biggielist_fname);
 
-    malloc_string(tmp);
     malloc_string(bigfile_fname);
     malloc_string(sz_devfile);
@@ -2047 +2059 @@
         return (0);
     }
-    sprintf(tmp, "I am now backing up all large files.");
+    mr_asprintf(&tmp, "I am now backing up all large files.");
     log_to_screen(tmp);
     noof_biggie_files = count_lines_in_file(biggielist_fname);
@@ -2053 +2065 @@
                        "Please wait. This may take some time.", "",
                        estimated_total_noof_slices);
+    paranoid_free(tmp);
+
     if (!(fin = fopen(biggielist_fname, "r"))) {
         log_OS_error("Unable to openin biggielist");
@@ -2109 +2123 @@
                 }
             }
-// Otherwise, use good old 'dd' and 'bzip2'
+            // Otherwise, use good old 'dd' and 'bzip2'
             else {
                 sz_devfile[0] = '\0';
@@ -2115 +2129 @@
             }
 
-// Whether partition or biggiefile, just do your thang :-)
-            sprintf(tmp, "Bigfile #%ld is '%s' (%ld KB)",
-                    biggie_file_number + 1, bigfile_fname,
-                    (long) biggie_fsize >> 10);
+            // Whether partition or biggiefile, just do your thang :-)
             if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
                 write_header_block_to_stream(biggie_fsize, bigfile_fname,
@@ -2142 +2153 @@
                 p = bigfile_fname;
             }
-            sprintf(tmp, "Archiving %s ... ", bigfile_fname);
+            mr_asprintf(&tmp, "Archiving %s ... ", bigfile_fname);
             if (res) {
-                strcat(tmp, "Failed!");
+                mr_strcat(tmp, "Failed!");
             } else {
-                strcat(tmp, "OK");
+                mr_strcat(tmp, "OK");
             }
             if (delete_when_done) {
@@ -2159 +2170 @@
         }
 #endif
+        paranoid_free(tmp);
     }
     log_msg(1, "Finished backing up bigfiles");
@@ -2165 +2177 @@
     close_progress_form();
     paranoid_fclose(fin);
-    paranoid_free(tmp);
     paranoid_free(bigfile_fname);
     paranoid_free(sz_devfile);
@@ -2191 +2202 @@
     char *curr_xattr_list_fname;
     char *curr_acl_list_fname;
-    char *tmp;
+    char *tmp = NULL;
     char *media_usage_comment;
 
@@ -2199 +2210 @@
     malloc_string(curr_xattr_list_fname);
     malloc_string(curr_acl_list_fname);
-
-    tmp = malloc(MAX_STR_LEN * 2);
-
-    sprintf(tmp, "%s/archives/filelist.full", bkpinfo->scratchdir);
 
     log_to_screen("Archiving regular files");
@@ -2242 +2249 @@
         retval += res;
         if (res) {
-            sprintf(tmp,
+            mr_asprintf(&tmp,
                     "Errors occurred while archiving set %ld. Perhaps your live filesystem changed?",
                     curr_set_no);
             log_to_screen(tmp);
+            paranoid_free(tmp);
         }
 
@@ -2288 +2296 @@
 
         if (res) {
-            sprintf(tmp, "Failed to add archive %ld's files to CD dir\n",
+            mr_asprintf(&tmp, "Failed to add archive %ld's files to CD dir\n",
                     curr_set_no);
             log_to_screen(tmp);
+            paranoid_free(tmp);
             fatal_error
                 ("Is your hard disk is full? If not, please send the author the logfile.");
@@ -2296 +2305 @@
     }
     close_progress_form();
-    sprintf(tmp, "Your regular files have been archived ");
+    mr_asprintf(&tmp, "Your regular files have been archived ");
     if (retval) {
-        strcat(tmp, "(with errors).");
+        mr_strcat(tmp, "(with errors).");
     } else {
-        strcat(tmp, "successfully.");
+        mr_strcat(tmp, "successfully.");
     }
     log_to_screen(tmp);
@@ -2398 +2407 @@
     }
 
-    (void)asprintf(&command, "cp %s/biggielist.txt %s", bkpinfo->tmpdir,
+    mr_asprintf(&command, "cp %s/biggielist.txt %s", bkpinfo->tmpdir,
             biggielist);
     paranoid_system(command);
     paranoid_free(command);
 
-    (void)asprintf(&blah, "biggielist = %s", biggielist);
+    mr_asprintf(&blah, "biggielist = %s", biggielist);
     log_msg(2, blah);
     paranoid_free(blah);
@@ -2413 +2422 @@
     if (g_getfattr) {
         get_fattr_list(biggielist, xattr_fname);
-        (void)asprintf(&command, "cp %s %s/archives/", xattr_fname,
+        mr_asprintf(&command, "cp %s %s/archives/", xattr_fname,
             bkpinfo->scratchdir);
         paranoid_system(command);
@@ -2420 +2429 @@
     if (g_getfacl) {
         get_acl_list(biggielist, acl_fname);
-        (void)asprintf(&command, "cp %s %s/archives/", acl_fname,
+        mr_asprintf(&command, "cp %s %s/archives/", acl_fname,
              bkpinfo->scratchdir);
         paranoid_system(command);
@@ -2428 +2437 @@
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
         res += write_EXAT_files_to_tape(xattr_fname, acl_fname);
-        (void)asprintf(&blah, "%ld", count_lines_in_file(biggielist));
+        mr_asprintf(&blah, "%ld", count_lines_in_file(biggielist));
         write_header_block_to_stream((off_t)0, blah, BLK_START_BIGGIEFILES);
         paranoid_free(blah);
@@ -2954 +2963 @@
 
     /*@ buffers ************************************************** */
-    char *tmp, *checksum_line, *command;
+    char *tmp = NULL;
+    char *checksum_line, *command;
     char *tempblock;
     char *curr_slice_fname_uncompressed;
@@ -2990 +3000 @@
     assert(bkpinfo != NULL);
     assert_string_is_neither_NULL_nor_zerolength(biggie_filename);
-    malloc_string(tmp);
     malloc_string(checksum_line);
     malloc_string(curr_slice_fname_uncompressed);
@@ -3028 +3037 @@
         sprintf(command, "ntfsresize --force --info %s|grep '^You might resize at '|cut -d' ' -f5", biggie_filename);
         log_it("command = %s", command);
-        strcpy (tmp, call_program_and_get_last_line_of_output(command));
+        mr_asprintf(&tmp, call_program_and_get_last_line_of_output(command));
         log_it("res of it = %s", tmp); 
         totallength = (off_t)atoll(tmp);
+        paranoid_free(tmp);
     } else {
         file_to_openin = biggie_filename;
@@ -3057 +3067 @@
     strcpy(biggiestruct.checksum, checksum_line);
 
-    strcpy(tmp, slice_fname(biggie_file_number, 0, bkpinfo->tmpdir, ""));
+    mr_asprintf(&tmp, slice_fname(biggie_file_number, 0, bkpinfo->tmpdir, ""));
     fout = fopen(tmp, "w");
     if (fout == NULL) {
@@ -3065 +3075 @@
         return (1);
     }
+    paranoid_free(tmp);
 
     (void) fwrite((void *) &biggiestruct, 1, sizeof(biggiestruct), fout);
@@ -3075 +3086 @@
     if (!(fin = fopen(file_to_openin, "r"))) {
         log_OS_error("Unable to openin biggie_filename");
-        sprintf(tmp, "Cannot archive bigfile '%s': not found",
-                biggie_filename);
+        mr_asprintf(&tmp, "Cannot archive bigfile '%s': not found", biggie_filename);
         log_to_screen(tmp);
+        paranoid_free(tmp);
+
         paranoid_free(tempblock);
-        paranoid_free(tmp);
         paranoid_free(checksum_line);
         paranoid_free(command);
@@ -3102 +3113 @@
                            suffix));
 
-        strcpy(tmp, percent_media_full_comment());
+        mr_asprintf(&tmp, percent_media_full_comment());
         update_progress_form(tmp);
+        paranoid_free(tmp);
+
         if (!(fout = fopen(curr_slice_fname_uncompressed, "w"))) {
             log_OS_error(curr_slice_fname_uncompressed);
@@ -3156 +3169 @@
             }
             if (res) {
-                sprintf(tmp, "Problem with slice # %ld", slice_num);
+                mr_asprintf(&tmp, "Problem with slice # %ld", slice_num);
             } else {
-                sprintf(tmp,
+                mr_asprintf(&tmp,
                         "%s - Bigfile #%ld, slice #%ld compressed OK          ",
                         biggie_filename, biggie_file_number + 1,
@@ -3173 +3186 @@
             log_msg(2, tmp);
 #endif
+            paranoid_free(tmp);
+
             strcpy(file_to_archive, curr_slice_fname_compressed);
             g_current_progress++;
@@ -3195 +3210 @@
         retval += res;
         if (res) {
-            sprintf(tmp,
+            mr_asprintf(&tmp,
                     "Failed to add slice %ld of bigfile %ld to scratchdir",
                     slice_num, biggie_file_number + 1);
             log_to_screen(tmp);
+            paranoid_free(tmp);
             fatal_error
                 ("Hard disk full. You should have bought a bigger one.");
@@ -3204 +3220 @@
     }
     paranoid_fclose(fin);
-    sprintf(tmp, "Sliced bigfile #%ld", biggie_file_number + 1);
+    mr_asprintf(&tmp, "Sliced bigfile #%ld", biggie_file_number + 1);
     if (retval) {
-        strcat(tmp, "...FAILED");
+        mr_strcat(tmp, "...FAILED");
     } else {
-        strcat(tmp, "...OK!");
+        mr_strcat(tmp, "...OK!");
     }
     log_msg(1, tmp);
+    paranoid_free(tmp);
+
     paranoid_free(tempblock);
-    paranoid_free(tmp);
     paranoid_free(checksum_line);
     paranoid_free(command);