Changeset 2211 in MondoRescue

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

Location:

branches/2.2.9/mondo

Files:

• src/common/libmondo-archive.c (modified) (75 diffs)
• src/common/libmondo-cli.c (modified) (22 diffs)
• src/common/libmondo-devices.c (modified) (12 diffs)
• src/common/libmondo-filelist.c (modified) (13 diffs)
• src/common/libmondo-mountlist.c (modified) (11 diffs)
• src/common/libmondo-raid.c (modified) (8 diffs)
• src/common/libmondo-stream.c (modified) (7 diffs)
• src/common/libmondo-string.c (modified) (3 diffs)
• src/common/libmondo-tools.c (modified) (17 diffs)
• src/common/libmondo-verify.c (modified) (8 diffs)
• src/common/newt-specific.c (modified) (16 diffs)
• src/mondoarchive/Makefile.am (modified) (1 diff)
• src/mondoarchive/mondoarchive.c (modified) (10 diffs)
• src/mondorestore/mondo-prep.c (modified) (29 diffs)
• src/mondorestore/mondo-rstr-compare.c (modified) (15 diffs)
• src/mondorestore/mondo-rstr-newt.c (modified) (4 diffs)
• src/mondorestore/mondo-rstr-tools.c (modified) (27 diffs)
• src/mondorestore/mondorestore.c (modified) (19 diffs)
• test/test-mountlist.c (modified) (3 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);

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

@@ -12 +12 @@
 #include <pthread.h>
 #include "my-stuff.h"
+#include "mr_mem.h"
+#include "mr_string.h"
 #include "mondostructures.h"
 #include "libmondo-cli-EXT.h"
 #include "libmondo.h"
-#include "mr_string.h"
 
 extern int g_loglevel;
@@ -278 +279 @@
     ********/
     /* Get the number of mounted file systems ((those that start with "/dev/" */
-    asprintf(&command, "mount 2>/dev/null | awk '{if($1 ~ \"^/dev/\"){print $0}}'|wc -l");
+    mr_asprintf(&command, "mount 2>/dev/null | awk '{if($1 ~ \"^/dev/\"){print $0}}'|wc -l");
     log_msg(5, "Running: %s", command);
-    asprintf(&mounted_file_system, "%s", call_program_and_get_last_line_of_output(command));
+    mr_asprintf(&mounted_file_system, "%s", call_program_and_get_last_line_of_output(command));
     paranoid_free(command);
 
@@ -288 +289 @@
 
     for (i=mount_cnt; i > 0; i--) {
-        asprintf(&command, "mount 2>/dev/null | awk '{if($1 ~ \"^/dev/\"){print $1,$3}}'|head -n %d", i);
+        mr_asprintf(&command, "mount 2>/dev/null | awk '{if($1 ~ \"^/dev/\"){print $1,$3}}'|head -n %d", i);
         log_msg(5, "Running: %s", command);
-        asprintf(&mounted_file_system, "%s", call_program_and_get_last_line_of_output(command));
+        mr_asprintf(&mounted_file_system, "%s", call_program_and_get_last_line_of_output(command));
         paranoid_free(command);
 
@@ -366 +367 @@
     log_msg(5, "  %s looks like a device special file", dsf);
     /* Verify that the dsf exists */ 
-    asprintf(&command, "ls -al %s 2>/dev/null | wc -l", dsf);
+    mr_asprintf(&command, "ls -al %s 2>/dev/null | wc -l", dsf);
     log_msg(5, "  Executing: %s", command);
-    asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));
+    mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));
     paranoid_free(command);
 
@@ -392 +393 @@
     * Either way, it's an error.
     ********/
-    asprintf(&command, 
+    mr_asprintf(&command, 
       "fdisk -l %s 2>/dev/null|grep -E \"^/dev/\"|awk '{printf(\"%%s \", $1)}END{print \"\"}'", dsf);
     log_msg(4, "Executing: %s", command);
-    asprintf(&partition_list, "%s", call_program_and_get_last_line_of_output(command));
+    mr_asprintf(&partition_list, "%s", call_program_and_get_last_line_of_output(command));
     paranoid_free(command);
     log_msg(4, "Partition list for %s: %s", dsf, partition_list);
@@ -445 +446 @@
         log_msg(4, "Processing partition: %s", partitions[i]);
         /* See if it's swap. If it is, ignore it. */
-        asprintf(&command,
+        mr_asprintf(&command,
           "fdisk -l %s 2>/dev/null | awk '{if(($1==\"%s\")&&(toupper($0) ~ \"SWAP\")){print $1;exit}}'", 
           dsf, partitions[i]);
         log_msg(4, "  Running: %s", command);
-        asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));
+        mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));
         paranoid_free(command);
         log_msg(4, "  Return value: %s", tmp);
@@ -459 +460 @@
         } 
         /* It's not swap. See if we can find the mount point from the mount command. */
-        asprintf(&command, "mount 2>/dev/null | awk '{if((NF>0)&&($1==\"%s\")){print $3}}'", partitions[i]);
-        asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));
+        mr_asprintf(&command, "mount 2>/dev/null | awk '{if((NF>0)&&($1==\"%s\")){print $3}}'", partitions[i]);
+        mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));
         paranoid_free(command);
         if (strlen(tmp)) {
@@ -477 +478 @@
         log_msg(4, "  It's not mounted. Checking to see if it's LVM...");
         /* Get the partition ID; 8e for LVM */
-        asprintf(&command, "fdisk -l %s |awk '{if($1 ~ \"^%s\"){print $5}}'", dsf, partitions[i]);
+        mr_asprintf(&command, "fdisk -l %s |awk '{if($1 ~ \"^%s\"){print $5}}'", dsf, partitions[i]);
         log_msg(4, "  Running: %s", command);
-        asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));
+        mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));
         paranoid_free(command);
         if (strlen(tmp)) {
@@ -486 +487 @@
                 /* It's LVM: Find the VG it's in */
                 log_msg(4, "  It's LVM: Find the VG it's in...");
-                asprintf(&command, "pvdisplay -v %s 2>/dev/null|grep \"VG Name\"|awk '{print $NF}'", partitions[i]);
+                mr_asprintf(&command, "pvdisplay -v %s 2>/dev/null|grep \"VG Name\"|awk '{print $NF}'", partitions[i]);
                 log_msg(4, "  Running: %s", command);
                 strcpy(VG, call_program_and_get_last_line_of_output(command));
@@ -494 +495 @@
                     /* Found the Volume Group. Now find all of the VG's mount points */
                     log_msg(4, "  Found the Volume Group. Now find all of the VG's mount points");
-                    asprintf(&command, 
+                    mr_asprintf(&command, 
                       "mount 2>/dev/null|grep -E \"/dev/mapper/%s-|/dev/%s/\"|awk '{printf(\"%%s \",$3)}END{print \"\"}'", 
                       VG, VG);
                     log_msg(4, "  Running: %s", command);
-                    asprintf(&mount_list, "%s", call_program_and_get_last_line_of_output(command));
+                    mr_asprintf(&mount_list, "%s", call_program_and_get_last_line_of_output(command));
                     paranoid_free(command);
                     log_msg(4, "  VG %s mount_list: %s", VG, mount_list);
@@ -516 +517 @@
                      *******/
                     paranoid_free(mount_list);
-                    asprintf(&command, "%s",
+                    mr_asprintf(&command, "%s",
                         "cat /proc/mdstat|grep -iv Personal|awk '{if($0~\"^.*[ ]+:\"){printf(\"/dev/%s \", $1)}}END{print \"\"}'");
                     log_msg (5, "Running: %s", command);
-                    asprintf(&mount_list, "%s", call_program_and_get_last_line_of_output(command));
+                    mr_asprintf(&mount_list, "%s", call_program_and_get_last_line_of_output(command));
                     paranoid_free(command);
                     log_msg(4, "  Software raid device list: %s", mount_list);   
                     lastpos = 0;
                     while ((token = mr_strtok(mount_list, token_chars, &lastpos)) != NULL) {
-                        asprintf(&command, "mdadm --detail %s 2>/dev/null | grep -c %s", token, VG); 
+                        mr_asprintf(&command, "mdadm --detail %s 2>/dev/null | grep -c %s", token, VG); 
                         log_msg (5, "Running: %s", command);
                         paranoid_free(tmp);
-                        asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));
+                        mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));
                         paranoid_free(command);
                         log_msg(4, "Number of Software raid device: %s", tmp);
@@ -557 +558 @@
          ********/
         log_msg (5, "It's not swap, mounted, or LVM. See if it's used in a software raid device.");
-        asprintf(&command, "mdadm --examine %s 2>/dev/null | awk '{if($1 == \"UUID\"){print $3}}'", partitions[i]);
+        mr_asprintf(&command, "mdadm --examine %s 2>/dev/null | awk '{if($1 == \"UUID\"){print $3}}'", partitions[i]);
         log_msg(4, "  Running: %s", command);
-        asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));
+        mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));
         paranoid_free(command);
         if (!strlen(tmp)) {
@@ -568 +569 @@
         log_msg (5, "  UUID: %s", tmp);
         /* Get the Software raid device list */
-        asprintf(&command, "%s",
+        mr_asprintf(&command, "%s",
          "cat /proc/mdstat|grep -iv Personal|awk '{if($0~\"^.*[ ]+:\"){printf(\"/dev/%s \", $1)}}END{print \"\"}'");
         log_msg (5, "  Running: %s", command);
-        asprintf(&mount_list, "%s", call_program_and_get_last_line_of_output(command));
+        mr_asprintf(&mount_list, "%s", call_program_and_get_last_line_of_output(command));
         paranoid_free(command);
         log_msg(4, "  Software raid device list: %s", mount_list);   
@@ -577 +578 @@
         lastpos = 0;
         while ((token = mr_strtok(mount_list, token_chars, &lastpos)) != NULL) {
-            asprintf(&command, "mdadm --detail %s 2>/dev/null | grep -c %s", token, tmp);
+            mr_asprintf(&command, "mdadm --detail %s 2>/dev/null | grep -c %s", token, tmp);
             log_msg(4, "  Running: %s", command);
             paranoid_free(tmp);
-            asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));
+            mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));
             paranoid_free(command);
             if (!atoi(tmp)) {
@@ -756 +757 @@
         }
         
-        asprintf(&tmp1, "%s", flag_val['I']);
+        mr_asprintf(&tmp1, "%s", flag_val['I']);
         p = tmp1;
         q = tmp1;
@@ -1035 +1036 @@
     if (flag_set['z']) {
         if (find_home_of_exe("getfattr")) {
-            asprintf(&g_getfattr,"getfattr");
+            mr_asprintf(&g_getfattr,"getfattr");
         }
         if (find_home_of_exe("getfacl")) {
-            asprintf(&g_getfacl,"getfacl");
+            mr_asprintf(&g_getfacl,"getfacl");
         }
     }
@@ -1055 +1056 @@
             strcat(bkpinfo->exclude_paths, " ");
         }
-        asprintf(&tmp1, "%s", flag_val['E']);
+        mr_asprintf(&tmp1, "%s", flag_val['E']);
 
         p = tmp1;
@@ -1211 +1212 @@
 
     if ((flag_set['n']) && (! bkpinfo->restore_data)) {
-        asprintf(&tmp1,"%s/%s/.dummy.txt", bkpinfo->isodir,bkpinfo->nfs_remote_dir);
+        mr_asprintf(&tmp1,"%s/%s/.dummy.txt", bkpinfo->isodir,bkpinfo->nfs_remote_dir);
         sprintf(tmp, "echo hi > %s", tmp1);
         if (run_program_and_log_output(tmp, 2)) {
@@ -1467 +1468 @@
             if (flag_set[optopt]) {
                 bad_switches = TRUE;
-                (void) asprintf(&tmp, "Switch -%c previously defined as %s\n", opt,
+                mr_asprintf(&tmp, "Switch -%c previously defined as %s\n", opt,
                         flag_val[i]);
                 log_to_screen(tmp);
@@ -1484 +1485 @@
                         if (strchr(flag_val[opt], '/')
                             && flag_val[opt][0] != '/') {
-                            (void)asprintf(&tmp,
+                            mr_asprintf(&tmp,
                                     "-%c flag --- must be absolute path --- '%s' isn't absolute",
                                     opt, flag_val[opt]);
@@ -1499 +1500 @@
     for (i = optind; i < argc; i++) {
         bad_switches = TRUE;
-        (void)asprintf(&tmp, "Invalid arg -- %s\n", argv[i]);
+        mr_asprintf(&tmp, "Invalid arg -- %s\n", argv[i]);
         log_to_screen(tmp);
         paranoid_free(tmp);
@@ -1525 +1526 @@
 void terminate_daemon(int sig)
 {
-    char tmp[64];
-    char tmp2[MAX_STR_LEN];
-    //  char command[512];
-    //  pid_t pid;
+    char *tmp = NULL;
+    char *tmp2 = NULL;
 
     switch (sig) {
     case SIGINT:
-        sprintf(tmp, "SIGINT");
-        strcpy(tmp2, "You interrupted me :-)");
+        mr_asprintf(&tmp, "SIGINT");
+        mr_asprintf(&tmp2, "You interrupted me :-)");
         break;
     case SIGKILL:
-        sprintf(tmp, "SIGKILL");
-        strcpy(tmp2,
+        mr_asprintf(&tmp, "SIGKILL");
+        mr_asprintf(&tmp2,
                "I seriously have no clue how this signal even got to me. Something's wrong with your system.");
         break;
     case SIGTERM:
-        sprintf(tmp, "SIGTERM");
-        strcpy(tmp2, "Got terminate signal");
+        mr_asprintf(&tmp, "SIGTERM");
+        mr_asprintf(&tmp2, "Got terminate signal");
         break;
     case SIGHUP:
-        sprintf(tmp, "SIGHUP");
-        strcpy(tmp2, "Hangup on line");
+        mr_asprintf(&tmp, "SIGHUP");
+        mr_asprintf(&tmp2, "Hangup on line");
         break;
     case SIGSEGV:
-        sprintf(tmp, "SIGSEGV");
-        strcpy(tmp2,
+        mr_asprintf(&tmp, "SIGSEGV");
+        mr_asprintf(&tmp2,
                "Internal programming error. Please send a backtrace as well as your log.");
         break;
     case SIGPIPE:
-        sprintf(tmp, "SIGPIPE");
-        strcpy(tmp2, "Pipe was broken");
+        mr_asprintf(&tmp, "SIGPIPE");
+        mr_asprintf(&tmp2, "Pipe was broken");
         break;
     case SIGABRT:
-        sprintf(tmp, "SIGABRT");
-        sprintf(tmp2,
+        mr_asprintf(&tmp, "SIGABRT");
+        mr_asprintf(&tmp2,
                 "Abort - probably failed assertion. I'm sleeping for a few seconds so you can read the message.");
         break;
     default:
-        sprintf(tmp, "(Unknown)");
-    }
-
-    strcat(tmp, " signal received from OS");
+        mr_asprintf(&tmp, "(Unknown)");
+        mr_asprintf(&tmp2, "(Unknown)");
+    }
+
+    mr_strcat(tmp, " signal received from OS");
     log_to_screen(tmp);
+    paranoid_free(tmp);
+
     log_to_screen(tmp2);
+    paranoid_free(tmp2);
     if (sig == SIGABRT) {
         sleep(10);

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

@@ -9 +9 @@
 
 #include "my-stuff.h"
+#include "mr_mem.h"
 #include "mondostructures.h"
 #include "libmondo-files-EXT.h"
@@ -327 +328 @@
     char *program;
     char *incoming;
-    char *searchstr;
+    char *searchstr = NULL;
     char *tmp;
 
@@ -1040 +1041 @@
 bool is_this_a_valid_disk_format(char *format)
 {
-    char *good_formats;
+    char *good_formats = NULL;
     char *command;
     char *format_sz;
@@ -1288 +1289 @@
 {
     /*@ buffer ****************************************************** */
-    char *command;
-    char *dev;
-    char *options;
+    char *command = NULL;
     int retval;
 
-    malloc_string(command);
-    malloc_string(dev);
-    malloc_string(options);
     assert_string_is_neither_NULL_nor_zerolength(device);
     assert_string_is_neither_NULL_nor_zerolength(mountpoint);
 
     make_hole_for_dir(mountpoint);
-    strcpy(options, "ro");
+
+#ifndef __FreeBSD__
+    char *dev = NULL;
+    char *options = NULL;
+    mr_asprintf(&options, "ro");
+#endif
+
     if (isdigit(device[0])) {
         find_cdrom_device(device, FALSE);
-    } else {
-        strcpy(dev, device);
     }
     if (g_ISO_restore_mode) {
 
 #ifdef __FreeBSD__
-        strcpy(dev, make_vn(device));
+        mr_asprintf(&dev, make_vn(device));
         if (!dev) {
-            sprintf(command, "Unable to mount ISO (make_vn(%s) failed)",
-                    device);
+            mr_asprintf(&command, "Unable to mount ISO (make_vn(%s) failed)", device);
             fatal_error(command);
         }
         strcpy(device, dev);
+        paranoid_free(dev);
 #else
-        strcat(options, ",loop");
+        mr_strcat(options, ",loop");
 #endif
 
@@ -1326 +1326 @@
 
 #ifdef __FreeBSD__
-    sprintf(command, "mount_cd9660 -r %s %s 2>> %s",
+    mr_asprintf(&command, "mount_cd9660 -r %s %s 2>> %s",
             device, mountpoint, MONDO_LOGFILE);
 
 #else
-    sprintf(command, "mount %s -o %s -t iso9660 %s 2>> %s",
+    mr_asprintf(&command, "mount %s -o %s -t iso9660 %s 2>> %s",
             device, options, mountpoint, MONDO_LOGFILE);
+    paranoid_free(options);
 #endif
 
@@ -1340 +1341 @@
     retval = system(command);
     log_msg(1, "system(%s) returned %d", command, retval);
-
     paranoid_free(command);
-    paranoid_free(dev);
-    paranoid_free(options);
+
     return (retval);
 }
@@ -2183 +2182 @@
 void sensibly_set_tmpdir_and_scratchdir()
 {
-    char *tmp, *command, *sz;
-
-    malloc_string(tmp);
+    char *tmp = NULL; 
+    char *command, *sz;
+
     malloc_string(command);
     malloc_string(sz);
@@ -2191 +2190 @@
 
 #ifdef __FreeBSD__
-    strcpy(tmp,
+    mr_asprintf(&tmp,
            call_program_and_get_last_line_of_output
            ("LANGUAGE=C df -m -P -t nonfs,msdosfs,ntfs,ntfs-3g,smbfs,smb,cifs,afs,gfs,ocfs,ocfs2,mvfs,nsspool,nssvol | tr -s '\t' ' ' | grep -vE \"none|Filesystem\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
 #else
-    strcpy(tmp,
+    mr_asprintf(&tmp,
            call_program_and_get_last_line_of_output
            ("LANGUAGE=C df -m -P -x nfs -x nfs4 -x vfat -x ntfs -x ntfs-3g -x smbfs -x smb -x cifs -x afs -x gfs -x ocfs -x ocfs2 -x mvfs -x nsspool -x nssvol -x iso9660| sed 's/                  /devdev/' | tr -s '\t' ' ' | grep -vE \"none|Filesystem|/dev/shm\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
@@ -2202 +2201 @@
     if (tmp[0] != '/') {
         strcpy(sz, tmp);
-        strcpy(tmp, "/");
-        strcat(tmp, sz);
+        paranoid_free(tmp);
+        mr_asprintf(&tmp, "/%s", sz);
     }
     if (!tmp[0]) {
@@ -2216 +2215 @@
 
     sprintf(command, "rm -Rf %s/tmp.mondo.* %s/mondo.scratch.*", tmp, tmp);
+    paranoid_free(tmp);
+
     paranoid_system(command);
-    paranoid_free(tmp);
     paranoid_free(command);
     paranoid_free(sz);
@@ -2282 +2282 @@
 {
     int cd_number = -1;
-    char *mountdev;
-    char *tmp;
-
-    malloc_string(mountdev);
-    malloc_string(tmp);
+    char *mountdev = NULL;
+    char *tmp = NULL;
+
     assert(bkpinfo != NULL);
 //  log_it("Asking what_number_cd_is_this");
     if (g_ISO_restore_mode) {
-        sprintf(tmp, "mount | grep iso9660 | awk '{print $3;}'");
-//      log_it("tmp = %s", tmp);
-
-        strcpy(mountdev, call_program_and_get_last_line_of_output(tmp));
-        strcat(mountdev, "/archives/THIS-CD-NUMBER");
-//      log_it("mountdev = %s", mountdev);
+        mr_asprintf(&tmp, "mount | grep iso9660 | awk '{print $3;}'");
+
+        mr_asprintf(&mountdev, "%s%s", call_program_and_get_last_line_of_output(tmp), "/archives/THIS-CD-NUMBER");
         cd_number = atoi(last_line_of_file(mountdev));
-//      log_it("cd_number = %d", cd_number);
         paranoid_free(mountdev);
         paranoid_free(tmp);
+
         return (cd_number);
     }
 
-    strcpy(mountdev, bkpinfo->media_device);
+    mr_asprintf(&mountdev, bkpinfo->media_device);
     if (!mountdev[0]) {
         log_it
@@ -2316 +2311 @@
         }
     }
-    cd_number =
-        atoi(last_line_of_file(MNT_CDROM "/archives/THIS-CD-NUMBER"));
-//  log_it("cd_number..later.. = %d", cd_number);
     paranoid_free(mountdev);
-    paranoid_free(tmp);
+
+    cd_number = atoi(last_line_of_file(MNT_CDROM "/archives/THIS-CD-NUMBER"));
     return (cd_number);
 }

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

@@ -18 +18 @@
 #include "libmondo-tools-EXT.h"
 #include "mr_string.h"
+#include "mr_mem.h"
 
 #include <time.h>
@@ -484 +485 @@
         log_msg(8, "Analyzing %s", file_to_analyze);
         tmp = mr_stresc(file_to_analyze, "`$\\\"(){}[]'*?&|!#~", '\\');
-        (void)asprintf(&strtmp, syscall_sprintf, tmp);
+        mr_asprintf(&strtmp, syscall_sprintf, tmp);
         paranoid_free(tmp);
-        (void)asprintf(&syscall, "%s 2>> /dev/null", strtmp);   // " MONDO_LOGFILE);
+        mr_asprintf(&syscall, "%s 2>> /dev/null", strtmp);  // " MONDO_LOGFILE);
         paranoid_free(strtmp);
         call_exe_and_pipe_output_to_fd(syscall, pout);
@@ -1389 +1390 @@
         malloc_string(name_of_evalcall_form);
         malloc_string(find_skeleton_marker);
-        (void)asprintf(&find_excludes, " ");
+        mr_asprintf(&find_excludes, " ");
         while((token = mr_strtok (sth, delims, &lastpos))) {
-          (void)asprintf(&strtmp,"%s", find_excludes);
+          mr_asprintf(&strtmp,"%s", find_excludes);
           paranoid_free(find_excludes);
-          (void)asprintf(&find_excludes,"%s -path %s -prune -o", strtmp, token);
+          mr_asprintf(&find_excludes,"%s -path %s -prune -o", strtmp, token);
           paranoid_free(strtmp);
           paranoid_free(token);
@@ -1399 +1400 @@
 #if linux
         // 2.6 has /sys as a proc-type thing -- must be excluded
-        (void)asprintf(&strtmp,
+        mr_asprintf(&strtmp,
              "find '%s' -fstype mvfs -prune -o -fstype devpts -prune -o -fstype tmpfs -prune -o -fstype proc -prune -o -fstype sysfs -prune -o %s -type d -print > %s 2> /dev/null",
              dir, find_excludes, g_skeleton_filelist);
 #else
         // On BSD, for example, /sys is the kernel sources -- don't exclude
-        (void)asprintf(&strtmp,
+        mr_asprintf(&strtmp,
              "find '%s' -fstype mvfs -prune -o -path /proc -prune -o %s -type d -print > %s 2> /dev/null",
                 dir, find_excludes, g_skeleton_filelist);
@@ -1412 +1413 @@
         (void)system(strtmp);
         paranoid_free(strtmp);
-        (void)asprintf(&tmp, "wc -l %s | awk '{print $1;}'", g_skeleton_filelist);
+        mr_asprintf(&tmp, "wc -l %s | awk '{print $1;}'", g_skeleton_filelist);
         g_skeleton_entries =
             1 + atol(call_program_and_get_last_line_of_output(tmp));
@@ -1442 +1443 @@
 #ifndef _XWIN
                 if (!g_text_mode) {
-                    (void)asprintf(&tmp, "Reading %-68s", dir);
+                    mr_asprintf(&tmp, "Reading %-68s", dir);
                     newtDrawRootText(0, g_noof_rows - 3, tmp);
                     paranoid_free(tmp);
@@ -1456 +1457 @@
 //  log_msg(0, "Cataloguing %s", dir);
     if (sth[0] == ' ') {
-        (void)asprintf(&skip_these, "%s", sth);
+        mr_asprintf(&skip_these, "%s", sth);
     } else {
-        (void)asprintf(&skip_these, " %s ", sth);
-    }
-    (void)asprintf(&new_with_spaces, " %s ", dir);
+        mr_asprintf(&skip_these, " %s ", sth);
+    }
+    mr_asprintf(&new_with_spaces, " %s ", dir);
     if ((dip = opendir(dir)) == NULL) {
-        (void)asprintf(&tmp,"opendir %s", dir);
+        mr_asprintf(&tmp,"opendir %s", dir);
         log_OS_error(tmp);
         paranoid_free(tmp);
@@ -1472 +1473 @@
             i++;
             if (strcmp(dir, "/")) {
-                (void)asprintf(&new,"%s/%s",dir,dit->d_name);
+                mr_asprintf(&new,"%s/%s",dir,dit->d_name);
             } else {
-                (void)asprintf(&new,"%s%s",dir,dit->d_name);
+                mr_asprintf(&new,"%s%s",dir,dit->d_name);
             }
             paranoid_free(new_with_spaces);
-            (void)asprintf(&new_with_spaces, " %s ", new);
+            mr_asprintf(&new_with_spaces, " %s ", new);
             if (strstr(skip_these, new_with_spaces)) {
                 fprintf(fout, "%s\n", new);
@@ -1496 +1497 @@
                                 counter = 0;
                                 uberctr++;
-                                (void)asprintf(&tmp, " %c ",
+                                mr_asprintf(&tmp, " %c ",
                                         special_dot_char(uberctr));
 #ifndef _XWIN
@@ -1550 +1551 @@
     bool in_quotes = FALSE;
 
-    (void)asprintf(&sz_res, "%s", incoming);
+    mr_asprintf(&sz_res, "%s", incoming);
     p = sz_res;
     while ((*p != ' ' || in_quotes) && *p != '\0') {
@@ -1598 +1599 @@
         fatal_error("Cannot malloc exclude_paths");
     }
-    (void)asprintf(&sz_datefile,MONDO_CACHE"/difflevel.%d" , 0);
+    mr_asprintf(&sz_datefile,MONDO_CACHE"/difflevel.%d" , 0);
     if (!include_paths && !userdef_filelist) {
         fatal_error
@@ -1606 +1607 @@
     sprintf(command, "mkdir -p %s/archives", scratchdir);
     paranoid_system(command);
-    (void)asprintf(&sz_filelist, "%s/tmpfs/filelist.full", tmpdir);
+    mr_asprintf(&sz_filelist, "%s/tmpfs/filelist.full", tmpdir);
     make_hole_for_file(sz_filelist);
 
@@ -1646 +1647 @@
         log_msg(2, "include_paths = '%s'", include_paths);
         log_msg(1, "Calculating filelist");
-        (void)asprintf(&tmp2, "%s", call_program_and_get_last_line_of_output("mount | grep -Ew 'ntfs|ntfs-3g|fat|vfat|dos' | awk '{print $3}'"));
+        mr_asprintf(&tmp2, "%s", call_program_and_get_last_line_of_output("mount | grep -Ew 'ntfs|ntfs-3g|fat|vfat|dos' | awk '{print $3}'"));
         if (strlen(tmp2) < 1) {
-            (void)asprintf(&tmp1," ");
+            mr_asprintf(&tmp1," ");
         } else {
             log_msg(2, "Found windows FS: %s",tmp2);
-            (void)asprintf(&tmp1, "find %s -name '/win386.swp' -o -name '/hiberfil.sys' -o -name '/pagefile.sys' 2> /dev/null\n",tmp2);
+            mr_asprintf(&tmp1, "find %s -name '/win386.swp' -o -name '/hiberfil.sys' -o -name '/pagefile.sys' 2> /dev/null\n",tmp2);
             paranoid_free(tmp2);
-            (void)asprintf(&tmp2, "%s", call_program_and_get_last_line_of_output(tmp1));
+            mr_asprintf(&tmp2, "%s", call_program_and_get_last_line_of_output(tmp1));
             log_msg(2, "Found windows files: %s",tmp2);
         }

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

@@ -74 +74 @@
     prev_part_no = 0;
     tmp[0] = '\0';
-    asprintf(&flaws_str, "%s", "");
+    mr_asprintf(&flaws_str, "%s", "");
 
 
@@ -363 +363 @@
     assert_string_is_neither_NULL_nor_zerolength(drive);
     assert(mountlist != NULL);
-    asprintf(&flaws_str, "%s", "");
+    mr_asprintf(&flaws_str, "%s", "");
 
     malloc_string(tmp);
@@ -522 +522 @@
     assert(flaws_str_C != NULL);
 
-    asprintf(&flaws_str, "%s", "");
+    mr_asprintf(&flaws_str, "%s", "");
 
     make_list_of_drives_in_mountlist(mountlist, drivelist);
@@ -532 +532 @@
             (drivelist->el[i].device,
              DONT_KNOW_HOW_TO_EVALUATE_THIS_DEVICE_TYPE)) {
-            asprintf(&tmp, " Not evaluating %s (I don't know how yet)",
+            mr_asprintf(&tmp, " Not evaluating %s (I don't know how yet)",
                     drivelist->el[i].device);
             log_it(tmp);
@@ -606 +606 @@
 
     for (currline = 0; currline < mountlist->entries; currline++) {
-        asprintf(&curr_mountpoint, "%s", mountlist->el[currline].mountpoint);
+        mr_asprintf(&curr_mountpoint, "%s", mountlist->el[currline].mountpoint);
         for (i = 0, copies = 0, last_copy = -1; i < mountlist->entries;
              i++) {
@@ -618 +618 @@
         if (copies > 1 && last_copy == currline
             && strcmp(curr_mountpoint, "raid")) {
-            asprintf(&tmp, " %s %s's.", number_to_text(copies),
+            mr_asprintf(&tmp, " %s %s's.", number_to_text(copies),
                     curr_mountpoint);
             mr_strcat(flaws_str, "%s", tmp);
@@ -657 +657 @@
     for (lino = 0, noof_drives = 0; lino < mountlist->entries; lino++) {
 
-        asprintf(&drive, "%s", mountlist->el[lino].device);
+        mr_asprintf(&drive, "%s", mountlist->el[lino].device);
         if (!strncmp(drive, RAID_DEVICE_STUB, strlen(RAID_DEVICE_STUB))) {
             log_msg(8, "Not putting %s in list of drives: it's a virtual drive", drive);
@@ -733 +733 @@
                        (void *) &mountlist->el[i],
                        sizeof(struct mountlist_line));
-                asprintf(&tmp,
+                mr_asprintf(&tmp,
                          "%s is available; user may choose to add it to raid device",
                          output_list->el[items - 1].device);
@@ -853 +853 @@
             if (j < items) {
                 strcat(mountlist->el[items].device, "_dup");
-                asprintf(&tmp,
+                mr_asprintf(&tmp,
                          "Duplicate entry in mountlist - renaming to %s",
                          mountlist->el[items].device);
@@ -859 +859 @@
                 paranoid_free(tmp);
             }
-            asprintf(&tmp, "%s", mountlist->el[items].device);
+            mr_asprintf(&tmp, "%s", mountlist->el[items].device);
             if (strstr(tmp, "/dev/md/")) {
                 log_it("format_device() --- Contracting %s", tmp);
@@ -1008 +1008 @@
     assert(b >= 0);
 
-    asprintf(&device, "%s", mountlist->el[a].device);
-    asprintf(&mountpoint, "%s", mountlist->el[a].mountpoint);
-    asprintf(&format, "%s", mountlist->el[a].format);
+    mr_asprintf(&device, "%s", mountlist->el[a].device);
+    mr_asprintf(&mountpoint, "%s", mountlist->el[a].mountpoint);
+    mr_asprintf(&format, "%s", mountlist->el[a].format);
 
     size = mountlist->el[a].size;

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

@@ -1 +1 @@
 /* libmondo-raid.c                                                subroutines for handling RAID
    $Id$
-.
-
-
-06/29
-- added create_raidtab_from_mdstat()
-- changed char[MAX_STR_LEN] to char*
-
-10/21/2003
-- get_next_raidtab_line() --- correctly handle multiple spaces
-  between label and value
-
-07/03
-- line 447 - changed assert()
-
-05/08
-- cleaned up some FreeBSd-specific stuff
-
-05/05
-- added Joshua Oreman's FreeBSD patches
-
-04/25
-- added a bunch of RAID utilities from mondorestore/mondo-restore.c
-
-04/24/2003
-- added some assert()'s and log_OS_error()'s
-
-10/19/2002
-- added some comments
-
-07/24
-- created
 */
 
@@ -49 +18 @@
 #include "libmondo-raid.h"
 #include "mr_string.h"
+#include "mr_mem.h"
 
 #ifdef __FreeBSD__
@@ -77 +47 @@
 #else
     /*@ buffer ********************************************************** */
-    char *command;
+    char *command = NULL;
     int res;
 
-    command = malloc(MAX_STR_LEN * 2);
-    strcpy(command, "grep \"");
+    mr_asprintf(&command, "grep \"");
     if (raidno == -1) {
-        strcat(command, "linear");
+        mr_strcat(command, "linear");
     } else {
-        sprintf(command + strlen(command), "raid%d", raidno);
-    }
-    strcat(command, "\" /proc/mdstat > /dev/null 2> /dev/null");
+        mr_strcat(command, "raid%d", raidno);
+    }
+    mr_strcat(command, "\" /proc/mdstat > /dev/null 2> /dev/null");
     log_it("Is raid %d registered? Command = '%s'", raidno, command);
     res = system(command);
     paranoid_free(command);
+
     if (res) {
         return (FALSE);
@@ -1043 +1013 @@
     pos = string;
     while (*pos == ' ') pos += 1;
-    asprintf(&strtmp, "%s", pos);
+    mr_asprintf(&strtmp, "%s", pos);
     strcpy(string, strtmp);
     paranoid_free(strtmp);
@@ -1064 +1034 @@
     token = mr_strtok (string, delims, &lastpos);
     // get RAID device name
-    asprintf(&strtmp,"%s%s", device_prefix, token);
+    mr_asprintf(&strtmp,"%s%s", device_prefix, token);
     strcpy(raidlist->el[raidlist->entries].raid_device, strtmp);
     paranoid_free(strtmp);
@@ -1123 +1093 @@
       case ' ': // normal data disks
         raidlist->el[raidlist->entries].data_disks.el[raidlist->el[raidlist->entries].data_disks.entries].index = atoi(pos + 1);
-        asprintf(&strtmp,"%s%s", device_prefix, token);
+        mr_asprintf(&strtmp,"%s%s", device_prefix, token);
         strcpy(raidlist->el[raidlist->entries].data_disks.el[raidlist->el[raidlist->entries].data_disks.entries].device, strtmp);
         paranoid_free(strtmp);
@@ -1130 +1100 @@
       case 'S': // spare disks
         raidlist->el[raidlist->entries].spare_disks.el[raidlist->el[raidlist->entries].spare_disks.entries].index = atoi(pos + 1);
-        asprintf(&strtmp,"%s%s", device_prefix, token);
+        mr_asprintf(&strtmp,"%s%s", device_prefix, token);
         strcpy(raidlist->el[raidlist->entries].spare_disks.el[raidlist->el[raidlist->entries].spare_disks.entries].device, strtmp);
         paranoid_free(strtmp);
@@ -1137 +1107 @@
       case 'F': // failed disks
         raidlist->el[raidlist->entries].failed_disks.el[raidlist->el[raidlist->entries].failed_disks.entries].index = atoi(pos + 1);
-        asprintf(&strtmp,"%s%s", device_prefix, token);
+        mr_asprintf(&strtmp,"%s%s", device_prefix, token);
         strcpy(raidlist->el[raidlist->entries].failed_disks.el[raidlist->el[raidlist->entries].failed_disks.entries].device, strtmp);
         paranoid_free(strtmp);

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

@@ -13 +13 @@
 
 #include "my-stuff.h"
+#include "mr_mem.h"
 #include "mondostructures.h"
 #include "libmondo-devices.h"
@@ -369 +370 @@
         }
         if (strstr(fname, "xattr") == NULL) {
-            asprintf(&tmp,"Wrong order expected xattr, got %s, sunshine.", fname);
+            mr_asprintf(&tmp,"Wrong order expected xattr, got %s, sunshine.", fname);
             fatal_error(tmp);
         }
@@ -399 +400 @@
         }
         if (strstr(fname, "acl") == NULL) {
-            asprintf(&tmp,"Wrong order expected acl, got %s, sunshine.", fname);
+            mr_asprintf(&tmp,"Wrong order expected acl, got %s, sunshine.", fname);
             fatal_error(tmp);
         }
@@ -682 +683 @@
 
     log_it("Skipping OBDR headers");
-    asprintf(&command, "mt -f %s rewind",bkpinfo->media_device);
+    mr_asprintf(&command, "mt -f %s rewind",bkpinfo->media_device);
     res = run_program_and_log_output(command, 1);
     paranoid_free(command);
 
-    asprintf(&command, "mt -f %s fsf 2",bkpinfo->media_device);
+    mr_asprintf(&command, "mt -f %s fsf 2",bkpinfo->media_device);
     res = run_program_and_log_output(command, 1);
     paranoid_free(command);
@@ -709 +710 @@
     log_it("Creating OBDR headers");
     /* OBDR: First block 10 kB of zero bs = 512 */
-    asprintf(&command, "mt -f %s compression off",bkpinfo->media_device);
+    mr_asprintf(&command, "mt -f %s compression off",bkpinfo->media_device);
     res = run_program_and_log_output(command, 1);
     paranoid_free(command);
 
-    asprintf(&command, "mt -f %s rewind",bkpinfo->media_device);
+    mr_asprintf(&command, "mt -f %s rewind",bkpinfo->media_device);
     res += run_program_and_log_output(command, 1);
     paranoid_free(command);
@@ -719 +720 @@
     set_tape_block_size_with_mt(512);
 
-    asprintf(&command, "dd if=/dev/zero of=%s bs=512 count=20",bkpinfo->media_device);
+    mr_asprintf(&command, "dd if=/dev/zero of=%s bs=512 count=20",bkpinfo->media_device);
     res += run_program_and_log_output(command, 1);
     paranoid_free(command);
@@ -726 +727 @@
     set_tape_block_size_with_mt(2048);
 
-    asprintf(&command, "dd if=%s of=%s bs=2048",MINDI_CACHE"/mondorescue.iso",bkpinfo->media_device);
+    mr_asprintf(&command, "dd if=%s of=%s bs=2048",MINDI_CACHE"/mondorescue.iso",bkpinfo->media_device);
     res += run_program_and_log_output(command, 1);
     paranoid_free(command);

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

@@ -8 +8 @@
 
 #include "my-stuff.h"
+#include "mr_mem.h"
 #include "mondostructures.h"
 #include "libmondo-string.h"
@@ -630 +631 @@
     if (strlen(flaws_str) > 0) {
         paranoid_free(flaws_str_A);
-        asprintf(&flaws_str_A, "%s", flaws_str + 1);
+        mr_asprintf(&flaws_str_A, "%s", flaws_str + 1);
     }
     if (strlen(flaws_str_A) >= 74) {
         for (i = 74; flaws_str_A[i] != ' '; i--);
         paranoid_free(flaws_str_B);
-        asprintf(&flaws_str_B, "%s", flaws_str_A + i + 1);
+        mr_asprintf(&flaws_str_B, "%s", flaws_str_A + i + 1);
         flaws_str_A[i] = '\0';
     }
@@ -641 +642 @@
         for (i = 74; flaws_str_B[i] != ' '; i--);
         paranoid_free(flaws_str_C);
-        asprintf(&flaws_str_C, "%s", flaws_str_B + i + 1);
+        mr_asprintf(&flaws_str_C, "%s", flaws_str_B + i + 1);
         flaws_str_B[i] = '\0';
     }

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

@@ -10 +10 @@
 
 #include "my-stuff.h"
+#include "mr_mem.h"
 #include "mondostructures.h"
 #include "lib-common-externs.h"
@@ -232 +233 @@
 
     uname(&utsn);
-    asprintf(&tmp, "%s", utsn.machine);
+    mr_asprintf(&tmp, "%s", utsn.machine);
     return (tmp);
 }
@@ -420 +421 @@
 int post_param_configuration()
 {
-    char *extra_cdrom_params;
-    char *mondo_mkisofs_sz;
+    char *extra_cdrom_params = NULL;
+    char *mondo_mkisofs_sz = NULL;
     char *command;
     char *mtpt;
-    char *hostname, *ip_address;
+    char *hostname;
+    char *ip_address = NULL;
     int retval = 0;
     char *colon;
@@ -440 +442 @@
 
     assert(bkpinfo != NULL);
-    malloc_string(extra_cdrom_params);
-    malloc_string(mondo_mkisofs_sz);
     malloc_string(command);
     malloc_string(mtpt);
     malloc_string(hostname);
-    malloc_string(ip_address);
     malloc_string(cdr_exe);
     malloc_string(tmp);
@@ -497 +496 @@
 
     if (bkpinfo->backup_media_type == dvd) {
-        extra_cdrom_params[0] = '\0';
-        mondo_mkisofs_sz[0] = '\0';
         if (find_home_of_exe("growisofs")) {
             strcpy(cdr_exe, "growisofs");
@@ -506 +503 @@
         }
         if (bkpinfo->nonbootable_backup) {
-            strcat(mondo_mkisofs_sz, MONDO_GROWISOFS_NONBOOT);
+            mr_asprintf(&mondo_mkisofs_sz, MONDO_GROWISOFS_NONBOOT);
         } else if
 #ifdef __FreeBSD__
@@ -515 +512 @@
 #ifdef __IA64__
     {
-        strcat(mondo_mkisofs_sz, MONDO_GROWISOFS_REGULAR_ELILO);
+        mr_asprintf(&mondo_mkisofs_sz, MONDO_GROWISOFS_REGULAR_ELILO);
     }
 #else
     {
-        strcat(mondo_mkisofs_sz, MONDO_GROWISOFS_REGULAR_LILO);
+        mr_asprintf(&mondo_mkisofs_sz, MONDO_GROWISOFS_REGULAR_LILO);
     }
 #endif
         else
         {
-            strcat(mondo_mkisofs_sz, MONDO_GROWISOFS_REGULAR_SYSLINUX);
+            mr_asprintf(&mondo_mkisofs_sz, MONDO_GROWISOFS_REGULAR_SYSLINUX);
         }
         if (bkpinfo->manual_cd_tray) {
+            paranoid_free(mondo_mkisofs_sz);
             fatal_error("Manual CD tray + DVD not supported yet.");
             // -m isn't supported by growisofs, BTW...
@@ -533 +531 @@
                     "%s %s -Z %s . 2>> _ERR_",
                     mondo_mkisofs_sz,
-                    extra_cdrom_params, bkpinfo->media_device);
+                    "", bkpinfo->media_device);
+            paranoid_free(mondo_mkisofs_sz);
         }
         if (getenv ("SUDO_COMMAND")) {
@@ -549 +548 @@
     if (bkpinfo->backup_media_type == cdrw
         || bkpinfo->backup_media_type == cdr) {
-        extra_cdrom_params[0] = '\0';
         if (!bkpinfo->manual_cd_tray) {
-            strcat(extra_cdrom_params, "-waiti ");
+            mr_asprintf(&extra_cdrom_params, "-waiti ");
         }
         if (bkpinfo->backup_media_type == cdrw) {
-            strcat(extra_cdrom_params, "blank=fast ");
+            mr_asprintf(&extra_cdrom_params, "blank=fast ");
         }
         if (find_home_of_exe("cdrecord")) {
@@ -564 +562 @@
         }
         if (bkpinfo->nonbootable_backup) {
-            strcpy(mondo_mkisofs_sz, MONDO_MKISOFS_NONBOOT);
+            mr_asprintf(&mondo_mkisofs_sz, MONDO_MKISOFS_NONBOOT);
         } else if
 #ifdef __FreeBSD__
@@ -573 +571 @@
 #ifdef __IA64__
     {
-        strcat(mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_ELILO);
+        mr_asprintf(&mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_ELILO);
     }
 #else
     {
-        strcpy(mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_LILO);
+        mr_asprintf(&mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_LILO);
     }
 #endif
         else
         {
-            strcpy(mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_SYSLINUX);
+            mr_asprintf(&mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_SYSLINUX);
         }
         if (bkpinfo->manual_cd_tray) {
@@ -609 +607 @@
                     bkpinfo->cdrw_speed);
         }
+        paranoid_free(mondo_mkisofs_sz);
+        paranoid_free(extra_cdrom_params);
     }                           // end of CD code
 
@@ -693 +693 @@
                 retval++;
             } else {
-                strcpy(ip_address, inet_ntoa
+                mr_asprintf(&ip_address, inet_ntoa
                        ((struct in_addr)
                         *((struct in_addr *) hent->h_addr)));
-                strcat(ip_address, strchr(bkpinfo->nfs_mount, ':'));
+                mr_strcat(ip_address, strchr(bkpinfo->nfs_mount, ':'));
                 strcpy(bkpinfo->nfs_mount, ip_address);
+                paranoid_free(ip_address);
             }
         }
@@ -718 +719 @@
     g_backup_media_type = bkpinfo->backup_media_type;
     paranoid_free(mtpt);
-    paranoid_free(extra_cdrom_params);
-    paranoid_free(mondo_mkisofs_sz);
     paranoid_free(command);
     paranoid_free(hostname);
-    paranoid_free(ip_address);
     paranoid_free(cdr_exe);
     paranoid_free(tmp);
@@ -758 +756 @@
 
     unlink(MONDO_TRACEFILE);
-    asprintf(&tmp,"rm -Rf %s/changed.files*",MONDO_CACHE);
+    mr_asprintf(&tmp,"rm -Rf %s/changed.files*",MONDO_CACHE);
     run_program_and_log_output(tmp, FALSE);
     paranoid_free(tmp);
@@ -783 +781 @@
     if ((bkpinfo->tmpdir != NULL) && (strstr(bkpinfo->tmpdir,"mondo.tmp.") != NULL)) {
         /* purging a potential old tmpdir */
-        asprintf(&tmp,"rm -Rf %s",bkpinfo->tmpdir);
+        mr_asprintf(&tmp,"rm -Rf %s",bkpinfo->tmpdir);
         system(tmp);
         paranoid_free(tmp);
@@ -789 +787 @@
 
     if (path != NULL) {
-        asprintf(&tmp, "%s/mondo.tmp.XXXXXX", path);
+        mr_asprintf(&tmp, "%s/mondo.tmp.XXXXXX", path);
     } else if (getenv("TMPDIR")) {
-        asprintf(&tmp, "%s/mondo.tmp.XXXXXX", getenv("TMPDIR"));
+        mr_asprintf(&tmp, "%s/mondo.tmp.XXXXXX", getenv("TMPDIR"));
     } else if (getenv("TMP")) {
-        asprintf(&tmp, "%s/mondo.tmp.XXXXXX", getenv("TMP"));
+        mr_asprintf(&tmp, "%s/mondo.tmp.XXXXXX", getenv("TMP"));
     } else {
-        asprintf(&tmp, "/tmp/mondo.tmp.XXXXXX");
+        mr_asprintf(&tmp, "/tmp/mondo.tmp.XXXXXX");
     }
     p = mkdtemp(tmp);

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

@@ -1 +1 @@
 /***************************************************************************
-libmondo-verify.c  -  description
------------------
-
-begin: Fri Apr 19 16:40:35 EDT 2002
-copyright : (C) 2002 Mondo  Hugo Rabson
-email     : Hugo Rabson <hugorabson@msn.com>
-edited by : by Stan Benoit 4/2002
-email     : troff@nakedsoul.org
-cvsid     : $Id$
+$Id$
 ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-/* mondo-verify
-
-
-07/07
-- added star verify support
-
-04/04/2004
-- added star support
-
-10/23/2003
-- changed "ISO #n" to "<media descriptor> #n"
-
-10/01
-- working on biggiefile verification (CDs)
-
-09/16
-- fixed bug in CD biggie verif'n
-
-09/15
-- state explicitly that we do not verify disk images
-
-09/13
-- working on verify_all_slices_on_CD()
-
-09/01
-- write list of changed biggiefiles (streaming only) to changed.files
-
-05/05
-- exclude /dev/ * from list of changed files
-- add Joshua Oreman's FreeBSD patches
-
-04/24/2003
-- added lots of assert()'s and log_OS_error()'s
-
-09/01 - 09/30/2002
-- run_program_and_log_output() now takes boolean operator to specify
-  whether it will log its activities in the event of _success_
-- eject_device() added
-- cleaned up 'changed file' feedback a little bit
-
-08/01 - 08/31
-- make sure to prefix bkpinfo->restore_path to local biggiefile fname when
-  comparing it to the archived copy of biggiefile; otherwise, biggiefile
-  not found & checksum missing & so on
-- exclude "incheckentry xwait()" from changed.files
-- cleaned up some log_it() calls
-
-07/01 - 07/31
-- renamed libmondo-verify.c
-- say 'bigfile' not 'biggiefile'
-- exclude /dev/ * from changed.files
-
-01/01 - 06/30
-- remove /tmp/changed.files.* dead files
-- don't pclose() tape after calling closein_tape(): the latter does it already
-- fixed bug in verify_cd_image()'s CD-mounting code
-- don't write to screen "old cksum.. curr cksum.."
-- changed the gawks to awks for the benefit of Debian
-- handles files >2GB in size
-- fixed bug in /tmp/changed.files-generator
-- re-enabled a lot of CD-verification code
-- afioballs are saved in %s/tmpfs/ now (%s=tmpdir)
-- changed some labels to make them more user-friendly
-- don't chdir() anywhere before verifying stuff
-- changed files are now detected by verify_tape_backup() and listed in
-  /tmp/changed.files
-- replaced &> with > .. 2>
-- still implementing improved tape support
-
-
-Started late Dec, 2001
-
------------------------------------------------------------------------------
-*/
 
 
@@ -101 +10 @@
 
 #include "my-stuff.h"
+#include "mr_mem.h"
 #include "mondostructures.h"
 #include "libmondo-verify.h"
@@ -419 +329 @@
                             bkpinfo->restore_path,
                             biggiestruct.filename);
-                asprintf(&tmp, "echo \"%s/%s not found\" >> %s/biggies.changed",
+                mr_asprintf(&tmp, "echo \"%s/%s not found\" >> %s/biggies.changed",
                             bkpinfo->restore_path,
                             biggiestruct.filename,
@@ -1070 +980 @@
     assert(bkpinfo != NULL);
 
-    asprintf(&fname, "%s1", bkpinfo->media_device);
+    mr_asprintf(&fname, "%s1", bkpinfo->media_device);
     if (is_this_device_mounted(fname)) {
         log_msg(1, "USB device mounted. Remounting it at the right place");
-        asprintf(&tmp, "umount %s", fname);
+        mr_asprintf(&tmp, "umount %s", fname);
         run_program_and_log_output(tmp, FALSE);
         paranoid_free(tmp);
@@ -1080 +990 @@
 
     log_msg(1, "Mounting USB device.");
-    asprintf(&mountpoint, "%s/usb", bkpinfo->tmpdir);
-    asprintf(&tmp, "mkdir -p %s", mountpoint);
+    mr_asprintf(&mountpoint, "%s/usb", bkpinfo->tmpdir);
+    mr_asprintf(&tmp, "mkdir -p %s", mountpoint);
     run_program_and_log_output(tmp, FALSE);
     paranoid_free(tmp);
     /* Mindi always create one single parition on the USB dev */
-    asprintf(&tmp, "mount %s1 %s", bkpinfo->media_device, mountpoint);
+    mr_asprintf(&tmp, "mount %s1 %s", bkpinfo->media_device, mountpoint);
     ret = run_program_and_log_output(tmp, FALSE);
     paranoid_free(tmp);
@@ -1095 +1005 @@
     sync();
     log_msg(2, "OK, I've mounted the USB Disk/Key\n");
-    asprintf(&tmp, "%s/archives/NOT-THE-LAST", mountpoint);
+    mr_asprintf(&tmp, "%s/archives/NOT-THE-LAST", mountpoint);
     if (!does_file_exist(tmp)) {
         log_msg
@@ -1112 +1022 @@
     verify_all_slices_on_CD(mountpoint);
 
-    asprintf(&tmp1, "umount %s", mountpoint);
+    mr_asprintf(&tmp1, "umount %s", mountpoint);
 #ifdef __FreeBSD__
     ret += system(tmp1);
@@ -1121 +1031 @@
 #endif
     {
-        asprintf(&tmp, "%s failed; unable to unmount USB device\n", tmp1);
+        mr_asprintf(&tmp, "%s failed; unable to unmount USB device\n", tmp1);
         log_to_screen(tmp);
         paranoid_free(tmp);

branches/2.2.9/mondo/src/common/newt-specific.c

@@ -19 +19 @@
 
 #include "my-stuff.h"
+#include "mr_mem.h"
 #include "mondostructures.h"
 #include "newt-specific.h"
@@ -263 +264 @@
 char *tmp1 = NULL;
 
-    asprintf(&tmp,"ps %s | grep \" %s \" | awk '{print %s;}' | grep -v \"grep\"", ps_options, str , ps_proc_id);
+    mr_asprintf(&tmp,"ps %s | grep \" %s \" | awk '{print %s;}' | grep -v \"grep\"", ps_options, str , ps_proc_id);
     run_program_and_log_output(tmp, TRUE);
     if (strlen(tmp) > 0) {
-        asprintf(&tmp1,"kill `%s`", tmp);
+        mr_asprintf(&tmp1,"kill `%s`", tmp);
         run_program_and_log_output(tmp1, TRUE);
         paranoid_free(tmp1);
@@ -386 +387 @@
         run_program_and_log_output("umount " MNT_CDROM, FALSE);
         if (g_selfmounted_isodir) {
-            asprintf(&command, "umount %s", g_selfmounted_isodir);
+            mr_asprintf(&command, "umount %s", g_selfmounted_isodir);
             run_program_and_log_output(command, 1);
             paranoid_free(command);
-            asprintf(&command, "rmdir %s", g_selfmounted_isodir);
+            mr_asprintf(&command, "rmdir %s", g_selfmounted_isodir);
             run_program_and_log_output(command, 1);
             paranoid_free(command);
@@ -405 +406 @@
         printf("Type 'less %s' to see the output log\n", MONDO_LOGFILE);
         if (strstr(bkpinfo->tmpdir ,"mondo.tmp.") != NULL) {
-            asprintf(&command, "rm -Rf %s %s", bkpinfo->tmpdir, bkpinfo->scratchdir);
+            mr_asprintf(&command, "rm -Rf %s %s", bkpinfo->tmpdir, bkpinfo->scratchdir);
             system(command);
             paranoid_free(command);
@@ -956 +957 @@
         /*@ buffers ********************************************************** */
         char *timeline_str;
-        char *pcline_str;
-        char *taskprogress;
+        char *pcline_str = NULL;
+        char *taskprogress = NULL;
 
         /*@ int ************************************************************** */
@@ -965 +966 @@
 
         malloc_string(timeline_str);
-        malloc_string(pcline_str);
-        malloc_string(taskprogress);
         timeline_str[0] = '\0';
 //  log_it("update_eval_call_form called");
@@ -997 +996 @@
                     time_remaining % 60);
             if (percentage < 3) {
-                sprintf(pcline_str, " Working");
+                mr_asprintf(&pcline_str, " Working");
                 for (j = 0; j < g_mysterious_dot_counter; j++) {
-                    strcat(pcline_str, ".");
+                    mr_strcat(pcline_str, ".");
                 }
                 for (; j < 27; j++) {
-                    strcat(pcline_str, " ");
+                    mr_strcat(pcline_str, " ");
                 }
-                sprintf(pcline_str + strlen(pcline_str), " %c",
-                        special_dot_char(g_mysterious_dot_counter));
+                mr_strcat(pcline_str, " %c", special_dot_char(g_mysterious_dot_counter));
             } else {
-                sprintf(pcline_str, " %3d%% done              %3d%% to go",
+                mr_asprintf(&pcline_str, " %3d%% done              %3d%% to go",
                         percentage, 100 - percentage);
             }
             if (g_text_mode) {
-                sprintf(taskprogress, "TASK:  [");
+                mr_asprintf(&taskprogress, "TASK:  [");
                 for (i = 0; i < percentage; i += 5) {
-                    strcat(taskprogress, "*");
+                    mr_strcat(taskprogress, "*");
                 }
                 for (; i < 100; i += 5) {
-                    strcat(taskprogress, ".");
+                    mr_strcat(taskprogress, ".");
                 }
                 if (percentage >= 3) {
-                    sprintf(taskprogress + strlen(taskprogress),
-                            "] %3d%% done; %2ld:%02ld to go", percentage,
+                    mr_strcat(taskprogress, "] %3d%% done; %2ld:%02ld to go", percentage,
                             time_remaining / 60, time_remaining % 60);
                     printf("---evalcall---1--- %s\n",
@@ -1027 +1024 @@
                     printf("---evalcall---E---\n");
                 }
+                paranoid_free(taskprogress);
             } else {
                 newtScaleSet(g_isoform_scale,
@@ -1037 +1035 @@
                 }
             }
+            paranoid_free(pcline_str);
         }
         if (!g_text_mode) {
@@ -1043 +1042 @@
         }
         paranoid_free(timeline_str);
-        paranoid_free(pcline_str);
-        paranoid_free(taskprogress);
     }
 
@@ -1099 +1096 @@
         char *percentline_str;
         char *timeline_str;
-        char *taskprogress;
+        char *taskprogress = NULL;
         char *tmp;
 
@@ -1105 +1102 @@
         percentline_str = malloc(MAX_NEWT_COMMENT_LEN);
         timeline_str = malloc(MAX_NEWT_COMMENT_LEN);
-        taskprogress = malloc(MAX_NEWT_COMMENT_LEN);
         malloc_string(tmp);
         if (!g_text_mode) {
@@ -1159 +1155 @@
             printf("---progress-form---3--- %s\n", blurb3);
             printf("---progress-form---E---\n");
-            sprintf(taskprogress, "TASK:  [");
+            mr_asprintf(&taskprogress, "TASK:  [");
             for (i = 0; i < percentage; i += 5) {
-                strcat(taskprogress, "*");
+                mr_strcat(taskprogress, "*");
             }
             for (; i < 100; i += 5) {
-                strcat(taskprogress, ".");
+                mr_strcat(taskprogress, ".");
             }
             if (percentage > 100) {
                 log_msg(2, "percentage = %d", percentage);
             }
-            sprintf(taskprogress + strlen(taskprogress),
-                    "] %3d%c", percentage, '%');
-            sprintf(taskprogress + strlen(taskprogress),
-                    " done; %2ld:%02ld to go",
+            mr_strcat(taskprogress, "] %3d%c", percentage, '%');
+            mr_strcat(taskprogress, " done; %2ld:%02ld to go",
                     time_remaining / 60, time_remaining % 60);
             printf("---progress-form---4--- %s\n", taskprogress);
+            paranoid_free(taskprogress);
         } else {
             center_string(blurb1, 54);
@@ -1199 +1194 @@
         paranoid_free(percentline_str);
         paranoid_free(timeline_str);
-        paranoid_free(taskprogress);
         paranoid_free(tmp);
     }
@@ -1414 +1408 @@
         }
 
-        asprintf(&tmp1,"%s/icantfindthesefiles.txt",bkpinfo->tmpdir);
+        mr_asprintf(&tmp1,"%s/icantfindthesefiles.txt",bkpinfo->tmpdir);
         if (!(fout = fopen(tmp1, "a"))) {
             log_msg(2, "Can't write to %s", tmp1);
@@ -1503 +1497 @@
     char *filelist_entry_to_string(struct s_filelist_entry *flentry) {
         static char comment[100];
-        char *tmp;
+        char *tmp = NULL;
 
         iamhere("entering");
-        malloc_string(tmp);
         assert(flentry != NULL);
         if (flentry->severity == 0) {
-            strcpy(tmp, "0   ");
+            mr_asprintf(&tmp, "0   ");
         } else if (flentry->severity == 1) {
-            strcpy(tmp, "low ");
+            mr_asprintf(&tmp, "low ");
         } else if (flentry->severity == 2) {
-            strcpy(tmp, "med ");
-        } else {
-            strcpy(tmp, "high");
-        }
-        strcat(tmp, "  ");
-        strncat(tmp, flentry->filename, 100);
-        tmp[98] = '\0';
-        strcpy(comment, tmp);
+            mr_asprintf(&tmp, "med ");
+        } else {
+            mr_asprintf(&tmp, "high");
+        }
+        mr_strcat(tmp, "  ");
+        mr_strcat(tmp, flentry->filename);
+        strncpy(comment, tmp, 99);
         paranoid_free(tmp);
+
         iamhere("leaving");
         return (comment);

branches/2.2.9/mondo/src/mondoarchive/Makefile.am

@@ -11 +11 @@
 sbin_PROGRAMS        = mondoarchive
 mondoarchive_SOURCES = mondoarchive.c
-mondoarchive_LDADD   = ${top_builddir}/src/common/libmondo.a
+mondoarchive_LDADD   = ${top_builddir}/src/common/libmondo.a ${top_builddir}/src/lib/libmr.a

branches/2.2.9/mondo/src/mondoarchive/mondoarchive.c

@@ -1 +1 @@
 /***************************************************************************
-                          main.c  -  description
-                             -------------------
-    begin                : Fri Apr 19 16:40:35 EDT 2002
-    copyright            : (C) 2002 by Stan Benoit
-    email                : troff@nakedsoul.org
-    cvsid                : $Id$
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-/**
- * @file
- * The main file for mondoarchive.
- */
+$Id$
+* The main file for mondoarchive.
+*/
 
 /************************* #include statements *************************/
@@ -27 +9 @@
 #include <stdlib.h>
 #include "my-stuff.h"
+#include "mr_mem.h"
 #include "../common/mondostructures.h"
 #include "../common/libmondo.h"
@@ -70 +53 @@
 /* Reference to global bkpinfo */
 struct s_bkpinfo *bkpinfo;
+
+/* No cleanup for the moment */
+void (*mr_cleanup)(void) = NULL;
 
 /* To be coded */
@@ -183 +169 @@
     char *tmp1 = NULL;
     int res, retval;
-    char *say_at_end;
+    char *say_at_end = NULL;
 
 /* Make sure I'm root; abort if not */
@@ -211 +197 @@
     diffs = 0;
     malloc_string(tmp);
-    malloc_string(say_at_end);
-    say_at_end[0] = '\0';
     malloc_libmondo_global_strings();
 
@@ -220 +204 @@
 
     /* make sure PATH environmental variable allows access to mkfs, fdisk, etc. */
-    asprintf(&tmp1,"%s:/sbin:/usr/sbin:/usr/local/sbin",getenv("PATH"));
+    mr_asprintf(&tmp1,"%s:/sbin:/usr/sbin:/usr/local/sbin",getenv("PATH"));
     setenv("PATH", tmp1, 1);
     paranoid_free(tmp1);
 
     /* Add the ARCH environment variable for ia64 purposes */
-    asprintf(&tmp1,"%s",get_architecture());
+    mr_asprintf(&tmp1,"%s",get_architecture());
     setenv("ARCH", tmp1, 1);
     paranoid_free(tmp1);
@@ -378 +362 @@
         retval += res;
         if (res) {
-            strcat(say_at_end,
+            mr_asprintf(&say_at_end,
                    "Data archived. Please check the logs, just as a precaution. ");
         } else {
-            strcat(say_at_end, "Data archived OK. ");
+            mr_asprintf(&say_at_end, "Data archived OK. ");
         }
     }
@@ -391 +375 @@
             sprintf(tmp, "%d difference%c found.", -res,
                     (-res != 1) ? 's' : ' ');
-            strcat(say_at_end, tmp);
+            mr_asprintf(&say_at_end, tmp);
             log_to_screen(tmp);
             res = 0;
@@ -424 +408 @@
         unlink(MONDO_CACHE"/changed.files");
     }
-    log_to_screen(say_at_end);
+    if (say_at_end != NULL) {
+        log_to_screen(say_at_end);
+        paranoid_free(say_at_end);
+    }
     sprintf(tmp, "umount %s/tmpfs", bkpinfo->tmpdir);
     run_program_and_log_output(tmp, TRUE);
@@ -445 +432 @@
 
     free_libmondo_global_strings();
-    paranoid_free(say_at_end);
     
 

branches/2.2.9/mondo/src/mondorestore/mondo-prep.c

@@ -1 +1 @@
 /***************************************************************************
 $Id$
-***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-/**
- * @file
- * Functions for prepping hard drives: partitioning, formatting, etc.
- */
+* Functions for prepping hard drives: partitioning, formatting, etc.
+*/
 
 
 #include "my-stuff.h"
+#include "mr_mem.h"
 #include "../common/mondostructures.h"
 #include "mondoprep.h"
@@ -349 +337 @@
             log_it("%s... so I'll get creative.", tmp);
             if (lvmversion == 2) {
-                asprintf(&tmp1, "tail -n5 %s | grep Insufficient | tail -n1", MONDO_LOGFILE);
+                mr_asprintf(&tmp1, "tail -n5 %s | grep Insufficient | tail -n1", MONDO_LOGFILE);
                 strcpy(tmp, call_program_and_get_last_line_of_output(tmp1));
                 free(tmp1);
             } else {
-                asprintf(&tmp1, "tail -n5 %s | grep lvcreate | tail -n1", MONDO_LOGFILE);
+                mr_asprintf(&tmp1, "tail -n5 %s | grep lvcreate | tail -n1", MONDO_LOGFILE);
                 strcpy(tmp, call_program_and_get_last_line_of_output(tmp1));
                 free(tmp1);
@@ -596 +584 @@
   }
   // create device list from normal disks followed by spare ones
-  asprintf(&devices, "%s", raidlist->el[i].data_disks.el[0].device);
+  mr_asprintf(&devices, "%s", raidlist->el[i].data_disks.el[0].device);
   for (j = 1; j < raidlist->el[i].data_disks.entries; j++) {
-    asprintf(&strtmp, "%s", devices);
+    mr_asprintf(&strtmp, "%s", devices);
     paranoid_free(devices);
-    asprintf(&devices, "%s %s", strtmp,
+    mr_asprintf(&devices, "%s %s", strtmp,
          raidlist->el[i].data_disks.el[j].device);
     paranoid_free(strtmp);
   }
   for (j = 0; j < raidlist->el[i].spare_disks.entries; j++) {
-    asprintf(&strtmp, "%s", devices);
+    mr_asprintf(&strtmp, "%s", devices);
     paranoid_free(devices);
-    asprintf(&devices, "%s %s", strtmp,
+    mr_asprintf(&devices, "%s %s", strtmp,
          raidlist->el[i].spare_disks.el[j].device);
     paranoid_free(strtmp);
@@ -613 +601 @@
   // translate RAID level
   if (raidlist->el[i].raid_level == -2) {
-    asprintf(&level, "multipath");
+    mr_asprintf(&level, "multipath");
   } else if (raidlist->el[i].raid_level == -1) {
-    asprintf(&level, "linear");
+    mr_asprintf(&level, "linear");
   } else {
-    asprintf(&level, "raid%d", raidlist->el[i].raid_level);
+    mr_asprintf(&level, "raid%d", raidlist->el[i].raid_level);
   }
   // create RAID device:
@@ -624 +612 @@
   // - faulty devices ignored
   // - persistent superblock always used as this is recommended
-  asprintf(&program,
+  mr_asprintf(&program,
        "mdadm --create --force --run --auto=yes %s --level=%s --raid-devices=%d",
        raidlist->el[i].raid_device, level,
        raidlist->el[i].data_disks.entries);
   if (raidlist->el[i].parity != -1) {
-    asprintf(&strtmp, "%s", program);
+    mr_asprintf(&strtmp, "%s", program);
     paranoid_free(program);
     switch(raidlist->el[i].parity) {
     case 0:
-      asprintf(&program, "%s --parity=%s", strtmp, "la");
+      mr_asprintf(&program, "%s --parity=%s", strtmp, "la");
       break;
     case 1:
-      asprintf(&program, "%s --parity=%s", strtmp, "ra");
+      mr_asprintf(&program, "%s --parity=%s", strtmp, "ra");
       break;
     case 2:
-      asprintf(&program, "%s --parity=%s", strtmp, "ls");
+      mr_asprintf(&program, "%s --parity=%s", strtmp, "ls");
       break;
     case 3:
-      asprintf(&program, "%s --parity=%s", strtmp, "rs");
+      mr_asprintf(&program, "%s --parity=%s", strtmp, "rs");
       break;
     default:
@@ -651 +639 @@
   }
   if (raidlist->el[i].chunk_size != -1) {
-    asprintf(&strtmp, "%s", program);
+    mr_asprintf(&strtmp, "%s", program);
     paranoid_free(program);
-    asprintf(&program, "%s --chunk=%d", strtmp, raidlist->el[i].chunk_size);
+    mr_asprintf(&program, "%s --chunk=%d", strtmp, raidlist->el[i].chunk_size);
     paranoid_free(strtmp);
   }
   if (raidlist->el[i].spare_disks.entries > 0) {
-    asprintf(&strtmp, "%s", program);
+    mr_asprintf(&strtmp, "%s", program);
     paranoid_free(program);
-    asprintf(&program, "%s --spare-devices=%d", strtmp,
+    mr_asprintf(&program, "%s --spare-devices=%d", strtmp,
          raidlist->el[i].spare_disks.entries);
     paranoid_free(strtmp);
   }
-  asprintf(&strtmp, "%s", program);
+  mr_asprintf(&strtmp, "%s", program);
   paranoid_free(program);
-  asprintf(&program, "%s %s", strtmp, devices);
+  mr_asprintf(&program, "%s %s", strtmp, devices);
   paranoid_free(strtmp);
   res = run_program_and_log_output(program, 1);
@@ -690 +678 @@
 {
     /** int **************************************************************/
-    int res;
-    int retval = 0;
 #ifdef __FreeBSD__
     static bool vinum_started_yet = FALSE;
@@ -698 +684 @@
     /** buffers ***********************************************************/
     char *program;
-    char *tmp;
+    char *tmp = NULL;
+    int res = 0;
+    int retval = 0;
 
     /** end ****************************************************************/
 
     malloc_string(program);
-    malloc_string(tmp);
     assert_string_is_neither_NULL_nor_zerolength(device);
     assert(format != NULL);
 
     if (strstr(format, "raid")) {   // do not form RAID disks; do it to /dev/md* instead
-        sprintf(tmp, "Not formatting %s (it is a RAID disk)", device);
+        mr_asprintf(&tmp, "Not formatting %s (it is a RAID disk)", device);
         log_it(tmp);
+        paranoid_free(tmp);
         paranoid_free(program);
-        paranoid_free(tmp);
         return (0);
     }
@@ -723 +710 @@
 #endif
     if (strlen(format) <= 2) {
-        sprintf(tmp,
+        mr_asprintf(&tmp,
                 "%s has a really small format type ('%s') - this is probably a hexadecimal string, which would suggest the partition is an image --- I shouldn't format it",
                 device, format);
         log_it(tmp);
+        paranoid_free(tmp);
         paranoid_free(program);
+        return (0);
+    }
+    if (is_this_device_mounted(device)) {
+        mr_asprintf(&tmp, "%s is mounted - cannot format it       ", device);
+        log_to_screen(tmp);
         paranoid_free(tmp);
-        return (0);
-    }
-    if (is_this_device_mounted(device)) {
-        sprintf(tmp, "%s is mounted - cannot format it       ", device);
-        log_to_screen(tmp);
         paranoid_free(program);
-        paranoid_free(tmp);
         return (1);
     }
@@ -762 +749 @@
             FILE *fin;
             char line[MAX_STR_LEN];
-            sprintf(tmp,
-                    "Initializing Vinum device %s (this may take a *long* time)",
-                    device);
+
+            mr_asprintf(&tmp, "Initializing Vinum device %s (this may take a *long* time)", device);
             log_to_screen(tmp);
+            paranoid_free(tmp);
+
             /* format raid partition */
             //      sprintf (program, "mkraid --really-force %s", device); --- disabled -- BB, 02/12/2003
@@ -780 +768 @@
                     *(strchr(line, '\n')) = '\0';   // get rid of the \n on the end
 
-                sprintf(tmp, "Initializing plex: %s", line);
+                mr_asprintf(&tmp, "Initializing plex: %s", line);
                 open_evalcall_form(tmp);
-                sprintf(tmp, "vinum init %s", line);
+                paranoid_free(tmp);
+
+                mr_asprintf(&tmp, "vinum init %s", line);
                 system(tmp);
+                paranoid_free(tmp);
+
                 while (1) {
-                    sprintf(tmp,
+                    mr_asprintf(&tmp,
                             "vinum lp -r %s | grep '^S' | head -1 | tr -s ' ' | cut -d: -f2 | cut -f1 | sed 's/^ //' | sed 's/I //' | sed 's/%%//'",
                             line);
                     FILE *pin = popen(tmp, "r");
+                    paranoid_free(tmp);
+
                     char status[MAX_STR_LEN / 4];
                     fgets(status, MAX_STR_LEN / 4 - 1, pin);
@@ -806 +800 @@
         }
 #else
-        sprintf(tmp, "Initializing RAID device %s", device);
+        mr_asprintf(&tmp, "Initializing RAID device %s", device);
         log_to_screen(tmp);
+        paranoid_free(tmp);
 
 // Shouldn't be necessary.
@@ -856 +851 @@
     }
     res = which_format_command_do_i_need(format, program);
-    sprintf(tmp, "%s %s", program, device);
+    mr_asprintf(&tmp, "%s %s", program, device);
     if (strstr(program, "kludge")) {
-        strcat(tmp, " /");
+        mr_strcat(tmp, " /");
     }
     sprintf(program, "sh -c 'echo -en \"y\\ny\\ny\\n\" | %s'", tmp);
-    sprintf(tmp, "Formatting %s as %s", device, format);
+    paranoid_free(tmp);
+
+    mr_asprintf(&tmp, "Formatting %s as %s", device, format);
     update_progress_form(tmp);
+    paranoid_free(tmp);
+
     res = run_program_and_log_output(program, FALSE);
+    mr_asprintf(&tmp, "");
     if (res && strstr(program, "kludge")) {
-        sprintf(tmp, "Kludge failed; using regular mkfs.%s to format %s",
+        mr_strcat(tmp, "Kludge failed; using regular mkfs.%s to format %s",
                 format, device);
 #ifdef __FreeBSD__
@@ -885 +885 @@
     retval += res;
     if (retval) {
-        strcat(tmp, "...failed");
+        mr_strcat(tmp, "...failed");
     } else {
-        strcat(tmp, "...OK");
+        mr_strcat(tmp, "...OK");
     }
 
     log_to_screen(tmp);
+    paranoid_free(tmp);
+
     paranoid_free(program);
-    paranoid_free(tmp);
     system("sync");
     sleep(1);
@@ -1717 +1718 @@
     char *tmp;
     char *logfile;
-    char *output;
+    char *output = NULL;
 
     /** pointers **********************************************************/
@@ -1730 +1731 @@
     malloc_string(tmp);
     malloc_string(logfile);
-    malloc_string(output);
 
     assert_string_is_neither_NULL_nor_zerolength(drive);
@@ -1745 +1745 @@
         paranoid_free(tmp);
         paranoid_free(logfile);
-        paranoid_free(output);
         return (0);
     }
@@ -1766 +1765 @@
         paranoid_free(tmp);
         paranoid_free(logfile);
-        paranoid_free(output);
         return (1);
 /*
@@ -1786 +1784 @@
     /* BERLIOS: should not be called each time */
     part_table_fmt = which_partition_format(drive);
-    output[0] = '\0';
+    mr_asprintf(&output, "");
     /* make it a primary/extended/logical */
     if (partno <= 4) {
-        sprintf(output + strlen(output), "n\np\n%d\n", partno);
+        mr_strcat(output, "n\np\n%d\n", partno);
     } else {
         /* MBR needs an extended partition if more than 4 partitions */
@@ -1804 +1802 @@
                     return (1);
                 } else {
-                    sprintf(output + strlen(output), "n\ne\n%d\n\n\n",
-                            prev_partno + 1);
+                    mr_strcat(output, "n\ne\n%d\n\n\n", prev_partno + 1);
                 }
             }
-            strcat(output + strlen(output), "n\nl\n");
+            mr_strcat(output, "n\nl\n");
         } else {
             /* GPT allows more than 4 primary partitions */
-            sprintf(output + strlen(output), "n\np\n%d\n", partno);
-        }
-    }
-    strcat(output + strlen(output), "\n");  /*start block (ENTER for next free blk */
+            mr_strcat(output, "n\np\n%d\n", partno);
+        }
+    }
+    mr_strcat(output, "\n");    /*start block (ENTER for next free blk */
     if (partsize > 0) {
         if (!strcmp(format, "7")) {
@@ -1820 +1817 @@
             partsize += 512;
         }
-        sprintf(output + strlen(output), "+%lldK", (long long) (partsize));
-    }
-    strcat(output + strlen(output), "\n");
+        mr_strcat(output, "+%lldK", (long long) (partsize));
+    }
+    mr_strcat(output, "\n");
 #if 0
 /*
@@ -1864 +1861 @@
         }
     } else {
-        strcat(output, "w\n\n");
+        mr_strcat(output, "w\n\n");
         if (g_fprep) {
             fprintf(g_fprep, "echo \"%s\" | %s\n", output, program);
@@ -1916 +1913 @@
         }
     }
+    paranoid_free(output);
+
     g_current_progress++;
     log_it("partition_device() --- leaving");
@@ -1922 +1921 @@
     paranoid_free(tmp);
     paranoid_free(logfile);
-    paranoid_free(output);
     return (retval);
 }
@@ -2032 +2030 @@
     char *partition;
     char *command;
-    char *output;
+    char *output = NULL;
     char *tmp;
     char *partcode;
@@ -2051 +2049 @@
     malloc_string(partition);
     malloc_string(command);
-    malloc_string(output);
     malloc_string(tmp);
     malloc_string(partcode);
@@ -2138 +2135 @@
             fput_string_one_char_at_a_time(pout_to_fdisk, "p\n");
         } else {
-            sprintf(output, "t\n%d\n%s\n", partno, partcode);
-            strcat(output, "w\n");
+            mr_asprintf(&output, "t\n%d\n%s\nw\n", partno, partcode);
             sprintf(command, "parted2fdisk %s >> %s 2>> %s", drive,
                     MONDO_LOGFILE, MONDO_LOGFILE);
@@ -2154 +2150 @@
                 paranoid_pclose(fout);
             }
+            paranoid_free(output);
         }
         if (res) {
@@ -2162 +2159 @@
     paranoid_free(partition);
     paranoid_free(command);
-    paranoid_free(output);
     paranoid_free(tmp);
     paranoid_free(partcode);

branches/2.2.9/mondo/src/mondorestore/mondo-rstr-compare.c

@@ -1 +1 @@
 /***************************************************************************
-       mondo-compare.c  -  compares mondoarchive data
-                             -------------------
-    begin                : Fri Apr 25 2003
-    copyright            : (C) 2000 by Hugo Rabson
-    email                : Hugo Rabson <hugorabson@msn.com>
     cvsid                : $Id$
 ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-/***************************************************************************
- *                         Change Log                                      *
- ***************************************************************************
-.
-
-
-
-10/21/2003
-- changed "/mnt/cdrom" to MNT_CDROM
-
-10/18
-- don't say unknown compressor if no compressor at all
-
-09/17
-- cleaned up logging & conversion-to-changed.txt
-- cleaned up compare_mode()
-
-09/16
-- fixed bad malloc(),free() pairs in compare_a_biggiefile()
-
-09/14
-- compare_mode() --- a couple of strings were the wrong way round,
-  e.g. changed.txt and changed.files
-
-05/05
-- exclude /dev/ * from list of changed files
-
-04/30
-- added textonly mode
-
-04/27
-- improved compare_mode() to allow for ISO/cd/crazy people
-
-04/25
-- first incarnation
-*/
-
-
 #include <pthread.h>
 #include "my-stuff.h"
+#include "mr_mem.h"
 #include "../common/mondostructures.h"
 #include "../common/libmondo.h"
@@ -97 +46 @@
     char *original_cksum_ptr;
     char *bigfile_fname_ptr;
-    char *tmp_ptr;
+    char *tmp_ptr = NULL;
     char *command_ptr;
 
@@ -117 +66 @@
     malloc_string(bigfile_fname_ptr);
     malloc_string(command_ptr);
-    malloc_string(tmp_ptr);
 
   /*********************************************************************
@@ -126 +74 @@
     memset(original_cksum_ptr, '\0', sizeof(original_cksum));
     memset(bigfile_fname_ptr, '\0', sizeof(bigfile_fname));
-    memset(tmp_ptr, '\0', sizeof(tmp));
     memset(command_ptr, '\0', sizeof(command));
   /** end **/
@@ -134 +81 @@
             insist_on_this_cd_number((++g_current_media_number));
         } else {
-            sprintf(tmp_ptr,
+            mr_asprintf(&tmp_ptr,
                     "No CD's left. No biggiefiles left. No prob, Bob.");
             log_msg(2, tmp_ptr);
+            paranoid_free(tmp_ptr);
             return (0);
         }
     }
     if (!(fin = fopen(slice_fname(bigfileno, 0, ARCHIVES_PATH, ""), "r"))) {
-        sprintf(tmp_ptr,
+        mr_asprintf(&tmp_ptr,
                 "Cannot open bigfile %ld (%s)'s info file",
                 bigfileno + 1, bigfile_fname_ptr);
         log_to_screen(tmp_ptr);
+        paranoid_free(tmp_ptr);
         return (1);
     }
@@ -156 +105 @@
     log_msg(2, "biggiestruct.checksum = %s", biggiestruct.checksum);
 
-    sprintf(tmp_ptr, "Comparing %s", bigfile_fname_ptr);
-
     if (!g_text_mode) {
+        mr_asprintf(&tmp_ptr, "Comparing %s", bigfile_fname_ptr);
         newtDrawRootText(0, 22, tmp_ptr);
+        paranoid_free(tmp_ptr);
         newtRefresh();
     }
@@ -173 +122 @@
     }
     log_msg(2, command_ptr);
-    sprintf(tmp_ptr, "cat /tmp/errors >> %s 2> /dev/null", MONDO_LOGFILE);
+    mr_asprintf(&tmp_ptr, "cat /tmp/errors >> %s 2> /dev/null", MONDO_LOGFILE);
     paranoid_system(tmp_ptr);
+    paranoid_free(tmp_ptr);
+
     if (system(command_ptr)) {
         log_OS_error("Warning - command failed");
@@ -197 +148 @@
         }
     }
-    sprintf(tmp_ptr, "bigfile #%ld ('%s') ", bigfileno + 1,
+    mr_asprintf(&tmp_ptr, "bigfile #%ld ('%s') ", bigfileno + 1,
             bigfile_fname_ptr);
     if (!strcmp(checksum_ptr, original_cksum_ptr) != 0) {
-        strcat(tmp_ptr, " ... OK");
-    } else {
-        strcat(tmp_ptr, "... changed");
+        mr_strcat(tmp_ptr, " ... OK");
+    } else {
+        mr_strcat(tmp_ptr, "... changed");
         retval++;
     }
     log_msg(1, tmp_ptr);
+    paranoid_free(tmp_ptr);
+
     if (retval) {
         if (!(fout = fopen(MONDO_CACHE"/changed.txt", "a"))) {
@@ -222 +175 @@
     paranoid_free(command_ptr);
     paranoid_free(command);
-    paranoid_free(tmp_ptr);
     paranoid_free(tmp);
 
@@ -302 +254 @@
 
   /***  needs malloc *********/
-    char *command, *tmp, *filelist_name, *logfile, *archiver_exe,
+    char *command, *tmp, *filelist_name, *logfile,
         *compressor_exe;
+    char *archiver_exe = NULL;
 
     malloc_string(command);
@@ -309 +262 @@
     malloc_string(filelist_name);
     malloc_string(logfile);
-    malloc_string(archiver_exe);
     malloc_string(compressor_exe);
 
@@ -331 +283 @@
 
     if (use_star) {
-        strcpy(archiver_exe, "star");
-    } else {
-        strcpy(archiver_exe, "afio");
+        mr_asprintf(&archiver_exe, "star");
+    } else {
+        mr_asprintf(&archiver_exe, "afio");
     }
 
@@ -344 +296 @@
         {
             if (!strcmp(compressor_exe, "bzip2")) {
-                strcat(archiver_exe, " -bz");
+                mr_strcat(archiver_exe, " -bz");
             } else {
                 fatal_error
@@ -373 +325 @@
                 BUFSIZE, compressor_exe, tarball_fname, logfile, logfile);
     }
+    paranoid_free(archiver_exe);
+
 #undef BUFSIZE
 
@@ -405 +359 @@
     paranoid_free(filelist_name);
     paranoid_free(logfile);
-    paranoid_free(archiver_exe);
     paranoid_free(compressor_exe);
     return (retval);

branches/2.2.9/mondo/src/mondorestore/mondo-rstr-newt.c

@@ -1 +1 @@
 /***************************************************************************
  * $Id$
- */
-
-
-/**
- * @file
  * Functions for handling GUI interfaces in the restore.
  */
@@ -11 +6 @@
 #ifdef __FreeBSD__
 #define OSSWAP(linux,fbsd) fbsd
-//#include <libgen.h>
 #else
 #define OSSWAP(linux,fbsd) linux
@@ -17 +11 @@
 
 #include "mondo-rstr-newt.h"
+#include "mr_mem.h"
 
 //static char cvsid[] = "$Id$";
@@ -1950 +1945 @@
     assert(raidlist != NULL);
 
-    asprintf(&flaws_str_A, "%s", "xxxxxxxxx");
-    asprintf(&flaws_str_B, "%s", "xxxxxxxxx");
-    asprintf(&flaws_str_C, "%s", "xxxxxxxxx");
+    mr_asprintf(&flaws_str_A, "%s", "         ");
+    mr_asprintf(&flaws_str_B, "%s", "         ");
+    mr_asprintf(&flaws_str_C, "%s", "         ");
     if (mountlist->entries > ARBITRARY_MAXIMUM) {
         log_to_screen("Arbitrary limits suck, man!");

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

@@ -1 +1 @@
 /***************************************************************************
 $Id$
-
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
 ***************************************************************************/
 
@@ -14 +6 @@
 #include <linux/fd.h>
 #include "my-stuff.h"
+#include "mr_mem.h"
 #include "../common/mondostructures.h"
 #include "../common/libmondo.h"
@@ -284 +277 @@
 int iso_fiddly_bits(bool nuke_me_please)
 {
-char *mount_isodir_command, *tmp, *command;
+char *mount_isodir_command = NULL;
+char *tmp, *command;
 int retval = 0, i;
 bool already_mounted = FALSE;
 
 assert(bkpinfo != NULL);
-malloc_string(mount_isodir_command);
 malloc_string(tmp);
 malloc_string(command);
@@ -295 +288 @@
 read_cfg_var(g_mondo_cfg_file, "iso-dev", g_isodir_device);
 if (bkpinfo->disaster_recovery) {
-/* Patch Conor Daly 26-june-2004 
-* Don't let this clobber an existing bkpinfo->isodir */
-if (!bkpinfo->isodir[0]) {
-    strcpy(bkpinfo->isodir, "/tmp/isodir");
-}
-/* End patch */
-sprintf(command, "mkdir -p %s", bkpinfo->isodir);
-run_program_and_log_output(command, 5);
-log_msg(2, "Setting isodir to %s", bkpinfo->isodir);
-}
-
-if (!get_isodir_info
-(g_isodir_device, g_isodir_format, bkpinfo->isodir,
- nuke_me_please)) {
-return (1);
+    /* Patch Conor Daly 26-june-2004 
+    * Don't let this clobber an existing bkpinfo->isodir */
+    if (!bkpinfo->isodir[0]) {
+        strcpy(bkpinfo->isodir, "/tmp/isodir");
+    }
+    /* End patch */
+    sprintf(command, "mkdir -p %s", bkpinfo->isodir);
+    run_program_and_log_output(command, 5);
+    log_msg(2, "Setting isodir to %s", bkpinfo->isodir);
+}
+
+if (!get_isodir_info(g_isodir_device, g_isodir_format, bkpinfo->isodir, nuke_me_please)) {
+    return (1);
 }
 paranoid_system("umount " MNT_CDROM " 2> /dev/null");   /* just in case */
 
 if (is_this_device_mounted(g_isodir_device)) {
-log_to_screen("WARNING - isodir is already mounted");
-already_mounted = TRUE;
+    log_to_screen("WARNING - isodir is already mounted");
+    already_mounted = TRUE;
 } else {
-sprintf(mount_isodir_command, "mount %s", g_isodir_device);
-if (strlen(g_isodir_format) > 1) {
-    sprintf(mount_isodir_command + strlen(mount_isodir_command),
-            " -t %s", g_isodir_format);
-}
-strcat(mount_isodir_command, " -o ro ");
-strcat(mount_isodir_command, bkpinfo->isodir);
-run_program_and_log_output("df -m", FALSE);
-sprintf(tmp,
+    mr_asprintf(&mount_isodir_command, "mount %s", g_isodir_device);
+    if (strlen(g_isodir_format) > 1) {
+        mr_strcat(mount_isodir_command, " -t %s", g_isodir_format);
+    }
+    mr_strcat(mount_isodir_command, " -o ro %s", bkpinfo->isodir);
+    run_program_and_log_output("df -m", FALSE);
+    sprintf(tmp,
         "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
-        ("Cannot mount the device where the ISO files are stored.");
-    return (1);
-}
-log_to_screen
+    log_msg(1, tmp);
+    if (run_program_and_log_output(mount_isodir_command, FALSE)) {
+        popup_and_OK
+            ("Cannot mount the device where the ISO files are stored.");
+        return (1);
+    }
+    paranoid_free(mount_isodir_command);
+    log_to_screen
     ("I have mounted the device where the ISO files are stored.");
 }
@@ -351 +341 @@
 log_msg(2, "%ld: bkpinfo->isodir is now %s", __LINE__,
     bkpinfo->isodir);
-paranoid_free(mount_isodir_command);
 paranoid_free(tmp);
 paranoid_free(command);
@@ -385 +374 @@
 
 /** malloc **/
-char *tmp, *command, *mountdir, *mountpoint, *additional_parameters;
+char *tmp, *command, *mountdir, *mountpoint;
+char *additional_parameters = NULL;
 
 assert_string_is_neither_NULL_nor_zerolength(device);
@@ -394 +384 @@
 malloc_string(mountdir);
 malloc_string(mountpoint);
-malloc_string(additional_parameters);
 
     if (!strcmp(mpt, "/1")) {
@@ -412 +401 @@
     log_msg(1, tmp);
     /* Deal with additional params only if not /proc or /sys */
+    mr_asprintf(&additional_parameters, "");
     if (strcmp(format, "proc") && strcmp(format, "sys")) {
         if (writeable) {
-            strcpy(additional_parameters, "-o rw");
+            mr_strcat(additional_parameters, "-o rw");
         } else {
-            strcpy(additional_parameters, "-o ro");
+            mr_strcat(additional_parameters, "-o ro");
         }
         if (find_home_of_exe("setfattr")) {
-            strcat(additional_parameters, ",user_xattr");
+            mr_strcat(additional_parameters, ",user_xattr");
         }
         if (find_home_of_exe("setfacl")) {
-            strcat(additional_parameters, ",acl");
+            mr_strcat(additional_parameters, ",acl");
         }
     }
@@ -440 +430 @@
         log_msg(2, "command='%s'", command);
     }
+    paranoid_free(additional_parameters);
 
     res = run_program_and_log_output(command, TRUE);
@@ -479 +470 @@
 paranoid_free(mountdir);
 paranoid_free(mountpoint);
-paranoid_free(additional_parameters);
 
     return (res);
@@ -498 +488 @@
 {
 int retval = 0, lino, res;
-char *tmp, *these_failed, *format;
-    struct mountlist_itself *mountlist = NULL;
+char *tmp;
+char *these_failed = NULL;
+char *format;
+struct mountlist_itself *mountlist = NULL;
 
 malloc_string(tmp);
 malloc_string(format);
-malloc_string(these_failed);
-/** menset **/
-these_failed[0] = '\0';
 
 assert(p_external_copy_of_mountlist != NULL);
@@ -520 +509 @@
                "", mountlist->entries);
 
+    mr_asprintf(&these_failed, "");
     for (lino = 0; lino < mountlist->entries; lino++) {
         if (!strcmp(mountlist->el[lino].device, "/proc")) {
@@ -540 +530 @@
             retval += res;
             if (res) {
-                strcat(these_failed, mountlist->el[lino].device);
-                strcat(these_failed, " ");
+                mr_strcat(these_failed, "%s ",mountlist->el[lino].device);
             }
         }
@@ -556 +545 @@
                 ("format and restore *without* partitioning first. Sorry for the inconvenience.");
         }
-        sprintf(tmp, "Could not mount device(s) %s- shall I abort?",
-                these_failed);
+        sprintf(tmp, "Could not mount device(s) %s- shall I abort?", these_failed);
 
         if (!ask_me_yes_or_no(tmp)) {
@@ -573 +561 @@
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     }
+    paranoid_free(these_failed);
+
     /* Also mounting under MNT_RESTORING  special FS */
     (void)mount_device("/proc","/proc","proc",TRUE);
@@ -580 +570 @@
     paranoid_free(tmp);
     paranoid_free(format);
-    paranoid_free(these_failed);
     return (retval);
 }
@@ -896 +885 @@
 read_cfg_var(cfg_file, "acl", value);
 if (strstr(value, "TRUE")) {
-    asprintf(&g_getfacl,"setfacl");
+    mr_asprintf(&g_getfacl,"setfacl");
     log_msg(1, "We will restore ACLs");
     if (! find_home_of_exe("setfacl")) {
@@ -904 +893 @@
 read_cfg_var(cfg_file, "xattr", value);
 if (strstr(value, "TRUE")) {
-    asprintf(&g_getfattr,"setfattr");
+    mr_asprintf(&g_getfattr,"setfattr");
     log_msg(1, "We will restore XATTRs");
     if (! find_home_of_exe("setfattr")) {
@@ -1398 +1387 @@
      * the current /dev location 
      */
-    asprintf(&cmd,"tar cf - /dev | ( cd %s ; tar xf - )",MNT_RESTORING);
+    mr_asprintf(&cmd,"tar cf - /dev | ( cd %s ; tar xf - )",MNT_RESTORING);
     run_program_and_log_output(cmd, 3);
     paranoid_free(cmd);
@@ -1410 +1399 @@
     read_cfg_var(g_mondo_cfg_file, "bootloader.device", device);
     read_cfg_var(g_mondo_cfg_file, "bootloader.name", name);
-    asprintf(&tmp, "run_boot_loader: device='%s', name='%s'", device, name);
+    mr_asprintf(&tmp, "run_boot_loader: device='%s', name='%s'", device, name);
     log_msg(2, tmp);
     paranoid_free(tmp);
@@ -1427 +1416 @@
 #ifdef __FreeBSD__
     else if (!strcmp(name, "BOOT0")) {
-        asprintf(&tmp, "boot0cfg -B %s", device);
+        mr_asprintf(&tmp, "boot0cfg -B %s", device);
         res = run_program_and_log_output(tmp, FALSE);
         paranoid_free(tmp);
     } else {
-        asprintf(&tmp, "ls /dev | grep -Eq '^%ss[1-4].*'", device);
+        mr_asprintf(&tmp, "ls /dev | grep -Eq '^%ss[1-4].*'", device);
         if (!system(tmp)) {
             paranoid_free(tmp);
-            asprintf(&tmp, MNT_RESTORING "/sbin/fdisk -B %s", device);
+            mr_asprintf(&tmp, MNT_RESTORING "/sbin/fdisk -B %s", device);
             res = run_program_and_log_output(tmp, 3);
         } else {
@@ -2019 +2008 @@
     int retval = 0, lino, res = 0, i;
     char *command;
-    char *tmp;
+    char *tmp = NULL;
 
     malloc_string(command);
-    malloc_string(tmp);
     assert(p_external_copy_of_mountlist != NULL);
 
@@ -2049 +2037 @@
     paranoid_system("sync");
 
-    sprintf(tmp, "cp -f %s " MNT_RESTORING "/var/log", MONDO_LOGFILE);
+    mr_asprintf(&tmp, "cp -f %s " MNT_RESTORING "/var/log", MONDO_LOGFILE);
     if (run_program_and_log_output(tmp, FALSE)) {
         log_msg(1,
                 "Error. Failed to copy log to PC's /var/log dir. (Mounted read-only?)");
     }
+    paranoid_free(tmp);
     if (does_file_exist("/tmp/DUMBASS-GENTOO")) {
         run_program_and_log_output("mkdir -p " MNT_RESTORING
@@ -2067 +2056 @@
             continue;
         }
-        sprintf(tmp, "Unmounting device %s  ", mountlist->el[lino].device);
+        mr_asprintf(&tmp, "Unmounting device %s  ", mountlist->el[lino].device);
 
         update_progress_form(tmp);
+
         if (is_this_device_mounted(mountlist->el[lino].device)) {
             if (!strcmp(mountlist->el[lino].mountpoint, "swap")) {
@@ -2094 +2084 @@
             res = run_program_and_log_output(command, 3);
         } else {
-            strcat(tmp, "...not mounted anyway :-) OK");
+            mr_strcat(tmp, "...not mounted anyway :-) OK");
             res = 0;
         }
         g_current_progress++;
         if (res) {
-            strcat(tmp, "...Failed");
+            mr_strcat(tmp, "...Failed");
             retval++;
             log_to_screen(tmp);
@@ -2105 +2095 @@
             log_msg(2, tmp);
         }
+        paranoid_free(tmp);
     }
     close_progress_form();
@@ -2119 +2110 @@
     free(mountlist);
     paranoid_free(command);
-    paranoid_free(tmp);
     return (retval);
 }

branches/2.2.9/mondo/src/mondorestore/mondorestore.c

@@ -2 +2 @@
 $Id$
 restores mondoarchive data
+The main file for mondorestore.
 ***************************************************************************/
-
-/**
- * @file
- * The main file for mondorestore.
- */
 
 /**************************************************************************
@@ -14 +10 @@
 #include <pthread.h>
 #include "my-stuff.h"
+#include "mr_mem.h"
 #include "../common/mondostructures.h"
 #include "../common/libmondo.h"
@@ -364 +361 @@
 
     /* Clean up blkid cache file if they exist */
-    asprintf(&tmp1,"%s/etc/blkid.tab",bkpinfo->restore_path);
+    mr_asprintf(&tmp1,"%s/etc/blkid.tab",bkpinfo->restore_path);
     (void)unlink(tmp1);
     paranoid_free(tmp1);
-    asprintf(&tmp1,"%s/etc/blkid.tab.old",bkpinfo->restore_path);
+    mr_asprintf(&tmp1,"%s/etc/blkid.tab.old",bkpinfo->restore_path);
     (void)unlink(tmp1);
     paranoid_free(tmp1);
@@ -379 +376 @@
 
     /* Clean up multiconf cache file if they exist */
-    asprintf(&tmp1,"%s/var/lib/multipath/bindings",bkpinfo->restore_path);
+    mr_asprintf(&tmp1,"%s/var/lib/multipath/bindings",bkpinfo->restore_path);
     (void)unlink(tmp1);
     paranoid_free(tmp1);
 
     /* Edit multipath.conf if needed to adapt wwid */
-    asprintf(&tmp1,"%s/etc/multipath.conf", MNT_RESTORING);
+    mr_asprintf(&tmp1,"%s/etc/multipath.conf", MNT_RESTORING);
     if (does_file_exist(tmp1)) {
         log_msg(2, "We may need to clean /etc/multipath.conf");
@@ -394 +391 @@
 
     if (bkpinfo->restore_mode != nuke) {
-        asprintf(&editor, "%s", find_my_editor());
-        asprintf(&tmp1,"chroot %s %s /etc/multipath.conf", MNT_RESTORING, editor);
+        mr_asprintf(&editor, "%s", find_my_editor());
+        mr_asprintf(&tmp1,"chroot %s %s /etc/multipath.conf", MNT_RESTORING, editor);
         popup_and_OK("You will now edit multipath.conf");
         if (!g_text_mode) {
@@ -788 +785 @@
     assert(raidlist != NULL);
 
-    asprintf(&tmpA, "%s", "xxxxxxxxx");
-    asprintf(&tmpB, "%s", "xxxxxxxxx");
-    asprintf(&tmpC, "%s", "xxxxxxxxx");
+    mr_asprintf(&tmpA, "%s", "         ");
+    mr_asprintf(&tmpB, "%s", "         ");
+    mr_asprintf(&tmpC, "%s", "         ");
 
     log_msg(2, "nuke_mode --- starting");
@@ -1671 +1668 @@
 
   /** malloc **/
-    char *command;
+    char *command = NULL;
     char *tmp;
     char *filelist_name;
@@ -1685 +1682 @@
 
     assert_string_is_neither_NULL_nor_zerolength(tarball_fname);
-    malloc_string(command);
     malloc_string(tmp);
     malloc_string(filelist_name);
@@ -1698 +1694 @@
     use_star = (strstr(tarball_fname, ".star")) ? TRUE : FALSE;
 //  sprintf(files_to_restore_this_time_fname, "/tmp/ftrttf.%d.%d", (int)getpid(), (int)random());
-    sprintf(command, "mkdir -p %s/tmp", MNT_RESTORING);
+    mr_asprintf(&command, "mkdir -p %s/tmp", MNT_RESTORING);
     run_program_and_log_output(command, 9);
+    paranoid_free(command);
+
     sprintf(temp_log, "/tmp/%d.%d", (int) (random() % 32768),
             (int) (random() % 32768));
@@ -1783 +1781 @@
 //      if (strstr(tarball_fname, ".star."))
         if (use_star) {
-            sprintf(command,
+            mr_asprintf(&command,
                     "star -x -force-remove -U " STAR_ACL_SZ
                     " errctl= file=%s", tarball_fname);
             if (strstr(tarball_fname, ".bz2")) {
-                strcat(command, " -bz");
+                mr_strcat(command, " -bz");
             }
         } else {
             if (filelist_subset_fname[0] != '\0') {
-                sprintf(command,
+                mr_asprintf(&command,
                         "afio -i -M 8m -b %ld -c %ld %s -w '%s' %s",
                         TAPE_BLOCK_SIZE,
@@ -1798 +1796 @@
                         tarball_fname);
             } else {
-                sprintf(command,
+                mr_asprintf(&command,
                         "afio -i -b %ld -c %ld -M 8m %s %s",
                         TAPE_BLOCK_SIZE,
@@ -1804 +1802 @@
             }
         }
+
 #undef BUFSIZE
-        sprintf(command + strlen(command), " 2>> %s >> %s", temp_log,
-                temp_log);
+        mr_strcat(command, " 2>> %s >> %s", temp_log, temp_log);
         log_msg(1, "command = '%s'", command);
         unlink(temp_log);
@@ -1818 +1816 @@
             }
         }
+        paranoid_free(command);
+
         if (res && length_of_file(temp_log) < 5) {
             res = 0;
@@ -1849 +1849 @@
         }
         if (retval) {
-            sprintf(command, "cat %s >> %s", temp_log, MONDO_LOGFILE);
+            mr_asprintf(&command, "cat %s >> %s", temp_log, MONDO_LOGFILE);
             system(command);
+            paranoid_free(command);
+
             log_msg(2, "Errors occurred while processing fileset #%d",
                     current_tarball_number);
@@ -1867 +1869 @@
 
   leave_sub:
-    paranoid_free(command);
     paranoid_free(tmp);
     paranoid_free(filelist_name);
@@ -2249 +2250 @@
     long max_val;
   /**malloc ***/
-    char *tmp;
+    char *tmp = NULL;
+    char *tmp1 = NULL;
     char *tarball_fname;
     char *progress_str;
@@ -2271 +2273 @@
     read_cfg_var(g_mondo_cfg_file, "last-filelist-number", tmp);
     max_val = atol(tmp) + 1;
+    paranoid_free(tmp);
+
     sprintf(progress_str, "Restoring from %s #%d",
             media_descriptor_string(bkpinfo->backup_media_type),
@@ -2334 +2338 @@
                                               filelist);
             }
-            sprintf(tmp, "%s #%d, fileset #%ld - restore ",
+            mr_asprintf(&tmp1, "%s #%d, fileset #%ld - restore ",
                     media_descriptor_string(bkpinfo->backup_media_type),
                     g_current_media_number, current_tarball_number);
             if (res) {
-                strcat(tmp, "reported errors");
+                mr_strcat(tmp1, "reported errors");
             } else if (attempts > 1) {
-                strcat(tmp, "succeeded");
+                mr_strcat(tmp1, "succeeded");
             } else {
-                strcat(tmp, "succeeded");
+                mr_strcat(tmp1, "succeeded");
             }
             if (attempts > 1) {
-                sprintf(tmp + strlen(tmp), " (%d attempts) - review logs",
-                        attempts);
-            }
-            strcpy(comment, tmp);
+                mr_strcat(tmp1, " (%d attempts) - review logs", attempts);
+            }
+            strcpy(comment, tmp1);
+            paranoid_free(tmp1);
             if (attempts > 1) {
                 log_to_screen(comment);
@@ -2364 +2368 @@
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     }
-    paranoid_free(tmp);
     paranoid_free(tarball_fname);
     paranoid_free(progress_str);

branches/2.2.9/mondo/test/test-mountlist.c

@@ +1 @@
+/*
+ * $Id$
+ *
+ * Test program for mountlist management at restore time
+ * Cn be used on host system with valgrind easier than with mondorestore
+ */
 #include <stdio.h>
 #include "my-stuff.h"
+#include "mr_mem.h"
 #include "../common/mondostructures.h"
 #include "../common/libmondo.h"
@@ -44 +51 @@
     struct raidlist_itself *raidlist;
 
-    asprintf(&MONDO_LOGFILE,"/tmp/mrtest-mountlist.log");
+    mr_asprintf(&MONDO_LOGFILE,"/tmp/mrtest-mountlist.log");
 
     /* Globals */
@@ -60 +67 @@
 
 setup_newt_stuff();
-asprintf(&g_mountlist_fname, "/tmp/mountlist.txt");
+mr_asprintf(&g_mountlist_fname, "/tmp/mountlist.txt");
 log_it("before mountlist");
 load_mountlist(mountlist, g_mountlist_fname);