Changeset 2296 in MondoRescue

Timestamp:

Jul 23, 2009, 2:53:30 PM (15 years ago)

Author:

Bruno Cornec

Message:

• Replace sprintf by mr_asprintf in mondo-rstr-compare.c
• All mr_asprintf call should be on one line (for quality script) and use a string as second param
• Improve quality script

Location:

branches/2.2.10

Files:

• mondo/src/common/libmondo-archive.c (modified) (14 diffs)
• mondo/src/common/libmondo-cli.c (modified) (6 diffs)
• mondo/src/common/libmondo-devices.c (modified) (12 diffs)
• mondo/src/common/libmondo-fifo.c (modified) (1 diff)
• mondo/src/common/libmondo-filelist.c (modified) (1 diff)
• mondo/src/common/libmondo-files.c (modified) (15 diffs)
• mondo/src/common/libmondo-fork.c (modified) (2 diffs)
• mondo/src/common/libmondo-stream.c (modified) (9 diffs)
• mondo/src/common/libmondo-tools.c (modified) (10 diffs)
• mondo/src/common/libmondo-verify.c (modified) (9 diffs)
• mondo/src/common/newt-specific.c (modified) (5 diffs)
• mondo/src/mondorestore/mondo-prep.c (modified) (13 diffs)
• mondo/src/mondorestore/mondo-rstr-compare.c (modified) (26 diffs)
• mondo/src/mondorestore/mondo-rstr-tools.c (modified) (17 diffs)
• mondo/src/mondorestore/mondorestore.c (modified) (10 diffs)
• tools/quality (modified) (2 diffs)

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

@@ -350 +350 @@
     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);
+    mr_asprintf(&command, "afio -o -b %ld -M 16m %s %s < %s 2>> %s", TAPE_BLOCK_SIZE, zipparams, fname, filelist, MONDO_LOGFILE);
     paranoid_free(zipparams);
 
@@ -867 +866 @@
     log_msg(1, "lines_in_filelist = %ld", lines_in_filelist);
 
-    mr_asprintf(&command,
-/*     "mindi --custom 2=%s 3=%s/images 4=\"%s\" 5=\"%s\" \
+/*     "mindi 1=%s --custom 2=%s 3=%s/images 4=\"%s\" 5=\"%s\" \
 6=\"%s\" 7=%ld 8=\"%s\" 9=\"%s\" 10=\"%s\" \
 11=\"%s\" 12=%s 13=%ld 14=\"%s\" 15=\"%s\" 16=\"%s\" 17=\"%s\" 18=%ld 19=%d",*/
-            "mindi %s --custom %s %s/images '%s' '%s' \
+    mr_asprintf(&command, "mindi %s --custom %s %s/images '%s' '%s' \
 '%s' %ld '%s' '%s' '%s' \
 '%s' %s %ld '%s' '%s' '%s' '%s' %ld %d '%s'", tmp2, bkpinfo->tmpdir,    // parameter #2
@@ -1076 +1074 @@
                 this_thread_no, archiving_set_no);
         if (g_getfattr) {
-            mr_asprintf(&curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ,
-                bkpinfo->tmpdir, archiving_set_no);
+            mr_asprintf(&curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ, bkpinfo->tmpdir, archiving_set_no);
             get_fattr_list(archiving_filelist_fname, curr_xattr_list_fname);
             mr_free(curr_xattr_list_fname);
         }
         if (g_getfacl) {
-            mr_asprintf(&curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ,
-                bkpinfo->tmpdir, archiving_set_no);
+            mr_asprintf(&curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ, bkpinfo->tmpdir, archiving_set_no);
             get_acl_list(archiving_filelist_fname, curr_acl_list_fname);
             mr_free(curr_acl_list_fname);
@@ -1097 +1093 @@
 
         if (res) {
-            mr_asprintf(&tmp,
-                    "Errors occurred while archiving set %ld. Please review logs.",
-                    archiving_set_no);
+            mr_asprintf(&tmp, "Errors occurred while archiving set %ld. Please review logs.", archiving_set_no);
             log_to_screen(tmp);
             mr_free(tmp);
@@ -1427 +1421 @@
             } else {
                 // store set N
-                mr_asprintf(&storing_filelist_fname, FILELIST_FNAME_RAW_SZ,
-                        bkpinfo->tmpdir, storing_set_no);
-                mr_asprintf(&storing_afioball_fname, AFIOBALL_FNAME_RAW_SZ,
-                        bkpinfo->tmpdir, storing_set_no, bkpinfo->zip_suffix);
+                mr_asprintf(&storing_filelist_fname, FILELIST_FNAME_RAW_SZ, bkpinfo->tmpdir, storing_set_no);
+                mr_asprintf(&storing_afioball_fname, AFIOBALL_FNAME_RAW_SZ, bkpinfo->tmpdir, storing_set_no, bkpinfo->zip_suffix);
                 if (g_getfattr) {
-                    mr_asprintf(&curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ,
-                        bkpinfo->tmpdir, storing_set_no);
+                    mr_asprintf(&curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ, bkpinfo->tmpdir, storing_set_no);
                 }
                 if (g_getfacl) {
-                    mr_asprintf(&curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ,
-                        bkpinfo->tmpdir, storing_set_no);
+                    mr_asprintf(&curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ, bkpinfo->tmpdir, storing_set_no);
                 }
 
@@ -1491 +1481 @@
                 mr_free(media_usage_comment);
                 if (res) {
-                    mr_asprintf(&tmp, "Failed to add archive %ld's files to CD dir\n",
-                        storing_set_no);
+                    mr_asprintf(&tmp, "Failed to add archive %ld's files to CD dir\n", storing_set_no);
                     log_to_screen(tmp);
                     paranoid_free(tmp);
@@ -1717 +1706 @@
 
     if (bkpinfo->call_before_iso[0] != '\0') {
-        mr_asprintf(&message_to_screen, "Running pre-ISO call for CD#%d",
-                g_current_media_number);
+        mr_asprintf(&message_to_screen, "Running pre-ISO call for CD#%d", g_current_media_number);
         res =
             eval_call_to_make_ISO(bkpinfo->call_before_iso,
@@ -1763 +1751 @@
             retval += res;
 #ifdef DVDRWFORMAT
-            mr_asprintf(&tmp,
-                    "tail -n8 %s | grep 'blank=full.*dvd-compat.*DAO'",
-                    MONDO_LOGFILE);
+            mr_asprintf(&tmp, "tail -n8 %s | grep 'blank=full.*dvd-compat.*DAO'", MONDO_LOGFILE);
             if (g_backup_media_type == dvd
                 && (res || !run_program_and_log_output(tmp, 1))) {
@@ -2089 +2075 @@
                         "Calling ntfsclone in background because %s is an NTFS partition",
                         bigfile_fname);
-                mr_asprintf(&sz_devfile, "%s/%d.%d.000", bkpinfo->tmpdir,
-                        (int) (random() % 32768),
-                        (int) (random() % 32768));
+                mr_asprintf(&sz_devfile, "%s/%d.%d.000", bkpinfo->tmpdir, (int) (random() % 32768), (int) (random() % 32768));
                 mkfifo(sz_devfile, 0x770);
                 ntfsprog_fifo = sz_devfile;
@@ -2774 +2758 @@
             mr_asprintf(&tmp, "cat %s 2> /dev/null", szserfname);
             mr_free(our_serial_str);
-            mr_asprintf(&our_serial_str, "%s",
-                   call_program_and_get_last_line_of_output(tmp));
+            mr_asprintf(&our_serial_str, "%s", call_program_and_get_last_line_of_output(tmp));
             mr_free(tmp);
             // FIXME - should be able to use last_line_of_file(), surely?
@@ -2812 +2795 @@
         eject_device(cdrom_dev);
         mds = media_descriptor_string(g_backup_media_type);
-        mr_asprintf(&tmp, "I am about to burn %s #%d of the backup set. Please insert %s and press Enter.", 
-                mds, g_current_media_number, mds);
+        mr_asprintf(&tmp, "I am about to burn %s #%d of the backup set. Please insert %s and press Enter.", mds, g_current_media_number, mds);
         mr_free(mds);
 
@@ -3114 +3096 @@
                 mr_asprintf(&tmp, "Problem with slice # %ld", slice_num);
             } else {
-                mr_asprintf(&tmp, "%s - Bigfile #%ld, slice #%ld compressed OK          ", biggie_filename, biggie_file_number + 1,
-                        slice_num);
+                mr_asprintf(&tmp, "%s - Bigfile #%ld, slice #%ld compressed OK          ", biggie_filename, biggie_file_number + 1, slice_num);
             }
 #ifndef _XWIN
@@ -3351 +3332 @@
     if (space_occupied_by_cd(bkpinfo->scratchdir) / 1024 >
         bkpinfo->media_size[g_current_media_number]) {
-        mr_asprintf(&tmp1,
-                "Warning! CD is too big. It occupies %ld KB, which is more than the %ld KB allowed.",
-                (long) space_occupied_by_cd(bkpinfo->scratchdir),
+        mr_asprintf(&tmp1, "Warning! CD is too big. It occupies %ld KB, which is more than the %ld KB allowed.", (long) space_occupied_by_cd(bkpinfo->scratchdir),
                 (long) bkpinfo->media_size[g_current_media_number]);
         log_to_screen(tmp1);
         mr_free(tmp1);
     }
-    mr_asprintf(&isofile, "%s/%s/%s-%d.iso", bkpinfo->isodir,
-            bkpinfo->nfs_remote_dir, bkpinfo->prefix,
-            g_current_media_number);
+    mr_asprintf(&isofile, "%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->nfs_remote_dir, bkpinfo->prefix, g_current_media_number);
     for (that_one_was_ok = FALSE; !that_one_was_ok;) {
         if (bkpinfo->backup_media_type != usb) {
@@ -3421 +3398 @@
     }
     wipe_archives(bkpinfo->scratchdir);
-    mr_asprintf(&tmp1, "rm -Rf %s/images/*gz %s/images/*data*img",
-            bkpinfo->scratchdir, bkpinfo->scratchdir);
+    mr_asprintf(&tmp1, "rm -Rf %s/images/*gz %s/images/*data*img", bkpinfo->scratchdir, bkpinfo->scratchdir);
     if (system(tmp1)) {
         log_msg

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

@@ -901 +901 @@
         }
         flag_set['d'] = TRUE;
-        mr_asprintf(&tmp1,
-                "You didn't specify a tape streamer device. I'm assuming %s",
-                flag_val['d']);
+        mr_asprintf(&tmp1, "You didn't specify a tape streamer device. I'm assuming %s", flag_val['d']);
         log_to_screen(tmp1);
         mr_free(tmp1);
@@ -1184 +1182 @@
 
     if (flag_set['b']) {
-        mr_asprintf(&psz, flag_val['b']);
+        mr_asprintf(&psz, "%s", flag_val['b']);
         log_msg(1, "psz = '%s'", psz);
         if (psz[strlen(psz) - 1] == 'k') {
@@ -1230 +1228 @@
             && !does_file_exist(bkpinfo->kernel_path)) {
             retval++;
-            mr_asprintf(&tmp1,
-                    "You specified kernel '%s', which does not exist\n",
-                    bkpinfo->kernel_path);
+            mr_asprintf(&tmp1, "You specified kernel '%s', which does not exist\n", bkpinfo->kernel_path);
             log_to_screen(tmp1);
             mr_free(tmp1);
@@ -1272 +1268 @@
         if (i) {
             retval++;
-            mr_asprintf(&tmp2,
-                    "Are you sure directory '%s' exists in remote dir '%s'?\nIf so, do you have rights to write to it?\n",
-                    bkpinfo->nfs_remote_dir, bkpinfo->nfs_mount);
+            mr_asprintf(&tmp2, "Are you sure directory '%s' exists in remote dir '%s'?\nIf so, do you have rights to write to it?\n", bkpinfo->nfs_remote_dir, bkpinfo->nfs_mount);
             log_to_screen(tmp2);
             mr_free(tmp2);
@@ -1593 +1587 @@
     case SIGKILL:
         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.");
+        mr_asprintf(&tmp2, "I seriously have no clue how this signal even got to me. Something's wrong with your system.");
         break;
     case SIGTERM:
@@ -1606 +1599 @@
     case SIGSEGV:
         mr_asprintf(&tmp, "SIGSEGV");
-        mr_asprintf(&tmp2,
-               "Internal programming error. Please send a backtrace as well as your log.");
+        mr_asprintf(&tmp2, "Internal programming error. Please send a backtrace as well as your log.");
         break;
     case SIGPIPE:

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

@@ -257 +257 @@
         mr_asprintf(&command, "cdcontrol -f %s close", dev);
     } else {
-        mr_asprintf(&command, "camcontrol load `echo %s | sed 's|/dev/||'`",
-                dev);
+        mr_asprintf(&command, "camcontrol load `echo %s | sed 's|/dev/||'`", dev);
     }
 #else
@@ -343 +342 @@
 #ifdef __FreeBSD__
     // We assume here that this is running from mondorestore. (It is.)
-    mr_asprintf(&program, "ls %s %s >/dev/null 2>&1", drive,
-            build_partition_name(tmp, drive, partno));
+    mr_asprintf(&program, "ls %s %s >/dev/null 2>&1", drive, build_partition_name(tmp, drive, partno));
     res = system(program);
     mr_free(program);
@@ -399 +397 @@
     assert_string_is_neither_NULL_nor_zerolength(str);
 
-    mr_asprintf(&command,
-            "dd if=%s bs=446 count=1 2> /dev/null | strings | grep \"%s\" > /dev/null 2> /dev/null",
-            dev, str);
+    mr_asprintf(&command, "dd if=%s bs=446 count=1 2> /dev/null | strings | grep \"%s\" > /dev/null 2> /dev/null", dev, str);
     i = system(command);
     mr_free(command);
@@ -425 +421 @@
     int i;
 
-    mr_asprintf(&command,
-            "dd if=%s bs=512 count=%i 2> /dev/null | strings | grep \"%s\" > /dev/null 2> /dev/null",
-            dev, n, str);
+    mr_asprintf(&command, "dd if=%s bs=512 count=%i 2> /dev/null | strings | grep \"%s\" > /dev/null 2> /dev/null", dev, n, str);
     i = system(command);
     mr_free(command);
@@ -530 +524 @@
     }
     if (find_home_of_exe(cdr_exe)) {
-        mr_asprintf(&command,
-                "%s -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep CD | cut -d' ' -f2 | head -n1",
-                cdr_exe);
+        mr_asprintf(&command, "%s -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep CD | cut -d' ' -f2 | head -n1", cdr_exe);
         mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));
         mr_free(command);
@@ -848 +840 @@
     }
 
-    mr_asprintf(&command,
-            "%s -scanbus | grep \"[0-9],[0-9],[0-9]\" | grep \"[D|C][V|D]\" | grep -n \"\" | grep \"%s\" | cut -d':' -f2",
-            cdr_exe, g_cdrw_drive_is_here);
+    mr_asprintf(&command, "%s -scanbus | grep \"[0-9],[0-9],[0-9]\" | grep \"[D|C][V|D]\" | grep -n \"\" | grep \"%s\" | cut -d':' -f2", cdr_exe, g_cdrw_drive_is_here);
     log_msg(1, "command=%s", command);
     mr_asprintf(&tmp1, "%s", call_program_and_get_last_line_of_output(command));
@@ -1042 +1032 @@
 
 #ifdef __FreeBSD__
-    mr_asprintf(&command,
-            "lsvfs | tr -s '\t' ' ' | grep -v Filesys | grep -v -- -- | cut -d' ' -f1 | tr -s '\n' ' '");
+    mr_asprintf(&command, "lsvfs | tr -s '\t' ' ' | grep -v Filesys | grep -v -- -- | cut -d' ' -f1 | tr -s '\n' ' '");
 #else
-    mr_asprintf(&command,
-            "grep -v nodev /proc/filesystems | tr -s '\t' ' ' | cut -d' ' -f2 | tr -s '\n' ' '");
+    mr_asprintf(&command, "grep -v nodev /proc/filesystems | tr -s '\t' ' ' | cut -d' ' -f2 | tr -s '\n' ' '");
 #endif
 
@@ -1243 +1231 @@
 
 #ifdef __FreeBSD__
-    mr_asprintf(&command, "mount_vfat %s %s 2>> %s",
-            device, mountpoint, MONDO_LOGFILE);
+    mr_asprintf(&command, "mount_vfat %s %s 2>> %s", device, mountpoint, MONDO_LOGFILE);
 
 #else
-    mr_asprintf(&command, "mount %s -t vfat %s 2>> %s",
-            device, mountpoint, MONDO_LOGFILE);
+    mr_asprintf(&command, "mount %s -t vfat %s 2>> %s", device, mountpoint, MONDO_LOGFILE);
 #endif
 
@@ -1382 +1368 @@
         mr_free(tmp);
 
-        mr_asprintf(&tmp, "%s/%s/%s-%d.iso", bkpinfo->isodir,
-                bkpinfo->nfs_remote_dir, bkpinfo->prefix,
-                cd_number_i_want);
+        mr_asprintf(&tmp, "%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->nfs_remote_dir, bkpinfo->prefix, cd_number_i_want);
         if (!does_file_exist(tmp)) {
             mr_free(tmp);
-            mr_asprintf(&tmp, "%s/isodir/%s/%s-%d.iso", bkpinfo->tmpdir,
-                    bkpinfo->nfs_remote_dir, bkpinfo->prefix,
-                    cd_number_i_want);
+            mr_asprintf(&tmp, "%s/isodir/%s/%s-%d.iso", bkpinfo->tmpdir, bkpinfo->nfs_remote_dir, bkpinfo->prefix, cd_number_i_want);
             if (does_file_exist(tmp)) {
                 log_msg(1,
@@ -1550 +1532 @@
             mr_free(tmp);
 
-            mr_asprintf(&comment,
-                    "How much data (in Megabytes) will each %s store?", mds);
+            mr_asprintf(&comment, "How much data (in Megabytes) will each %s store?", mds);
             mr_free(mds);
             if (!popup_and_get_string("Size", comment, sz_size, 5)) {
@@ -1588 +1569 @@
                 log_msg(1, "bkpinfo->media_device = %s",
                         bkpinfo->media_device);
-                mr_asprintf(&comment,
-                        "Please specify your %s drive's /dev entry", mds);
+                mr_asprintf(&comment, "Please specify your %s drive's /dev entry", mds);
                 if (!popup_and_get_string
                     ("Device?", comment, bkpinfo->media_device,
@@ -1761 +1741 @@
 
             if (!bkpinfo->restore_data) {
-                mr_asprintf(&comment,
-                    "How much data (in Megabytes) will each media store?");
+                mr_asprintf(&comment, "How much data (in Megabytes) will each media store?");
                 if (!popup_and_get_string("Size", comment, sz_size, 5)) {
                     mr_free(comment);

branches/2.2.10/mondo/src/common/libmondo-fifo.c

@@ -88 +88 @@
     for (bufsize = wise_upper_limit, res = -1;
          res != 0 && bufsize >= wise_lower_limit; bufsize--) {
-        mr_asprintf(&tmp,
-                "dd if=/dev/zero bs=1024 count=16k 2> /dev/null | buffer -o /dev/null -s %ld -m %d%c",
-                internal_tape_block_size, bufsize, 'm');
+        mr_asprintf(&tmp, "dd if=/dev/zero bs=1024 count=16k 2> /dev/null | buffer -o /dev/null -s %ld -m %d%c", internal_tape_block_size, bufsize, 'm');
         res = run_program_and_log_output(tmp, 2);
         mr_free(tmp);

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

@@ -500 +500 @@
         mr_free(command);
 
-        mr_asprintf(&command,
-                "getfacl --all-effective -P %s 2>> %s | gzip -c1 > %s 2>> %s",
-                filelist, MONDO_LOGFILE, facl_fname, MONDO_LOGFILE);
+        mr_asprintf(&command, "getfacl --all-effective -P %s 2>> %s | gzip -c1 > %s 2>> %s", filelist, MONDO_LOGFILE, facl_fname, MONDO_LOGFILE);
         log_it("%s",command);
         retval = system(command);

branches/2.2.10/mondo/src/common/libmondo-files.c

@@ -71 +71 @@
         mr_free(command);
     } else {
-        mr_asprintf(&tmp, "File '%s' not found; cannot calc checksum",
-                filename);
+        mr_asprintf(&tmp, "File '%s' not found; cannot calc checksum", filename);
         log_it(tmp);
         mr_free(tmp);
@@ -143 +142 @@
     assert_string_is_neither_NULL_nor_zerolength(filename);
     if (!does_file_exist(filename)) {
-        mr_asprintf(&tmp,
-                "%s does not exist, so I cannot found the number of lines in it",
-                filename);
+        mr_asprintf(&tmp, "%s does not exist, so I cannot found the number of lines in it", filename);
         log_it(tmp);
         mr_free(tmp);
@@ -358 +355 @@
             return (NULL);      // forget it :)
         }
-        mr_asprintf(&command,
-                "file %s 2> /dev/null | cut -d':' -f1 2> /dev/null",
-                incoming);
+        mr_asprintf(&command, "file %s 2> /dev/null | cut -d':' -f1 2> /dev/null", incoming);
         strcpy(incoming,
                call_program_and_get_last_line_of_output(command));
@@ -459 +454 @@
          && !strstr(err_log_lines[i], "% done"); i--);
     if (i < 0) {
-        mr_asprintf(&command,
-                "tail -n3 %s | grep -Fi \"%c\" | tail -n1 | awk '{print $0;}'",
-                filename, '%');
+        mr_asprintf(&command, "tail -n3 %s | grep -Fi \"%c\" | tail -n1 | awk '{print $0;}'", filename, '%');
         strcpy(lastline,
                call_program_and_get_last_line_of_output(command));
@@ -512 +505 @@
 
     if (!does_file_exist(filename)) {
-        mr_asprintf(&tmp, "Tring to get last line of nonexistent file (%s)",
-                filename);
+        mr_asprintf(&tmp, "Tring to get last line of nonexistent file (%s)", filename);
         log_it(tmp);
         mr_free(tmp);
@@ -630 +622 @@
                 time_remaining =
                     time_taken * 100 / (long) (percentage) - time_taken;
-                mr_asprintf(&tmp,
-                        "%02d%% done   %02d:%02d taken   %02d:%02d remaining  %-37s\r",
-                        percentage, (int) (time_taken / 60),
-                        (int) (time_taken % 60),
-                        (int) (time_remaining / 60),
-                        (int) (time_remaining % 60), curr_fname);
+                mr_asprintf(&tmp, "%02d%% done   %02d:%02d taken   %02d:%02d remaining  %-37s\r", percentage, (int) (time_taken / 60), (int) (time_taken % 60), (int) (time_remaining / 60), (int) (time_remaining % 60), curr_fname);
                 log_to_screen(tmp);
                 mr_free(tmp);
@@ -758 +745 @@
 
     mr_asprintf(&mountlist, "%s/mountlist.txt", tmpdir);
-    mr_asprintf(&command,
-            "grep \"%s \" %s/mountlist.txt | head -n1 | awk '{print $4}'",
-            dev, tmpdir);
+    mr_asprintf(&command, "grep \"%s \" %s/mountlist.txt | head -n1 | awk '{print $4}'", dev, tmpdir);
     mr_free(mountlist);
 
@@ -837 +822 @@
                 log_msg(4, "%s --> %ld K", fname, file_len_K);
             }
-            mr_asprintf(&comment,
-                    "After adding %s, scratchL+%ld now equals %ld", fname,
-                    file_len_K, scratchL);
+            mr_asprintf(&comment, "After adding %s, scratchL+%ld now equals %ld", fname, file_len_K, scratchL);
             log_msg(4, comment);
             mr_free(comment);
@@ -1060 +1043 @@
         find_and_store_mondoarchives_home(g_mondo_home);
     }
-    mr_asprintf(&command, CP_BIN " --parents -pRdf %s %s", g_mondo_home,
-            bkpinfo->scratchdir);
+    mr_asprintf(&command, CP_BIN " --parents -pRdf %s %s", g_mondo_home, bkpinfo->scratchdir);
 
     log_msg(4, "command = %s", command);
@@ -1071 +1053 @@
     }
 
-    mr_asprintf(&command, "cp -f %s/LAST-FILELIST-NUMBER %s", bkpinfo->tmpdir,
-            bkpinfo->scratchdir);
+    mr_asprintf(&command, "cp -f %s/LAST-FILELIST-NUMBER %s", bkpinfo->tmpdir, bkpinfo->scratchdir);
     res = run_program_and_log_output(command, FALSE);
     mr_free(command);
@@ -1099 +1080 @@
 
     if (bkpinfo->postnuke_tarball[0]) {
-        mr_asprintf(&command, "cp -f %s %s/post-nuke.tgz",
-                bkpinfo->postnuke_tarball, bkpinfo->tmpdir);
+        mr_asprintf(&command, "cp -f %s %s/post-nuke.tgz", bkpinfo->postnuke_tarball, bkpinfo->tmpdir);
         res = run_program_and_log_output(command, FALSE);
         mr_free(command);
@@ -1150 +1130 @@
     }
     *(p++) = '\0';
-    mr_asprintf(&nfs_server_ipaddr, tmp);
-    mr_asprintf(&nfs_mount, p);
+    mr_asprintf(&nfs_server_ipaddr, "%s", tmp);
+    mr_asprintf(&nfs_mount, "%s", p);
     mr_free(tmp);
 
     /* BERLIOS : there is a bug #67 here as it only considers the first NIC */
-    mr_asprintf(&command,
-            "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\n' | head -n1 | cut -d' ' -f1");
+    mr_asprintf(&command, "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\n' | head -n1 | cut -d' ' -f1");
     mr_asprintf(&nfs_dev, "%s", call_program_and_get_last_line_of_output(command));
     mr_free(command);
 
-    mr_asprintf(&command,
-            "%s", "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\\n' | head -n1 | tr -s '\t' ' ' | cut -d' ' -f7 | cut -d':' -f2");
+    mr_asprintf(&command, "%s", "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\\n' | head -n1 | tr -s '\t' ' ' | cut -d' ' -f7 | cut -d':' -f2");
     mr_asprintf(&nfs_client_ipaddr, "%s", call_program_and_get_last_line_of_output(command));
     mr_free(command);
 
-    mr_asprintf(&command,
-            "%s", "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\\n' | head -n1 | tr -s '\t' ' ' | cut -d' ' -f9 | cut -d':' -f2");
+    mr_asprintf(&command, "%s", "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\\n' | head -n1 | tr -s '\t' ' ' | cut -d' ' -f9 | cut -d':' -f2");
     mr_asprintf(&nfs_client_netmask, "%s", call_program_and_get_last_line_of_output(command));
     mr_free(command);
 
-    mr_asprintf(&command,
-            "%s", "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\\n' | head -n1 | tr -s '\t' ' ' | cut -d' ' -f8 | cut -d':' -f2");
+    mr_asprintf(&command, "%s", "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\\n' | head -n1 | tr -s '\t' ' ' | cut -d' ' -f8 | cut -d':' -f2");
     mr_asprintf(&nfs_client_broadcast, "%s", call_program_and_get_last_line_of_output(command));
     mr_free(command);
 
-    mr_asprintf(&command,
-            "%s", "route -n | grep '^0.0.0.0' | awk '{print $2}'");
+    mr_asprintf(&command, "%s", "route -n | grep '^0.0.0.0' | awk '{print $2}'");
     mr_asprintf(&nfs_client_defgw, "%s", call_program_and_get_last_line_of_output(command));
     mr_free(command);
@@ -1195 +1170 @@
     if (!strncmp(nfs_dev, "bond", 4) || !strncmp(nfs_dev, "alb", 3) || !strncmp(nfs_dev, "aft", 3)) {
         log_to_screen("Found bonding device %s; looking for corresponding ethN slave device\n", nfs_dev);
-        mr_asprintf(&command,
-                "%s", "ifconfig %s | awk '{print $5}' | head -n1", nfs_dev);
+        mr_asprintf(&command, "%s", "ifconfig %s | awk '{print $5}' | head -n1", nfs_dev);
         mr_asprintf(&mac_addr, "%s", call_program_and_get_last_line_of_output(command));
         mr_free(command);
@@ -1204 +1178 @@
         mr_free(nfs_dev);
 
-        mr_asprintf(&nfs_dev, call_program_and_get_last_line_of_output(command));
+        mr_asprintf(&nfs_dev, "%s", call_program_and_get_last_line_of_output(command));
         mr_free(command);
 
@@ -1313 +1287 @@
         mr_free(mds);
     } else if (scratchLL > 4) {
-        mr_asprintf(&tmp,
-                "Your backup will occupy one meeeeellion media! (maybe %s)",
-                number_to_text((int) (scratchLL + 1)));
+        mr_asprintf(&tmp, "Your backup will occupy one meeeeellion media! (maybe %s)", number_to_text((int) (scratchLL + 1)));
     } else {
-        mr_asprintf(&tmp, "Your backup will occupy approximately %s media.",
-                number_to_text((int) (scratchLL + 1)));
+        mr_asprintf(&tmp, "Your backup will occupy approximately %s media.", number_to_text((int) (scratchLL + 1)));
     }
     if (!bkpinfo->image_devs[0] && (scratchLL < 50)) {

branches/2.2.10/mondo/src/common/libmondo-fork.c

@@ -283 +283 @@
         log_if_failure = TRUE;
     }
-    mr_asprintf(&callstr, "%s > %s/mondo-run-prog-thing.tmp 2> %s/mondo-run-prog-thing.err",
-             program, bkpinfo->tmpdir, bkpinfo->tmpdir);
+    mr_asprintf(&callstr, "%s > %s/mondo-run-prog-thing.tmp 2> %s/mondo-run-prog-thing.err", program, bkpinfo->tmpdir, bkpinfo->tmpdir);
     while ((p = strchr(callstr, '\r'))) {
         *p = ' ';
@@ -390 +389 @@
     mr_asprintf(&lockfile, "%s/mojo-jojo.bla.bla", bkpinfo->tmpdir);
 
-    mr_asprintf(&command,
-            "echo hi > %s ; %s >> %s 2>> %s; res=$?; sleep 1; rm -f %s; exit $res",
-            lockfile, basic_call, MONDO_LOGFILE, MONDO_LOGFILE, lockfile);
+    mr_asprintf(&command, "echo hi > %s ; %s >> %s 2>> %s; res=$?; sleep 1; rm -f %s; exit $res", lockfile, basic_call, MONDO_LOGFILE, MONDO_LOGFILE, lockfile);
     open_evalcall_form(what_i_am_doing);
     mr_asprintf(&tmp, "Executing %s", basic_call);

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

@@ -273 +273 @@
         strcpy(cdr_exe, "dvdrecord");
     }
-    mr_asprintf(&command, "%s -scanbus 2> /dev/null | grep -i tape | wc -l",
-            cdr_exe);
+    mr_asprintf(&command, "%s -scanbus 2> /dev/null | grep -i tape | wc -l", cdr_exe);
     strcpy(tmp, call_program_and_get_last_line_of_output(command));
     mr_free(command);
@@ -284 +283 @@
         return 1;
     }
-    mr_asprintf(&command,
-            "%s -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep -i TAPE | cut -d' ' -f2 | head -n1",
-            cdr_exe);
+    mr_asprintf(&command, "%s -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep -i TAPE | cut -d' ' -f2 | head -n1", cdr_exe);
     strcpy(tmp, call_program_and_get_last_line_of_output(command));
     mr_free(command);
@@ -294 +291 @@
         return 1;
     }
-    mr_asprintf(&command,
-            "%s -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep -i TAPE | cut -d' ' -f3 | cut -d')' -f1 | head -n1",
-            cdr_exe);
+    mr_asprintf(&command, "%s -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep -i TAPE | cut -d' ' -f3 | cut -d')' -f1 | head -n1", cdr_exe);
     strcpy(tmp, call_program_and_get_last_line_of_output(command));
     mr_free(command);
@@ -475 +470 @@
     log_it("Insisting on tape #%d", tapeno);
     if (g_current_media_number != tapeno) {
-        mr_asprintf(&tmp,
-                "When the tape drive goes quiet, please insert volume %d in this series.",
-                tapeno);
+        mr_asprintf(&tmp, "When the tape drive goes quiet, please insert volume %d in this series.", tapeno);
         popup_and_OK(tmp);
         mr_free(tmp);
@@ -869 +862 @@
     (void) getcwd(old_cwd, MAX_STR_LEN);
     chdir(bkpinfo->tmpdir);
-    mr_asprintf(&tmp, "tar -zxf %s ./tmp/mondo-restore.cfg 2> /dev/null",
-            outfname);
+    mr_asprintf(&tmp, "tar -zxf %s ./tmp/mondo-restore.cfg 2> /dev/null", outfname);
     paranoid_system(tmp);
     mr_free(tmp);
@@ -1143 +1135 @@
     }
     if (strcmp(temp_cksum, actual_cksum)) {
-        mr_asprintf(&tmp, "actual cksum=%s; recorded cksum=%s", actual_cksum,
-                temp_cksum);
+        mr_asprintf(&tmp, "actual cksum=%s; recorded cksum=%s", actual_cksum, temp_cksum);
         log_to_screen(tmp);
         mr_free(tmp);
 
-        mr_asprintf(&tmp, "%s (%ld K) is corrupt on tape", temp_fname,
-                (long) orig_size >> 10);
+        mr_asprintf(&tmp, "%s (%ld K) is corrupt on tape", temp_fname, (long) orig_size >> 10);
         log_to_screen(tmp);
         mr_free(tmp);
@@ -1500 +1490 @@
     }
     if (bkpinfo->backup_media_type == cdstream) {
-        mr_asprintf(&command,
-                "cdrecord -eject dev=%s speed=%d fs=24m -waiti - >> %s 2>> %s",
-                bkpinfo->media_device, bkpinfo->cdrw_speed, MONDO_LOGFILE,
-                MONDO_LOGFILE);
+        mr_asprintf(&command, "cdrecord -eject dev=%s speed=%d fs=24m -waiti - >> %s 2>> %s", bkpinfo->media_device, bkpinfo->cdrw_speed, MONDO_LOGFILE, MONDO_LOGFILE);
         log_it("Opening OUT to next CD with the command");
         log_it(command);
@@ -1706 +1693 @@
         p++;
     }
-    mr_asprintf(&tmp, "Writing file '%s' to tape (%ld KB)", p,
-            (long) filesize >> 10);
+    mr_asprintf(&tmp, "Writing file '%s' to tape (%ld KB)", p, (long) filesize >> 10);
     log_it(tmp);
     mr_free(tmp);
@@ -1812 +1798 @@
         fwrite(tempblock, 1, (size_t) TAPE_BLOCK_SIZE,
                g_tape_stream) / 1024;
-    mr_asprintf(&tmp, "%s (fname=%s, size=%ld K)",
-            marker_to_string(control_char), p,
-            (long) length_of_incoming_file >> 10);
+    mr_asprintf(&tmp, "%s (fname=%s, size=%ld K)", marker_to_string(control_char), p, (long) length_of_incoming_file >> 10);
     log_msg(6, tmp);
     mr_free(tmp);

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

@@ -610 +610 @@
 
         log_it("isodir = %s", bkpinfo->isodir);
-        mr_asprintf(&command, "df -P %s | tail -n1 | cut -d' ' -f1",
-                bkpinfo->isodir);
+        mr_asprintf(&command, "df -P %s | tail -n1 | cut -d' ' -f1", bkpinfo->isodir);
         log_it("command = %s", command);
         log_it("res of it = %s", call_program_and_get_last_line_of_output(command));
@@ -911 +910 @@
             ("ln -sf `which mkfs.msdos` /sbin/mkfs.vfat", FALSE);
     }
-    mr_asprintf(&tmp, "%s",
-           call_program_and_get_last_line_of_output
-           ("free | grep Mem | head -n1 | tr -s ' ' '\t' | cut -f2"));
+    mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output("free | grep Mem | head -n1 | tr -s ' ' '\t' | cut -f2"));
     if (atol(tmp) < 35000) {
         retval++;
@@ -984 +981 @@
     run_program_and_log_output
         ("umount `mount | grep cdr | cut -d' ' -f3 | tr '\n' ' '`", 5);
-    mr_asprintf(&tmp, "%s",
-           call_program_and_get_last_line_of_output
-           ("mount | grep -E \"cdr(om|w)\""));
+    mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output("mount | grep -E \"cdr(om|w)\""));
     if (strcmp("", tmp)) {
         if (strstr(tmp, "autofs")) {
@@ -1067 +1062 @@
     assert_string_is_neither_NULL_nor_zerolength(label);
     if (!does_file_exist(config_file)) {
-        mr_asprintf(&tmp, "(read_cfg_var) Cannot find %s config file",
-                config_file);
+        mr_asprintf(&tmp, "(read_cfg_var) Cannot find %s config file", config_file);
         log_to_screen(tmp);
         mr_free(tmp);
@@ -1078 +1072 @@
         return (0);
     } else {
-        mr_asprintf(&command, "grep '%s .*' %s| cut -d' ' -f2,3,4,5",
-                label, config_file);
+        mr_asprintf(&command, "grep '%s .*' %s| cut -d' ' -f2,3,4,5", label, config_file);
         strcpy(value, call_program_and_get_last_line_of_output(command));
         mr_free(command);
@@ -1207 +1200 @@
     g_boot_mountpt[0] = '\0';
     log_msg(4, "Done. Great. Seeting command to something");
-    mr_asprintf(&command, "%s",
-           "grep -v \":\" /etc/fstab | grep -vE '^#.*$' | grep -E \"[   ]/boot[     ]\" | tr -s ' ' '\t' | cut -f1 | head -n1");
+    mr_asprintf(&command, "grep -v \":\" /etc/fstab | grep -vE '^#.*$' | grep -E \"[    ]/boot[     ]\" | tr -s ' ' '\t' | cut -f1 | head -n1");
     log_msg(4, "Cool. Command = '%s'", command);
     mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));
@@ -1218 +1210 @@
         mr_asprintf(&command, "mount | grep -Ew '/boot'");
         mr_free(tmp);
-        mr_asprintf(&tmp, call_program_and_get_last_line_of_output(command));
+        mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));
         mr_free(command);
 
@@ -1235 +1227 @@
                     strcpy(g_boot_mountpt, tmp);
                     mr_free(tmp);
-                    mr_asprintf(&tmp,
-                            "%s (your /boot partition) is not mounted. I'll mount it before backing up",
-                            g_boot_mountpt);
+                    mr_asprintf(&tmp, "%s (your /boot partition) is not mounted. I'll mount it before backing up", g_boot_mountpt);
                     log_it(tmp);
                     mr_free(tmp);
@@ -1304 +1294 @@
     assert(value != NULL);
     if (!does_file_exist(config_file)) {
-        mr_asprintf(&tmp, "(write_cfg_file) Cannot find %s config file",
-                config_file);
+        mr_asprintf(&tmp, "(write_cfg_file) Cannot find %s config file", config_file);
         log_to_screen(tmp);
         mr_free(tmp);
@@ -1312 +1301 @@
     mr_asprintf(&tempfile, "%s/mojo-jojo.blah", bkpinfo->tmpdir);
     if (does_file_exist(config_file)) {
-        mr_asprintf(&command, "grep -vE '^%s .*$' %s > %s",
-                label, config_file, tempfile);
+        mr_asprintf(&command, "grep -vE '^%s .*$' %s > %s", label, config_file, tempfile);
         paranoid_system(command);
         mr_free(command);

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

@@ -107 +107 @@
 
     log_msg(1, "Now scanning log file for 'star: ' stuff");
-    mr_asprintf(&command,
-            "grep \"star: \" %s | sed 's/star: //' | grep -vE '^/dev/.*$' >> %s",
-            stderr_fname, afio_found_changes);
+    mr_asprintf(&command, "grep \"star: \" %s | sed 's/star: //' | grep -vE '^/dev/.*$' >> %s", stderr_fname, afio_found_changes);
     log_msg(2, command);
     res = system(command);
@@ -118 +116 @@
     }
     afio_diffs = count_lines_in_file(afio_found_changes);
-    mr_asprintf(&command,
-            "sort %s %s %s | uniq -c | awk '{ if ($1==\"2\") {print $2;};}' | grep -v \"incheckentry xwait()\" > %s",
-            ignorefiles_fname, afio_found_changes, afio_found_changes,
-            changedfiles_fname);
+    mr_asprintf(&command, "sort %s %s %s | uniq -c | awk '{ if ($1==\"2\") {print $2;};}' | grep -v \"incheckentry xwait()\" > %s", ignorefiles_fname, afio_found_changes, afio_found_changes, changedfiles_fname);
     mr_free(afio_found_changes);
     log_msg(2, command);
@@ -172 +167 @@
         } else {
             retval++;
-            mr_asprintf(&tmp, "Warning - missing set(s) between %d and %d\n",
-                    g_last_afioball_number, set_number - 1);
+            mr_asprintf(&tmp, "Warning - missing set(s) between %d and %d\n", g_last_afioball_number, set_number - 1);
             log_to_screen(tmp);
             mr_free(tmp);
@@ -342 +336 @@
                     g_current_media_number, bigfile_num, slice_num);
             if (!does_file_exist(slice_fname(bigfile_num, slice_num, mountpoint, ""))) {
-                mr_asprintf(&command, "%s -dc %s 2>> %s",
-                        sz_exe,
-                        slice_fname(bigfile_num, slice_num, mountpoint, bkpinfo->zip_suffix),
-                        MONDO_LOGFILE);
+                mr_asprintf(&command, "%s -dc %s 2>> %s", sz_exe, slice_fname(bigfile_num, slice_num, mountpoint, bkpinfo->zip_suffix), MONDO_LOGFILE);
             } else {
                 mr_asprintf(&command, "cat %s 2>> %s", slice_fname(bigfile_num, slice_num, mountpoint, ""), MONDO_LOGFILE);
@@ -474 +465 @@
         bkpinfo->use_star = TRUE;
         if (strstr(tarball_fname, ".bz2"))
-            mr_asprintf(&command,
-                    "star -diff diffopts=mode,size,data file=%s %s >> %s 2>> %s",
-                    tarball_fname,
-                    (strstr(tarball_fname, ".bz2")) ? "-bz" : " ", outlog,
-                    outlog);
+            mr_asprintf(&command, "star -diff diffopts=mode,size,data file=%s -bz >> %s 2>> %s", tarball_fname, outlog, outlog);
     } else {
         bkpinfo->use_star = FALSE;
-        mr_asprintf(&command, "afio -r -P %s -Z %s >> %s 2>> %s",
-                bkpinfo->zip_exe, tarball_fname, outlog, outlog);
+        mr_asprintf(&command, "afio -r -P %s -Z %s >> %s 2>> %s", bkpinfo->zip_exe, tarball_fname, outlog, outlog);
     }
     log_msg(6, "command=%s", command);
@@ -491 +477 @@
         mr_asprintf(&command, "cat %s >> %s", outlog, MONDO_LOGFILE);
     } else {
-        mr_asprintf(&command, "cut -d: -f%d %s | sort -u",
-                (bkpinfo->use_star) ? 1 : 2, outlog);
+        mr_asprintf(&command, "cut -d: -f%d %s | sort -u", (bkpinfo->use_star) ? 1 : 2, outlog);
         pin = popen(command, "r");
         if (pin) {
@@ -794 +779 @@
         res = verify_an_afioball_from_stream(fname, size);
         if (res) {
-            mr_asprintf(&tmp, "Afioball %ld differs from live filesystem",
-                    current_afioball_number);
+            mr_asprintf(&tmp, "Afioball %ld differs from live filesystem", current_afioball_number);
             log_to_screen(tmp);
             mr_free(tmp);
@@ -897 +881 @@
             p++;
         }
-        mr_asprintf(&comment, "Verifying bigfile #%ld (%ld K)",
-                current_biggiefile_number, (long) size >> 10);
+        mr_asprintf(&comment, "Verifying bigfile #%ld (%ld K)", current_biggiefile_number, (long) size >> 10);
         update_progress_form(comment);
         mr_free(comment);
@@ -1208 +1191 @@
     diffs = count_lines_in_file(changed_files_fname);
     if (diffs > 0) {
-        mr_asprintf(&tmp, "cp -f %s %s/changed.files", changed_files_fname,
-                MONDO_CACHE);
+        mr_asprintf(&tmp, "cp -f %s %s/changed.files", changed_files_fname, MONDO_CACHE);
         run_program_and_log_output(tmp, FALSE);
         mr_free(tmp);

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

@@ -1026 +1026 @@
             || percentage > g_isoform_old_progress) {
             g_isoform_old_progress = percentage;
-            mr_asprintf(&timeline_str, "%2ld:%02ld taken            %2ld:%02ld remaining", (long) time_taken / 60, (long) time_taken % 60, 
-                            (long) time_remaining / 60, (long) time_remaining % 60);
+            mr_asprintf(&timeline_str, "%2ld:%02ld taken            %2ld:%02ld remaining", (long) time_taken / 60, (long) time_taken % 60, (long) time_remaining / 60, (long) time_remaining % 60);
             if (percentage < 3) {
                 mr_asprintf(&pcline_str, " Working");
@@ -1038 +1037 @@
                 mr_strcat(pcline_str, " %c", special_dot_char(g_mysterious_dot_counter));
             } else {
-                mr_asprintf(&pcline_str, " %3d%% done              %3d%% to go",
-                        percentage, 100 - percentage);
+                mr_asprintf(&pcline_str, " %3d%% done              %3d%% to go", percentage, 100 - percentage);
             }
             if (g_text_mode) {
@@ -1143 +1141 @@
         } else {
             if (g_current_progress > g_maximum_progress) {
-                mr_asprintf(&tmp,
-                        "update_progress_form_full(%s,%s,%s) --- g_current_progress=%ld; g_maximum_progress=%ld",
-                        blurb1, blurb2, blurb3, g_current_progress,
-                        g_maximum_progress);
-                log_msg(0, tmp);
-                mr_free(tmp);
+                log_msg(0, "update_progress_form_full(%s,%s,%s) --- g_current_progress=%ld; g_maximum_progress=%ld", blurb1, blurb2, blurb3, g_current_progress, g_maximum_progress);
                 g_current_progress = g_maximum_progress;
             }
@@ -1185 +1178 @@
             paranoid_free(taskprogress);
         } else {
-            mr_asprintf(&timeline_str, "%2ld:%02ld taken               %2ld:%02ld remaining  ",
-                (long) time_taken / 60, (long) time_taken % 60, (long) time_remaining / 60, (long) time_remaining % 60);
+            mr_asprintf(&timeline_str, "%2ld:%02ld taken               %2ld:%02ld remaining  ", (long) time_taken / 60, (long) time_taken % 60, (long) time_remaining / 60, (long) time_remaining % 60);
             mr_asprintf(percentline_str, " %3d%% done                 %3d%% to go", percentage, 100 - percentage);
 
@@ -1608 +1600 @@
                                    keylist[i]);
         }
-        mr_asprintf(&differ_sz,
-                "  %ld files differ. Hit 'Select' to pick a file. Hit 'Close' to quit the list.",
-                i);
+        mr_asprintf(&differ_sz, "  %ld files differ. Hit 'Select' to pick a file. Hit 'Close' to quit the list.", i);
         newtPushHelpLine(differ_sz);
         mr_free(differ_sz);

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

@@ -79 +79 @@
         make_list_of_drives_in_mountlist(mountlist, drivelist);
         for (lino = 0; lino < drivelist->entries; lino++) {
-            mr_asprintf(&command,
-                    "dd if=%s bs=512 count=1 2> /dev/null | grep \"%s\"",
-                    drivelist->el[lino].device, MONDO_WAS_HERE);
+            mr_asprintf(&command, "dd if=%s bs=512 count=1 2> /dev/null | grep \"%s\"", drivelist->el[lino].device, MONDO_WAS_HERE);
             res = run_program_and_log_output(command, 1);
             mr_free(command);
@@ -260 +258 @@
         strcpy(vgremove_sz, "vgremove");
     }
-    mr_asprintf(&tmp1,
-            "for i in `%s | cut -d\"'\" -f2 | sort -r` ; do echo \"Shutting down lv $i\" >> %s ; %s -f $i; done", lvscan_sz, MONDO_LOGFILE, lvremove_sz);
+    mr_asprintf(&tmp1, "for i in `%s | cut -d\"'\" -f2 | sort -r` ; do echo \"Shutting down lv $i\" >> %s ; %s -f $i; done", lvscan_sz, MONDO_LOGFILE, lvremove_sz);
     run_program_and_log_output(tmp1, 5);
     mr_free(tmp1);
@@ -521 +518 @@
                             new_mountlist->entries++;
                         } else {
-                            mr_asprintf(&tmp,
-                                    "Not adding %s to mountlist: it's already there",
-                                    p);
+                            mr_asprintf(&tmp, "Not adding %s to mountlist: it's already there", p);
                             log_it(tmp);
                             mr_free(tmp);
@@ -647 +642 @@
     mr_asprintf(&strtmp, "%s", program);
     paranoid_free(program);
-    mr_asprintf(&program, "%s --spare-devices=%d", strtmp,
-         raidlist->el[i].spare_disks.entries);
+    mr_asprintf(&program, "%s --spare-devices=%d", strtmp, raidlist->el[i].spare_disks.entries);
     paranoid_free(strtmp);
   }
@@ -747 +741 @@
 
             /* format raid partition */
-            mr_asprintf(&program,
-                    "for plex in `vinum lv -r %s | grep '^P' | tr '\t' ' ' | tr -s ' ' | cut -d' ' -f2`; do echo $plex; done > /tmp/plexes", basename(device));
+            mr_asprintf(&program, "for plex in `vinum lv -r %s | grep '^P' | tr '\t' ' ' | tr -s ' ' | cut -d' ' -f2`; do echo $plex; done > /tmp/plexes", basename(device));
             system(program);
             if (g_fprep) {
@@ -914 +907 @@
 
     assert(mountlist != NULL);
-    mr_asprintf(&tmp, "format_everything (mountlist, interactively = %s",
-            (interactively) ? "true" : "false");
+    mr_asprintf(&tmp, "format_everything (mountlist, interactively = %s", (interactively) ? "true" : "false");
     log_it(tmp);
     mr_free(tmp);
@@ -943 +935 @@
             if (interactively) {
                 // ask user if we should format the current device
-                mr_asprintf(&tmp, "Shall I format %s (%s) ?", me->device,
-                        me->mountpoint);
+                mr_asprintf(&tmp, "Shall I format %s (%s) ?", me->device, me->mountpoint);
                 do_it = ask_me_yes_or_no(tmp);
                 mr_free(tmp);
@@ -1425 +1416 @@
     mr_free(command);
 
-    mr_asprintf(&command, "disklabel -R %s /tmp/disklabel",
-            canonical_name(drivename));
+    mr_asprintf(&command, "disklabel -R %s /tmp/disklabel", canonical_name(drivename));
     retval += run_program_and_log_output(command, TRUE);
     mr_free(command);
@@ -1571 +1561 @@
             file = open(drivename, O_WRONLY);
             if (file != -1) {
-                mr_asprintf(&tmp,
-                        "Warning - unable to open %s for wiping it's partition table",
-                        drivename);
+                mr_asprintf(&tmp, "Warning - unable to open %s for wiping it's partition table", drivename);
                 log_to_screen(tmp);
                 mr_free(tmp);
@@ -1580 +1568 @@
             for (i = 0; i < 512; i++) {
                 if (!write(file, "\0", 1)) {
-                    mr_asprintf(&tmp, "Warning - unable to write to %s",
-                            drivename);
+                    mr_asprintf(&tmp, "Warning - unable to write to %s", drivename);
                     log_to_screen(tmp);
                     mr_free(tmp);
@@ -1642 +1629 @@
     if (pout_to_fdisk) {
 // mark relevant partition as bootable
-        mr_asprintf(&tmp, "a\n%s\n",
-                call_program_and_get_last_line_of_output
-                ("make-me-bootable /tmp/mountlist.txt dummy"));
+        mr_asprintf(&tmp, "a\n%s\n", call_program_and_get_last_line_of_output("make-me-bootable /tmp/mountlist.txt dummy"));
         fput_string_one_char_at_a_time(pout_to_fdisk, tmp);
         mr_free(tmp);
@@ -1739 +1724 @@
 
     if (is_this_device_mounted(partition_name)) {
-        mr_asprintf(&tmp, "%s is mounted, and should not be partitioned",
-                partition_name);
+        mr_asprintf(&tmp, "%s is mounted, and should not be partitioned", partition_name);
         log_to_screen(tmp);
         mr_free(tmp);
@@ -2050 +2034 @@
     } else {
         /* probably an image */
-        mr_asprintf(&tmp,
-                "Unknown format ('%s') - using supplied string anyway",
-                format);
+        mr_asprintf(&tmp, "Unknown format ('%s') - using supplied string anyway", format);
         mvaddstr_and_log_it(g_currentY++, 0, tmp);
         mr_free(tmp);

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

@@ -47 +47 @@
     char *bigfile_fname_ptr;
     char *tmp_ptr = NULL;
-    char *command_ptr;
+    char *command_ptr = NULL;
 
     char *checksum, *original_cksum, *bigfile_fname, *tmp, *command;
@@ -65 +65 @@
     malloc_string(original_cksum_ptr);
     malloc_string(bigfile_fname_ptr);
-    malloc_string(command_ptr);
 
   /*********************************************************************
@@ -74 +73 @@
     memset(original_cksum_ptr, '\0', sizeof(original_cksum));
     memset(bigfile_fname_ptr, '\0', sizeof(bigfile_fname));
-    memset(command_ptr, '\0', sizeof(command));
   /** end **/
 
@@ -113 +111 @@
     if (!strncmp(bigfile_fname_ptr, "/dev/", 5)) {
         strcpy(original_cksum_ptr, "IGNORE");
-    } else {
-        sprintf(command_ptr,
-                "md5sum \"%s%s\" > /tmp/md5sum.txt 2> /tmp/errors",
-                MNT_RESTORING, bigfile_fname_ptr);
-    }
+        log_msg(2, "IGNORING %s as begining with /dev", bigfile_fname_ptr);
+        return (1);
+    }
+
+    mr_asprintf(&command_ptr, "md5sum \"%s%s\" > /tmp/md5sum.txt 2> /tmp/errors", MNT_RESTORING, bigfile_fname_ptr);
     log_msg(2, command_ptr);
+    i =  system(command_ptr);
+    mr_free(command_ptr);
+
     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)) {
+    if (i) {
         log_OS_error("Warning - command failed");
         original_cksum[0] = '\0';
@@ -169 +170 @@
     paranoid_free(checksum_ptr);
     paranoid_free(checksum);
-    paranoid_free(command_ptr);
     paranoid_free(command);
     paranoid_free(tmp);
@@ -190 +190 @@
     int res;
     long noof_biggiefiles, bigfileno = 0;
-    char tmp[MAX_STR_LEN];
+    char *tmp = NULL;
 
     log_msg(1, "Comparing biggiefiles");
@@ -211 +211 @@
                        noof_biggiefiles);
     for (bigfileno = 0; bigfileno < noof_biggiefiles; bigfileno++) {
-        sprintf(tmp, "Comparing big file #%ld", bigfileno + 1);
+        mr_asprintf(&tmp, "Comparing big file #%ld", bigfileno + 1);
         log_msg(1, tmp);
         update_progress_form(tmp);
+        mr_free(tmp);
+
         res = compare_a_biggiefile(bigfileno);
         retval += res;
@@ -250 +252 @@
 
   /***  needs malloc *********/
-    char *command, *tmp, *filelist_name, *logfile,
-        *compressor_exe;
+    char *command = NULL;
+    char *tmp = NULL;
     char *archiver_exe = NULL;
-
-    malloc_string(command);
-    malloc_string(tmp);
-    malloc_string(filelist_name);
-    malloc_string(logfile);
-    malloc_string(compressor_exe);
+    char *filelist_name = NULL;
+    char *logfile = NULL;
+    char *compressor_exe = NULL;
 
     use_star = (strstr(tarball_fname, ".star")) ? TRUE : FALSE;
     assert_string_is_neither_NULL_nor_zerolength(tarball_fname);
-    sprintf(logfile, "/tmp/afio.log.%d", current_tarball_number);
-    sprintf(filelist_name, MNT_CDROM "/archives/filelist.%d",
-            current_tarball_number);
-
+    mr_asprintf(&filelist_name, MNT_CDROM "/archives/filelist.%d", current_tarball_number);
     noof_lines = count_lines_in_file(filelist_name);
+    mr_free(filelist_name);
 
     if (strstr(tarball_fname, ".bz2")) {
-        strcpy(compressor_exe, "bzip2");
+        mr_asprintf(&compressor_exe, "bzip2");
     } else if (strstr(tarball_fname, ".gz")) {
-        strcpy(compressor_exe, "gzip");
+        mr_asprintf(&compressor_exe, "gzip");
     } else if (strstr(tarball_fname, ".lzo")) {
-        strcpy(compressor_exe, "lzop");
-    } else {
-        compressor_exe[0] = '\0';
+        mr_asprintf(&compressor_exe, "lzop");
     }
 
@@ -284 +279 @@
     }
 
-    if (compressor_exe[0]) {
-        strcpy(tmp, compressor_exe);
-        if (!find_home_of_exe(tmp)) {
+    if (compressor_exe) {
+        if (!find_home_of_exe(compressor_exe)) {
+            mr_free(compressor_exe);
+            mr_free(archiver_exe);
             fatal_error("(compare_a_tarball) Compression program missing");
         }
-        if (use_star)           // star
-        {
+        if (use_star) {
             if (!strcmp(compressor_exe, "bzip2")) {
                 mr_strcat(archiver_exe, " -bz");
             } else {
-                fatal_error
-                    ("(compare_a_tarball) Please use only bzip2 with star");
+                mr_free(compressor_exe);
+                mr_free(archiver_exe);
+                fatal_error("(compare_a_tarball) Please use only bzip2 with star");
             }
-        } else                  // afio
-        {
-            sprintf(compressor_exe, "-P %s -Z", tmp);
-        }
-    }
-// star -diff H=star -bz file=....
+        } else {
+            // afio
+            mr_free(compressor_exe);
+            mr_asprintf(&tmp, "%s", compressor_exe);
+            mr_asprintf(&compressor_exe, "-P %s -Z", tmp);
+            mr_free(tmp);
+        }
+    }
 
 #ifdef __FreeBSD__
@@ -309 +307 @@
 #define BUFSIZE (1024L*1024L)/TAPE_BLOCK_SIZE
 #endif
-    if (use_star)               // doesn't use compressor_exe
-    {
-        sprintf(command,
-                "%s -diff H=star file=%s >> %s 2>> %s",
-                archiver_exe, tarball_fname, logfile, logfile);
-    } else {
-        sprintf(command,
-                "%s -r -b %ld -M 16m -c %ld %s %s >> %s 2>> %s",
-                archiver_exe,
-                TAPE_BLOCK_SIZE,
-                BUFSIZE, compressor_exe, tarball_fname, logfile, logfile);
-    }
+    mr_asprintf(&logfile, "/tmp/afio.log.%d", current_tarball_number);
+
+    if (use_star) {
+        // doesn't use compressor_exe
+        mr_asprintf(&command, "%s -diff H=star file=%s >> %s 2>> %s", archiver_exe, tarball_fname, logfile, logfile);
+    } else {
+        mr_asprintf(&command, "%s -r -b %ld -M 16m -c %ld %s %s >> %s 2>> %s", archiver_exe, TAPE_BLOCK_SIZE, BUFSIZE, compressor_exe, tarball_fname, logfile, logfile);
+    }
+    mr_free(compressor_exe);
     paranoid_free(archiver_exe);
 
@@ -329 +324 @@
     if (res) {
         log_OS_error(command);
-        sprintf(tmp, "Warning - afio returned error = %d", res);
-        log_msg(2, tmp);
-    }
+        log_msg(2, "Warning - afio returned error = %d", res);
+    }
+    mr_free(command);
+
     if (length_of_file(logfile) > 5) {
-        sprintf(command,
-                "sed s/': \\\"'/\\|/ %s | sed s/'\\\": '/\\|/ | cut -d'|' -f2 | sort -u | grep -vE \"^dev/.*\" >> "MONDO_CACHE"/changed.txt",
-                logfile);
+        mr_asprintf(&command, "sed s/': \\\"'/\\|/ %s | sed s/'\\\": '/\\|/ | cut -d'|' -f2 | sort -u | grep -vE \"^dev/.*\" >> "MONDO_CACHE"/changed.txt", logfile);
         system(command);
+        mr_free(command);
+
         archiver_errors = count_lines_in_file(logfile);
     } else {
         archiver_errors = 0;
     }
-    sprintf(tmp, "%ld difference%c in fileset #%d          ",
-            archiver_errors, (archiver_errors != 1) ? 's' : ' ',
-            current_tarball_number);
     if (archiver_errors) {
-        sprintf(tmp,
-                "Differences found while processing fileset #%d       ",
-                current_tarball_number);
-        log_msg(1, tmp);
+        log_msg(1, "%ld difference%c in fileset #%d          ", archiver_errors, (archiver_errors != 1) ? 's' : ' ', current_tarball_number);
     }
     unlink(logfile);
-    paranoid_free(command);
-    paranoid_free(tmp);
-    paranoid_free(filelist_name);
-    paranoid_free(logfile);
-    paranoid_free(compressor_exe);
+    mr_free(logfile);
+
     return (retval);
 }
@@ -377 +364 @@
   /**  needs malloc **********/
 
-    char *tarball_fname, *progress_str, *tmp;
+    char *tarball_fname = NULL; 
+    char *progress_str = NULL;
+    char *tmp = NULL;
     char *mds = NULL;
     long max_val;
 
-    malloc_string(tarball_fname);
-    malloc_string(progress_str);
-    malloc_string(tmp);
 
     assert(bkpinfo != NULL);
     mvaddstr_and_log_it(g_currentY, 0, "Comparing archives");
+
+    malloc_string(tmp);
     read_cfg_var(g_mondo_cfg_file, "last-filelist-number", tmp);
-
     max_val = atol(tmp);
+    paranoid_free(tmp);
+
     mds = media_descriptor_string(bkpinfo->backup_media_type);
-    sprintf(progress_str, "Comparing with %s #%d ", mds, g_current_media_number);
+    mr_asprintf(&progress_str, "Comparing with %s #%d ", mds, g_current_media_number);
 
     open_progress_form("Comparing files",
@@ -403 +392 @@
         insist_on_this_cd_number(g_current_media_number);
         update_progress_form(progress_str);
-        sprintf(tarball_fname,
-                MNT_CDROM "/archives/%d.afio.bz2", current_tarball_number);
+        mr_asprintf(&tarball_fname, MNT_CDROM "/archives/%d.afio.bz2", current_tarball_number);
 
         if (!does_file_exist(tarball_fname)) {
-            sprintf(tarball_fname, MNT_CDROM "/archives/%d.afio.lzo",
-                    current_tarball_number);
+            mr_free(tarball_fname);
+            mr_asprintf(&tarball_fname, MNT_CDROM "/archives/%d.afio.lzo", current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
-            sprintf(tarball_fname, MNT_CDROM "/archives/%d.afio.gz",
-                    current_tarball_number);
+            mr_free(tarball_fname);
+            mr_asprintf(&tarball_fname, MNT_CDROM "/archives/%d.afio.gz", current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
-            sprintf(tarball_fname, MNT_CDROM "/archives/%d.afio.",
-                    current_tarball_number);
+            mr_free(tarball_fname);
+            mr_asprintf(&tarball_fname, MNT_CDROM "/archives/%d.afio.", current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
-            sprintf(tarball_fname, MNT_CDROM "/archives/%d.star.bz2",
-                    current_tarball_number);
+            mr_free(tarball_fname);
+            mr_asprintf(&tarball_fname, MNT_CDROM "/archives/%d.star.bz2", current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
-            sprintf(tarball_fname, MNT_CDROM "/archives/%d.star.",
-                    current_tarball_number);
+            mr_free(tarball_fname);
+            mr_asprintf(&tarball_fname, MNT_CDROM "/archives/%d.star.", current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
@@ -432 +420 @@
                 == 0) {
                 log_msg(2, "OK, I think I'm done with tarballs...");
+                mr_free(tarball_fname);
                 break;
             }
             log_msg(2, "OK, I think it's time for another CD...");
             g_current_media_number++;
-            sprintf(progress_str, "Comparing with %s #%d ", mds, g_current_media_number);
+
+            mr_free(progress_str);
+            mr_asprintf(&progress_str, "Comparing with %s #%d ", mds, g_current_media_number);
             log_to_screen(progress_str);
         } else {
@@ -444 +435 @@
             current_tarball_number++;
         }
-    }
+        mr_free(tarball_fname);
+    }
+    mr_free(progress_str);
     mr_free(mds);
 
@@ -453 +446 @@
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     }
-    paranoid_free(tarball_fname);
-    paranoid_free(progress_str);
-    paranoid_free(tmp);
     return (retval);
 }
@@ -478 +468 @@
 {
   /** needs malloc *********/
-    char *tmp, *cwd, *new, *command;
+    char *tmp = NULL;
+    char *cwd, *new;
+    char *command = NULL;
     int resA = 0;
     int resB = 0;
     long noof_changed_files;
 
-    malloc_string(tmp);
     malloc_string(cwd);
     malloc_string(new);
-    malloc_string(command);
 
     assert(bkpinfo != NULL);
@@ -501 +491 @@
     noof_changed_files = count_lines_in_file(MONDO_CACHE"/changed.txt");
     if (noof_changed_files) {
-        sprintf(tmp, "%ld files do not match the backup            ",
-                noof_changed_files);
-        //      mvaddstr_and_log_it( g_currentY++, 0, tmp );
+        mr_asprintf(&tmp, "%ld files do not match the backup            ", noof_changed_files);
         log_to_screen(tmp);
-        sprintf(command, "cat "MONDO_CACHE"/changed.txt >> %s", MONDO_LOGFILE);
+        mr_free(tmp);
+
+        mr_asprintf(&command, "cat "MONDO_CACHE"/changed.txt >> %s", MONDO_LOGFILE);
         paranoid_system(command);
-    } else {
-        sprintf(tmp, "All files match the backup                     ");
+        mr_free(command);
+    } else {
+        mr_asprintf(&tmp, "All files match the backup                     ");
         mvaddstr_and_log_it(g_currentY++, 0, tmp);
         log_to_screen(tmp);
-    }
-
-    paranoid_free(tmp);
+        mr_free(tmp);
+    }
+
     paranoid_free(cwd);
     paranoid_free(new);
-    paranoid_free(command);
 
     return (resA + resB);
@@ -544 +534 @@
     int res = 0;
     long q;
-    char *tmp;
+    char *tmp = NULL;
     char *new;
     char *cwd;
 
-    malloc_string(tmp);
     malloc_string(new);
     malloc_string(cwd);
@@ -575 +564 @@
     if (g_text_mode) {
         save_mountlist_to_disk(mountlist, g_mountlist_fname);
-        sprintf(tmp, "%s %s", find_my_editor(), g_mountlist_fname);
+        mr_asprintf(&tmp, "%s %s", find_my_editor(), g_mountlist_fname);
         res = system(tmp);
+        mr_free(tmp);
+
         load_mountlist(mountlist, g_mountlist_fname);
     } else {
@@ -622 +613 @@
         } else {
             q = count_lines_in_file(MONDO_CACHE"/changed.files");
-            sprintf(tmp, "%ld significant difference%s found.", q,
-                    (q != 1) ? "s" : "");
+            mr_asprintf(&tmp, "%ld significant difference%s found.", q, (q != 1) ? "s" : "");
             mvaddstr_and_log_it(g_currentY++, 0, tmp);
             log_to_screen(tmp);
-
-            strcpy(tmp,
-                   "Type 'less /tmp/changed.files' for a list of non-matching files");
+            mr_free(tmp);
+
+            mr_asprintf(&tmp, "Type 'less /tmp/changed.files' for a list of non-matching files");
             mvaddstr_and_log_it(g_currentY++, 0, tmp);
             log_to_screen(tmp);
+            mr_free(tmp);
 
             log_msg(2, "calling popup_changelist_from_file()");
@@ -647 +638 @@
 
     kill_petris();
-    paranoid_free(tmp);
     paranoid_free(new);
     paranoid_free(cwd);
@@ -670 +660 @@
 
   /** needs malloc **/
-    char *dir, *command;
+    char *dir;
+    char *command = NULL;
 
     assert(bkpinfo != NULL);
     malloc_string(dir);
-    malloc_string(command);
     getcwd(dir, MAX_STR_LEN);
     chdir(bkpinfo->restore_path);
 
-    sprintf(command, "cp -f /tmp/LAST-FILELIST-NUMBER %s/tmp",
-            bkpinfo->restore_path);
+    mr_asprintf(&command, "cp -f /tmp/LAST-FILELIST-NUMBER %s/tmp", bkpinfo->restore_path);
     run_program_and_log_output(command, FALSE);
+    mr_free(command);
+
     mvaddstr_and_log_it(g_currentY,
                         0, "Verifying archives against filesystem");
@@ -704 +695 @@
     mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     paranoid_free(dir);
-    paranoid_free(command);
     return (res);
 }
@@ -727 +717 @@
 {
     int res;
-    char *dir, *command;
+    char *dir;
+    char *command = NULL;
 
     assert(bkpinfo != NULL);
     malloc_string(dir);
-    malloc_string(command);
 
     getcwd(dir, MAX_STR_LEN);
     chdir(bkpinfo->restore_path);
-    sprintf(command, "cp -f /tmp/LAST-FILELIST-NUMBER %s/tmp",
-            bkpinfo->restore_path);
+    mr_asprintf(&command, "cp -f /tmp/LAST-FILELIST-NUMBER %s/tmp", bkpinfo->restore_path);
     run_program_and_log_output(command, FALSE);
+    mr_free(command);
+
     mvaddstr_and_log_it(g_currentY,
                         0, "Verifying archives against filesystem");
@@ -748 +739 @@
     }
     paranoid_free(dir);
-    paranoid_free(command);
     return (res);
 }

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

@@ -368 +368 @@
         log_msg(3, "Mommm! SME is being a dildo!");
     } else {
-        mr_asprintf(&mountpoint, mpt);
+        mr_asprintf(&mountpoint, "%s", mpt);
     }
 
@@ -408 +408 @@
         mr_free(command);
 
-        mr_asprintf(&command, "mount -t %s %s %s %s 2>> %s", format, device,
-                additional_parameters, mountdir, MONDO_LOGFILE);
+        mr_asprintf(&command, "mount -t %s %s %s %s 2>> %s", format, device, additional_parameters, mountdir, MONDO_LOGFILE);
         log_msg(2, "command='%s'", command);
     }
@@ -418 +417 @@
         log_msg(1, "Re-trying without the fancy extra parameters");
         mr_free(command);
-        mr_asprintf(&command, "mount -t %s %s %s 2>> %s", format, device,
-            mountdir, MONDO_LOGFILE);
+        mr_asprintf(&command, "mount -t %s %s %s 2>> %s", format, device, mountdir, MONDO_LOGFILE);
         res = run_program_and_log_output(command, TRUE);
     }
@@ -497 +495 @@
                 "Again with the /proc - why is this in your mountlist?");
         } else if (is_this_device_mounted(mountlist->el[lino].device)) {
-            mr_asprintf(&tmp, "%s is already mounted",
-                mountlist->el[lino].device);
+            mr_asprintf(&tmp, "%s is already mounted", mountlist->el[lino].device);
             log_to_screen(tmp);
             mr_free(tmp);
@@ -607 +604 @@
         mr_asprintf(&mount_cmd, "mount_cd9660 -r %s " MNT_CDROM, mddev);
 #else
-        mr_asprintf(&mount_cmd, "mount %s/%s/%s-%d.iso -t iso9660 -o loop,ro %s", bkpinfo->isodir, bkpinfo->nfs_remote_dir,
-            bkpinfo->prefix, g_current_media_number, MNT_CDROM);
+        mr_asprintf(&mount_cmd, "mount %s/%s/%s-%d.iso -t iso9660 -o loop,ro %s", bkpinfo->isodir, bkpinfo->nfs_remote_dir, bkpinfo->prefix, g_current_media_number, MNT_CDROM);
 #endif
 
@@ -619 +615 @@
         mr_asprintf(&mount_cmd, "mount_cd9660 -r %s %s", mddev, MNT_CDROM);
 #else
-        mr_asprintf(&mount_cmd, "mount %s/%s-%d.iso -t iso9660 -o loop,ro %s",
-            bkpinfo->isodir, bkpinfo->prefix, g_current_media_number, MNT_CDROM);
+        mr_asprintf(&mount_cmd, "mount %s/%s-%d.iso -t iso9660 -o loop,ro %s", bkpinfo->isodir, bkpinfo->prefix, g_current_media_number, MNT_CDROM);
 #endif
     } else if (bkpinfo->backup_media_type == usb) {
@@ -1101 +1096 @@
     unlink(FILELIST_FULL_STUB);
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-        mr_asprintf(&command, "tar -b %ld -zxf %s ./%s ./%s ./%s ./%s ./%s",
-            bkpinfo->internal_tape_block_size,
-            bkpinfo->media_device,
-            MOUNTLIST_FNAME_STUB,
-            BIGGIELIST_TXT_STUB,
-            FILELIST_FULL_STUB,
-            IWANTMYLVM_STUB,
-            MONDO_CFG_FILE_STUB);
+        mr_asprintf(&command, "tar -b %ld -zxf %s ./%s ./%s ./%s ./%s ./%s", bkpinfo->internal_tape_block_size, bkpinfo->media_device, MOUNTLIST_FNAME_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB, MONDO_CFG_FILE_STUB);
         log_msg(1, "tarcommand = %s", command);
         run_program_and_log_output(command, 1);
@@ -1116 +1104 @@
             /* Doing that allow us to remain compatible with pre-2.2.5 versions */
             log_msg(2, "pre-2.2.4 compatible mode on");
-            mr_asprintf(&command,
-                "tar -b %ld -zxf %s %s %s %s %s %s",
-                bkpinfo->internal_tape_block_size,
-                bkpinfo->media_device,
-                MOUNTLIST_FNAME_STUB,
-                BIGGIELIST_TXT_STUB,
-                FILELIST_FULL_STUB,
-                IWANTMYLVM_STUB,
-                MONDO_CFG_FILE_STUB);
+            mr_asprintf(&command, "tar -b %ld -zxf %s %s %s %s %s %s", bkpinfo->internal_tape_block_size, bkpinfo->media_device, MOUNTLIST_FNAME_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB, MONDO_CFG_FILE_STUB);
             log_msg(1, "tarcommand = %s", command);
             run_program_and_log_output(command, 1);
@@ -1136 +1116 @@
         log_msg(2, "Back from iotcn");
         run_program_and_log_output("mount", 1);
-        mr_asprintf(&command,
-            "tar -zxf %s/images/all.tar.gz ./%s ./%s ./%s ./%s ./%s",
-            MNT_CDROM,
-            MOUNTLIST_FNAME_STUB,
-            BIGGIELIST_TXT_STUB,
-            FILELIST_FULL_STUB,
-            IWANTMYLVM_STUB,
-            MONDO_CFG_FILE_STUB);
+        mr_asprintf(&command, "tar -zxf %s/images/all.tar.gz ./%s ./%s ./%s ./%s ./%s", MNT_CDROM, MOUNTLIST_FNAME_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB, MONDO_CFG_FILE_STUB);
 
         log_msg(1, "tarcommand = %s", command);
@@ -1152 +1125 @@
             /* Doing that allow us to remain compatible with pre-2.2.5 versions */
             log_msg(2, "pre-2.2.4 compatible mode on");
-            mr_asprintf(&command,
-                "tar -zxf %s/images/all.tar.gz %s %s %s %s %s",
-                MNT_CDROM,
-                MOUNTLIST_FNAME_STUB,
-                BIGGIELIST_TXT_STUB,
-                FILELIST_FULL_STUB,
-                IWANTMYLVM_STUB,
-                MONDO_CFG_FILE_STUB);
+            mr_asprintf(&command, "tar -zxf %s/images/all.tar.gz %s %s %s %s %s", MNT_CDROM, MOUNTLIST_FNAME_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB, MONDO_CFG_FILE_STUB);
 
             log_msg(1, "tarcommand = %s", command);
@@ -1195 +1161 @@
     &&
     ask_me_yes_or_no("Do you want to retrieve the mountlist as well?")) {
-        mr_asprintf(&command, "ln -sf %s/%s /tmp", MOUNTLIST_FNAME_STUB,
-            bkpinfo->tmpdir);
+        mr_asprintf(&command, "ln -sf %s/%s /tmp", MOUNTLIST_FNAME_STUB, bkpinfo->tmpdir);
         paranoid_system(command);
         mr_free(command);
@@ -1225 +1190 @@
             mr_free(command);
         }
-        mr_asprintf(&command, "grep -E '^/dev/.*' %s > %s",
-                g_biggielist_txt, g_filelist_imagedevs);
+        mr_asprintf(&command, "grep -E '^/dev/.*' %s > %s", g_biggielist_txt, g_filelist_imagedevs);
         paranoid_system(command);
         mr_free(command);
@@ -2044 +2008 @@
                             "Well, I know a certain kitty-kitty who'll be sleeping with Mommy tonight...");
                 } else {
-                    mr_asprintf(&command, "umount " MNT_RESTORING "%s",
-                            mountlist->el[lino].mountpoint);
+                    mr_asprintf(&command, "umount " MNT_RESTORING "%s", mountlist->el[lino].mountpoint);
 
                     /* To support latest Ubuntu where /var is a separate FS 
@@ -2112 +2075 @@
     }
 
-    mr_asprintf(&command,
-            "dd if=%s bs=%ld count=%ld 2> /dev/null | tar -zx ./%s ./%s ./%s ./%s ./%s",
-            dev,
-            bkpinfo->internal_tape_block_size,
-            1024L * 1024 * 32 / bkpinfo->internal_tape_block_size,
-            MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB,
-            BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB);
+    mr_asprintf(&command, "dd if=%s bs=%ld count=%ld 2> /dev/null | tar -zx ./%s ./%s ./%s ./%s ./%s", dev, bkpinfo->internal_tape_block_size, 1024L * 1024 * 32 / bkpinfo->internal_tape_block_size, MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB);
     log_msg(2, "command = '%s'", command);
     res = run_program_and_log_output(command, -1);
@@ -2129 +2086 @@
             /* Doing that allow us to remain compatible with pre-2.2.5 versions */
             log_msg(2, "pre-2.2.4 compatible mode on");
-            mr_asprintf(&command,
-                    "dd if=%s bs=%ld count=%ld 2> /dev/null | tar -zx %s %s %s %s %s",
-                    dev,
-                    bkpinfo->internal_tape_block_size,
-                    1024L * 1024 * 32 / bkpinfo->internal_tape_block_size,
-                    MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB,
-                    BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB);
+            mr_asprintf(&command, "dd if=%s bs=%ld count=%ld 2> /dev/null | tar -zx %s %s %s %s %s", dev, bkpinfo->internal_tape_block_size, 1024L * 1024 * 32 / bkpinfo->internal_tape_block_size, MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB);
             log_msg(2, "command = '%s'", command);
             res = run_program_and_log_output(command, -1);
@@ -2226 +2177 @@
                 log_msg(2, "media_device is blank; assuming %s");
             }
-            mr_asprintf(&tmp, bkpinfo->media_device);
+            mr_asprintf(&tmp, "%s", bkpinfo->media_device);
             if (extract_cfg_file_and_mountlist_from_tape_dev
                 (bkpinfo->media_device)) {
@@ -2335 +2286 @@
             /* Is this code really useful ??? */
         if (extract_mountlist_stub) {
-            mr_asprintf(&command, "cp -f %s %s/%s", MOUNTLIST_FNAME_STUB,
-                    bkpinfo->tmpdir, MOUNTLIST_FNAME_STUB);
+            mr_asprintf(&command, "cp -f %s %s/%s", MOUNTLIST_FNAME_STUB, bkpinfo->tmpdir, MOUNTLIST_FNAME_STUB);
             run_program_and_log_output(command, FALSE);
             mr_free(command);

branches/2.2.10/mondo/src/mondorestore/mondorestore.c

@@ -668 +668 @@
             strcpy(fstab_fname, "/tmp/fstab");
         }
-        mr_asprintf(&tmp1,
-                "label-partitions-as-necessary %s < %s >> %s 2>> %s",
-                g_mountlist_fname, fstab_fname, MONDO_LOGFILE,
-                MONDO_LOGFILE);
+        mr_asprintf(&tmp1, "label-partitions-as-necessary %s < %s >> %s 2>> %s", g_mountlist_fname, fstab_fname, MONDO_LOGFILE, MONDO_LOGFILE);
         res = system(tmp1);
         mr_free(tmp1);
@@ -811 +808 @@
     }
     if (!evaluate_mountlist(mountlist, tmpA, tmpB, tmpC)) {
-        mr_asprintf(&tmp,
-                "Mountlist analyzed. Result: \"%s %s %s\" Switch to Interactive Mode?",
-                tmpA, tmpB, tmpC);
+        mr_asprintf(&tmp, "Mountlist analyzed. Result: \"%s %s %s\" Switch to Interactive Mode?", tmpA, tmpB, tmpC);
         res = ask_me_yes_or_no(tmp);
         mr_free(tmp);
@@ -1293 +1288 @@
             }
             mds = media_descriptor_string(bkpinfo->backup_media_type);
-            mr_asprintf(&tmp, "Working on %s #%d, file #%ld, slice #%ld    ", mds,
-                    g_current_media_number, bigfileno + 1, sliceno);
+            mr_asprintf(&tmp, "Working on %s #%d, file #%ld, slice #%ld    ", mds, g_current_media_number, bigfileno + 1, sliceno);
             mr_free(mds);
             log_msg(2, tmp);
@@ -1329 +1323 @@
     if (use_ntfsprog_hack) {
         log_msg(3, "Waiting for ntfsclone to finish");
-        mr_asprintf(&tmp,
-                " ps | grep \" ntfsclone \" | grep -v grep > /dev/null 2> /dev/null");
+        mr_asprintf(&tmp, " ps | grep \" ntfsclone \" | grep -v grep > /dev/null 2> /dev/null");
         while (system(tmp) == 0) {
             sleep(1);
@@ -1464 +1457 @@
         use_ntfsprog_hack = TRUE;
         log_msg(2, "Calling ntfsclone in background because %s is a /dev entry", outfile_fname);
-        mr_asprintf(&sz_devfile, "%s/%d.%d.000", 
-                bkpinfo->tmpdir,
-                (int) (random() % 32768),
-                (int) (random() % 32768));
+        mr_asprintf(&sz_devfile, "%s/%d.%d.000", bkpinfo->tmpdir, (int) (random() % 32768), (int) (random() % 32768));
         mkfifo(sz_devfile, 0x770);
         strcpy(ntfsprog_fifo, sz_devfile);
@@ -1684 +1674 @@
             log_msg(3, "Saved fileset %ld's subset to %s", current_tarball_number, filelist_subset_fname);
         }
-        mr_asprintf(&screen_message, "Tarball #%ld --- %ld matches",
-                current_tarball_number, matches);
+        mr_asprintf(&screen_message, "Tarball #%ld --- %ld matches", current_tarball_number, matches);
         log_to_screen(screen_message);
         mr_free(screen_message);
@@ -2237 +2226 @@
             }
             g_current_media_number++;
-            mr_asprintf(&progress_str, "Restoring from %s #%d",
-                    media_descriptor_string(bkpinfo->backup_media_type),
-                    g_current_media_number);
+            mr_asprintf(&progress_str, "Restoring from %s #%d", media_descriptor_string(bkpinfo->backup_media_type), g_current_media_number);
             log_to_screen(progress_str);
         } else {
-            mr_asprintf(&progress_str, "Restoring from fileset #%ld on %s #%d",
-                    current_tarball_number, mds, g_current_media_number);
+            mr_asprintf(&progress_str, "Restoring from fileset #%ld on %s #%d", current_tarball_number, mds, g_current_media_number);
             for (res = 999, attempts = 0; attempts < 3 && res != 0;
                  attempts++) {
@@ -2251 +2237 @@
                                               filelist);
             }
-            mr_asprintf(&tmp1, "%s #%d, fileset #%ld - restore ",
-                    mds, g_current_media_number, current_tarball_number);
+            mr_asprintf(&tmp1, "%s #%d, fileset #%ld - restore ", mds, g_current_media_number, current_tarball_number);
             if (res) {
                 mr_strcat(tmp1, "reported errors");
@@ -2381 +2366 @@
             p++;
         }
-        mr_asprintf(&tmp1, "Restoring big file %ld (%lld K)",
-                current_bigfile_number + 1, biggie_size / 1024);
+        mr_asprintf(&tmp1, "Restoring big file %ld (%lld K)", current_bigfile_number + 1, biggie_size / 1024);
         update_progress_form(tmp1);
         mr_free(tmp1);
@@ -2519 +2503 @@
         update_progress_form(progress_str);
         if (g_getfattr) {
-            mr_asprintf(&xattr_fname, "%s/xattr-subset-%ld.tmp", bkpinfo->tmpdir,
-                current_afioball_number);
+            mr_asprintf(&xattr_fname, "%s/xattr-subset-%ld.tmp", bkpinfo->tmpdir, current_afioball_number);
             unlink(xattr_fname);
         }

branches/2.2.10/tools/quality

@@ -28 +28 @@
 
 # How many sprintf/strcat/strcpy vs asprintf are they
-for s in asprintf mr_asprintf sprintf snprintf strcat strcpy strncpy fgets malloc mr_malloc malloc_string getline mr_getline MAX_STR_LEN getcwd goto free mr_free paranoid_free; do
+for s in asprintf mr_asprintf sprintf snprintf strcat strcpy strncpy fgets malloc mr_malloc malloc_string getline mr_getline MAX_STR_LEN getcwd goto free mr_free paranoid_free paranoid_system; do
     echo "monodrescue $s usage : "
     tot=0
@@ -40 +40 @@
 echo " "
 echo "Qualimetry: "
-find . -name '*.c' -o -name '*.h' |  egrep -v '\.svn|/\*|monitas|/\*|mindi-busybox' | xargs grep -rw asprintf | egrep -v '/\*' | egrep -v 'asprintf\(&' > /tmp/mondo.quality
+pbg -w asprintf | grep -vE 'monitas|mindi-busybox|quality|/\*|asprintf\(&' > /tmp/mondo.quality
 cat /tmp/mondo.quality
 echo "monodrescue uses : `cat /tmp/mondo.quality | wc -l` asprintf without &"
-find . -name '*.c' -o -name '*.h' |  egrep -v '\.svn|/\*|monitas|/\*|mindi-busybox' | xargs grep -rw getline | egrep -v '/\*' | egrep -v 'getline\(&' > /tmp/mondo.quality
+pbg -w getline | grep -vE 'monitas|mindi-busybox|quality|/\*|getline\(&' > /tmp/mondo.quality
 cat /tmp/mondo.quality
 echo "monodrescue uses : `cat /tmp/mondo.quality | wc -l` getline without &"
-
+pbg mr_asprintf | grep -vE '"|FNAME|ISOFS|syscall_sprintf|mr_mem|quality' > /tmp/mondo.quality
+cat /tmp/mondo.quality
+echo "monodrescue uses : `cat /tmp/mondo.quality | wc -l` mr_aspritnf without \""
 echo " "
 echo "Splint: "