Changeset 2323 in MondoRescue

Timestamp:

Aug 18, 2009, 3:05:43 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3334@localhost: bruno | 2009-08-08 12:17:37 +0200

• Change mr_asprintf interface to pass only the char * (makes bkpinfo usage more easy)

Location:

branches/2.2.10/mondo

Files:

• src/common/libmondo-archive.c (modified) (109 diffs)
• src/common/libmondo-cli.c (modified) (39 diffs)
• src/common/libmondo-devices.c (modified) (60 diffs)
• src/common/libmondo-fifo.c (modified) (6 diffs)
• src/common/libmondo-filelist.c (modified) (33 diffs)
• src/common/libmondo-files.c (modified) (34 diffs)
• src/common/libmondo-fork.c (modified) (17 diffs)
• src/common/libmondo-mountlist.c (modified) (44 diffs)
• src/common/libmondo-raid.c (modified) (9 diffs)
• src/common/libmondo-stream.c (modified) (27 diffs)
• src/common/libmondo-string.c (modified) (17 diffs)
• src/common/libmondo-tools.c (modified) (33 diffs)
• src/common/libmondo-verify.c (modified) (37 diffs)
• src/common/mondostructures.h (modified) (2 diffs)
• src/common/newt-specific.c (modified) (17 diffs)
• src/include/mr_mem.h (modified) (1 diff)
• src/lib/mr_conf.c (modified) (6 diffs)
• src/mondoarchive/mondoarchive.c (modified) (4 diffs)
• src/mondorestore/mondo-prep.c (modified) (71 diffs)
• src/mondorestore/mondo-rstr-compare.c (modified) (6 diffs)
• src/mondorestore/mondo-rstr-newt.c (modified) (9 diffs)
• src/mondorestore/mondo-rstr-tools.c (modified) (71 diffs)
• src/mondorestore/mondorestore.c (modified) (63 diffs)
• test/test-mountlist.c (modified) (3 diffs)
• test/test-truncname.c (modified) (2 diffs)

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

@@ -202 +202 @@
 
     if (!does_file_exist(filelist)) {
-        mr_asprintf(&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);
@@ -208 +208 @@
     }
 
-    mr_asprintf(&tmp, "echo hi > %s 2> /dev/null", fname);
+    mr_asprintf(tmp, "echo hi > %s 2> /dev/null", fname);
     if (system(tmp)) {
         paranoid_free(tmp);
@@ -215 +215 @@
     paranoid_free(tmp);
 
-    mr_asprintf(&command, "star H=star list=%s -c " STAR_ACL_SZ " file=%s",
+    mr_asprintf(command, "star H=star list=%s -c " STAR_ACL_SZ " file=%s",
             filelist, fname);
     if (bkpinfo->use_lzo) {
@@ -229 +229 @@
         log_msg(5, "command='%s'", command);
         res = system(command);
-        mr_asprintf(&tmp, "%s", last_line_of_file(MONDO_LOGFILE));
+        mr_asprintf(tmp, "%s", last_line_of_file(MONDO_LOGFILE));
         log_msg(1, "res=%d; tmp='%s'", res, tmp);
         if (bkpinfo->use_star && (res == 254 || res == 65024)
@@ -309 +309 @@
 
     if (!does_file_exist(filelist)) {
-        mr_asprintf(&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);
@@ -315 +315 @@
         return (1);
     }
-    mr_asprintf(&tmp, "echo hi > %s 2> /dev/null", fname);
+    mr_asprintf(tmp, "echo hi > %s 2> /dev/null", fname);
     if (system(tmp)) {
         paranoid_free(tmp);
@@ -324 +324 @@
 
     if (bkpinfo->compression_level > 0) {
-        mr_asprintf(&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
-        mr_asprintf(&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)) {
@@ -335 +335 @@
         paranoid_free(tmp);
     } else {
-        mr_asprintf(&zipparams, "");
+        mr_asprintf(zipparams, "");
     }
 
@@ -346 +346 @@
         fatal_error("scratchdir not found");
     }
-    mr_asprintf(&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);
     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);
 
-    mr_asprintf(&tmp, "echo hi > %s 2> /dev/null", fname);
+    mr_asprintf(tmp, "echo hi > %s 2> /dev/null", fname);
     if (system(tmp)) {
         paranoid_free(tmp);
@@ -429 +429 @@
     }
 
-    mr_asprintf(&tmp, "gzip -9 %s/archives/filelist.full", bkpinfo->scratchdir);
+    mr_asprintf(tmp, "gzip -9 %s/archives/filelist.full", bkpinfo->scratchdir);
     if (run_program_and_log_output(tmp, 2)) {
         mr_free(tmp);
@@ -436 +436 @@
     mr_free(tmp);
 
-    mr_asprintf(&tmp, "cp -f %s/archives/*list*.gz %s", bkpinfo->scratchdir, bkpinfo->tmpdir);
+    mr_asprintf(tmp, "cp -f %s/archives/*list*.gz %s", bkpinfo->scratchdir, bkpinfo->tmpdir);
     if (run_program_and_log_output(tmp, 2)) {
         mr_free(tmp);
@@ -461 +461 @@
     }
     retval += do_that_initial_phase();  // prepare
-    mr_asprintf(&tmp, "rm -f %s/images/*.iso", bkpinfo->scratchdir);
+    mr_asprintf(tmp, "rm -f %s/images/*.iso", bkpinfo->scratchdir);
     run_program_and_log_output(tmp, 1);
     mr_free(tmp);
@@ -541 +541 @@
     assert(bkpinfo != NULL);
     if (bkpinfo->exclude_paths) {
-        mr_asprintf(&tmp, "echo '%s' | tr -s ' ' '\n' | grep -E '^/dev/.*$' | tr -s '\n' ' ' | awk '{print $0\"\\n\";}'", bkpinfo->exclude_paths);
-        mr_asprintf(&devs_to_exclude, "%s", call_program_and_get_last_line_of_output(tmp));
+        mr_asprintf(tmp, "echo '%s' | tr -s ' ' '\n' | grep -E '^/dev/.*$' | tr -s '\n' ' ' | awk '{print $0\"\\n\";}'", bkpinfo->exclude_paths);
+        mr_asprintf(devs_to_exclude, "%s", call_program_and_get_last_line_of_output(tmp));
         mr_free(tmp);
 
-        mr_asprintf(&tmp, "devs_to_exclude = '%s'", devs_to_exclude);
+        mr_asprintf(tmp, "devs_to_exclude = '%s'", devs_to_exclude);
         log_msg(2, tmp);
         mr_free(tmp);
@@ -552 +552 @@
     mvaddstr_and_log_it(g_currentY, 0,
                         "Calling MINDI to create boot+data disks");
-    mr_asprintf(&tmp, "%s/filelist.full", bkpinfo->tmpdir);
+    mr_asprintf(tmp, "%s/filelist.full", bkpinfo->tmpdir);
     if (!does_file_exist(tmp)) {
         mr_free(tmp);
-        mr_asprintf(&tmp, "%s/tmpfs/filelist.full", bkpinfo->tmpdir);
+        mr_asprintf(tmp, "%s/tmpfs/filelist.full", bkpinfo->tmpdir);
         if (!does_file_exist(tmp)) {
             fatal_error
@@ -564 +564 @@
     mr_free(tmp);
 
-    mr_asprintf(&tmp, "%s/LAST-FILELIST-NUMBER", bkpinfo->tmpdir);
-    mr_asprintf(&last_filelist_number, "%s", last_line_of_file(tmp));
+    mr_asprintf(tmp, "%s/LAST-FILELIST-NUMBER", bkpinfo->tmpdir);
+    mr_asprintf(last_filelist_number, "%s", last_line_of_file(tmp));
     mr_free(tmp);
 
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-        mr_asprintf(&tape_size_sz, "%ld", bkpinfo->media_size[1]);
+        mr_asprintf(tape_size_sz, "%ld", bkpinfo->media_size[1]);
         ntapedev = get_non_rewind_dev(bkpinfo->media_device);
         if ((bkpinfo->use_obdr) && (ntapedev != NULL)) {
@@ -579 +579 @@
         }
         paranoid_free(ntapedev);
-        mr_asprintf(&tape_device, "%s", bkpinfo->media_device);
+        mr_asprintf(tape_device, "%s", bkpinfo->media_device);
     } else {
-        mr_asprintf(&tape_size_sz, "%ld", 0L);;
-        mr_asprintf(&tape_device, "");
+        mr_asprintf(tape_size_sz, "%ld", 0L);;
+        mr_asprintf(tape_device, "");
     }
     if (bkpinfo->use_lzo) {
-        mr_asprintf(&use_lzo_sz, "yes");
+        mr_asprintf(use_lzo_sz, "yes");
     } else {
-        mr_asprintf(&use_lzo_sz, "no");
+        mr_asprintf(use_lzo_sz, "no");
     }
     if (bkpinfo->use_gzip) {
-        mr_asprintf(&use_gzip_sz, "yes");
+        mr_asprintf(use_gzip_sz, "yes");
     } else {
-        mr_asprintf(&use_gzip_sz, "no");
+        mr_asprintf(use_gzip_sz, "no");
     }
     if (bkpinfo->use_star) {
-        mr_asprintf(&use_star_sz, "yes");
+        mr_asprintf(use_star_sz, "yes");
     } else {
-        mr_asprintf(&use_star_sz, "no");
+        mr_asprintf(use_star_sz, "no");
     }
 
     if (bkpinfo->compression_level > 0) {
-        mr_asprintf(&use_comp_sz, "yes");
+        mr_asprintf(use_comp_sz, "yes");
     } else {
-        mr_asprintf(&use_comp_sz, "no");
-    }
-
-    mr_asprintf(&broken_bios_sz, "yes");    /* assume so */
+        mr_asprintf(use_comp_sz, "no");
+    }
+
+    mr_asprintf(broken_bios_sz, "yes"); /* assume so */
     if (g_cd_recovery) {
-        mr_asprintf(&cd_recovery_sz, "yes");
+        mr_asprintf(cd_recovery_sz, "yes");
     } else {
-        mr_asprintf(&cd_recovery_sz, "no");
+        mr_asprintf(cd_recovery_sz, "no");
     }
     if (bkpinfo->make_cd_use_lilo) {
-        mr_asprintf(&use_lilo_sz, "yes");
+        mr_asprintf(use_lilo_sz, "yes");
     } else {
-        mr_asprintf(&use_lilo_sz, "no");
+        mr_asprintf(use_lilo_sz, "no");
     }
 
@@ -623 +623 @@
 
 #ifdef __FreeBSD__
-        mr_asprintf(&bootdev, "%s", call_program_and_get_last_line_of_output
+        mr_asprintf(bootdev, "%s", call_program_and_get_last_line_of_output
                ("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | sed 's/\\([0-9]\\).*/\\1/'"));
         if (!bootdev[0]) {
             mr_free(bootdev);
-            mr_asprintf(&bootdev, "%s", call_program_and_get_last_line_of_output
+            mr_asprintf(bootdev, "%s", call_program_and_get_last_line_of_output
                    ("mount | grep ' / ' | head -1 | cut -d' ' -f1 | sed 's/\\([0-9]\\).*/\\1/'"));
         }
@@ -633 +633 @@
         /* Linux */
 #ifdef __IA64__
-        mr_asprintf(&bootdev, "%s", call_program_and_get_last_line_of_output
+        mr_asprintf(bootdev, "%s", call_program_and_get_last_line_of_output
                ("mount | grep ' /boot/efi ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'"));
 #else
-        mr_asprintf(&bootdev, "%s", call_program_and_get_last_line_of_output
+        mr_asprintf(bootdev, "%s", call_program_and_get_last_line_of_output
                ("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'"));
 #endif
@@ -642 +642 @@
             mr_free(bootdev);
 #ifdef __IA64__
-            mr_asprintf(&bootdev, "%s", call_program_and_get_last_line_of_output
+            mr_asprintf(bootdev, "%s", call_program_and_get_last_line_of_output
                    ("mount | grep ' /boot/efi ' | head -1 | cut -d' ' -f1 | cut -dp -f1"));
 #else
-            mr_asprintf(&bootdev, "%s", call_program_and_get_last_line_of_output
+            mr_asprintf(bootdev, "%s", call_program_and_get_last_line_of_output
                    ("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | cut -dp -f1"));
 #endif
@@ -651 +651 @@
         if (!bootdev[0]) {
             mr_free(bootdev);
-            mr_asprintf(&bootdev, "%s", call_program_and_get_last_line_of_output
+            mr_asprintf(bootdev, "%s", call_program_and_get_last_line_of_output
                    ("mount | grep ' / ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'"));
             if (strstr(bootdev, "/dev/cciss/")) {
                 mr_free(bootdev);
-                mr_asprintf(&bootdev, "%s", call_program_and_get_last_line_of_output
+                mr_asprintf(bootdev, "%s", call_program_and_get_last_line_of_output
                        ("mount | grep ' / ' | head -1 | cut -d' ' -f1 | cut -dp -f1"));
             }
@@ -666 +666 @@
             ch = 'U';
         if (bkpinfo->boot_loader != '\0') {
-            mr_asprintf(&tmp, "User specified boot loader. It is '%c'.", bkpinfo->boot_loader);
+            mr_asprintf(tmp, "User specified boot loader. It is '%c'.", bkpinfo->boot_loader);
             log_msg(2, tmp);
             mr_free(tmp);
@@ -673 +673 @@
         }
         if (bkpinfo->boot_device[0] != '\0') {
-            mr_asprintf(&tmp, "User specified boot device. It is '%s'.", bkpinfo->boot_device);
+            mr_asprintf(tmp, "User specified boot device. It is '%s'.", bkpinfo->boot_device);
             log_msg(2, tmp);
             mr_free(tmp);
@@ -696 +696 @@
     }
     if (bkpinfo->boot_loader == 'L') {
-        mr_asprintf(&bootldr_str, "LILO");
+        mr_asprintf(bootldr_str, "LILO");
         if (!does_file_exist("/etc/lilo.conf")) {
             fatal_error
@@ -702 +702 @@
         }
     } else if (bkpinfo->boot_loader == 'G') {
-        mr_asprintf(&bootldr_str, "GRUB");
+        mr_asprintf(bootldr_str, "GRUB");
         if (!does_file_exist("/boot/grub/menu.lst")
             && does_file_exist("/boot/grub/grub.conf")) {
@@ -713 +713 @@
         }
     } else if (bkpinfo->boot_loader == 'E') {
-        mr_asprintf(&bootldr_str, "ELILO");
+        mr_asprintf(bootldr_str, "ELILO");
         /* BCO: fix it for Debian, Mandrake, ... */
         if (!does_file_exist("/etc/elilo.conf")
@@ -744 +744 @@
         }
     } else if (bkpinfo->boot_loader == 'R') {
-        mr_asprintf(&bootldr_str, "RAW");
+        mr_asprintf(bootldr_str, "RAW");
     }
 #ifdef __FreeBSD__
     else if (bkpinfo->boot_loader == 'D') {
-        mr_asprintf(&bootldr_str, "DD");
+        mr_asprintf(bootldr_str, "DD");
     }
 
     else if (bkpinfo->boot_loader == 'B') {
-        mr_asprintf(&bootldr_str, "BOOT0");
+        mr_asprintf(bootldr_str, "BOOT0");
     }
 #endif
     else {
-        mr_asprintf(&bootldr_str, "unknown");
-    }
-    mr_asprintf(&tmp, "Your boot loader is %s and it boots from %s", bootldr_str, bkpinfo->boot_device);
+        mr_asprintf(bootldr_str, "unknown");
+    }
+    mr_asprintf(tmp, "Your boot loader is %s and it boots from %s", bootldr_str, bkpinfo->boot_device);
     log_to_screen(tmp);
     mr_free(tmp);
 
-    mr_asprintf(&tmp, "%s/BOOTLOADER.DEVICE", bkpinfo->tmpdir);
+    mr_asprintf(tmp, "%s/BOOTLOADER.DEVICE", bkpinfo->tmpdir);
     if (write_one_liner_data_file(tmp, bkpinfo->boot_device)) {
         log_msg(1, "%ld: Unable to write one-liner boot device", __LINE__);
@@ -770 +770 @@
     switch (bkpinfo->backup_media_type) {
     case cdr:
-        mr_asprintf(&value, "cdr");
+        mr_asprintf(value, "cdr");
         break;
     case cdrw:
-        mr_asprintf(&value, "cdrw");
+        mr_asprintf(value, "cdrw");
         break;
     case cdstream:
-        mr_asprintf(&value, "cdstream");
+        mr_asprintf(value, "cdstream");
         break;
     case tape:
-        mr_asprintf(&value, "tape");
+        mr_asprintf(value, "tape");
         break;
     case udev:
-        mr_asprintf(&value, "udev");
+        mr_asprintf(value, "udev");
         break;
     case iso:
-        mr_asprintf(&value, "iso");
+        mr_asprintf(value, "iso");
         break;
     case nfs:
-        mr_asprintf(&value, "nfs");
+        mr_asprintf(value, "nfs");
         break;
     case dvd:
-        mr_asprintf(&value, "dvd");
+        mr_asprintf(value, "dvd");
         break;
     case usb:
-        mr_asprintf(&value, "usb");
+        mr_asprintf(value, "usb");
         break;
     default:
@@ -800 +800 @@
     }
     if (bkpinfo->backup_media_type == usb) {
-        mr_asprintf(&tmp2, "--usb %s", bkpinfo->media_device);
+        mr_asprintf(tmp2, "--usb %s", bkpinfo->media_device);
     } else {
-        mr_asprintf(&tmp2," ");
-    }
-
-    mr_asprintf(&tmp, "%s/BACKUP-MEDIA-TYPE", bkpinfo->tmpdir);
+        mr_asprintf(tmp2," ");
+    }
+
+    mr_asprintf(tmp, "%s/BACKUP-MEDIA-TYPE", bkpinfo->tmpdir);
     if (write_one_liner_data_file(tmp, value)) {
         res++;
@@ -814 +814 @@
     mr_free(tmp);
 
-    mr_asprintf(&tmp, "%s/BOOTLOADER.NAME", bkpinfo->tmpdir);
+    mr_asprintf(tmp, "%s/BOOTLOADER.NAME", bkpinfo->tmpdir);
     if (write_one_liner_data_file(tmp, bootldr_str)) {
         res++;
@@ -823 +823 @@
     mr_free(tmp);
 
-    mr_asprintf(&tmp, "%s/DIFFERENTIAL", bkpinfo->tmpdir);
+    mr_asprintf(tmp, "%s/DIFFERENTIAL", bkpinfo->tmpdir);
     if (bkpinfo->differential) {
         res += write_one_liner_data_file(tmp, "1");
@@ -832 +832 @@
 
     if (g_getfattr) {
-        mr_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",
@@ -840 +840 @@
     }
     if (g_getfacl) {
-        mr_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",
@@ -848 +848 @@
     }
     if (bkpinfo->use_obdr) {
-        mr_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",
@@ -859 +859 @@
         size_of_all_biggiefiles_K(bkpinfo) / bkpinfo->optimal_set_size + 1;
     /* add nfs stuff here? */
-    mr_asprintf(&command, "mkdir -p %s/images", bkpinfo->scratchdir);
+    mr_asprintf(command, "mkdir -p %s/images", bkpinfo->scratchdir);
     if (system(command)) {
         res++;
@@ -867 +867 @@
     log_msg(1, "lines_in_filelist = %ld", lines_in_filelist);
 
-/*     "mindi 1=%s --custom 2=%s 3=%s/images 4=\"%s\" 5=\"%s\" \
+    mr_asprintf(command,
+/*     "mindi --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",*/
@@ -919 +920 @@
     if (!res) {
         log_to_screen("Boot+data disks were created OK");
-        mr_asprintf(&command, "cp -f %s/images/mindi.iso %s/mondorescue.iso", bkpinfo->scratchdir, MINDI_CACHE);
+        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);
@@ -925 +926 @@
 
         if (bkpinfo->nonbootable_backup) {
-            mr_asprintf(&command, "cp -f %s/all.tar.gz %s/images", bkpinfo->tmpdir, bkpinfo->scratchdir);
+            mr_asprintf(command, "cp -f %s/all.tar.gz %s/images", bkpinfo->tmpdir, bkpinfo->scratchdir);
             if (system(command)) {
                 paranoid_free(command);
@@ -934 +935 @@
         /* For USB we already have everything on the key */
         if (bkpinfo->backup_media_type == usb) {
-            mr_asprintf(&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 {
-            mr_asprintf(&tmp, "cp -f %s/images/all.tar.gz %s", bkpinfo->scratchdir, bkpinfo->tmpdir);
+            mr_asprintf(tmp, "cp -f %s/images/all.tar.gz %s", bkpinfo->scratchdir, bkpinfo->tmpdir);
             if (system(tmp)) {
                 fatal_error("Cannot find all.tar.gz in tmpdir");
@@ -951 +952 @@
     } else {
         log_to_screen("Mindi failed to create your boot+data disks.");
-        mr_asprintf(&command, "grep 'Fatal error' /var/log/mindi.log");
-        mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));
+        mr_asprintf(command, "grep 'Fatal error' /var/log/mindi.log");
+        mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
         paranoid_free(command);
 
@@ -1058 +1059 @@
         }
 
-        mr_asprintf(&tmp, AFIOBALL_FNAME_RAW_SZ, bkpinfo->tmpdir, archiving_set_no - ARCH_BUFFER_NUM, bkpinfo->zip_suffix);
+        mr_asprintf(tmp, AFIOBALL_FNAME_RAW_SZ, bkpinfo->tmpdir, archiving_set_no - ARCH_BUFFER_NUM, bkpinfo->zip_suffix);
         if (does_file_exist(tmp)) {
             log_msg(4, "%s[%d:%d] - waiting for storer", FORTY_SPACES,
@@ -1072 +1073 @@
                 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);
@@ -1091 +1092 @@
 
         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);
@@ -1209 +1210 @@
 
     assert(bkpinfo != NULL);
-    mr_asprintf(&data_disks_file, "%s/all.tar.gz", bkpinfo->tmpdir);
-
-    mr_asprintf(&g_serial_string, "%s", call_program_and_get_last_line_of_output("dd  if=/dev/urandom bs=16 count=1 2> /dev/null |  hexdump | tr -s ' ' '0' | head -n1"));
+    mr_asprintf(data_disks_file, "%s/all.tar.gz", bkpinfo->tmpdir);
+
+    mr_asprintf(g_serial_string, "%s", call_program_and_get_last_line_of_output("dd  if=/dev/urandom bs=16 count=1 2> /dev/null |  hexdump | tr -s ' ' '0' | head -n1"));
     mr_strip_spaces(g_serial_string);
     mr_strcat(g_serial_string, "...word.");
     log_msg(2, "g_serial_string = '%s'", g_serial_string);
 
-    mr_asprintf(&tmpfile, "%s/archives/SERIAL-STRING", bkpinfo->scratchdir);
+    mr_asprintf(tmpfile, "%s/archives/SERIAL-STRING", bkpinfo->scratchdir);
     if (write_one_liner_data_file(tmpfile, g_serial_string)) {
         log_msg(1, "%ld: Failed to write serial string", __LINE__);
@@ -1243 +1244 @@
     mr_free(data_disks_file);
 
-    mr_asprintf(&command, "rm -f %s/%s/%s-[1-9]*.iso", bkpinfo->isodir, bkpinfo->nfs_remote_dir, bkpinfo->prefix);
+    mr_asprintf(command, "rm -f %s/%s/%s-[1-9]*.iso", bkpinfo->isodir, bkpinfo->nfs_remote_dir, bkpinfo->prefix);
     paranoid_system(command);
     mr_free(command);
@@ -1409 +1410 @@
             } 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);
                 }
 
@@ -1469 +1470 @@
                 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);
@@ -1489 +1490 @@
     close_progress_form();
 
-    mr_asprintf(&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++) {
@@ -1555 +1556 @@
     log_msg(2, "make_usb_fs --- scratchdir=%s", bkpinfo->scratchdir);
     (void) getcwd(old_pwd, MAX_STR_LEN - 1);
-    mr_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);
@@ -1561 +1562 @@
 
     mds = media_descriptor_string(bkpinfo->backup_media_type);
-    mr_asprintf(&message_to_screen, "Copying data to make %s #%d",mds, g_current_media_number);
+    mr_asprintf(message_to_screen, "Copying data to make %s #%d",mds, g_current_media_number);
     mr_free(mds);
     log_msg(1, message_to_screen);
 
-    mr_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");
-        mr_asprintf(&tmp, "umount %s", tmp1);
+        mr_asprintf(tmp, "umount %s", tmp1);
         run_program_and_log_output(tmp, FALSE);
         paranoid_free(tmp);
@@ -1575 +1576 @@
 
     log_msg(1, "Mounting USB device.");
-    mr_asprintf(&tmp1, "%s/usb", bkpinfo->tmpdir);
-    mr_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 */
-    mr_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);
@@ -1590 +1591 @@
 
         /* Command to execute */
-        mr_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) {
-            mr_asprintf(&result_sz, "%s ...failed",tmp);
+            mr_asprintf(result_sz, "%s ...failed",tmp);
         } else {
-            mr_asprintf(&result_sz, "%s ...OK",tmp);
+            mr_asprintf(result_sz, "%s ...OK",tmp);
         }
         log_to_screen(result_sz);
@@ -1603 +1604 @@
 
         /* Recreate the required structure under the scratch dir */
-        mr_asprintf(&tmp,"mkdir %s/archive", bkpinfo->scratchdir); 
+        mr_asprintf(tmp,"mkdir %s/archive", bkpinfo->scratchdir); 
         run_program_and_log_output(tmp, FALSE);
         paranoid_free(tmp);
@@ -1611 +1612 @@
 
     if (is_this_device_mounted(bkpinfo->media_device)) {
-        mr_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);
@@ -1665 +1666 @@
     assert_string_is_neither_NULL_nor_zerolength(destfile);
 
-    mr_asprintf(&tmp, "%s/isolinux.bin", bkpinfo->scratchdir);
-    mr_asprintf(&tmp2, "%s/isolinux.bin", bkpinfo->tmpdir);
+    mr_asprintf(tmp, "%s/isolinux.bin", bkpinfo->scratchdir);
+    mr_asprintf(tmp2, "%s/isolinux.bin", bkpinfo->tmpdir);
     if (does_file_exist(tmp)) {
-        mr_asprintf(&tmp3, "cp -f %s %s", tmp, tmp2);
+        mr_asprintf(tmp3, "cp -f %s %s", tmp, tmp2);
         paranoid_system(tmp3);
         mr_free(tmp3);
     }
     if (!does_file_exist(tmp) && does_file_exist(tmp2)) {
-        mr_asprintf(&tmp3, "cp -f %s %s", tmp2, tmp);
+        mr_asprintf(tmp3, "cp -f %s %s", tmp2, tmp);
         paranoid_system(tmp3);
         mr_free(tmp3);
@@ -1686 +1687 @@
     log_msg(2, "make_iso_fs --- scratchdir=%s --- destfile=%s", bkpinfo->scratchdir, destfile);
     (void) getcwd(old_pwd, MAX_STR_LEN - 1);
-    mr_asprintf(&tmp, "chmod 755 %s", bkpinfo->scratchdir);
+    mr_asprintf(tmp, "chmod 755 %s", bkpinfo->scratchdir);
     run_program_and_log_output(tmp, FALSE);
     mr_free(tmp);
@@ -1693 +1694 @@
 
     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,
@@ -1712 +1713 @@
         log_msg(2, "bkpinfo->call_make_iso = %s", bkpinfo->call_make_iso);
         mds = media_descriptor_string(bkpinfo->backup_media_type);
-        mr_asprintf(&message_to_screen, "Making an ISO (%s #%d)", mds, g_current_media_number);
+        mr_asprintf(message_to_screen, "Making an ISO (%s #%d)", mds, g_current_media_number);
         mr_free(mds);
 
@@ -1726 +1727 @@
             } else {
                 log_to_screen("%s...OK", message_to_screen);
-                mr_asprintf(&tmp, "tail -n10 %s | grep -F ':-('", MONDO_LOGFILE);
+                mr_asprintf(tmp, "tail -n10 %s | grep -F ':-('", MONDO_LOGFILE);
                 if (!run_program_and_log_output(tmp, 1)) {
                     log_to_screen
@@ -1735 +1736 @@
             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))) {
@@ -1751 +1752 @@
                 }
                 pause_for_N_seconds(5, "Letting DVD drive settle");
-                mr_asprintf(&sz_blank_disk, "dvd+rw-format -force %s", bkpinfo->media_device);
+                mr_asprintf(sz_blank_disk, "dvd+rw-format -force %s", bkpinfo->media_device);
                 log_msg(3, "sz_blank_disk = '%s'", sz_blank_disk);
                 res =
@@ -1802 +1803 @@
     } else {
         mds = media_descriptor_string(bkpinfo->backup_media_type);
-        mr_asprintf(&message_to_screen, "Running mkisofs to make %s #%d", mds, g_current_media_number);
+        mr_asprintf(message_to_screen, "Running mkisofs to make %s #%d", mds, g_current_media_number);
         log_msg(1, message_to_screen);
-        mr_asprintf(&result_sz, "Call to mkisofs to make ISO (%s #%d) ", mds,  g_current_media_number);
+        mr_asprintf(result_sz, "Call to mkisofs to make ISO (%s #%d) ", mds,  g_current_media_number);
         mr_free(mds);
         if (bkpinfo->nonbootable_backup) {
@@ -1874 +1875 @@
                     "Warning - %s mounted. I'm unmounting it before I burn to it.",
                     bkpinfo->media_device);
-            mr_asprintf(&tmp, "umount %s", bkpinfo->media_device);
+            mr_asprintf(tmp, "umount %s", bkpinfo->media_device);
             run_program_and_log_output(tmp, FALSE);
             mr_free(tmp);
@@ -1883 +1884 @@
         log_msg(2, "bkpinfo->call_burn_iso = %s", bkpinfo->call_burn_iso);
         mds = media_descriptor_string(bkpinfo->backup_media_type);
-        mr_asprintf(&message_to_screen, "Burning %s #%d", mds, g_current_media_number);
+        mr_asprintf(message_to_screen, "Burning %s #%d", mds, g_current_media_number);
         mr_free(mds);
         pause_and_ask_for_cdr(2, &cd_is_mountable);
@@ -1903 +1904 @@
     if (bkpinfo->call_after_iso[0] != '\0') {
         mds = media_descriptor_string(bkpinfo->backup_media_type);
-        mr_asprintf(&message_to_screen, "Running post-ISO call (%s #%d)", mds, g_current_media_number);
+        mr_asprintf(message_to_screen, "Running post-ISO call (%s #%d)", mds, g_current_media_number);
         mr_free(mds);
         res =
@@ -1936 +1937 @@
     bool ret = TRUE;
 
-    mr_asprintf(&command, "dd if=%s bs=512 count=1 2> /dev/null | strings | head -n1", bigfile_fname);
+    mr_asprintf(command, "dd if=%s bs=512 count=1 2> /dev/null | strings | head -n1", bigfile_fname);
     log_msg(1, "command = '%s'", command);
-    mr_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));
     mr_free(command);
 
@@ -2011 +2012 @@
         return (0);
     }
-    mr_asprintf(&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);
@@ -2055 +2056 @@
                         "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;
@@ -2109 +2110 @@
                 p = bigfile_fname;
             }
-            mr_asprintf(&tmp, "Archiving %s ... ", bigfile_fname);
+            mr_asprintf(tmp, "Archiving %s ... ", bigfile_fname);
             if (res) {
                 mr_strcat(tmp, "Failed!");
@@ -2170 +2171 @@
     for (; does_file_exist(curr_filelist_fname); curr_set_no++) {
         /* backup this set of files */
-        mr_asprintf(&curr_filelist_fname, FILELIST_FNAME_RAW_SZ, bkpinfo->tmpdir, curr_set_no);
+        mr_asprintf(curr_filelist_fname, FILELIST_FNAME_RAW_SZ, bkpinfo->tmpdir, curr_set_no);
         if (! does_file_exist(curr_filelist_fname)) {
             mr_free(curr_filelist_fname);
@@ -2176 +2177 @@
         }
 
-        mr_asprintf(&curr_afioball_fname, AFIOBALL_FNAME_RAW_SZ, bkpinfo->tmpdir, curr_set_no, bkpinfo->zip_suffix);
+        mr_asprintf(curr_afioball_fname, AFIOBALL_FNAME_RAW_SZ, bkpinfo->tmpdir, curr_set_no, bkpinfo->zip_suffix);
 
         log_msg(1, "EXAT'g set %ld", curr_set_no);
         if (g_getfattr) {
-            mr_asprintf(&curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ, bkpinfo->tmpdir, curr_set_no);
+            mr_asprintf(curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ, bkpinfo->tmpdir, curr_set_no);
             get_fattr_list(curr_filelist_fname, curr_xattr_list_fname);
         }
         if (g_getfacl) {
-            mr_asprintf(&curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ, bkpinfo->tmpdir, curr_set_no);
+            mr_asprintf(curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ, bkpinfo->tmpdir, curr_set_no);
             get_acl_list(curr_filelist_fname, curr_acl_list_fname);
         }
@@ -2194 +2195 @@
         retval += res;
         if (res) {
-            mr_asprintf(&tmp, "Errors occurred while archiving set %ld. Perhaps your live filesystem changed?", curr_set_no);
+            mr_asprintf(tmp, "Errors occurred while archiving set %ld. Perhaps your live filesystem changed?", curr_set_no);
             log_to_screen(tmp);
             mr_free(tmp);
@@ -2246 +2247 @@
 
         if (res) {
-            mr_asprintf(&tmp, "Failed to add archive %ld's files to CD dir\n", curr_set_no);
+            mr_asprintf(tmp, "Failed to add archive %ld's files to CD dir\n", curr_set_no);
             log_to_screen(tmp);
             mr_free(tmp);
@@ -2256 +2257 @@
     }
     close_progress_form();
-    mr_asprintf(&tmp, "Your regular files have been archived ");
+    mr_asprintf(tmp, "Your regular files have been archived ");
     if (retval) {
         mr_strcat(tmp, "(with errors).");
@@ -2342 +2343 @@
     mvaddstr_and_log_it(g_currentY, 0,
                         "Archiving large files to media           ");
-    mr_asprintf(&biggielist, "%s/archives/biggielist.txt", bkpinfo->scratchdir);
+    mr_asprintf(biggielist, "%s/archives/biggielist.txt", bkpinfo->scratchdir);
     if (g_getfattr) {
-        mr_asprintf(&xattr_fname, XATTR_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
+        mr_asprintf(xattr_fname, XATTR_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
     }
     if (g_getfacl) {
-        mr_asprintf(&acl_fname, ACL_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
-    }
-
-    mr_asprintf(&command, "cp %s/biggielist.txt %s", bkpinfo->tmpdir,
+        mr_asprintf(acl_fname, ACL_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
+    }
+
+    mr_asprintf(command, "cp %s/biggielist.txt %s", bkpinfo->tmpdir,
             biggielist);
     paranoid_system(command);
     mr_free(command);
 
-    mr_asprintf(&blah, "biggielist = %s", biggielist);
+    mr_asprintf(blah, "biggielist = %s", biggielist);
     log_msg(2, blah);
     mr_free(blah);
@@ -2365 +2366 @@
     if (g_getfattr) {
         get_fattr_list(biggielist, xattr_fname);
-        mr_asprintf(&command, "cp %s %s/archives/", xattr_fname, bkpinfo->scratchdir);
+        mr_asprintf(command, "cp %s %s/archives/", xattr_fname, bkpinfo->scratchdir);
         paranoid_system(command);
         mr_free(command);
@@ -2371 +2372 @@
     if (g_getfacl) {
         get_acl_list(biggielist, acl_fname);
-        mr_asprintf(&command, "cp %s %s/archives/", acl_fname, bkpinfo->scratchdir);
+        mr_asprintf(command, "cp %s %s/archives/", acl_fname, bkpinfo->scratchdir);
         paranoid_system(command);
         mr_free(command);
@@ -2378 +2379 @@
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
         res += write_EXAT_files_to_tape(xattr_fname, acl_fname);
-        mr_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);
         mr_free(blah);
@@ -2454 +2455 @@
             continue;
         }
-        mr_asprintf(&curr_file, "%s", cf);
+        mr_asprintf(curr_file, "%s", cf);
         if (!does_file_exist(curr_file)) {
             log_msg(1,
@@ -2483 +2484 @@
             continue;
         }
-        mr_asprintf(&curr_file, "%s", cf);
-
-        mr_asprintf(&tmp, "mv -f %s %s/archives/", curr_file, bkpinfo->scratchdir);
+        mr_asprintf(curr_file, "%s", cf);
+
+        mr_asprintf(tmp, "mv -f %s %s/archives/", curr_file, bkpinfo->scratchdir);
         mr_free(curr_file);
         res = run_program_and_log_output(tmp, 5);
@@ -2558 +2559 @@
             continue;
         }
-        mr_asprintf(&curr_file, "%s", cf);
+        mr_asprintf(curr_file, "%s", cf);
         if (!does_file_exist(curr_file)) {
             log_msg(1,
@@ -2616 +2617 @@
     char *cdrecord = NULL;
 
-    mr_asprintf(&bkp, "%s", cdrw_dev);
+    mr_asprintf(bkp, "%s", cdrw_dev);
     if (find_cdrw_device(cdrw_dev)) {
         strcpy(cdrw_dev, bkp);
     } else {
         if (!system("which cdrecord > /dev/null 2> /dev/null")) {
-            mr_asprintf(&cdrecord, "cdrecord dev=%s -atip", cdrw_dev);
+            mr_asprintf(cdrecord, "cdrecord dev=%s -atip", cdrw_dev);
         } else if (!system("which dvdrecord > /dev/null 2> /dev/null")) {
-            mr_asprintf(&cdrecord, "cdrecord dev=%s -atip", cdrw_dev);
+            mr_asprintf(cdrecord, "cdrecord dev=%s -atip", cdrw_dev);
         } else {
             log_msg(2, "Oh well. I guess I'll just pray then.");
@@ -2681 +2682 @@
 
     mds = media_descriptor_string(g_backup_media_type);
-    mr_asprintf(&tmp, "I am about to burn %s #%d", mds, g_current_media_number);
+    mr_asprintf(tmp, "I am about to burn %s #%d", mds, g_current_media_number);
     mr_free(mds);
     log_to_screen(tmp);
@@ -2699 +2700 @@
       retract_CD_tray_and_defeat_autorun();
 */
-        mr_asprintf(&tmp, "umount %s", cdrom_dev);
+        mr_asprintf(tmp, "umount %s", cdrom_dev);
         run_program_and_log_output(tmp, 1);
         sprintf(szcdno, "%s/archives/THIS-CD-NUMBER", mtpt);
@@ -2705 +2706 @@
         sprintf(szunmount, "umount %s", mtpt);
         cd_number = -1;
-        mr_asprintf(&tmp, "mount %s %s", cdrom_dev, mtpt);
-        mr_asprintf(&our_serial_str, "%s", "");
+        mr_asprintf(tmp, "mount %s %s", cdrom_dev, mtpt);
+        mr_asprintf(our_serial_str, "%s", "");
         attempt_to_mount_returned_this = run_program_and_log_output(tmp, 1);
         mr_free(tmp);
@@ -2735 +2736 @@
 
             cd_number = atoi(last_line_of_file(szcdno));
-            mr_asprintf(&tmp, "cat %s 2> /dev/null", szserfname);
+            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?
@@ -2773 +2774 @@
         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);
 
@@ -2918 +2919 @@
     if (is_this_file_compressed(biggie_filename)
         || bkpinfo->compression_level == 0) {
-        mr_asprintf(&suffix, "%s", "");
+        mr_asprintf(suffix, "%s", "");
         //      log_it("%s is indeed compressed :-)", filename);
         should_I_compress_slices = FALSE;
     } else {
-        mr_asprintf(&suffix, "%s", bkpinfo->zip_suffix);
+        mr_asprintf(suffix, "%s", bkpinfo->zip_suffix);
         should_I_compress_slices = TRUE;
     }
@@ -2938 +2939 @@
             fatal_error("ntfsresize not found");
         }
-        mr_asprintf(&command, "ntfsresize --force --info %s|grep '^You might resize at '|cut -d' ' -f5", biggie_filename);
+        mr_asprintf(command, "ntfsresize --force --info %s|grep '^You might resize at '|cut -d' ' -f5", biggie_filename);
         log_it("command = %s", command);
-        mr_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));
         mr_free(command);
         log_it("res of it = %s", tmp); 
@@ -2948 +2949 @@
         file_to_openin = biggie_filename;
         if (strchr(biggie_filename,'\'') != NULL) {
-            mr_asprintf(&command, "md5sum \"%s\"", biggie_filename);
+            mr_asprintf(command, "md5sum \"%s\"", biggie_filename);
         } else {
-            mr_asprintf(&command, "md5sum '%s'", biggie_filename);
+            mr_asprintf(command, "md5sum '%s'", biggie_filename);
         }
         if (!(fin = popen(command, "r"))) {
@@ -2973 +2974 @@
     strcpy(biggiestruct.checksum, checksum_line);
 
-    mr_asprintf(&tmp, "%s", slice_fname(biggie_file_number, 0, bkpinfo->tmpdir, ""));
+    mr_asprintf(tmp, "%s", slice_fname(biggie_file_number, 0, bkpinfo->tmpdir, ""));
     fout = fopen(tmp, "w");
     if (fout == NULL) {
@@ -2992 +2993 @@
     if (!(fin = fopen(file_to_openin, "r"))) {
         log_OS_error("Unable to openin biggie_filename");
-        mr_asprintf(&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);
@@ -3014 +3015 @@
     }
     for (slice_num = 1; !finished; slice_num++) {
-        mr_asprintf(&curr_slice_fname_uncompressed, "%s", slice_fname(biggie_file_number, slice_num, bkpinfo->tmpdir, ""));
-        mr_asprintf(&curr_slice_fname_compressed, "%s", slice_fname(biggie_file_number, slice_num, bkpinfo->tmpdir, suffix));
+        mr_asprintf(curr_slice_fname_uncompressed, "%s", slice_fname(biggie_file_number, slice_num, bkpinfo->tmpdir, ""));
+        mr_asprintf(curr_slice_fname_compressed, "%s", slice_fname(biggie_file_number, slice_num, bkpinfo->tmpdir, suffix));
 
         
@@ -3050 +3051 @@
             }
             if (should_I_compress_slices && bkpinfo->compression_level > 0) {
-                mr_asprintf(&command, "%s -%d %s", bkpinfo->zip_exe, bkpinfo->compression_level, curr_slice_fname_uncompressed);
+                mr_asprintf(command, "%s -%d %s", bkpinfo->zip_exe, bkpinfo->compression_level, curr_slice_fname_uncompressed);
                 log_msg(2, command);
                 if ((res = system(command))) {
@@ -3057 +3058 @@
                 //          did_I_compress_slice = TRUE;
             } else {
-                mr_asprintf(&command, "mv %s %s 2>> %s", curr_slice_fname_uncompressed, curr_slice_fname_compressed, MONDO_LOGFILE);
+                mr_asprintf(command, "mv %s %s 2>> %s", curr_slice_fname_uncompressed, curr_slice_fname_compressed, MONDO_LOGFILE);
                 res = 0;        // don't do it :)
                 //          did_I_compress_slice = FALSE;
@@ -3073 +3074 @@
             }
             if (res) {
-                mr_asprintf(&tmp, "Problem with slice # %ld", slice_num);
+                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
@@ -3089 +3090 @@
             paranoid_free(tmp);
 
-            mr_asprintf(&file_to_archive, "%s", curr_slice_fname_compressed);
+            mr_asprintf(file_to_archive, "%s", curr_slice_fname_compressed);
             g_current_progress++;
         } else {                /* if i==0 then ... */
 
             finished = TRUE;
-            mr_asprintf(&file_to_archive, "%s", curr_slice_fname_uncompressed);
+            mr_asprintf(file_to_archive, "%s", curr_slice_fname_uncompressed);
             if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
                 break;
@@ -3114 +3115 @@
         retval += res;
         if (res) {
-            mr_asprintf(&tmp, "Failed to add slice %ld of bigfile %ld to scratchdir", slice_num, biggie_file_number + 1);
+            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);
@@ -3124 +3125 @@
     mr_free(suffix);
     paranoid_fclose(fin);
-    mr_asprintf(&tmp, "Sliced bigfile #%ld", biggie_file_number + 1);
+    mr_asprintf(tmp, "Sliced bigfile #%ld", biggie_file_number + 1);
     if (retval) {
         mr_strcat(tmp, "...FAILED");
@@ -3158 +3159 @@
     assert_string_is_neither_NULL_nor_zerolength(d);
 
-    mr_asprintf(&dir, "%s/archives", d);
-    mr_asprintf(&tmp, "find %s -name '*.afio*' -exec rm -f '{}' \\;", dir);
+    mr_asprintf(dir, "%s/archives", d);
+    mr_asprintf(tmp, "find %s -name '*.afio*' -exec rm -f '{}' \\;", dir);
     run_program_and_log_output(tmp, FALSE);
     mr_free(tmp);
-    mr_asprintf(&tmp, "find %s -name '*list.[0-9]*' -exec rm -f '{}' \\;", dir);
+    mr_asprintf(tmp, "find %s -name '*list.[0-9]*' -exec rm -f '{}' \\;", dir);
     run_program_and_log_output(tmp, FALSE);
     mr_free(tmp);
-    mr_asprintf(&tmp, "find %s -name 'slice*' -exec rm -f '{}' \\;", dir);
+    mr_asprintf(tmp, "find %s -name 'slice*' -exec rm -f '{}' \\;", dir);
     run_program_and_log_output(tmp, FALSE);
     mr_free(tmp);
-    mr_asprintf(&tmp, "rm -f %s/cklist*", dir);
+    mr_asprintf(tmp, "rm -f %s/cklist*", dir);
     run_program_and_log_output(tmp, FALSE);
     mr_free(tmp);
-    mr_asprintf(&tmp, "rm -f %s/zero", dir);
+    mr_asprintf(tmp, "rm -f %s/zero", dir);
     run_program_and_log_output(tmp, FALSE);
     mr_free(tmp);
     log_msg(1, "Wiped %s's archives", dir);
-    mr_asprintf(&tmp, "ls -l %s", dir);
+    mr_asprintf(tmp, "ls -l %s", dir);
     mr_free(dir);
     run_program_and_log_output(tmp, FALSE);
@@ -3280 +3281 @@
     /* label the ISO with its number */
 
-    mr_asprintf(&cdno_fname, "%s/archives/THIS-CD-NUMBER", bkpinfo->scratchdir);
+    mr_asprintf(cdno_fname, "%s/archives/THIS-CD-NUMBER", bkpinfo->scratchdir);
     fout = fopen(cdno_fname, "w");
     mr_free(cdno_fname);
@@ -3287 +3288 @@
     paranoid_fclose(fout);
 
-    mr_asprintf(&tmp1, "cp -f %s/autorun %s/", g_mondo_home, bkpinfo->scratchdir);
+    mr_asprintf(tmp1, "cp -f %s/autorun %s/", g_mondo_home, bkpinfo->scratchdir);
     if (run_program_and_log_output(tmp1, FALSE)) {
         log_msg(2, "Warning - unable to copy autorun to scratchdir");
@@ -3294 +3295 @@
 
     /* last CD or not? Label accordingly */
-    mr_asprintf(&lastcd_fname, "%s/archives/NOT-THE-LAST", bkpinfo->scratchdir);
+    mr_asprintf(lastcd_fname, "%s/archives/NOT-THE-LAST", bkpinfo->scratchdir);
     if (last_cd) {
         unlink(lastcd_fname);
@@ -3309 +3310 @@
     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),
-                (long) 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), (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) {
@@ -3351 +3351 @@
         } else {
             mds = media_descriptor_string(bkpinfo->backup_media_type);
-            mr_asprintf(&tmp1, "Failed to create %s #%d. Retry?", mds, g_current_media_number);
+            mr_asprintf(tmp1, "Failed to create %s #%d. Retry?", mds, g_current_media_number);
             mr_free(mds);
             res = ask_me_yes_or_no(tmp1);
@@ -3375 +3375 @@
     }
     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
@@ -3432 +3432 @@
         log_msg(2,
                 "Not verifying again. Per-CD/ISO verification already carried out.");
-        mr_asprintf(&tmp, "cat %s/changed.files > %s/changed.files 2> /dev/null",bkpinfo->tmpdir, MONDO_CACHE);
+        mr_asprintf(tmp, "cat %s/changed.files > %s/changed.files 2> /dev/null",bkpinfo->tmpdir, MONDO_CACHE);
         paranoid_system(tmp);
         mr_free(tmp);
@@ -3455 +3455 @@
             if (res) {
                 mds = media_descriptor_string(bkpinfo->backup_media_type);
-                mr_asprintf(&tmp, "Warnings/errors were reported while checking %s #%d", mds, g_current_media_number);
+                mr_asprintf(tmp, "Warnings/errors were reported while checking %s #%d", mds, g_current_media_number);
                 mr_free(mds);
                 log_to_screen(tmp);
@@ -3462 +3462 @@
             }
         }
-        mr_asprintf(&tmp, "grep 'afio: ' %s | sed 's/afio: //' | grep -vE '^/dev/.*$' >> %s/changed.files", MONDO_LOGFILE, MONDO_CACHE);
+        mr_asprintf(tmp, "grep 'afio: ' %s | sed 's/afio: //' | grep -vE '^/dev/.*$' >> %s/changed.files", MONDO_LOGFILE, MONDO_CACHE);
         (void)system(tmp);
         mr_free(tmp);
 
-        mr_asprintf(&tmp, "grep 'star: ' %s | sed 's/star: //' | grep -vE '^/dev/.*$' >> %s/changed.files", MONDO_LOGFILE, MONDO_CACHE);
+        mr_asprintf(tmp, "grep 'star: ' %s | sed 's/star: //' | grep -vE '^/dev/.*$' >> %s/changed.files", MONDO_LOGFILE, MONDO_CACHE);
         (void)system(tmp);
         mr_free(tmp);
@@ -3475 +3475 @@
 //}
     }
-    mr_asprintf(&tmp, "%s/changed.files", MONDO_CACHE);
+    mr_asprintf(tmp, "%s/changed.files", MONDO_CACHE);
     diffs = count_lines_in_file(tmp);
     mr_free(tmp);

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

@@ -111 +111 @@
     for (i = 0; i < 128; i++) {
         if (flag_set[i]) {
-            mr_asprintf(&tmp, "-%c %s", i, flag_val[i]);
+            mr_asprintf(tmp, "-%c %s", i, flag_val[i]);
             log_msg(3, tmp);
             mr_free(tmp);
         }
     }
-    mr_asprintf(&tmp, "rm -Rf %s/tmp.mondo.*", bkpinfo->tmpdir);
+    mr_asprintf(tmp, "rm -Rf %s/tmp.mondo.*", bkpinfo->tmpdir);
     paranoid_system(tmp);
     mr_free(tmp);
 
-    mr_asprintf(&tmp, "rm -Rf %s/mondo.scratch.*", bkpinfo->scratchdir);
+    mr_asprintf(tmp, "rm -Rf %s/mondo.scratch.*", bkpinfo->scratchdir);
     paranoid_system(tmp);
     mr_free(tmp);
@@ -126 +126 @@
     mr_strcat(bkpinfo->scratchdir, "/mondo.scratch.%ld", random() % 32767);
 
-    mr_asprintf(&tmp, "mkdir -p %s/tmpfs", bkpinfo->tmpdir);
+    mr_asprintf(tmp, "mkdir -p %s/tmpfs", bkpinfo->tmpdir);
     paranoid_system(tmp);
     mr_free(tmp);
 
-    mr_asprintf(&tmp, "mkdir -p %s", bkpinfo->scratchdir);
+    mr_asprintf(tmp, "mkdir -p %s", bkpinfo->scratchdir);
     paranoid_system(tmp);
     mr_free(tmp);
@@ -161 +161 @@
         *(strchr(tmp, ',')) = '\0';
         bkpinfo->media_size[j] = friendly_sizestr_to_sizelong(tmp);
-        mr_asprintf(&comment, "media_size[%d] = %ld", j, bkpinfo->media_size[j]);
+        mr_asprintf(comment, "media_size[%d] = %ld", j, bkpinfo->media_size[j]);
         log_msg(3, comment);
         mr_free(comment);
@@ -279 +279 @@
     ********/
     /* Get the number of mounted file systems ((those that start with "/dev/" */
-    mr_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);
-    mr_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));
     mr_free(command);
 
@@ -289 +289 @@
 
     for (i=mount_cnt; i > 0; i--) {
-        mr_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);
-        mr_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));
         mr_free(command);
 
@@ -373 +373 @@
     log_msg(5, "  %s looks like a device special file", dsf);
     /* Verify that the dsf exists */ 
-    mr_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);
-    mr_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));
     mr_free(command);
 
@@ -399 +399 @@
     * Either way, it's an error.
     ********/
-    mr_asprintf(&command, "parted2fdisk -l %s 2>/dev/null|grep -E \"^/dev/\"|awk '{printf(\"%%s \", $1)}END{print \"\"}'", dsf);
+    mr_asprintf(command, "parted2fdisk -l %s 2>/dev/null|grep -E \"^/dev/\"|awk '{printf(\"%%s \", $1)}END{print \"\"}'", dsf);
     log_msg(4, "Executing: %s", command);
-    mr_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));
     mr_free(command);
     log_msg(4, "Partition list for %s: %s", dsf, partition_list);
@@ -452 +452 @@
         log_msg(4, "Processing partition: %s", partitions[i]);
         /* See if it's swap. If it is, ignore it. */
-        mr_asprintf(&command, "parted2fdisk -l %s 2>/dev/null | awk '{if(($1==\"%s\")&&(toupper($0) ~ \"SWAP\")){print $1;exit}}'", 
+        mr_asprintf(command, "parted2fdisk -l %s 2>/dev/null | awk '{if(($1==\"%s\")&&(toupper($0) ~ \"SWAP\")){print $1;exit}}'", 
           dsf, partitions[i]);
         log_msg(4, "  Running: %s", command);
-        mr_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));
         mr_free(command);
 
@@ -467 +467 @@
         } 
         /* It's not swap. See if we can find the mount point from the mount 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));
+        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));
         mr_free(command);
 
@@ -486 +486 @@
         log_msg(4, "  It's not mounted. Checking to see if it's LVM...");
         /* Get the partition ID; 8e for LVM */
-        mr_asprintf(&command, "parted2fdisk -l %s |awk '{if($1 ~ \"^%s\"){print $5}}'", dsf, partitions[i]);
+        mr_asprintf(command, "parted2fdisk -l %s |awk '{if($1 ~ \"^%s\"){print $5}}'", dsf, partitions[i]);
         log_msg(4, "  Running: %s", command);
-        mr_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));
         mr_free(command);
         if (strlen(tmp)) {
@@ -495 +495 @@
                 /* It's LVM: Find the VG it's in */
                 log_msg(4, "  It's LVM: Find the VG it's in...");
-                mr_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));
@@ -503 +503 @@
                     /* 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");
-                    mr_asprintf(&command, "mount 2>/dev/null|grep -E \"/dev/mapper/%s-|/dev/%s/\"|awk '{printf(\"%%s \",$3)}END{print \"\"}'", VG, VG);
+                    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);
-                    mr_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));
                     mr_free(command);
                     log_msg(4, "  VG %s mount_list: %s", VG, mount_list);
@@ -525 +525 @@
                      *******/
                     mr_free(mount_list);
-                    mr_asprintf(&command, "%s", "cat /proc/mdstat|grep -iv Personal|awk '{if($0~\"^.*[ ]+:\"){printf(\"/dev/%s \", $1)}}END{print \"\"}'");
+                    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);
-                    mr_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));
                     mr_free(command);
                     log_msg(4, "  Software raid device list: %s", mount_list);
                     lastpos = 0;
                     while ((token = mr_strtok(mount_list, token_chars, &lastpos)) != NULL) {
-                        mr_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);
                         mr_free(tmp);
-                        mr_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));
                         mr_free(command);
                         log_msg(4, "Number of Software raid device: %s", tmp);
@@ -567 +567 @@
          ********/
         log_msg (5, "It's not swap, mounted, or LVM. See if it's used in a software raid device.");
-        mr_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);
-        mr_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));
         mr_free(command);
         if (!strlen(tmp)) {
@@ -578 +578 @@
         log_msg (5, "  UUID: %s", tmp);
         /* Get the Software raid device list */
-        mr_asprintf(&command, "%s", "cat /proc/mdstat|grep -iv Personal|awk '{if($0~\"^.*[ ]+:\"){printf(\"/dev/%s \", $1)}}END{print \"\"}'");
+        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);
-        mr_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));
         mr_free(command);
         log_msg(4, "  Software raid device list: %s", mount_list);
@@ -586 +586 @@
         lastpos = 0;
         while ((token = mr_strtok(mount_list, token_chars, &lastpos)) != NULL) {
-            mr_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);
             mr_free(tmp);
-            mr_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));
             mr_free(command);
             if (!atoi(tmp)) {
@@ -760 +760 @@
         }
 
-        mr_asprintf(&tmp1, "%s", flag_val['I']);
+        mr_asprintf(tmp1, "%s", flag_val['I']);
         p = tmp1;
         q = tmp1;
@@ -797 +797 @@
                 log_to_screen("Archiving only the following file systems on %s:\n", token);
                 log_to_screen("  %s\n", mounted_on_dsf);
-                mr_asprintf(&p, "/");
+                mr_asprintf(p, "/");
                 mr_free(bkpinfo->include_paths);
                 bkpinfo->include_paths = p;
@@ -837 +837 @@
         }
         bkpinfo->make_filelist = FALSE;
-        mr_asprintf(&p, "%s", flag_val['J']);
+        mr_asprintf(p, "%s", flag_val['J']);
         mr_free(bkpinfo->include_paths);
         bkpinfo->include_paths = p;
@@ -903 +903 @@
         strcpy(flag_val['d'], p);
         mr_free(p);
-        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);
@@ -954 +954 @@
             }
         }
-/*
-      if (flag_set['Z']) {
-      bkpinfo->blank_dvd_first = TRUE;
-      }
-*/
     }
 
@@ -1009 +1004 @@
             p--;
             *p = '\0';
-            mr_asprintf(&q,"%s",bkpinfo->nfs_mount);
+            mr_asprintf(q,"%s",bkpinfo->nfs_mount);
             bkpinfo->nfs_user = q;
             strcpy(bkpinfo->nfs_mount,tmp);
         }
-        mr_asprintf(&tmp1, "mount | grep -E \"^%s[/]* .*\" | cut -d' ' -f3",
-                bkpinfo->nfs_mount);
-        strncpy(bkpinfo->isodir,
-                call_program_and_get_last_line_of_output(tmp1),
-                MAX_STR_LEN / 4);
+        mr_asprintf(tmp1, "mount | grep -E \"^%s[/]* .*\" | cut -d' ' -f3", bkpinfo->nfs_mount);
+        mr_free(bkpinfo->isodir);
+        mr_asprintf(tmp2, "%s", call_program_and_get_last_line_of_output(tmp1));
+        bkpinfo->isodir = tmp2;
         mr_free(tmp1);
 
         if (strlen(bkpinfo->isodir) < 3) {
             log_to_screen("NFS share is not mounted. Trying to mount it for you.\n");
-            mr_asprintf(&tmp1, "mount %s", bkpinfo->nfs_mount);
+            mr_asprintf(tmp1, "mount %s", bkpinfo->nfs_mount);
             i = system(tmp1);
             mr_free(tmp1);
@@ -1029 +1023 @@
                 retval++;
             } else {
-                mr_asprintf(&tmp1, "mount | grep -E \"^%s[/]* .*\" | cut -d' ' -f3", bkpinfo->nfs_mount);
-                strncpy(bkpinfo->isodir,
-                        call_program_and_get_last_line_of_output(tmp1),
-                        MAX_STR_LEN / 4);
+                mr_asprintf(tmp1, "mount | grep -E \"^%s[/]* .*\" | cut -d' ' -f3", bkpinfo->nfs_mount);
+                mr_free(bkpinfo->isodir);
+                mr_asprintf(tmp2, "%s", call_program_and_get_last_line_of_output(tmp1));
+                bkpinfo->isodir = tmp2;
                 mr_free(tmp1);
 
@@ -1078 +1072 @@
     if (flag_set['z']) {
         if (find_home_of_exe("getfattr")) {
-            mr_asprintf(&g_getfattr,"getfattr");
+            mr_asprintf(g_getfattr,"getfattr");
         }
         if (find_home_of_exe("getfacl")) {
-            mr_asprintf(&g_getfacl,"getfacl");
+            mr_asprintf(g_getfacl,"getfacl");
         }
     }
@@ -1095 +1089 @@
             log_to_screen("Please supply a sensible value with '-E'\n");
         }
-        mr_asprintf(&tmp1, "%s", flag_val['E']);
+        mr_asprintf(tmp1, "%s", flag_val['E']);
 
         p = tmp1;
@@ -1163 +1157 @@
     if ((flag_set['N']) && (! bkpinfo->restore_data))       // exclude NFS mounts & devices
     {
-        mr_asprintf(&psz, "%s", list_of_NFS_mounts_only());
+        mr_asprintf(psz, "%s", list_of_NFS_mounts_only());
         mr_strcat(bkpinfo->exclude_paths, " %s ", psz);
         mr_free(psz);
@@ -1173 +1167 @@
 
     if (flag_set['b']) {
-        mr_asprintf(&psz, "%s", flag_val['b']);
+        mr_asprintf(psz, "%s", flag_val['b']);
         log_msg(1, "psz = '%s'", psz);
         if (psz[strlen(psz) - 1] == 'k') {
@@ -1219 +1213 @@
             && !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);
@@ -1227 +1221 @@
     if (flag_set['p']) {
         mr_free(bkpinfo->prefix);
-        mr_asprintf(&tmp1, "%s", flag_val['p']);
+        mr_asprintf(tmp1, "%s", flag_val['p']);
         bkpinfo->prefix = tmp1;
         log_msg(1,"Prefix forced to %s",bkpinfo->prefix);
@@ -1234 +1228 @@
     if (flag_set['d']) {        /* backup directory (if ISO/NFS) */
         if (flag_set['i']) {
-            strncpy(bkpinfo->isodir, flag_val['d'], MAX_STR_LEN / 4);
-            mr_asprintf(&tmp1, "ls -l %s", bkpinfo->isodir);
+            mr_free(bkpinfo->isodir);
+            mr_asprintf(tmp2, "%s", flag_val['d']);
+            bkpinfo->isodir = tmp2;
+            mr_asprintf(tmp1, "ls -l %s", bkpinfo->isodir);
             if (run_program_and_log_output(tmp1, 2)) {
                 mr_free(tmp1);
-                fatal_error
-                    ("output folder does not exist - please create it");
+                fatal_error("output folder does not exist - please create it");
             }
             mr_free(tmp1);
@@ -1250 +1245 @@
 
     if ((flag_set['n']) && (! bkpinfo->restore_data)) {
-        mr_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);
         if (bkpinfo->nfs_user) {
-            mr_asprintf(&tmp2, "su - %s -c \"echo hi > %s\"", bkpinfo->nfs_user, tmp1);
+            mr_asprintf(tmp2, "su - %s -c \"echo hi > %s\"", bkpinfo->nfs_user, tmp1);
         } else {
-            mr_asprintf(&tmp2, "echo hi > %s", tmp1);
+            mr_asprintf(tmp2, "echo hi > %s", tmp1);
         }
         i = run_program_and_log_output(tmp2, 2);
@@ -1261 +1256 @@
         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);
@@ -1302 +1297 @@
 
     if (flag_set['S']) {
-        mr_asprintf(&tmp1, "%s/mondo.scratch.%ld", flag_val['S'], random() % 32768);
+        mr_asprintf(tmp1, "%s/mondo.scratch.%ld", flag_val['S'], random() % 32768);
         mr_free(bkpinfo->scratchdir);
         bkpinfo->scratchdir = tmp1;
@@ -1309 +1304 @@
     if (flag_set['T']) {
         setup_tmpdir(flag_val['T']);
-        mr_asprintf(&tmp1, "touch %s/.foo.dat", bkpinfo->tmpdir);
+        mr_asprintf(tmp1, "touch %s/.foo.dat", bkpinfo->tmpdir);
         i = run_program_and_log_output(tmp1, 1);
         mr_free(tmp1);
@@ -1318 +1313 @@
             fatal_error("I cannot write to the tempdir you specified.");
         }
-        mr_asprintf(&tmp1, "ln -sf %s/.foo.dat %s/.bar.dat", bkpinfo->tmpdir, bkpinfo->tmpdir);
+        mr_asprintf(tmp1, "ln -sf %s/.foo.dat %s/.bar.dat", bkpinfo->tmpdir, bkpinfo->tmpdir);
         i = run_program_and_log_output(tmp1, 1);
         mr_free(tmp1);
@@ -1515 +1510 @@
             if (flag_set[opt]) {
                 bad_switches = TRUE;
-                mr_asprintf(&tmp, "Switch -%c previously defined as %s\n", opt, flag_val[opt]);
+                mr_asprintf(tmp, "Switch -%c previously defined as %s\n", opt, flag_val[opt]);
                 log_to_screen(tmp);
                 mr_free(tmp);
@@ -1531 +1526 @@
                         if (strchr(flag_val[opt], '/')
                             && flag_val[opt][0] != '/') {
-                            mr_asprintf(&tmp, "-%c flag --- must be absolute path --- '%s' isn't absolute", opt, flag_val[opt]);
+                            mr_asprintf(tmp, "-%c flag --- must be absolute path --- '%s' isn't absolute", opt, flag_val[opt]);
                             log_to_screen(tmp);
                             mr_free(tmp);
@@ -1544 +1539 @@
     for (i = optind; i < argc; i++) {
         bad_switches = TRUE;
-        mr_asprintf(&tmp, "Invalid arg -- %s\n", argv[i]);
+        mr_asprintf(tmp, "Invalid arg -- %s\n", argv[i]);
         log_to_screen(tmp);
         mr_free(tmp);
@@ -1575 +1570 @@
     switch (sig) {
     case SIGINT:
-        mr_asprintf(&tmp, "SIGINT");
-        mr_asprintf(&tmp2, "You interrupted me :-)");
+        mr_asprintf(tmp, "SIGINT");
+        mr_asprintf(tmp2, "You interrupted me :-)");
         break;
     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(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:
-        mr_asprintf(&tmp, "SIGTERM");
-        mr_asprintf(&tmp2, "Got terminate signal");
+        mr_asprintf(tmp, "SIGTERM");
+        mr_asprintf(tmp2, "Got terminate signal");
         break;
     case SIGHUP:
-        mr_asprintf(&tmp, "SIGHUP");
-        mr_asprintf(&tmp2, "Hangup on line");
+        mr_asprintf(tmp, "SIGHUP");
+        mr_asprintf(tmp2, "Hangup on line");
         break;
     case SIGSEGV:
-        mr_asprintf(&tmp, "SIGSEGV");
-        mr_asprintf(&tmp2, "Internal programming error. Please send a backtrace as well as your log.");
+        mr_asprintf(tmp, "SIGSEGV");
+        mr_asprintf(tmp2, "Internal programming error. Please send a backtrace as well as your log.");
         break;
     case SIGPIPE:
-        mr_asprintf(&tmp, "SIGPIPE");
-        mr_asprintf(&tmp2, "Pipe was broken");
+        mr_asprintf(tmp, "SIGPIPE");
+        mr_asprintf(tmp2, "Pipe was broken");
         break;
     case SIGABRT:
-        mr_asprintf(&tmp, "SIGABRT");
-        mr_asprintf(&tmp2, "Abort - probably failed assertion. I'm sleeping for a few seconds so you can read the message.");
+        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:
-        mr_asprintf(&tmp, "(Unknown)");
-        mr_asprintf(&tmp2, "(Unknown)");
+        mr_asprintf(tmp, "(Unknown)");
+        mr_asprintf(tmp2, "(Unknown)");
     }
 

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

@@ -111 +111 @@
     bool is_this_a_ramdisk = FALSE;
 
-    mr_asprintf(&tmp, "%s", where_is_root_mounted());
-    mr_asprintf(&comment, "root is currently mounted at %s\n", tmp);
+    mr_asprintf(tmp, "%s", where_is_root_mounted());
+    mr_asprintf(comment, "root is currently mounted at %s\n", tmp);
     log_msg(0, comment);
     mr_free(comment);
@@ -210 +210 @@
     if (IS_THIS_A_STREAMING_BACKUP(g_backup_media_type)
         && g_backup_media_type != udev) {
-        mr_asprintf(&command, "mt -f %s offline", dev);
+        mr_asprintf(command, "mt -f %s offline", dev);
         res1 = run_program_and_log_output(command, 1);
         mr_free(command);
@@ -219 +219 @@
 #ifdef __FreeBSD__
     if (strstr(dev, "acd")) {
-        mr_asprintf(&command, "cdcontrol -f %s eject", dev);
+        mr_asprintf(command, "cdcontrol -f %s eject", dev);
     } else {
-        mr_asprintf(&command, "camcontrol eject `echo %s | sed 's|/dev/||'`",
+        mr_asprintf(command, "camcontrol eject `echo %s | sed 's|/dev/||'`",
                 dev);
     }
 #else
-    mr_asprintf(&command, "eject %s", dev);
+    mr_asprintf(command, "eject %s", dev);
 #endif
 
@@ -250 +250 @@
 #ifdef __FreeBSD__
     if (strstr(dev, "acd")) {
-        mr_asprintf(&command, "cdcontrol -f %s close", dev);
+        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
-    mr_asprintf(&command, "eject -t %s", dev);
+    mr_asprintf(command, "eject -t %s", dev);
 #endif
     i = run_program_and_log_output(command, FALSE);
@@ -277 +277 @@
     assert_string_is_neither_NULL_nor_zerolength(device);
 
-    mr_asprintf(&tmp, "ls %s > /dev/null 2> /dev/null", device);
+    mr_asprintf(tmp, "ls %s > /dev/null 2> /dev/null", device);
 
     if (system(tmp)) {
@@ -336 +336 @@
     // We assume here that this is running from mondorestore. (It is.)
     tmp = build_partition_name(drive, partno);
-    mr_asprintf(&program, "ls %s %s >/dev/null 2>&1", drive, tmp);
+    mr_asprintf(program, "ls %s %s >/dev/null 2>&1", drive, tmp);
     mr_free(tmp);
 
@@ -347 +347 @@
 #endif
 
-    mr_asprintf(&program, "parted2fdisk -l %s 2> /dev/null", drive);
+    mr_asprintf(program, "parted2fdisk -l %s 2> /dev/null", drive);
     fin = popen(program, "r");
     if (!fin) {
@@ -394 +394 @@
     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);
@@ -418 +418 @@
     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);
@@ -517 +517 @@
     run_program_and_log_output("insmod ide-scsi", -1);
     if (find_home_of_exe("cdrecord")) {
-        mr_asprintf(&cdr_exe, "cdrecord");
+        mr_asprintf(cdr_exe, "cdrecord");
     } else {
-        mr_asprintf(&cdr_exe, "dvdrecord");
+        mr_asprintf(cdr_exe, "dvdrecord");
     }
     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(&tmp, "%s", call_program_and_get_last_line_of_output(command));
+        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);
     }
@@ -532 +532 @@
     } else {
         strcpy(cdrw_device, tmp);
-        mr_asprintf(&comment, "Found CDRW device - %s", cdrw_device);
+        mr_asprintf(comment, "Found CDRW device - %s", cdrw_device);
         log_it(comment);
         strcpy(g_cdrw_drive_is_here, cdrw_device);
@@ -586 +586 @@
     phrase_two[0] = '\0';
 #ifndef __FreeBSD__
-    mr_asprintf(&dvd_last_resort, "%s", "");;
+    mr_asprintf(dvd_last_resort, "%s", "");;
 #endif
 
@@ -606 +606 @@
     }
 
-    mr_asprintf(&mountpoint, "%s/cd.mnt", bkpinfo->tmpdir);
+    mr_asprintf(mountpoint, "%s/cd.mnt", bkpinfo->tmpdir);
     make_hole_for_dir(mountpoint);
 
     if (find_home_of_exe("cdrecord")) {
-        mr_asprintf(&cdr_exe, "cdrecord");
+        mr_asprintf(cdr_exe, "cdrecord");
     } else {
-        mr_asprintf(&cdr_exe, "dvdrecord");
+        mr_asprintf(cdr_exe, "dvdrecord");
     }
     tmp[0] = '\0';
@@ -628 +628 @@
     }
 
-    mr_asprintf(&command, "%s -scanbus 2> /dev/null", cdr_exe);
+    mr_asprintf(command, "%s -scanbus 2> /dev/null", cdr_exe);
     fin = popen(command, "r");
     log_msg(4, "command=%s", command);
@@ -668 +668 @@
         log_msg(4, "Not running phase two. String is empty.");
     } else {
-        mr_asprintf(&command, "dmesg | grep \"%s\" 2> /dev/null", phrase_two);
+        mr_asprintf(command, "dmesg | grep \"%s\" 2> /dev/null", phrase_two);
         fin = popen(command, "r");
         mr_free(command);
@@ -684 +684 @@
                         if (strstr(tmp, "DVD")) {
                             mr_free(dvd_last_resort);
-                            mr_asprintf(&dvd_last_resort, "/dev/%s", tmp);
+                            mr_asprintf(dvd_last_resort, "/dev/%s", tmp);
                             log_msg(4,
                                     "Ignoring '%s' because it's a DVD drive",
@@ -815 +815 @@
                 found_it = FALSE;
             } else {
-                mr_asprintf(&command, "umount %s", output);
+                mr_asprintf(command, "umount %s", output);
                 paranoid_system(command);
                 mr_free(command);
@@ -838 +838 @@
     }
 
-    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));
+    mr_asprintf(tmp1, "%s", call_program_and_get_last_line_of_output(command));
     mr_free(command);
 
@@ -876 +876 @@
     }
 
-    mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output
+    mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output
             ("dvdrecord -scanbus 2> /dev/null | grep \") '\" | grep -n \"\" | grep DVD | cut -d':' -f1")
         );
@@ -882 +882 @@
     if (!tmp[0])
         mr_free(tmp);
-        mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output
+        mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output
                 ("cdrecord -scanbus 2> /dev/null | grep \") '\" | grep -n \"\" | grep DVD | cut -d':' -f1")
             );
@@ -1026 +1026 @@
     assert_string_is_neither_NULL_nor_zerolength(format);
 
-    mr_asprintf(&format_sz, "%s ", format);
+    mr_asprintf(format_sz, "%s ", format);
 
 #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
 
@@ -1094 +1094 @@
         log_msg(1, "%s needs to have a '/' prefixed - I'll do it",
                 device_raw);
-        mr_asprintf(&tmp, "/%s", device_raw);
+        mr_asprintf(tmp, "/%s", device_raw);
     } else {
-        mr_asprintf(&tmp, "%s", device_raw);
+        mr_asprintf(tmp, "%s", device_raw);
     }
     log_msg(1, "Is %s mounted?", tmp);
@@ -1105 +1105 @@
         return(FALSE);
     }
-    mr_asprintf(&device_with_tab, "%s\t", tmp);
-    mr_asprintf(&device_with_space, "%s ", tmp);
+    mr_asprintf(device_with_tab, "%s\t", tmp);
+    mr_asprintf(device_with_space, "%s ", tmp);
     mr_free(tmp);
 
@@ -1126 +1126 @@
     mr_free(device_with_space);
     paranoid_pclose(fin);
-    mr_asprintf(&tmp, "%s | grep -E \"^%s\" > /dev/null 2> /dev/null", SWAPLIST_COMMAND, device_with_space);
+    mr_asprintf(tmp, "%s | grep -E \"^%s\" > /dev/null 2> /dev/null", SWAPLIST_COMMAND, device_with_space);
     log_msg(4, "tmp (command) = '%s'", tmp);
     if (!system(tmp)) {
@@ -1193 +1193 @@
         (call_program_and_get_last_line_of_output
          ("/sbin/sysctl -n kern.osreldate")) < 500000) {
-        mr_asprintf(&command, "vnconfig -d %s", dname);
+        mr_asprintf(command, "vnconfig -d %s", dname);
     } else {
-        mr_asprintf(&command, "mdconfig -d -u %s", dname);
+        mr_asprintf(command, "mdconfig -d -u %s", dname);
     }
     res = system(command);
@@ -1227 +1227 @@
 
 #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
 
@@ -1267 +1267 @@
     }
 #ifndef __FreeBSD__
-    mr_asprintf(&options, "ro");
+    mr_asprintf(options, "ro");
 #endif
 
@@ -1273 +1273 @@
 
 #ifdef __FreeBSD__
-        mr_asprintf(&dev, "%s", make_vn(device));
+        mr_asprintf(dev, "%s", make_vn(device));
         if (!dev) {
-            mr_asprintf(&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);
         }
@@ -1290 +1290 @@
 
 #ifdef __FreeBSD__
-    mr_asprintf(&command, "mount_cd9660 -r %s %s 2>> %s", device, mountpoint, MONDO_LOGFILE);
+    mr_asprintf(command, "mount_cd9660 -r %s %s 2>> %s", device, mountpoint, MONDO_LOGFILE);
 
 #else
-    mr_asprintf(&command, "mount %s -o %s -t iso9660 %s 2>> %s", device, options, mountpoint, MONDO_LOGFILE);
+    mr_asprintf(command, "mount %s -o %s -t iso9660 %s 2>> %s", device, options, mountpoint, MONDO_LOGFILE);
     paranoid_free(options);
 #endif
@@ -1334 +1334 @@
     /*@ buffers ********************************************************* */
     char *tmp = NULL;
+    char *p = NULL;
     char *mds = NULL;
     char *request = NULL;
@@ -1347 +1348 @@
         return;
     }
-    mr_asprintf(&tmp, "mkdir -p " MNT_CDROM);
+    mr_asprintf(tmp, "mkdir -p " MNT_CDROM);
     run_program_and_log_output(tmp, 5);
     mr_free(tmp);
@@ -1360 +1361 @@
             run_program_and_log_output("umount " MNT_CDROM, 5);
         }
-        mr_asprintf(&tmp, "mkdir -p %s/isodir &> /dev/null", bkpinfo->tmpdir);
+        mr_asprintf(tmp, "mkdir -p %s/isodir &> /dev/null", bkpinfo->tmpdir);
         (void)system(tmp);
         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, "FIXME - hacking bkpinfo->isodir from '%s' to %s/isodir", bkpinfo->isodir, bkpinfo->tmpdir);
-                sprintf(bkpinfo->isodir, "%s/isodir", bkpinfo->tmpdir);
+                mr_free(bkpinfo->isodir);
+                mr_asprintf(p, "%s/isodir", bkpinfo->tmpdir);
+                bkpinfo->isodir = p;
             }
         }
@@ -1384 +1387 @@
                 cd_number_i_want);
         mds = media_descriptor_string(bkpinfo->backup_media_type);
-        mr_asprintf(&tmp, "Insisting on %s #%d", mds, cd_number_i_want);
-        mr_asprintf(&request, "Please insert %s #%d and press Enter.", mds, cd_number_i_want);
+        mr_asprintf(tmp, "Insisting on %s #%d", mds, cd_number_i_want);
+        mr_asprintf(request, "Please insert %s #%d and press Enter.", mds, cd_number_i_want);
         mr_free(mds);
         log_msg(3, tmp);
@@ -1499 +1502 @@
             }
             mds = media_descriptor_string(bkpinfo->backup_media_type);
-            mr_asprintf(&comment, "What speed is your %s (re)writer?", mds);
+            mr_asprintf(comment, "What speed is your %s (re)writer?", mds);
             if (bkpinfo->backup_media_type == dvd) {
                 find_dvd_device(bkpinfo->media_device, FALSE);
-                strcpy(tmp1, "1");
-                mr_asprintf(&sz_size, "%d", DEFAULT_DVD_DISK_SIZE); // 4.7 salesman's GB = 4.482 real GB = 4482 MB
+                mr_asprintf(tmp, "1");
+                mr_asprintf(sz_size, "%d", DEFAULT_DVD_DISK_SIZE);  // 4.7 salesman's GB = 4.482 real GB = 4482 MB
                 log_msg(1, "Setting to DVD defaults");
             } else {
                 strcpy(bkpinfo->media_device, VANILLA_SCSI_CDROM);
-                strcpy(tmp1, "4");
-                mr_asprintf(&sz_size, "%d", 650);
+                mr_asprintf(tmp, "4");
+                mr_asprintf(sz_size, "%d", 650);
                 log_msg(1, "Setting to CD defaults");
             }
@@ -1527 +1530 @@
             bkpinfo->cdrw_speed = atoi(tmp1);   // if DVD then this shouldn't ever be used anyway :)
 
-            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);
             p = popup_and_get_string("Size", comment, sz_size);
@@ -1567 +1570 @@
                 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);
                 p = popup_and_get_string("Device?", comment, bkpinfo->media_device);
                 mr_free(comment);
@@ -1585 +1588 @@
             if (bkpinfo->media_device[0]) {
                 if (bkpinfo->backup_media_type == usb) {
-                    mr_asprintf(&tmp, "I think your %s media corresponds to %s. Is this correct?", mds, bkpinfo->media_device);
+                    mr_asprintf(tmp, "I think your %s media corresponds to %s. Is this correct?", mds, bkpinfo->media_device);
                 } else {
-                    mr_asprintf(&tmp, "I think I've found your %s burner at SCSI node %s. Is this correct? (Say no if you have an IDE burner and you are running a 2.6 kernel. You will then be prompted for further details.)", mds, bkpinfo->media_device);
+                    mr_asprintf(tmp, "I think I've found your %s burner at SCSI node %s. Is this correct? (Say no if you have an IDE burner and you are running a 2.6 kernel. You will then be prompted for further details.)", mds, bkpinfo->media_device);
                 }
                 if (!ask_me_yes_or_no(tmp)) {
@@ -1648 +1651 @@
         }
         if (bkpinfo->media_device[0]) {
-            mr_asprintf(&tmp, "I think I've found your tape streamer at %s; am I right on the money?", bkpinfo->media_device);
+            mr_asprintf(tmp, "I think I've found your tape streamer at %s; am I right on the money?", bkpinfo->media_device);
             if (!ask_me_yes_or_no(tmp)) {
                 bkpinfo->media_device[0] = '\0';
@@ -1663 +1666 @@
             mr_free(p);
         }
-        mr_asprintf(&tmp, "ls -l %s", bkpinfo->media_device);
+        mr_asprintf(tmp, "ls -l %s", bkpinfo->media_device);
         if (run_program_and_log_output(tmp, FALSE)) {
             log_to_screen("User has not specified a valid /dev entry");
@@ -1726 +1729 @@
             if (bkpinfo->nfs_mount[strlen(bkpinfo->nfs_mount) - 1] == '/')
                 bkpinfo->nfs_mount[strlen(bkpinfo->nfs_mount) - 1] = '\0';
-            mr_asprintf(&command, "mount | grep \"%s \" | cut -d' ' -f3",
-                    bkpinfo->nfs_mount);
-            strcpy(bkpinfo->isodir,
-                   call_program_and_get_last_line_of_output(command));
+            mr_asprintf(command, "mount | grep \"%s \" | cut -d' ' -f3", bkpinfo->nfs_mount);
+            mr_free(bkpinfo->isodir);
+            mr_asprintf(p, "%s", call_program_and_get_last_line_of_output(command));
+            bkpinfo->isodir = p;
             mr_free(command);
 
             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?");
                 // BERLIOS: 4480 shouldn't be hardcoded here
                 sz_size = popup_and_get_string("Size", comment, "4480");
@@ -1742 +1745 @@
                 }
             } else {
-                mr_asprintf(&sz_size, "0");
+                mr_asprintf(sz_size, "0");
             }
             for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
@@ -1754 +1757 @@
         }
         if (bkpinfo->disaster_recovery) {
-            mr_asprintf(&command ,"umount %s/isodir 2> /dev/null", bkpinfo->tmpdir);
+            mr_asprintf(command ,"umount %s/isodir 2> /dev/null", bkpinfo->tmpdir);
             (void)system(command);
             mr_free(command);
@@ -1767 +1770 @@
         }
         /* Initiate bkpinfo isodir path from running environment if mount already done */
+        mr_free(bkpinfo->isodir);
         if (is_this_device_mounted(bkpinfo->nfs_mount)) {
-            strcpy(bkpinfo->isodir,
-                   call_program_and_get_last_line_of_output
-                   ("mount | grep \":\" | cut -d' ' -f3 | head -n1"));
+            mr_asprintf(p, "%s", call_program_and_get_last_line_of_output("mount | grep \":\" | cut -d' ' -f3 | head -n1"));
+            bkpinfo->isodir = p;
+
         } else {
-            sprintf(bkpinfo->isodir, "%s/nfsdir", bkpinfo->tmpdir);
-            mr_asprintf(&command, "mkdir -p %s", bkpinfo->isodir);
+            mr_asprintf(p, "%s/nfsdir", bkpinfo->tmpdir);
+            bkpinfo->isodir = p;
+            mr_asprintf(command, "mkdir -p %s", bkpinfo->isodir);
             run_program_and_log_output(command, 5);
             mr_free(command);
 
-            mr_asprintf(&tmp, "mount -t nfs -o nolock %s %s", bkpinfo->nfs_mount, bkpinfo->isodir);
+            mr_asprintf(tmp, "mount -t nfs -o nolock %s %s", bkpinfo->nfs_mount, bkpinfo->isodir);
             run_program_and_log_output(tmp, 3);
             mr_free(tmp);
@@ -1820 +1825 @@
                 finish(1);
             }
-            strcpy(bkpinfo->isodir,p);
-            mr_free(p);
+            bkpinfo->isodir = p;
 
             if (archiving_to_media) {
@@ -1918 +1922 @@
         bkpinfo->boot_loader = i;
         mr_free(bkpinfo->include_paths);
-        mr_asprintf(&p, "/");
+        mr_asprintf(p, "/");
         bkpinfo->include_paths = p;
 
@@ -1929 +1933 @@
         bkpinfo->include_paths = p;
 
-        mr_asprintf(&tmp, "%s", list_of_NFS_mounts_only());
+        mr_asprintf(tmp, "%s", list_of_NFS_mounts_only());
         if (strlen(tmp) > 2) {
             mr_strcat(bkpinfo->exclude_paths, " %s",tmp);
@@ -1935 +1939 @@
         mr_free(tmp);
 // NTFS 
-        strcpy(tmp1, call_program_and_get_last_line_of_output("parted2fdisk -l | grep -i ntfs | awk '{ print $1};' | tr -s '\\n' ' ' | awk '{ print $0};'"));
-        if (strlen(tmp1) > 2) {
+        mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output("parted2fdisk -l | grep -i ntfs | awk '{ print $1};' | tr -s '\\n' ' ' | awk '{ print $0};'"));
+        if (strlen(tmp) > 2) {
             p = popup_and_get_string("NTFS partitions", "Please enter/confirm the NTFS partitions you wish to backup as well.", tmp);
 
@@ -2008 +2012 @@
 #else
     if (bkpinfo->backup_media_type == nfs) {
-        log_msg(3, "I think the NFS mount is mounted at %s",
-                bkpinfo->isodir);
+        log_msg(3, "I think the NFS mount is mounted at %s", bkpinfo->isodir);
     }
     log_it("isodir = %s", bkpinfo->isodir);
@@ -2061 +2064 @@
     static char result_sz[1024];
 
-    mr_asprintf(&exclude_these_directories,"%s",list_of_NFS_mounts_only());
-    mr_asprintf(&exclude_these_devices,"%s", call_program_and_get_last_line_of_output("tr -s '\t' ' ' < /etc/fstab | grep -E '( (coda|ncpfs|nfs|nfs4|smbfs|cifs|afs|gfs|ocfs|ocfs2|mvfs|nsspool|nsvol) )' | cut -d' ' -f1 | tr -s '\n' ' ' | awk '{print $0;}'"));
+    mr_asprintf(exclude_these_directories,"%s",list_of_NFS_mounts_only());
+    mr_asprintf(exclude_these_devices,"%s", call_program_and_get_last_line_of_output("tr -s '\t' ' ' < /etc/fstab | grep -E '( (coda|ncpfs|nfs|nfs4|smbfs|cifs|afs|gfs|ocfs|ocfs2|mvfs|nsspool|nsvol) )' | cut -d' ' -f1 | tr -s '\n' ' ' | awk '{print $0;}'"));
     snprintf(result_sz, 1023, "%s %s", exclude_these_directories, exclude_these_devices);
     mr_free(exclude_these_devices);
@@ -2083 +2086 @@
     static char result_sz[512];
 
-    mr_asprintf(&exclude_these_directories,"%s", call_program_and_get_last_line_of_output("mount -t coda,ncpfs,nfs,nfs4,smbfs,cifs,afs,gfs,ocfs,ocfs2,mvfs,nsspool,nssvol | tr -s '\t' ' ' | cut -d' ' -f3 | tr -s '\n' ' ' | awk '{print $0;}'"));
+    mr_asprintf(exclude_these_directories,"%s", call_program_and_get_last_line_of_output("mount -t coda,ncpfs,nfs,nfs4,smbfs,cifs,afs,gfs,ocfs,ocfs2,mvfs,nsspool,nssvol | tr -s '\t' ' ' | cut -d' ' -f3 | tr -s '\n' ' ' | awk '{print $0;}'"));
     snprintf(result_sz, 511, "%s", exclude_these_directories);
     mr_free(exclude_these_directories);
@@ -2112 +2115 @@
     make_hole_for_file(store_name_here);
     mkfifo(store_name_here, S_IRWXU | S_IRWXG);
-    mr_asprintf(&tmp, "chmod 770 %s", store_name_here);
+    mr_asprintf(tmp, "chmod 770 %s", store_name_here);
     paranoid_system(tmp);
     mr_free(tmp);
@@ -2135 +2138 @@
 
 #ifdef __FreeBSD__
-    mr_asprintf(&tmp, "%s", 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;}'"));
+    mr_asprintf(tmp, "%s", 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
-    mr_asprintf(&tmp, "%s", 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;}'"));
+    mr_asprintf(tmp, "%s", 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;}'"));
 #endif
 
     if (tmp[0] != '/') {
-        mr_asprintf(&sz, "%s", tmp);
+        mr_asprintf(sz, "%s", tmp);
         mr_free(tmp);
-        mr_asprintf(&tmp, "/%s", sz);
+        mr_asprintf(tmp, "/%s", sz);
         mr_free(sz);
     }
@@ -2149 +2152 @@
         fatal_error("I couldn't figure out the scratchdir!");
     }
-    mr_asprintf(&sz, "%s/mondo.scratch.%d", tmp, (int) (random() % 32768));
+    mr_asprintf(sz, "%s/mondo.scratch.%d", tmp, (int) (random() % 32768));
     mr_free(bkpinfo->scratchdir);
     bkpinfo->scratchdir = sz;
     log_it("bkpinfo->scratchdir is being set to %s", bkpinfo->scratchdir);
 
-    mr_asprintf(&command, "rm -Rf %s/mondo.scratch.*", tmp);
+    mr_asprintf(command, "rm -Rf %s/mondo.scratch.*", tmp);
     mr_free(tmp);
 
@@ -2192 +2195 @@
         return (FALSE);
     }
-    mr_asprintf(&command, "dd bs=%ld count=1 if=%s of=/dev/null &> /dev/null", 512L, dev);
+    mr_asprintf(command, "dd bs=%ld count=1 if=%s of=/dev/null &> /dev/null", 512L, dev);
     if (!run_program_and_log_output(command, FALSE)
         && !run_program_and_log_output(command, FALSE)) {
@@ -2227 +2230 @@
 //  log_it("Asking what_number_cd_is_this");
     if (g_ISO_restore_mode) {
-        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");
+        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));
         paranoid_free(mountdev);
@@ -2237 +2240 @@
     }
 
-    mr_asprintf(&mountdev, "%s", bkpinfo->media_device);
+    mr_asprintf(mountdev, "%s", bkpinfo->media_device);
     if (!mountdev[0]) {
         log_it
@@ -2370 +2373 @@
     assert(which_device != NULL);
 
-    mr_asprintf(&list_drives_cmd, "parted2fdisk -l 2>/dev/null | grep \"/dev/.*:\" | tr -s ':' ' ' | tr -s ' ' '\n' | grep /dev/; echo %s", where_is_root_mounted());
+    mr_asprintf(list_drives_cmd, "parted2fdisk -l 2>/dev/null | grep \"/dev/.*:\" | tr -s ':' ' ' | tr -s ' ' '\n' | grep /dev/; echo %s", where_is_root_mounted());
     log_it("list_drives_cmd = %s", list_drives_cmd);
 
@@ -2412 +2415 @@
     } else {
         // We need to look on each partition then
-        mr_asprintf(&list_drives_cmd, "parted2fdisk -l 2>/dev/null | grep -E \"^/dev/\" | tr -s ':' ' ' | tr -s ' ' '\n' | grep /dev/");
+        mr_asprintf(list_drives_cmd, "parted2fdisk -l 2>/dev/null | grep -E \"^/dev/\" | tr -s ':' ' ' | tr -s ' ' '\n' | grep /dev/");
         log_it("list_drives_cmd = %s", list_drives_cmd);
 
@@ -2513 +2516 @@
         while (S_ISLNK(statbuf.st_mode)) {
             log_msg(1, "curr_fname = %s", curr_fname);
-            mr_asprintf(&command, "file %s", curr_fname);
-            mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));
+            mr_asprintf(command, "file %s", curr_fname);
+            mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
             mr_free(command);
             for (p = tmp + strlen(tmp); p != tmp && *p != '`' && *p != ' ';
                  p--);
             p++;
-            mr_asprintf(&scratch, "%s", p);
+            mr_asprintf(scratch, "%s", p);
             for (p = scratch; *p != '\0' && *p != '\''; p++);
             *p = '\0';
@@ -2563 +2566 @@
 #endif
     log_msg(0, "Looking for partition table format type");
-    mr_asprintf(&fdisk, "/sbin/parted2fdisk");
+    mr_asprintf(fdisk, "/sbin/parted2fdisk");
     log_msg(1, "Using %s", fdisk);
-    mr_asprintf(&command, "%s -l %s | grep 'EFI GPT'", fdisk, drive);
+    mr_asprintf(command, "%s -l %s | grep 'EFI GPT'", fdisk, drive);
     mr_free(fdisk);
 
-    mr_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));
     mr_free(command);
 

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);
@@ -94 +94 @@
     if (!res) {
         bufsize++;
-        mr_asprintf(&tmp, "Negotiated max buffer of %d MB ", bufsize);
+        mr_asprintf(tmp, "Negotiated max buffer of %d MB ", bufsize);
         log_to_screen(tmp);
         mr_free(tmp);
@@ -118 +118 @@
     }
     log_msg(2, "Calling buffer --- command = '%s'", g_sz_call_to_buffer);
-    mr_asprintf(&sz_dir, "%c", direction);
+    mr_asprintf(sz_dir, "%c", direction);
     fres = popen(g_sz_call_to_buffer, sz_dir);
     mr_free(sz_dir);
@@ -130 +130 @@
     }
     sleep(2);
-    mr_asprintf(&tmp, "ps %s | grep \"%s\"", ps_options, g_sz_call_to_buffer);
+    mr_asprintf(tmp, "ps %s | grep \"%s\"", ps_options, g_sz_call_to_buffer);
     if (run_program_and_log_output(tmp, 2)) {
         log_msg(2, "Warning - I think I failed to open tape, actually.");
@@ -136 +136 @@
     mr_free(tmp);
     g_tape_buffer_size_MB = bufsize;
-    mr_asprintf(&command, "ps %s | grep buffer | grep -v grep", ps_options);
+    mr_asprintf(command, "ps %s | grep buffer | grep -v grep", ps_options);
     if (run_program_and_log_output(command, 1)) {
         fres = NULL;
@@ -165 +165 @@
     }
     paranoid_system("sync");
-    mr_asprintf(&command, "ps %s | grep -F \"%s\" | grep -Fv grep | awk '{print $2;}' | grep -v PID | head -1", ps_options, g_sz_call_to_buffer);
+    mr_asprintf(command, "ps %s | grep -F \"%s\" | grep -Fv grep | awk '{print $2;}' | grep -v PID | head -1", ps_options, g_sz_call_to_buffer);
     log_msg(2, "kill_buffer() --- command = %s", command);
-    mr_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));
     mr_free(command);
 
-    mr_asprintf(&command, "kill %s", tmp);
+    mr_asprintf(command, "kill %s", tmp);
     log_msg(2, "kill_buffer() --- command = %s", command);
     if (strlen(tmp) > 0) {

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

@@ -97 +97 @@
     log_to_screen("Dividing filelist into sets. Please wait.");
     i = 0;
-    mr_asprintf(&filelist, "%s/archives/filelist.full", bkpinfo->scratchdir);
+    mr_asprintf(filelist, "%s/archives/filelist.full", bkpinfo->scratchdir);
     if (!does_file_exist(filelist)) {
         log_it("filelist %s not found", filelist);
@@ -108 +108 @@
     estimate_noof_media_required(noof_sets);    // for cosmetic purposes
 
-    mr_asprintf(&tempfile, "%s/biggielist.txt", bkpinfo->tmpdir);
+    mr_asprintf(tempfile, "%s/biggielist.txt", bkpinfo->tmpdir);
     if (!(fout = fopen(tempfile, "a"))) {
         log_OS_error("Cannot append to biggielist");
@@ -158 +158 @@
     }                           // no sense in trying to sort an empty file
 
-    mr_asprintf(&tmp_fname, "%s/sortfile", bkpinfo->tmpdir);
-
-    mr_asprintf(&command, "sort %s > %s 2>> %s", orig_fname, tmp_fname, MONDO_LOGFILE);
+    mr_asprintf(tmp_fname, "%s/sortfile", bkpinfo->tmpdir);
+
+    mr_asprintf(command, "sort %s > %s 2>> %s", orig_fname, tmp_fname, MONDO_LOGFILE);
     retval = system(command);
     mr_free(command);
@@ -168 +168 @@
     } else {
         log_msg(5, "Sorted %s --> %s OK. Copying it back to %s now", orig_fname, tmp_fname, orig_fname);
-        mr_asprintf(&command, "mv -f %s %s", tmp_fname, orig_fname);
+        mr_asprintf(command, "mv -f %s %s", tmp_fname, orig_fname);
         retval += run_program_and_log_output(command, 5);
         mr_free(command);
@@ -240 +240 @@
     curr_set_no = 0;
     curr_set_size = 0;
-    mr_asprintf(&outfname, "%s/filelist.%ld", bkpinfo->tmpdir, curr_set_no);
-    mr_asprintf(&biggie_fname, "%s/biggielist.txt", bkpinfo->tmpdir);
+    mr_asprintf(outfname, "%s/filelist.%ld", bkpinfo->tmpdir, curr_set_no);
+    mr_asprintf(biggie_fname, "%s/biggielist.txt", bkpinfo->tmpdir);
     log_it("outfname=%s; biggie_fname=%s", outfname, biggie_fname);
     if (!(fbig = fopen(biggie_fname, "w"))) {
@@ -293 +293 @@
                 curr_set_size = 0;
 
-                mr_asprintf(&outfname, "%s/filelist.%ld", bkpinfo->tmpdir, curr_set_no);
+                mr_asprintf(outfname, "%s/filelist.%ld", bkpinfo->tmpdir, curr_set_no);
                 if (!(fout = fopen(outfname, "w"))) {
                     log_OS_error("Unable to openout outfname");
@@ -323 +323 @@
     mr_free(biggie_fname);
 
-    mr_asprintf(&outfname, "%s/LAST-FILELIST-NUMBER", bkpinfo->tmpdir);
-    mr_asprintf(&tmp, "%ld", curr_set_no);
+    mr_asprintf(outfname, "%s/LAST-FILELIST-NUMBER", bkpinfo->tmpdir);
+    mr_asprintf(tmp, "%ld", curr_set_no);
     if (write_one_liner_data_file(outfname, tmp)) {
         log_OS_error
@@ -334 +334 @@
 
     if (curr_set_no == 0) {
-        mr_asprintf(&tmp, "Only one fileset. Fine.");
+        mr_asprintf(tmp, "Only one fileset. Fine.");
     } else {
-        mr_asprintf(&tmp, "Filelist divided into %ld sets", curr_set_no + 1);
+        mr_asprintf(tmp, "Filelist divided into %ld sets", curr_set_no + 1);
     }
     log_msg(1, tmp);
@@ -453 +453 @@
         return (1);
     }
-    mr_asprintf(&pout_command, "gzip -c1 > %s", auxlist_fname);
+    mr_asprintf(pout_command, "gzip -c1 > %s", auxlist_fname);
     if (!(pout = popen(pout_command, "w"))) {
         log_msg(1, "Cannot openout auxlist_fname %s", auxlist_fname);
@@ -471 +471 @@
         log_msg(8, "Analyzing %s", file_to_analyze);
         tmp = mr_stresc(file_to_analyze, "`$\\\"(){}[]'*?&|!#~", '\\');
-        mr_asprintf(&strtmp, syscall_sprintf, tmp);
+        mr_asprintf(strtmp, syscall_sprintf, tmp);
         paranoid_free(tmp);
-        mr_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);
@@ -491 +491 @@
 
     if (g_getfacl != NULL) {
-        mr_asprintf(&command, "touch %s", facl_fname);
+        mr_asprintf(command, "touch %s", facl_fname);
         run_program_and_log_output(command, 8);
         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);
@@ -510 +510 @@
 
     if (g_getfattr != NULL) {
-        mr_asprintf(&command, "touch %s", fattr_fname);
+        mr_asprintf(command, "touch %s", fattr_fname);
         run_program_and_log_output(command, 8);
         mr_free(command);
@@ -540 +540 @@
         || !does_file_exist(orig_msklist)) {
         log_msg(1, "No masklist provided. I shall therefore set ALL attributes.");
-        mr_asprintf(&command, "gzip -dc %s | %s --restore - 2>> %s", original_exat_fname, executable, MONDO_LOGFILE);
+        mr_asprintf(command, "gzip -dc %s | %s --restore - 2>> %s", original_exat_fname, executable, MONDO_LOGFILE);
         log_msg(1, "command = %s", command);
         retval = system(command);
@@ -554 +554 @@
     malloc_string(current_subset_file);
     malloc_string(current_master_file);
-    mr_asprintf(&masklist, "%s/masklist", bkpinfo->tmpdir);
-    mr_asprintf(&command, "cp -f %s %s", orig_msklist, masklist);
+    mr_asprintf(masklist, "%s/masklist", bkpinfo->tmpdir);
+    mr_asprintf(command, "cp -f %s %s", orig_msklist, masklist);
     run_program_and_log_output(command, 1);
     mr_free(command);
@@ -562 +562 @@
     current_subset_file[0] = current_master_file[0] = '\0';
 
-    mr_asprintf(&syscall_pout, "%s --restore - 2>> %s", executable, MONDO_LOGFILE);
+    mr_asprintf(syscall_pout, "%s --restore - 2>> %s", executable, MONDO_LOGFILE);
     log_msg(1, "syscall_pout = %s", syscall_pout);
     pout = popen(syscall_pout, "w");
@@ -573 +573 @@
     }
 
-    mr_asprintf(&syscall_pin, "gzip -dc %s", original_exat_fname);
+    mr_asprintf(syscall_pin, "gzip -dc %s", original_exat_fname);
     log_msg(1, "syscall_pin = %s", syscall_pin);
     pin = popen(syscall_pin, "r");
@@ -714 +714 @@
 
     strcpy(val_sz,"");
-    mr_asprintf(&cfg_fname, "%s/mondo-restore.cfg", bkpinfo->tmpdir);
+    mr_asprintf(cfg_fname, "%s/mondo-restore.cfg", bkpinfo->tmpdir);
     read_cfg_var(cfg_fname, "last-filelist-number", val_sz);
     mr_free(cfg_fname);
@@ -876 +876 @@
     }
     log_to_screen("Loading filelist");
-    mr_asprintf(&tmp1, "zcat %s | wc -l", filelist_fname);
+    mr_asprintf(tmp1, "zcat %s | wc -l", filelist_fname);
     log_msg(6, "tmp1 = %s", tmp1);
     lines_in_filelist = atol(call_program_and_get_last_line_of_output(tmp1));
@@ -896 +896 @@
     (filelist->down)->expanded = (filelist->down)->selected = FALSE;
 
-    mr_asprintf(&command_to_open_fname, "gzip -dc %s", filelist_fname);
+    mr_asprintf(command_to_open_fname, "gzip -dc %s", filelist_fname);
     if (!(pin = popen(command_to_open_fname, "r"))) {
         log_OS_error("Unable to openin filelist_fname");
@@ -1368 +1368 @@
         malloc_string(name_of_evalcall_form);
         malloc_string(find_skeleton_marker);
-        mr_asprintf(&find_excludes, " ");
+        mr_asprintf(find_excludes, " ");
         if (sth != NULL) {
             while((token = mr_strtok(sth, delims, &lastpos))) {
@@ -1377 +1377 @@
 #if linux
         // 2.6 has /sys as a proc-type thing -- must be excluded
-        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);
+        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
-        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);
+        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);
 #endif
         mr_free(find_excludes);
@@ -1388 +1388 @@
         mr_free(strtmp);
 
-        mr_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));
         mr_free(tmp);
@@ -1414 +1414 @@
 #ifndef _XWIN
                 if (!g_text_mode) {
-                    mr_asprintf(&tmp, "Reading %-68s", dir);
+                    mr_asprintf(tmp, "Reading %-68s", dir);
                     newtDrawRootText(0, g_noof_rows - 3, tmp);
                     paranoid_free(tmp);
@@ -1428 +1428 @@
 //  log_msg(0, "Cataloguing %s", dir);
     if (sth[0] == ' ') {
-        mr_asprintf(&skip_these, "%s", sth);
+        mr_asprintf(skip_these, "%s", sth);
     } else {
-        mr_asprintf(&skip_these, " %s ", sth);
-    }
-    mr_asprintf(&new_with_spaces, " %s ", dir);
+        mr_asprintf(skip_these, " %s ", sth);
+    }
+    mr_asprintf(new_with_spaces, " %s ", dir);
     if ((dip = opendir(dir)) == NULL) {
-        mr_asprintf(&tmp,"opendir %s", dir);
+        mr_asprintf(tmp,"opendir %s", dir);
         log_OS_error(tmp);
         paranoid_free(tmp);
@@ -1444 +1444 @@
             i++;
             if (strcmp(dir, "/")) {
-                mr_asprintf(&new,"%s/%s",dir,dit->d_name);
+                mr_asprintf(new,"%s/%s",dir,dit->d_name);
             } else {
-                mr_asprintf(&new,"%s%s",dir,dit->d_name);
+                mr_asprintf(new,"%s%s",dir,dit->d_name);
             }
             paranoid_free(new_with_spaces);
-            mr_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);
@@ -1468 +1468 @@
                                 counter = 0;
                                 uberctr++;
-                                mr_asprintf(&tmp, " %c ", special_dot_char(uberctr));
+                                mr_asprintf(tmp, " %c ", special_dot_char(uberctr));
 #ifndef _XWIN
                                 if (!g_text_mode) {
@@ -1521 +1521 @@
     bool in_quotes = FALSE;
 
-    mr_asprintf(&sz_res, "%s", incoming);
+    mr_asprintf(sz_res, "%s", incoming);
     p = sz_res;
     while ((*p != ' ' || in_quotes) && *p != '\0') {
@@ -1563 +1563 @@
     malloc_string(tmp);
     malloc_string(g_skeleton_filelist);
-    mr_asprintf(&sz_datefile,MONDO_CACHE"/difflevel.%d" , 0);
+    mr_asprintf(sz_datefile,MONDO_CACHE"/difflevel.%d" , 0);
     if (!include_paths && !userdef_filelist) {
         fatal_error
@@ -1569 +1569 @@
     }
     // make hole for filelist
-    mr_asprintf(&command, "mkdir -p %s/archives", bkpinfo->scratchdir);
+    mr_asprintf(command, "mkdir -p %s/archives", bkpinfo->scratchdir);
     paranoid_system(command);
     mr_free(command);
 
-    mr_asprintf(&sz_filelist, "%s/tmpfs/filelist.full", bkpinfo->tmpdir);
+    mr_asprintf(sz_filelist, "%s/tmpfs/filelist.full", bkpinfo->tmpdir);
     make_hole_for_file(sz_filelist);
 
     if (differential == 0) {
         // restore last good datefile if it exists
-        mr_asprintf(&command, "cp -f %s.aborted %s", sz_datefile, sz_datefile);
+        mr_asprintf(command, "cp -f %s.aborted %s", sz_datefile, sz_datefile);
         run_program_and_log_output(command, 3);
         mr_free(command);
@@ -1584 +1584 @@
         // backup last known good datefile just in case :)
         if (does_file_exist(sz_datefile)) {
-            mr_asprintf(&command, "mv -f %s %s.aborted", sz_datefile,
+            mr_asprintf(command, "mv -f %s %s.aborted", sz_datefile,
                     sz_datefile);
             paranoid_system(command);
@@ -1609 +1609 @@
                 "Using the user-specified filelist - %s - instead of calculating one",
                 userdef_filelist);
-        mr_asprintf(&command, "cp -f %s %s", userdef_filelist, sz_filelist);
+        mr_asprintf(command, "cp -f %s %s", userdef_filelist, sz_filelist);
         if (run_program_and_log_output(command, 3)) {
             mr_free(command);
@@ -1620 +1620 @@
         }
         log_msg(1, "Calculating filelist");
-        mr_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) {
-            mr_asprintf(&tmp1," ");
+            mr_asprintf(tmp1," ");
         } else {
             log_msg(2, "Found windows FS: %s",tmp2);
-            mr_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);
-            mr_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);
         }
         mr_free(tmp1);
 
-        mr_asprintf(&exclude_paths, " %s %s %s %s %s . ..  " MNT_CDROM " " MNT_FLOPPY " /media /tmp  /proc /sys " MINDI_CACHE, MONDO_CACHE, (excp == NULL) ? "" : excp, tmp2, (bkpinfo->tmpdir[0] == '/' && bkpinfo->tmpdir[1] == '/') ? (bkpinfo->tmpdir + 1) : bkpinfo->tmpdir, (bkpinfo->scratchdir[0] == '/' && bkpinfo->scratchdir[1] == '/') ? (bkpinfo->scratchdir + 1) : bkpinfo->scratchdir);
+        mr_asprintf(exclude_paths, " %s %s %s %s %s . ..  " MNT_CDROM " " MNT_FLOPPY " /media /tmp  /proc /sys " MINDI_CACHE, MONDO_CACHE, (excp == NULL) ? "" : excp, tmp2, (bkpinfo->tmpdir[0] == '/' && bkpinfo->tmpdir[1] == '/') ? (bkpinfo->tmpdir + 1) : bkpinfo->tmpdir, (bkpinfo->scratchdir[0] == '/' && bkpinfo->scratchdir[1] == '/') ? (bkpinfo->scratchdir + 1) : bkpinfo->scratchdir);
         mr_free(tmp2);
 
@@ -1667 +1667 @@
     }
     log_msg(2, "Copying new filelist to scratchdir");
-    mr_asprintf(&command, "mkdir -p %s/archives", bkpinfo->scratchdir);
+    mr_asprintf(command, "mkdir -p %s/archives", bkpinfo->scratchdir);
     paranoid_system(command);
     mr_free(command);
 
-    mr_asprintf(&command, "cp -f %s %s/archives/", sz_filelist, bkpinfo->scratchdir);
+    mr_asprintf(command, "cp -f %s %s/archives/", sz_filelist, bkpinfo->scratchdir);
     paranoid_system(command);
     mr_free(command);
 
-    mr_asprintf(&command, "mv -f %s %s", sz_filelist, bkpinfo->tmpdir);
+    mr_asprintf(command, "mv -f %s %s", sz_filelist, bkpinfo->tmpdir);
     paranoid_system(command);
     mr_free(command);

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

@@ -62 +62 @@
     assert_string_is_neither_NULL_nor_zerolength(filename);
     if (does_file_exist(filename)) {
-        mr_asprintf(&command, "md5sum \"%s\"", filename);
+        mr_asprintf(command, "md5sum \"%s\"", filename);
         fin = popen(command, "r");
         if (fin) {
@@ -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);
@@ -142 +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);
         return (0);
     }
-    mr_asprintf(&command, "cat %s | wc -l", filename);
+    mr_asprintf(command, "cat %s | wc -l", filename);
     if (!does_file_exist(filename)) {
         mr_free(command);
@@ -224 +224 @@
 
     assert_string_is_neither_NULL_nor_zerolength(inout);
-    mr_asprintf(&infname, "%s.in", inout);
-    mr_asprintf(&outfname, "%s", inout);
-    mr_asprintf(&tmp, "cp -f %s %s", inout, infname);
+    mr_asprintf(infname, "%s.in", inout);
+    mr_asprintf(outfname, "%s", inout);
+    mr_asprintf(tmp, "cp -f %s %s", inout, infname);
     run_program_and_log_output(tmp, FALSE);
     mr_free(tmp);
@@ -251 +251 @@
             fprintf(fout, "%s\n", incoming);
         } else {
-            mr_asprintf(&tmp, "Excluding '%s'-nonexistent\n", incoming);
+            mr_asprintf(tmp, "Excluding '%s'-nonexistent\n", incoming);
             log_it(tmp);
             mr_free(tmp);
@@ -289 +289 @@
     // If we didn't get anything back, check whether mindi raised a fatal error
     if (!kernel[0]) {
-        mr_asprintf(&command, "%s", "grep 'Fatal error' /var/log/mindi.log");
-        mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));
+        mr_asprintf(command, "%s", "grep 'Fatal error' /var/log/mindi.log");
+        mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
         if (strlen(tmp) > 1) {
             popup_and_OK(tmp);
@@ -344 +344 @@
 
     assert_string_is_neither_NULL_nor_zerolength(fname);
-    mr_asprintf(&command, "which %s 2> /dev/null", fname);
+    mr_asprintf(command, "which %s 2> /dev/null", fname);
     strcpy(incoming, call_program_and_get_last_line_of_output(command));
     mr_free(command);
@@ -353 +353 @@
             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));
@@ -360 +360 @@
     if (incoming[0] == '\0')    // yes, it is == '\0' twice, not once :)
     {
-        mr_asprintf(&command, "dirname %s 2> /dev/null", incoming);
+        mr_asprintf(command, "dirname %s 2> /dev/null", incoming);
         strcpy(incoming,
                call_program_and_get_last_line_of_output(command));
@@ -452 +452 @@
          && !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));
@@ -503 +503 @@
 
     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);
@@ -509 +509 @@
         return (output);
     }
-    mr_asprintf(&command, "tail -n1 %s", filename);
+    mr_asprintf(command, "tail -n1 %s", filename);
     fin = popen(command, "r");
     mr_free(command);
@@ -602 +602 @@
             stub_fname[i] = '\0';
         }
-        mr_asprintf(&tmp, "%s%s", comppath, stub_fname);
+        mr_asprintf(tmp, "%s%s", comppath, stub_fname);
         strcpy(curr_fname, tmp + 1);
         mr_free(tmp);
@@ -620 +620 @@
                 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);
@@ -645 +645 @@
 
     assert_string_is_neither_NULL_nor_zerolength(outdir_fname);
-    mr_asprintf(&tmp, "mkdir -p %s", outdir_fname);
+    mr_asprintf(tmp, "mkdir -p %s", outdir_fname);
     res = system(tmp);
     mr_free(tmp);
@@ -671 +671 @@
     assert(!strstr(outfile_fname, MNT_CDROM));
     assert(!strstr(outfile_fname, "/dev/cdrom"));
-    mr_asprintf(&command, "mkdir -p \"%s\" 2> /dev/null", outfile_fname);
+    mr_asprintf(command, "mkdir -p \"%s\" 2> /dev/null", outfile_fname);
     res += system(command);
     mr_free(command);
 
-    mr_asprintf(&command, "rmdir \"%s\" 2> /dev/null", outfile_fname);
+    mr_asprintf(command, "rmdir \"%s\" 2> /dev/null", outfile_fname);
     res += system(command);
     mr_free(command);
 
-    mr_asprintf(&command, "rm -f \"%s\" 2> /dev/null", outfile_fname);
+    mr_asprintf(command, "rm -f \"%s\" 2> /dev/null", outfile_fname);
     res += system(command);
     mr_free(command);
@@ -742 +742 @@
     long file_len_K;
 
-    mr_asprintf(&mountlist, "%s/mountlist.txt", tmpdir);
-    mr_asprintf(&command, "grep \"%s \" %s/mountlist.txt | head -n1 | awk '{print $4}'", dev, tmpdir);
+    mr_asprintf(mountlist, "%s/mountlist.txt", tmpdir);
+    mr_asprintf(command, "grep \"%s \" %s/mountlist.txt | head -n1 | awk '{print $4}'", dev, tmpdir);
     mr_free(mountlist);
 
@@ -782 +782 @@
     malloc_string(fname);
     log_it("Calculating size of all biggiefiles (in total)");
-    mr_asprintf(&biggielist, "%s/biggielist.txt", bkpinfo->tmpdir);
+    mr_asprintf(biggielist, "%s/biggielist.txt", bkpinfo->tmpdir);
     log_it("biggielist = %s", biggielist);
     fin = fopen(biggielist, "r");
@@ -801 +801 @@
                         fatal_error("ntfsresize not found");
                     }
-                    mr_asprintf(&command, "ntfsresize --force --info %s|grep '^You might resize at '|cut -d' ' -f5", fname);
+                    mr_asprintf(command, "ntfsresize --force --info %s|grep '^You might resize at '|cut -d' ' -f5", fname);
                     log_it("command = %s", command);
-                    mr_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));
                     mr_free(command);
 
@@ -820 +820 @@
                 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);
@@ -853 +853 @@
     /*@ end vars *************************************************** */
 
-    mr_asprintf(&command, "du -sk %s", mountpt);
+    mr_asprintf(command, "du -sk %s", mountpt);
     errno = 0;
     fin = popen(command, "r");
@@ -923 +923 @@
     int res = 0;
 
-    mr_asprintf(&command, "which %s > /dev/null 2> /dev/null", fname);
+    mr_asprintf(command, "which %s > /dev/null 2> /dev/null", fname);
     res = system(command);
     mr_free(command);
 
     if (res) {
-        mr_asprintf(&errorstr, "Please install '%s'. I cannot find it on your system.", fname);
+        mr_asprintf(errorstr, "Please install '%s'. I cannot find it on your system.", fname);
         log_to_screen(errorstr);
         mr_free(errorstr);
@@ -1041 +1041 @@
         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);
@@ -1051 +1051 @@
     }
 
-    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);
@@ -1065 +1065 @@
             ("'which mondorestore' returned null. Where's your mondorestore? `which` can't find it. That's odd. Did you install mondorestore?");
     }
-    mr_asprintf(&command, "cp -f %s %s", tmp, bkpinfo->tmpdir);
+    mr_asprintf(command, "cp -f %s %s", tmp, bkpinfo->tmpdir);
     res = run_program_and_log_output(command, FALSE);
     mr_free(command);
@@ -1073 +1073 @@
     }
 
-    mr_asprintf(&command, "hostname > %s/HOSTNAME", bkpinfo->scratchdir);
+    mr_asprintf(command, "hostname > %s/HOSTNAME", bkpinfo->scratchdir);
     paranoid_system(command);
     mr_free(command);
 
     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);
@@ -1121 +1121 @@
 
     log_it("Storing NFS configuration");
-    mr_asprintf(&tmp, "%s", bkpinfo->nfs_mount);
+    mr_asprintf(tmp, "%s", bkpinfo->nfs_mount);
     p = strchr(tmp, ':');
     if (!p) {
@@ -1128 +1128 @@
     }
     *(p++) = '\0';
-    mr_asprintf(&nfs_server_ipaddr, "%s", tmp);
-    mr_asprintf(&nfs_mount, "%s", 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(&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(&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(&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(&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(&nfs_client_defgw, "%s", call_program_and_get_last_line_of_output(command));
+    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(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(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(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(nfs_client_defgw, "%s", call_program_and_get_last_line_of_output(command));
     mr_free(command);
 
@@ -1168 +1168 @@
     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(&mac_addr, "%s", call_program_and_get_last_line_of_output(command));
+        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);
 
-        mr_asprintf(&command, "ifconfig | grep -E '%s' | grep -v '%s' | head -n1 | cut -d' ' -f1", mac_addr,nfs_dev);
+        mr_asprintf(command, "ifconfig | grep -E '%s' | grep -v '%s' | head -n1 | cut -d' ' -f1", mac_addr,nfs_dev);
         mr_free(mac_addr);
         mr_free(nfs_dev);
 
-        mr_asprintf(&nfs_dev, "%s", 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);
 
@@ -1182 +1182 @@
     }
 
-    mr_asprintf(&tmp, "%s/NFS-DEV", bkpinfo->tmpdir);
+    mr_asprintf(tmp, "%s/NFS-DEV", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, nfs_dev);
     mr_free(nfs_dev);
     mr_free(tmp);
 
-    mr_asprintf(&tmp, "%s/NFS-CLIENT-IPADDR", bkpinfo->tmpdir);
+    mr_asprintf(tmp, "%s/NFS-CLIENT-IPADDR", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, nfs_client_ipaddr);
     mr_free(nfs_client_ipaddr);
     mr_free(tmp);
 
-    mr_asprintf(&tmp, "%s/NFS-CLIENT-NETMASK", bkpinfo->tmpdir);
+    mr_asprintf(tmp, "%s/NFS-CLIENT-NETMASK", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, nfs_client_netmask);
     mr_free(nfs_client_netmask);
     mr_free(tmp);
 
-    mr_asprintf(&tmp, "%s/NFS-CLIENT-BROADCAST", bkpinfo->tmpdir);
+    mr_asprintf(tmp, "%s/NFS-CLIENT-BROADCAST", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, nfs_client_broadcast);
     mr_free(nfs_client_broadcast);
     mr_free(tmp);
 
-    mr_asprintf(&tmp, "%s/NFS-CLIENT-DEFGW", bkpinfo->tmpdir);
+    mr_asprintf(tmp, "%s/NFS-CLIENT-DEFGW", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, nfs_client_defgw);
     mr_free(nfs_client_defgw);
     mr_free(tmp);
 
-    mr_asprintf(&tmp, "%s/NFS-SERVER-IPADDR", bkpinfo->tmpdir);
+    mr_asprintf(tmp, "%s/NFS-SERVER-IPADDR", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, nfs_server_ipaddr);
     mr_free(tmp);
     mr_free(nfs_server_ipaddr);
 
-    mr_asprintf(&tmp, "%s/NFS-SERVER-MOUNT", bkpinfo->tmpdir);
+    mr_asprintf(tmp, "%s/NFS-SERVER-MOUNT", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, bkpinfo->nfs_mount);
     mr_free(tmp);
     mr_free(nfs_mount);
 
-    mr_asprintf(&tmp, "%s/NFS-SERVER-PATH", bkpinfo->tmpdir);
+    mr_asprintf(tmp, "%s/NFS-SERVER-PATH", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, bkpinfo->nfs_remote_dir);
     mr_free(tmp);
 
-    mr_asprintf(&tmp, "%s/ISO-PREFIX", bkpinfo->tmpdir);
+    mr_asprintf(tmp, "%s/ISO-PREFIX", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, bkpinfo->prefix);
     mr_free(tmp);
@@ -1282 +1282 @@
     if (scratchLL <= 1) {
         mds = media_descriptor_string(bkpinfo->backup_media_type);
-        mr_asprintf(&tmp, "Your backup will probably occupy a single %s. Maybe two.", mds);
+        mr_asprintf(tmp, "Your backup will probably occupy a single %s. Maybe two.", mds);
         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)) {
@@ -1336 +1336 @@
     }
 
-    mr_asprintf(&tmp, "%s/do-not-compress-these", g_mondo_home);
+    mr_asprintf(tmp, "%s/do-not-compress-these", g_mondo_home);
     if (!does_file_exist(tmp)) {
         mr_free(tmp);
@@ -1346 +1346 @@
 
     for (p = do_not_compress_these; p != NULL; p++) {
-        mr_asprintf(&tmp, "%s", p);
+        mr_asprintf(tmp, "%s", p);
         if (strchr(tmp, ' ')) {
             *(strchr(tmp, ' ')) = '\0';
@@ -1394 +1394 @@
         paranoid_fclose(fout);
         log_msg(2, "Created %s", outfile);
-        mr_asprintf(&tmp, "chmod +x %s", outfile);
+        mr_asprintf(tmp, "chmod +x %s", outfile);
         paranoid_system(tmp);
         mr_free(tmp);

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

@@ -125 +125 @@
 
     if (bkpinfo->nfs_user) {
-        mr_asprintf(&tmp1, "su - %s -c \"%s\"", bkpinfo->nfs_user, basic_call);
+        mr_asprintf(tmp1, "su - %s -c \"%s\"", bkpinfo->nfs_user, basic_call);
     } else {
-        mr_asprintf(&tmp1, "%s", basic_call);
-    }
-
-    mr_asprintf(&cd_number_str, "%d", cd_no);
+        mr_asprintf(tmp1, "%s", basic_call);
+    }
+
+    mr_asprintf(cd_number_str, "%d", cd_no);
     log_msg(4, "basic call = '%s'", tmp1);
     midway_call = resolve_naff_tokens(tmp1, isofile, "_ISO_");
@@ -145 +145 @@
 
     log_msg(4, "ultimate call = '%s'", ultimate_call);
-    mr_asprintf(&command, "%s >> %s", ultimate_call, MONDO_LOGFILE);
+    mr_asprintf(command, "%s >> %s", ultimate_call, MONDO_LOGFILE);
     mr_free(ultimate_call);
 
@@ -153 +153 @@
             what_i_am_doing);
     if (bkpinfo->manual_cd_tray) {
-        mr_asprintf(&tmp2, "%s", command);
+        mr_asprintf(tmp2, "%s", command);
         p = strstr(tmp2, "2>>");
         if (p) {
@@ -272 +272 @@
         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 = ' ';
@@ -288 +288 @@
     mr_free(callstr);
 
-    mr_asprintf(&callstr, "cat %s/mondo-run-prog-thing.err >> %s/mondo-run-prog-thing.tmp 2> /dev/null", bkpinfo->tmpdir, bkpinfo->tmpdir);
+    mr_asprintf(callstr, "cat %s/mondo-run-prog-thing.err >> %s/mondo-run-prog-thing.tmp 2> /dev/null", bkpinfo->tmpdir, bkpinfo->tmpdir);
     if (log_if_failure && system(callstr)) {
         log_OS_error("Command failed");
@@ -294 +294 @@
     mr_free(callstr);
 
-    mr_asprintf(&tmp1, "%s/mondo-run-prog-thing.err", bkpinfo->tmpdir);
+    mr_asprintf(tmp1, "%s/mondo-run-prog-thing.err", bkpinfo->tmpdir);
     unlink(tmp1);
     mr_free(tmp1);
 
-    mr_asprintf(&tmp1, "%s/mondo-run-prog-thing.tmp", bkpinfo->tmpdir);
+    mr_asprintf(tmp1, "%s/mondo-run-prog-thing.tmp", bkpinfo->tmpdir);
     fin = fopen(tmp1, "r");
     if (fin) {
@@ -363 +363 @@
     assert_string_is_neither_NULL_nor_zerolength(basic_call);
 
-    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(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);
     open_evalcall_form(what_i_am_doing);
-    mr_asprintf(&tmp, "Executing %s", basic_call);
+    mr_asprintf(tmp, "Executing %s", basic_call);
     log_msg(2, tmp);
     mr_free(tmp);
@@ -373 +373 @@
     if (!(fin = popen(command, "r"))) {
         log_OS_error("Unable to popen-in command");
-        mr_asprintf(&tmp, "Failed utterly to call '%s'", command);
+        mr_asprintf(tmp, "Failed utterly to call '%s'", command);
         log_to_screen(tmp);
         mr_free(tmp);
@@ -463 +463 @@
         fin = f_orig;
         fout = f_archived;
-        mr_asprintf(&tmp, "%-64s", PIMP_START_SZ);
+        mr_asprintf(tmp, "%-64s", PIMP_START_SZ);
         if (fwrite(tmp, 1, 64, fout) != 64) {
             mr_free(tmp);
@@ -475 +475 @@
                 break;
             }
-            mr_asprintf(&tmp, "%-64ld", bytes_read_in);
+            mr_asprintf(tmp, "%-64ld", bytes_read_in);
             if (fwrite(tmp, 1, 64, fout) != 64) {
                 mr_free(tmp);
@@ -486 +486 @@
                     subsliceno, bytes_read_in, bytes_to_be_read);
             bytes_written_out += fwrite(buf, 1, bytes_read_in, fout);
-            mr_asprintf(&tmp, "%-64ld", subsliceno);
+            mr_asprintf(tmp, "%-64ld", subsliceno);
             if (fwrite(tmp, 1, 64, fout) != 64) {
                 mr_free(tmp);
@@ -495 +495 @@
             subsliceno++;
         }
-        mr_asprintf(&tmp, "%-64ld", 0L);
+        mr_asprintf(tmp, "%-64ld", 0L);
         if (fwrite(tmp, 1, 64L, fout) != 64L) {
             mr_free(tmp);
@@ -502 +502 @@
         mr_free(tmp);
 
-        mr_asprintf(&tmp, "%-64s", PIMP_END_SZ);
+        mr_asprintf(tmp, "%-64s", PIMP_END_SZ);
         if (fwrite(tmp, 1, 64, fout) != 64) {
             mr_free(tmp);
@@ -559 +559 @@
             log_msg(5, "tmpB is %s", tmp1);
             if (!strstr(tmp1, PIMP_END_SZ)) {
-                mr_asprintf(&filestr, "%s/out.leftover", bkpinfo->tmpdir);
+                mr_asprintf(filestr, "%s/out.leftover", bkpinfo->tmpdir);
                 ftmp = fopen(filestr, "w");
                 mr_free(filestr);
@@ -604 +604 @@
         fatal_error("ntfsclone not found");
     }
-    mr_asprintf(&command, "ntfsclone --force --save-image --overwrite %s %s", output_fname, input_device);
+    mr_asprintf(command, "ntfsclone --force --save-image --overwrite %s %s", output_fname, input_device);
     res = run_program_and_log_output(command, 5);
     mr_free(command);
@@ -659 +659 @@
     malloc_string(title);
     strcpy(title, tt);
-    mr_asprintf(&command, "%s 2>> %s", cmd, MONDO_LOGFILE);
+    mr_asprintf(command, "%s 2>> %s", cmd, MONDO_LOGFILE);
     log_msg(3, "command = '%s'", command);
     if ((res = pthread_create(&childthread, NULL, run_prog_in_bkgd_then_exit, (void *) command))) {
@@ -719 +719 @@
         fatal_error("ntfsclone not found");
     }
-    mr_asprintf(&command, "ntfsclone --force --restore-image --overwrite %s %s", output_device, input_fifo);
+    mr_asprintf(command, "ntfsclone --force --restore-image --overwrite %s %s", output_device, input_fifo);
     res = run_program_and_log_output(command, 5);
     mr_free(command);

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

@@ -73 +73 @@
     /*@ initialize ***************************************************** */
     prev_part_no = 0;
-    mr_asprintf(&flaws_str, "%s", "");
+    mr_asprintf(flaws_str, "%s", "");
 
 
@@ -79 +79 @@
 
     if (physical_drive_size < 0) {
-        mr_asprintf(&tmp, " %s does not exist.", drive);
+        mr_asprintf(tmp, " %s does not exist.", drive);
         mr_strcat(flaws_str, "%s", tmp);
     } else {
-        mr_asprintf(&tmp, "%s is %ld MB", drive, physical_drive_size);
+        mr_asprintf(tmp, "%s is %ld MB", drive, physical_drive_size);
     }
     log_it(tmp);
@@ -90 +90 @@
     /* check DD */
     for (cur_sp_no = 'a'; cur_sp_no < 'z'; ++cur_sp_no) {
-        mr_asprintf(&device, "%s%c", drive, cur_sp_no);
+        mr_asprintf(device, "%s%c", drive, cur_sp_no);
         if (find_device_in_mountlist(mountlist, device) >= 0) {
             foundsome = TRUE;
@@ -98 +98 @@
     if (foundsome) {
         for (cur_sp_no = 'a'; cur_sp_no < 'z'; ++cur_sp_no) {
-            mr_asprintf(&device, "%s%c", drive, cur_sp_no);
+            mr_asprintf(device, "%s%c", drive, cur_sp_no);
             pos = find_device_in_mountlist(mountlist, device);
             if (pos < 0) {
@@ -107 +107 @@
             /* is it too big? */
             if (curr_part_no > 'h') {
-                mr_asprintf(&tmp, " Can only have up to 'h' in disklabel.");
+                mr_asprintf(tmp, " Can only have up to 'h' in disklabel.");
                 log_it(tmp);
                 mr_strcat(flaws_str, tmp);
@@ -121 +121 @@
             }
             if (device_copies > 1) {
-                mr_asprintf(&tmp, " %s %s's.", number_to_text(device_copies), device);
+                mr_asprintf(tmp, " %s %s's.", number_to_text(device_copies), device);
                 if (!strstr(flaws_str, tmp)) {
                     log_it(tmp);
@@ -132 +132 @@
             if (mountlist->el[pos].size < 8192
                 && strcmp(mountlist->el[pos].mountpoint, "lvm")) {
-                mr_asprintf(&tmp, " %s is tiny!", device);
+                mr_asprintf(tmp, " %s is tiny!", device);
                 log_it(tmp);
                 mr_strcat(flaws_str, tmp);
@@ -145 +145 @@
                 && strcmp(mountlist->el[pos].mountpoint, "none")
                 && mountlist->el[pos].mountpoint[0] != '/') {
-                mr_asprintf(&tmp, " %s has a weird mountpoint.", device);
+                mr_asprintf(tmp, " %s has a weird mountpoint.", device);
                 log_it(tmp);
                 mr_strcat(flaws_str, tmp);
@@ -153 +153 @@
             /* is format sensible? */
             if (!is_this_a_valid_disk_format(mountlist->el[pos].format)) {
-                mr_asprintf(&tmp, " %s has unsupported format %s.", device, mountlist->el[pos].format);
+                mr_asprintf(tmp, " %s has unsupported format %s.", device, mountlist->el[pos].format);
                 log_it(tmp);
                 mr_strcat(flaws_str, tmp);
@@ -172 +172 @@
         npos = 0;
         for (cur_sp_no = 'a'; cur_sp_no <= 'h'; cur_sp_no++) {
-            mr_asprintf(&tmp, "%ss%i%c", device, curr_part_no, cur_sp_no);
+            mr_asprintf(tmp, "%ss%i%c", device, curr_part_no, cur_sp_no);
             if (find_device_in_mountlist(mountlist, tmp) >= 0) {
                 npos++;
@@ -191 +191 @@
             if (curr_part_no - prev_part_no > 1) {
                 if (prev_part_no == 0) {
-                    mr_asprintf(&tmp, " Gap prior to %s.", device);
+                    mr_asprintf(tmp, " Gap prior to %s.", device);
                     log_it(tmp);
                     mr_strcat(flaws_str, "%s", tmp);
@@ -198 +198 @@
                 } else if (curr_part_no > 5
                            || (curr_part_no <= 4 && prev_part_no > 0)) {
-                    mr_asprintf(&tmp, " Gap between %ss%d and %d.", drive, prev_part_no, curr_part_no);
+                    mr_asprintf(tmp, " Gap between %ss%d and %d.", drive, prev_part_no, curr_part_no);
                     log_it(tmp);
                     mr_strcat(flaws_str, "%s", tmp);
@@ -210 +210 @@
             if ((curr_part_no >= 5 && prev_part_no == 4)
                 && (strcmp(part_table_fmt, "MBR") == 0)) {
-                mr_asprintf(&tmp, " Partition %ss4 is occupied.", drive);
+                mr_asprintf(tmp, " Partition %ss4 is occupied.", drive);
                 log_it(tmp);
                 mr_strcat(flaws_str, "%s", tmp);
@@ -224 +224 @@
             }
             if (device_copies > 1) {
-                mr_asprintf(&tmp, " %s %s's.", number_to_text(device_copies), device);
+                mr_asprintf(tmp, " %s %s's.", number_to_text(device_copies), device);
                 if (!strstr(flaws_str, "%s", tmp)) {
                     log_it(tmp);
@@ -235 +235 @@
             if (mountlist->el[pos].size < 8192
                 && strcmp(mountlist->el[pos].mountpoint, "lvm")) {
-                mr_asprintf(&tmp, " %s is tiny!", device);
+                mr_asprintf(tmp, " %s is tiny!", device);
                 log_it(tmp);
                 mr_strcat(flaws_str, "%s", tmp);
@@ -248 +248 @@
                 && strcmp(mountlist->el[pos].mountpoint, "none")
                 && mountlist->el[pos].mountpoint[0] != '/') {
-                mr_asprintf(&tmp, " %s has a weird mountpoint.", device);
+                mr_asprintf(tmp, " %s has a weird mountpoint.", device);
                 log_it(tmp);
                 mr_strcat(flaws_str, "%s", tmp);
@@ -256 +256 @@
             /* is format sensible? */
             if (!is_this_a_valid_disk_format(mountlist->el[pos].format)) {
-                mr_asprintf(&tmp, " %s has unsupported format %s.", device, mountlist->el[pos].format);
+                mr_asprintf(tmp, " %s has unsupported format %s.", device, mountlist->el[pos].format);
                 log_it(tmp);
                 mr_strcat(flaws_str, "%s", tmp);
@@ -274 +274 @@
                 /* is it too big? */
                 if (curr_part_no > 'h') {
-                    mr_asprintf(&tmp, " Can only have up to 'h' in disklabel.");
+                    mr_asprintf(tmp, " Can only have up to 'h' in disklabel.");
                     log_it(tmp);
                     mr_strcat(flaws_str, "%s", tmp);
@@ -288 +288 @@
                 }
                 if (device_copies > 1) {
-                    mr_asprintf(&tmp, " %s %s's.", number_to_text(device_copies), device);
+                    mr_asprintf(tmp, " %s %s's.", number_to_text(device_copies), device);
                     if (!strstr(flaws_str, tmp)) {
                         log_it(tmp);
@@ -299 +299 @@
                 if (mountlist->el[pos].size < 8192
                     && strcmp(mountlist->el[pos].mountpoint, "lvm")) {
-                    mr_asprintf(&tmp, " %s is tiny!", device);
+                    mr_asprintf(tmp, " %s is tiny!", device);
                     log_it(tmp);
                     mr_strcat(flaws_str, "%s", tmp);
@@ -312 +312 @@
                     && strcmp(mountlist->el[pos].mountpoint, "none")
                     && mountlist->el[pos].mountpoint[0] != '/') {
-                    mr_asprintf(&tmp, " %s has a weird mountpoint.", device);
+                    mr_asprintf(tmp, " %s has a weird mountpoint.", device);
                     log_it(tmp);
                     mr_strcat(flaws_str, "%s", tmp);
@@ -321 +321 @@
                 if (!is_this_a_valid_disk_format
                     (mountlist->el[pos].format)) {
-                    mr_asprintf(&tmp, " %s has unsupported format %s.", device, mountlist->el[pos].format);
+                    mr_asprintf(tmp, " %s has unsupported format %s.", device, mountlist->el[pos].format);
                     log_it(tmp);
                     mr_strcat(flaws_str, "%s", tmp);
@@ -341 +341 @@
     if (amount_allocated > physical_drive_size) // Used to be +1, but what if you're 1 MB too high?
     {
-        mr_asprintf(&tmp, " %ld MB over-allocated on %s.",
+        mr_asprintf(tmp, " %ld MB over-allocated on %s.",
                 amount_allocated - physical_drive_size, drive);
         log_it(tmp);
@@ -348 +348 @@
         res++;
     } else if (amount_allocated < physical_drive_size - 1) {    /* NOT AN ERROR, JUST A WARNING :-) */
-        mr_asprintf(&tmp, " %ld MB unallocated on %s.",
+        mr_asprintf(tmp, " %ld MB unallocated on %s.",
                 physical_drive_size - amount_allocated, drive);
         log_it(tmp);
@@ -389 +389 @@
     assert_string_is_neither_NULL_nor_zerolength(drive);
     assert(mountlist != NULL);
-    mr_asprintf(&flaws_str, "%s", "");
+    mr_asprintf(flaws_str, "%s", "");
 
     prev_part_no = 0;
@@ -396 +396 @@
 
     if (physical_drive_size < 0) {
-        mr_asprintf(&tmp, " %s does not exist.", drive);
+        mr_asprintf(tmp, " %s does not exist.", drive);
         mr_strcat(flaws_str, "%s", tmp);
         res++;
@@ -403 +403 @@
         return(flaws_str);
     } else {
-        mr_asprintf(&tmp, "%s is %ld MB", drive, physical_drive_size);
+        mr_asprintf(tmp, "%s is %ld MB", drive, physical_drive_size);
         log_it(tmp);
         mr_free(tmp);
@@ -417 +417 @@
         if (curr_part_no - prev_part_no > 1) {
             if (prev_part_no == 0) {
-                mr_asprintf(&tmp, " Gap prior to %s.", device);
+                mr_asprintf(tmp, " Gap prior to %s.", device);
                 log_it(tmp);
                 mr_strcat(flaws_str, "%s", tmp);
@@ -424 +424 @@
             } else if (curr_part_no > 5
                        || (curr_part_no <= 4 && prev_part_no > 0)) {
-                mr_asprintf(&tmp, " Gap on %s between %d and %d.", drive,
+                mr_asprintf(tmp, " Gap on %s between %d and %d.", drive,
                         prev_part_no, curr_part_no);
                 log_it(tmp);
@@ -437 +437 @@
         if ((curr_part_no >= 5 && prev_part_no == 4)
             && (strcmp(part_table_fmt, "MBR") == 0)) {
-            mr_asprintf(&tmp, " Partition 4 of %s is occupied.", drive);
+            mr_asprintf(tmp, " Partition 4 of %s is occupied.", drive);
             log_it(tmp);
             mr_strcat(flaws_str, "%s", tmp);
@@ -451 +451 @@
         }
         if (device_copies > 1) {
-            mr_asprintf(&tmp, " %s %s's.", number_to_text(device_copies), device);
+            mr_asprintf(tmp, " %s %s's.", number_to_text(device_copies), device);
             if (!strstr(flaws_str, tmp)) {
                 log_it(tmp);
@@ -462 +462 @@
         if (mountlist->el[pos].size < 8192
             && strcmp(mountlist->el[pos].mountpoint, "lvm")) {
-            mr_asprintf(&tmp, " %s is tiny!", device);
+            mr_asprintf(tmp, " %s is tiny!", device);
             log_it(tmp);
             mr_strcat(flaws_str, "%s", tmp);
@@ -474 +474 @@
             && strcmp(mountlist->el[pos].mountpoint, "image")
             && mountlist->el[pos].mountpoint[0] != '/') {
-            mr_asprintf(&tmp, " %s has a weird mountpoint.", device);
+            mr_asprintf(tmp, " %s has a weird mountpoint.", device);
             log_it(tmp);
             mr_strcat(flaws_str, "%s", tmp);
@@ -482 +482 @@
         /* is format sensible? */
         if (!is_this_a_valid_disk_format(mountlist->el[pos].format)) {
-            mr_asprintf(&tmp, " %s has unsupported format %s.", device, mountlist->el[pos].format);
+            mr_asprintf(tmp, " %s has unsupported format %s.", device, mountlist->el[pos].format);
             log_it(tmp);
             mr_strcat(flaws_str, "%s", tmp);
@@ -496 +496 @@
     /* Over-allocated the disk? Unallocated space on disk? */
     if (amount_allocated > physical_drive_size + 1) {
-        mr_asprintf(&tmp, " %ld MB over-allocated on %s.",
+        mr_asprintf(tmp, " %ld MB over-allocated on %s.",
                 amount_allocated - physical_drive_size, drive);
         log_it(tmp);
@@ -503 +503 @@
         res++;
     } else if (amount_allocated < physical_drive_size - 1) {    /* NOT AN ERROR, JUST A WARNING :-) */
-        mr_asprintf(&tmp, " %ld MB unallocated on %s.",
+        mr_asprintf(tmp, " %ld MB unallocated on %s.",
                 physical_drive_size - amount_allocated, drive);
         log_it(tmp);
@@ -551 +551 @@
     assert(flaws_str_C != NULL);
 
-    mr_asprintf(&flaws_str, "%s", "");
+    mr_asprintf(flaws_str, "%s", "");
 
     make_list_of_drives_in_mountlist(mountlist, drivelist);
@@ -561 +561 @@
             (drivelist->el[i].device,
              DONT_KNOW_HOW_TO_EVALUATE_THIS_DEVICE_TYPE)) {
-            mr_asprintf(&tmp, " Not evaluating %s (I don't know how yet)", drivelist->el[i].device);
+            mr_asprintf(tmp, " Not evaluating %s (I don't know how yet)", drivelist->el[i].device);
             log_it(tmp);
             paranoid_free(tmp);
@@ -639 +639 @@
 
     for (currline = 0; currline < mountlist->entries; currline++) {
-        mr_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++) {
@@ -651 +651 @@
         if (copies > 1 && last_copy == currline
             && strcmp(curr_mountpoint, "raid")) {
-            mr_asprintf(&tmp, " %s %s's.", number_to_text(copies), curr_mountpoint);
+            mr_asprintf(tmp, " %s %s's.", number_to_text(copies), curr_mountpoint);
             mr_strcat(flaws_str, "%s", tmp);
             log_it(tmp);
@@ -690 +690 @@
     for (lino = 0, noof_drives = 0; lino < mountlist->entries; lino++) {
 
-        mr_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);
@@ -777 +777 @@
                        (void *) &mountlist->el[i],
                        sizeof(struct mountlist_line));
-                mr_asprintf(&tmp, "%s is available; user may choose to add it to raid device", output_list->el[items - 1].device);
+                mr_asprintf(tmp, "%s is available; user may choose to add it to raid device", output_list->el[items - 1].device);
                 log_it(tmp);
                 paranoid_free(tmp);
@@ -895 +895 @@
             if (j < items) {
                 strcat(mountlist->el[items].device, "_dup");
-                mr_asprintf(&tmp, "Duplicate entry in mountlist - renaming to %s", mountlist->el[items].device);
+                mr_asprintf(tmp, "Duplicate entry in mountlist - renaming to %s", mountlist->el[items].device);
                 log_it(tmp);
                 paranoid_free(tmp);
             }
-            mr_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);
@@ -1048 +1048 @@
     assert(b >= 0);
 
-    mr_asprintf(&device, "%s", mountlist->el[a].device);
-    mr_asprintf(&mountpoint, "%s", mountlist->el[a].mountpoint);
-    mr_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.10/mondo/src/common/libmondo-raid.c

@@ -50 +50 @@
     int res;
 
-    mr_asprintf(&command, "grep \"");
+    mr_asprintf(command, "grep \"");
     if (raidno == -1) {
         mr_strcat(command, "linear");
@@ -197 +197 @@
     assert(label != NULL);
 
-    mr_asprintf(&sz_value, "%d", value);
+    mr_asprintf(sz_value, "%d", value);
     strcpy(raidrec->additional_vars.el[lino].label, label);
     strcpy(raidrec->additional_vars.el[lino].value, sz_value);
@@ -585 +585 @@
     fclose(fin);
     log_it("Raidtab loaded successfully.");
-    mr_asprintf(&tmp1, "%d RAID devices in raidtab", raidlist->entries);
+    mr_asprintf(tmp1, "%d RAID devices in raidtab", raidlist->entries);
     log_it(tmp1);
     mr_free(tmp1);
@@ -744 +744 @@
         }
         if (!disklist) {
-            mr_asprintf(&tmp, "Ignoring '%s %s' pair of disk %s", labelB, valueB, label);
+            mr_asprintf(tmp, "Ignoring '%s %s' pair of disk %s", labelB, valueB, label);
             log_it(tmp);
             mr_free(tmp);
@@ -1006 +1006 @@
     pos = string;
     while (*pos == ' ') pos += 1;
-    mr_asprintf(&strtmp, "%s", pos);
+    mr_asprintf(strtmp, "%s", pos);
     strcpy(string, strtmp);
     paranoid_free(strtmp);
@@ -1027 +1027 @@
     token = mr_strtok(string, delims, &lastpos);
     // get RAID device name
-    mr_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);
@@ -1086 +1086 @@
       case ' ': // normal data disks
         raidlist->el[raidlist->entries].data_disks.el[raidlist->el[raidlist->entries].data_disks.entries].index = atoi(pos + 1);
-        mr_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);
@@ -1093 +1093 @@
       case 'S': // spare disks
         raidlist->el[raidlist->entries].spare_disks.el[raidlist->el[raidlist->entries].spare_disks.entries].index = atoi(pos + 1);
-        mr_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);
@@ -1100 +1100 @@
       case 'F': // failed disks
         raidlist->el[raidlist->entries].failed_disks.el[raidlist->el[raidlist->entries].failed_disks.entries].index = atoi(pos + 1);
-        mr_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.10/mondo/src/common/libmondo-stream.c

@@ -236 +236 @@
     int res;
 
-    mr_asprintf(&command, "mt -f %s status", dev);
+    mr_asprintf(command, "mt -f %s status", dev);
     res = run_program_and_log_output(command, 1);
     mr_free(command);
@@ -268 +268 @@
         mr_asprintf(&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);
     mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));
     mr_free(command);
@@ -280 +280 @@
     mr_free(tmp);
 
-    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);
     mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));
     mr_free(command);
@@ -290 +290 @@
     }
     mr_free(tmp);
-    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);
     mr_free(cdr_exe);
 
@@ -372 +372 @@
         }
         if (strstr(fname, "xattr") == NULL) {
-            mr_asprintf(&tmp,"Wrong order expected xattr, got %s, sunshine.", fname);
+            mr_asprintf(tmp,"Wrong order expected xattr, got %s, sunshine.", fname);
             fatal_error(tmp);
         }
@@ -402 +402 @@
         }
         if (strstr(fname, "acl") == NULL) {
-            mr_asprintf(&tmp,"Wrong order expected acl, got %s, sunshine.", fname);
+            mr_asprintf(tmp,"Wrong order expected acl, got %s, sunshine.", fname);
             fatal_error(tmp);
         }
@@ -468 +468 @@
     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);
@@ -544 +544 @@
         fatal_error("Unknown type. Internal error in maintain_collection_of_recent_archives()");
     }
-    mr_asprintf(&tmpdir, "%s/tmpfs/backcatalog", bkpinfo->tmpdir);
+    mr_asprintf(tmpdir, "%s/tmpfs/backcatalog", bkpinfo->tmpdir);
     mkdir(tmpdir, 0x700);
-    mr_asprintf(&command, "cp -f %s %s", latest_fname, tmpdir);
+    mr_asprintf(command, "cp -f %s %s", latest_fname, tmpdir);
     if (run_program_and_log_output(command, 6)) {
         log_it("Warning - failed to copy %s to backcatalog at %s",
@@ -575 +575 @@
 
     for (i = curr - 1; i >= 0 && curr - i < 10; i--) {
-        mr_asprintf(&old_fname, "%s/%s", tmpdir, g_tapecatalog->el[i].fname);
+        mr_asprintf(old_fname, "%s/%s", tmpdir, g_tapecatalog->el[i].fname);
         unlink(old_fname);
         mr_free(old_fname);
@@ -615 +615 @@
         return (0);
     }
-    mr_asprintf(&tmp, "mt -f %s setblk %ld", bkpinfo->media_device, internal_tape_block_size);
+    mr_asprintf(tmp, "mt -f %s setblk %ld", bkpinfo->media_device, internal_tape_block_size);
     res = run_program_and_log_output(tmp, 3);
     mr_free(tmp);
@@ -684 +684 @@
 
     log_it("Skipping OBDR headers");
-    mr_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);
 
-    mr_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);
@@ -711 +711 @@
     log_it("Creating OBDR headers");
     /* OBDR: First block 10 kB of zero bs = 512 */
-    mr_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);
 
-    mr_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);
@@ -721 +721 @@
     set_tape_block_size_with_mt(512);
 
-    mr_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);
@@ -728 +728 @@
     set_tape_block_size_with_mt(2048);
 
-    mr_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);
@@ -795 +795 @@
 
     insist_on_this_tape_number(1);
-    mr_asprintf(&outfname, "%s/tmp/all.tar.gz", bkpinfo->tmpdir);
+    mr_asprintf(outfname, "%s/tmp/all.tar.gz", bkpinfo->tmpdir);
     make_hole_for_file(outfname);
 
@@ -858 +858 @@
     (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);
@@ -885 +885 @@
 
     /*  add 'dummy' if testing */
-    mr_asprintf(&command, "cdrecord -eject dev=%s speed=%d fs=24m -waiti - >> %s 2>> %s", cddev, speed, MONDO_LOGFILE, MONDO_LOGFILE);
+    mr_asprintf(command, "cdrecord -eject dev=%s speed=%d fs=24m -waiti - >> %s 2>> %s", cddev, speed, MONDO_LOGFILE, MONDO_LOGFILE);
     /*  initialise the catalog */
     g_current_media_number = 1;
@@ -1058 +1058 @@
     res = read_header_block_from_stream(&temp_size, temp_fname, &ctrl_chr);
     if (orig_size != temp_size && orig_size != -1) {
-        mr_asprintf(&tmp, "output file's size should be %ld K but is apparently %ld K", (long) size >> 10, (long) temp_size >> 10);
+        mr_asprintf(tmp, "output file's size should be %ld K but is apparently %ld K", (long) size >> 10, (long) temp_size >> 10);
         log_to_screen(tmp);
         mr_free(tmp);
@@ -1121 +1121 @@
     log_msg(6, ".......................... Should be %lld", orig_size);
     g_tape_posK += total_read_from_tape_for_this_file / 1024;
-    mr_asprintf(&actual_cksum, "%04x%04x", crc16, crctt);
+    mr_asprintf(actual_cksum, "%04x%04x", crc16, crctt);
     if (foutstream) {           /*log_it("Finished writing to foutstream"); */
     } else {
@@ -1131 +1131 @@
     }
     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);
@@ -1486 +1486 @@
     }
     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);
@@ -1538 +1538 @@
     last = g_tapecatalog->entries - 1;
     for (i = 0; i <= last; i++) {
-        mr_asprintf(&fname, "%s/tmpfs/backcatalog/%s", bkpinfo->tmpdir, g_tapecatalog->el[i].fname);
+        mr_asprintf(fname, "%s/tmpfs/backcatalog/%s", bkpinfo->tmpdir, g_tapecatalog->el[i].fname);
         if (!does_file_exist(fname)) {
             log_msg(6, "Can't write %s - it doesn't exist.", fname);
@@ -1591 +1591 @@
     log_it("Data disks = %s", fname);
     if (!does_file_exist(fname)) {
-        mr_asprintf(&tmp, "Cannot find %s", fname);
+        mr_asprintf(tmp, "Cannot find %s", fname);
         log_to_screen(tmp);
         mr_free(tmp);
@@ -1689 +1689 @@
         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);
@@ -1731 +1731 @@
     }
     paranoid_fclose(fin);
-    mr_asprintf(&checksum, "%04x%04x", crc16, crctt);
+    mr_asprintf(checksum, "%04x%04x", crc16, crctt);
     /* BERLIOS: what does it do ??? */
     write_header_block_to_stream((off_t)g_current_media_number, checksum, BLK_STOP_FILE);
@@ -1794 +1794 @@
         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);
@@ -1821 +1821 @@
 
     /*@ end vars *************************************************** */
-    mr_asprintf(&tmp, "Wrong marker! (Should be %s, is actually %s)", marker_to_string(should_be), marker_to_string(it_is));
+    mr_asprintf(tmp, "Wrong marker! (Should be %s, is actually %s)", marker_to_string(should_be), marker_to_string(it_is));
     log_to_screen(tmp);
     mr_free(tmp);

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

@@ -45 +45 @@
     assert(partno >= 0);
 
-    mr_asprintf(&partition, drive);
+    mr_asprintf(partition, drive);
     /* is this a devfs device path? */
     c = strrchr(partition, '/');
@@ -241 +241 @@
         fatal_error("Integer overflow.");
     } else if (ch != 'm' && ch != 'M') {
-        mr_asprintf(&tmp1, "Re: parameter '%s' - bad multiplier ('%c')", incoming, ch);
+        mr_asprintf(tmp1, "Re: parameter '%s' - bad multiplier ('%c')", incoming, ch);
         fatal_error(tmp1);
     }
@@ -420 +420 @@
         p = ' ';
     }
-    mr_asprintf(&output, "%d %s disk%c", noof_disks, label, p);
+    mr_asprintf(output, "%d %s disk%c", noof_disks, label, p);
     while (strlen(output) < 14) {
         mr_strcat(output, " ");
@@ -511 +511 @@
             mr_strcat(output, "%s%s", q, value);
         } else {
-            mr_asprintf(&output, "%s%s", q, value);
+            mr_asprintf(output, "%s%s", q, value);
         }
         p+= strlen(token);
@@ -520 +520 @@
     } else {
         /* just in case the token doesn't appear in string at all */
-        mr_asprintf(&output, "%s", q);
+        mr_asprintf(output, "%s", q);
     }
     return(output);
@@ -555 +555 @@
     assert_string_is_neither_NULL_nor_zerolength(path);
     if (s[0] != '\0') {
-        mr_asprintf(&suffix, ".%s", s);
+        mr_asprintf(suffix, ".%s", s);
     } else {
-        mr_asprintf(&suffix, "");
+        mr_asprintf(suffix, "");
     }
     sprintf(output, "%s/slice-%07ld.%05ld.dat%s", path, bigfileno, sliceno, suffix);
@@ -622 +622 @@
     if (strlen(flaws_str) > 0) {
         paranoid_free(flaws_str_A);
-        mr_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);
-        mr_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';
     }
@@ -633 +633 @@
         for (i = 74; flaws_str_B[i] != ' '; i--);
         paranoid_free(flaws_str_C);
-        mr_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';
     }
@@ -830 +830 @@
 
     assert_string_is_neither_NULL_nor_zerolength(partition);
-    mr_asprintf(&trunc, "%s", partition);
+    mr_asprintf(trunc, "%s", partition);
 
 #ifdef __FreeBSD__
@@ -931 +931 @@
     assert_string_is_neither_NULL_nor_zerolength(fn);
     if (!strncmp(fn, MNT_RESTORING, strlen(MNT_RESTORING))) {
-        mr_asprintf(&filename, "%s", fn + strlen(MNT_RESTORING));
+        mr_asprintf(filename, "%s", fn + strlen(MNT_RESTORING));
     } else if (fn[0] != '/') {
-        mr_asprintf(&filename, "/%s", fn);
+        mr_asprintf(filename, "/%s", fn);
     } else {
-        mr_asprintf(&filename, "%s", fn);
+        mr_asprintf(filename, "%s", fn);
     }
 
     sev = 3;
-    mr_asprintf(&reason, "Changed since backup. Consider running a differential backup in a day or two.");
+    mr_asprintf(reason, "Changed since backup. Consider running a differential backup in a day or two.");
 
     if (!strncmp(filename, "/var/", 5)) {
         sev = 2;
         mr_free(reason);
-        mr_asprintf(&reason, "/var's contents will change regularly, inevitably.");
+        mr_asprintf(reason, "/var's contents will change regularly, inevitably.");
     }
     if (!strncmp(filename, "/home", 5)) {
         sev = 2;
         mr_free(reason);
-        mr_asprintf(&reason, "It's in your /home directory. Therefore, it is important.");
+        mr_asprintf(reason, "It's in your /home directory. Therefore, it is important.");
     }
     if (!strncmp(filename, "/usr/", 5)) {
         sev = 3;
         mr_free(reason);
-        mr_asprintf(&reason, "You may have installed/removed software during the backup.");
+        mr_asprintf(reason, "You may have installed/removed software during the backup.");
     }
     if (!strncmp(filename, "/etc/", 5)) {
         sev = 3;
         mr_free(reason);
-        mr_asprintf(&reason, "Do not edit config files while backing up your PC.");
+        mr_asprintf(reason, "Do not edit config files while backing up your PC.");
     }
     if (!strcmp(filename, "/etc/adjtime")
@@ -965 +965 @@
         sev = 1;
         mr_free(reason);
-        mr_asprintf(&reason, "This file changes all the time. It's OK.");
+        mr_asprintf(reason, "This file changes all the time. It's OK.");
     }
     if (!strncmp(filename, "/root/", 6)) {
         sev = 3;
         mr_free(reason);
-        mr_asprintf(&reason, "Were you compiling/editing something in /root?");
+        mr_asprintf(reason, "Were you compiling/editing something in /root?");
     }
     if (!strncmp(filename, "/root/.", 7)) {
         sev = 2;
         mr_free(reason);
-        mr_asprintf(&reason, "Temp or 'dot' files changed in /root.");
+        mr_asprintf(reason, "Temp or 'dot' files changed in /root.");
     }
     if (!strncmp(filename, "/var/lib/", 9)) {
         sev = 2;
         mr_free(reason);
-        mr_asprintf(&reason, "Did you add/remove software during backing?");
+        mr_asprintf(reason, "Did you add/remove software during backing?");
     }
     if (!strncmp(filename, "/var/lib/rpm", 12)) {
         sev = 3;
         mr_free(reason);
-        mr_asprintf(&reason, "Did you add/remove software during backing?");
+        mr_asprintf(reason, "Did you add/remove software during backing?");
     }
     if (!strncmp(filename, "/var/lib/slocate", 16)) {
         sev = 1;
         mr_free(reason);
-        mr_asprintf(&reason, "The 'update' daemon ran during backup. This does not affect the integrity of your backup.");
+        mr_asprintf(reason, "The 'update' daemon ran during backup. This does not affect the integrity of your backup.");
     }
     if (!strncmp(filename, "/var/log/", 9)
@@ -997 +997 @@
         sev = 1;
         mr_free(reason);
-        mr_asprintf(&reason, "Log files change frequently as the computer runs. Fret not.");
+        mr_asprintf(reason, "Log files change frequently as the computer runs. Fret not.");
     }
     if (!strncmp(filename, "/var/spool", 10)) {
         sev = 1;
         mr_free(reason);
-        mr_asprintf(&reason, "Background processes or printers were active. This does not affect the integrity of your backup.");
+        mr_asprintf(reason, "Background processes or printers were active. This does not affect the integrity of your backup.");
     }
     if (!strncmp(filename, "/var/spool/mail", 10)) {
         sev = 2;
         mr_free(reason);
-        mr_asprintf(&reason, "Mail was sent/received during backup.");
+        mr_asprintf(reason, "Mail was sent/received during backup.");
     }
     if (filename[strlen(filename) - 1] == '~') {
         sev = 1;
         mr_free(reason);
-        mr_asprintf(&reason, "Backup copy of another file which was modified recently.");
+        mr_asprintf(reason, "Backup copy of another file which was modified recently.");
     }
     if (strstr(filename, "cache")) {
         sev = 1;
         mr_free(reason);
-        mr_asprintf(&reason, "Part of a cache of data. Caches change from time to time. Don't worry.");
+        mr_asprintf(reason, "Part of a cache of data. Caches change from time to time. Don't worry.");
     }
     if (!strncmp(filename, "/var/run/", 9)
@@ -1025 +1025 @@
         sev = 1;
         mr_free(reason);
-        mr_asprintf(&reason, "Temporary file (a lockfile, perhaps) used by software such as X or KDE to register its presence.");
+        mr_asprintf(reason, "Temporary file (a lockfile, perhaps) used by software such as X or KDE to register its presence.");
     }
     if (out_reason) {
@@ -1088 +1088 @@
 
     if (bkpinfo->media_size[g_current_media_number] <= 0) {
-        mr_asprintf(&tmp, "%lld", g_tape_posK);
-        mr_asprintf(&pos_w_commas, "%s", commarize(tmp));
+        mr_asprintf(tmp, "%lld", g_tape_posK);
+        mr_asprintf(pos_w_commas, "%s", commarize(tmp));
         mr_free(tmp);
-        mr_asprintf(&outstr, "Volume %d: %s kilobytes archived so far", g_current_media_number, pos_w_commas);
+        mr_asprintf(outstr, "Volume %d: %s kilobytes archived so far", g_current_media_number, pos_w_commas);
         mr_free(pos_w_commas);
         return (outstr);
@@ -1104 +1104 @@
             percentage = 100;
         }
-        mr_asprintf(&outstr, "Volume %d: [", g_current_media_number);
+        mr_asprintf(outstr, "Volume %d: [", g_current_media_number);
     } else {
         percentage =
@@ -1110 +1110 @@
                    bkpinfo->media_size[g_current_media_number]);
         mds = media_descriptor_string(bkpinfo->backup_media_type);
-        mr_asprintf(&outstr, "%s %d: [", mds, g_current_media_number);
+        mr_asprintf(outstr, "%s %d: [", mds, g_current_media_number);
         mr_free(mds);
     }
@@ -1136 +1136 @@
     switch (type_of_bkp) {
     case dvd:
-        mr_asprintf(&type_of_backup, "DVD");
+        mr_asprintf(type_of_backup, "DVD");
         break;
     case cdr:
-        mr_asprintf(&type_of_backup, "CDR");
+        mr_asprintf(type_of_backup, "CDR");
         break;
     case cdrw:
-        mr_asprintf(&type_of_backup, "CDRW");
+        mr_asprintf(type_of_backup, "CDRW");
         break;
     case tape:
-        mr_asprintf(&type_of_backup, "tape");
+        mr_asprintf(type_of_backup, "tape");
         break;
     case cdstream:
-        mr_asprintf(&type_of_backup, "CDR");
+        mr_asprintf(type_of_backup, "CDR");
         break;
     case udev:
-        mr_asprintf(&type_of_backup, "udev");
+        mr_asprintf(type_of_backup, "udev");
         break;
     case iso:
-        mr_asprintf(&type_of_backup, "ISO");
+        mr_asprintf(type_of_backup, "ISO");
         break;
     case nfs:
-        mr_asprintf(&type_of_backup, "nfs");
+        mr_asprintf(type_of_backup, "nfs");
         break;
     case usb:
-        mr_asprintf(&type_of_backup, "USB");
+        mr_asprintf(type_of_backup, "USB");
         break;
     default:
-        mr_asprintf(&type_of_backup, "ISO");
+        mr_asprintf(type_of_backup, "ISO");
     }
     return (type_of_backup);

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

@@ -219 +219 @@
 
     uname(&utsn);
-    mr_asprintf(&tmp, "%s", utsn.machine);
+    mr_asprintf(tmp, "%s", utsn.machine);
     return (tmp);
 }
@@ -449 +449 @@
     if (bkpinfo->backup_media_type == tape) {
         log_msg(1, "Bar");
-        mr_asprintf(&tmp, "mt -f %s status", bkpinfo->media_device);
+        mr_asprintf(tmp, "mt -f %s status", bkpinfo->media_device);
         log_msg(1, "tmp = '%s'", tmp);
         if (run_program_and_log_output(tmp, 3)) {
@@ -501 +501 @@
         }
         if (bkpinfo->nonbootable_backup) {
-            mr_asprintf(&mondo_mkisofs_sz, MONDO_GROWISOFS_NONBOOT);
+            mr_asprintf(mondo_mkisofs_sz, MONDO_GROWISOFS_NONBOOT);
         } else if
 #ifdef __FreeBSD__
@@ -510 +510 @@
 #ifdef __IA64__
     {
-        mr_asprintf(&mondo_mkisofs_sz, MONDO_GROWISOFS_REGULAR_ELILO);
+        mr_asprintf(mondo_mkisofs_sz, MONDO_GROWISOFS_REGULAR_ELILO);
     }
 #else
     {
-        mr_asprintf(&mondo_mkisofs_sz, MONDO_GROWISOFS_REGULAR_LILO);
+        mr_asprintf(mondo_mkisofs_sz, MONDO_GROWISOFS_REGULAR_LILO);
     }
 #endif
         else
         {
-            mr_asprintf(&mondo_mkisofs_sz, MONDO_GROWISOFS_REGULAR_SYSLINUX);
+            mr_asprintf(mondo_mkisofs_sz, MONDO_GROWISOFS_REGULAR_SYSLINUX);
         }
         if (bkpinfo->manual_cd_tray) {
@@ -533 +533 @@
         }
         if (getenv ("SUDO_COMMAND")) {
-            mr_asprintf(&command, "strings `which growisofs` | grep -c SUDO_COMMAND");
+            mr_asprintf(command, "strings `which growisofs` | grep -c SUDO_COMMAND");
             if (!strcmp(call_program_and_get_last_line_of_output(command), "1")) {
                 mr_free(command);
@@ -549 +549 @@
         || bkpinfo->backup_media_type == cdr) {
         if (!bkpinfo->manual_cd_tray) {
-            mr_asprintf(&extra_cdrom_params, "-waiti ");
+            mr_asprintf(extra_cdrom_params, "-waiti ");
         }
         if (bkpinfo->backup_media_type == cdrw) {
-            mr_asprintf(&extra_cdrom_params, "blank=fast ");
+            mr_asprintf(extra_cdrom_params, "blank=fast ");
         }
         if (find_home_of_exe("cdrecord")) {
@@ -562 +562 @@
         }
         if (bkpinfo->nonbootable_backup) {
-            mr_asprintf(&mondo_mkisofs_sz, MONDO_MKISOFS_NONBOOT);
+            mr_asprintf(mondo_mkisofs_sz, MONDO_MKISOFS_NONBOOT);
         } else if
 #ifdef __FreeBSD__
@@ -571 +571 @@
 #ifdef __IA64__
     {
-        mr_asprintf(&mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_ELILO);
+        mr_asprintf(mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_ELILO);
     }
 #else
     {
-        mr_asprintf(&mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_LILO);
+        mr_asprintf(mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_LILO);
     }
 #endif
         else
         {
-            mr_asprintf(&mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_SYSLINUX);
+            mr_asprintf(mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_SYSLINUX);
         }
         if (bkpinfo->manual_cd_tray) {
@@ -621 +621 @@
 
         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));
-        mr_asprintf(&iso_dev, "%s", call_program_and_get_last_line_of_output(command));
-        mr_asprintf(&tmp, "%s/ISO-DEV", bkpinfo->tmpdir);
+        mr_asprintf(iso_dev, "%s", call_program_and_get_last_line_of_output(command));
+        mr_asprintf(tmp, "%s/ISO-DEV", bkpinfo->tmpdir);
         write_one_liner_data_file(tmp, call_program_and_get_last_line_of_output(command));
         mr_free(tmp);
         mr_free(command);
 
-        mr_asprintf(&command, "mount | grep -w %s | tail -n1 | cut -d' ' -f3", iso_dev);
+        mr_asprintf(command, "mount | grep -w %s | tail -n1 | cut -d' ' -f3", iso_dev);
         mr_free(iso_dev);
 
         log_it("command = %s", command);
         log_it("res of it = %s", call_program_and_get_last_line_of_output(command));
-        mr_asprintf(&iso_mnt, "%s", call_program_and_get_last_line_of_output(command));
-        mr_asprintf(&tmp, "%s/ISO-MNT", bkpinfo->tmpdir);
+        mr_asprintf(iso_mnt, "%s", call_program_and_get_last_line_of_output(command));
+        mr_asprintf(tmp, "%s/ISO-MNT", bkpinfo->tmpdir);
         write_one_liner_data_file(tmp, call_program_and_get_last_line_of_output(command));
         mr_free(tmp);
@@ -642 +642 @@
 
         log_it("isomnt: %s, %d", iso_mnt, strlen(iso_mnt));
-        mr_asprintf(&iso_tmp, "%s", bkpinfo->isodir);
+        mr_asprintf(iso_tmp, "%s", bkpinfo->isodir);
         if (strlen(iso_tmp) < strlen(iso_mnt)) {
-            mr_asprintf(&iso_path, "%s", "");
+            mr_asprintf(iso_path, "%s", "");
         } else {
-            mr_asprintf(&iso_path, "%s", iso_tmp + strlen(iso_mnt));
+            mr_asprintf(iso_path, "%s", iso_tmp + strlen(iso_mnt));
         }
         mr_free(iso_tmp);
 
-        mr_asprintf(&tmp, "%s/ISODIR", bkpinfo->tmpdir);
+        mr_asprintf(tmp, "%s/ISODIR", bkpinfo->tmpdir);
         write_one_liner_data_file(tmp, iso_path);
         mr_free(tmp);
@@ -657 +657 @@
         mr_free(iso_path);
 
-        mr_asprintf(&tmp, "%s/ISO-PREFIX", bkpinfo->tmpdir);
+        mr_asprintf(tmp, "%s/ISO-PREFIX", bkpinfo->tmpdir);
         write_one_liner_data_file(tmp, bkpinfo->prefix);
         mr_free(tmp);
@@ -682 +682 @@
                 retval++;
             } else {
-                mr_asprintf(&ip_address, "%s", inet_ntoa((struct in_addr) *((struct in_addr *) hent->h_addr)));
+                mr_asprintf(ip_address, "%s", inet_ntoa((struct in_addr) *((struct in_addr *) hent->h_addr)));
                 mr_strcat(ip_address, strchr(bkpinfo->nfs_mount, ':'));
                 strcpy(bkpinfo->nfs_mount, ip_address);
@@ -696 +696 @@
     }
     if (bkpinfo->include_paths == NULL) {
-        mr_asprintf(&p, "/");
+        mr_asprintf(p, "/");
         bkpinfo->include_paths = p;
     }
@@ -732 +732 @@
 
     unlink(MONDO_TRACEFILE);
-    mr_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);
@@ -758 +758 @@
         /* purging a potential old tmpdir */
         log_it("Purging old tmpdir %s", bkpinfo->tmpdir);
-        mr_asprintf(&tmp,"rm -Rf %s",bkpinfo->tmpdir);
+        mr_asprintf(tmp,"rm -Rf %s",bkpinfo->tmpdir);
         mr_free(bkpinfo->tmpdir);
         (void)system(tmp);
@@ -765 +765 @@
 
     if (path != NULL) {
-        mr_asprintf(&tmp, "%s/mondo.tmp.XXXXXX", path);
+        mr_asprintf(tmp, "%s/mondo.tmp.XXXXXX", path);
     } else if (getenv("TMPDIR")) {
-        mr_asprintf(&tmp, "%s/mondo.tmp.XXXXXX", getenv("TMPDIR"));
+        mr_asprintf(tmp, "%s/mondo.tmp.XXXXXX", getenv("TMPDIR"));
     } else if (getenv("TMP")) {
-        mr_asprintf(&tmp, "%s/mondo.tmp.XXXXXX", getenv("TMP"));
+        mr_asprintf(tmp, "%s/mondo.tmp.XXXXXX", getenv("TMP"));
     } else {
-        mr_asprintf(&tmp, "/tmp/mondo.tmp.XXXXXX");
+        mr_asprintf(tmp, "/tmp/mondo.tmp.XXXXXX");
     }
     p = mkdtemp(tmp);
@@ -821 +821 @@
     bkpinfo->use_lzo = FALSE;
     bkpinfo->use_gzip = FALSE;
-    bkpinfo->do_not_compress_these[0] = '\0';
     bkpinfo->verify_data = FALSE;
     bkpinfo->backup_data = FALSE;
@@ -829 +828 @@
     bkpinfo->disaster_recovery = (am_I_in_disaster_recovery_mode()? TRUE : FALSE);
     if (bkpinfo->disaster_recovery) {
-        strcpy(bkpinfo->isodir, "/");
+        mr_asprintf(p, "%s", "/");
     } else {
-        strcpy(bkpinfo->isodir, MONDO_CACHE);
-    }
-    mr_asprintf(&p, "%s", STD_PREFIX);
+        mr_asprintf(p, "%s", MONDO_CACHE);
+    }
+    bkpinfo->isodir = p;
+    mr_asprintf(p, "%s", STD_PREFIX);
     bkpinfo->prefix = p;
     bkpinfo->scratchdir = NULL;
@@ -882 +882 @@
     assert_string_is_neither_NULL_nor_zerolength(partition);
 
-    mr_asprintf(&command, "df -m -P %s 1> /dev/null 2> /dev/null", partition);
+    mr_asprintf(command, "df -m -P %s 1> /dev/null 2> /dev/null", partition);
     if (system(command)) {
         mr_free(command);
@@ -889 +889 @@
     mr_free(command);
 
-    mr_asprintf(&command, "df -m -P %s | tail -n1 | tr -s ' ' '\t' | cut -f4",
+    mr_asprintf(command, "df -m -P %s | tail -n1 | tr -s ' ' '\t' | cut -f4",
             partition);
-    mr_asprintf(&out_sz, "%s", call_program_and_get_last_line_of_output(command));
+    mr_asprintf(out_sz, "%s", call_program_and_get_last_line_of_output(command));
     mr_free(command);
 
@@ -935 +935 @@
             ("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++;
@@ -1006 +1006 @@
     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")) {
@@ -1039 +1039 @@
         fatal_error("Please reinstall Mondo and Mindi.");
     }
-    mr_asprintf(&tmp, "mindi --makemountlist %s/mountlist.txt.test", bkpinfo->tmpdir);
+    mr_asprintf(tmp, "mindi --makemountlist %s/mountlist.txt.test", bkpinfo->tmpdir);
     if (run_program_and_log_output(tmp, 5)) {
         mr_free(tmp);
-        mr_asprintf(&tmp, "mindi --makemountlist %s/mountlist.txt.test failed for some reason.", bkpinfo->tmpdir);
+        mr_asprintf(tmp, "mindi --makemountlist %s/mountlist.txt.test failed for some reason.", bkpinfo->tmpdir);
         log_to_screen(tmp);
         log_to_screen
@@ -1087 +1087 @@
     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);
@@ -1097 +1097 @@
         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);
@@ -1180 +1180 @@
         log_msg(3, "%s --- autofs detected", g_autofs_exe);
         // FIXME -- only disable it if it's running ---  sprintf(tmp, "%s status", autofs_exe);
-        mr_asprintf(&tmp, "%s stop", g_autofs_exe);
+        mr_asprintf(tmp, "%s stop", g_autofs_exe);
         if (run_program_and_log_output(tmp, 2)) {
             log_it("Failed to stop autofs - I assume it wasn't running");
@@ -1202 +1202 @@
         return;
     }
-    mr_asprintf(&tmp, "%s start", g_autofs_exe);
+    mr_asprintf(tmp, "%s start", g_autofs_exe);
     if (run_program_and_log_output(tmp, 2)) {
         log_it("Failed to start autofs");
@@ -1225 +1225 @@
     g_boot_mountpt[0] = '\0';
     log_msg(4, "Done. Great. Seeting command to something");
-    mr_asprintf(&command, "grep -v \":\" /etc/fstab | grep -vE '^#.*$' | grep -E \"[    ]/boot[     ]\" | tr -s ' ' '\t' | cut -f1 | head -n1");
+    mr_asprintf(command, "%s", "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));
+    mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
     mr_free(command);
 
@@ -1233 +1233 @@
     if (tmp[0]) {
         log_it("/boot is at %s according to /etc/fstab", tmp);
-        mr_asprintf(&command, "mount | grep -Ew '/boot'");
+        mr_asprintf(command, "mount | grep -Ew '/boot'");
         mr_free(tmp);
-        mr_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));
         mr_free(command);
 
@@ -1247 +1247 @@
                 }
             } else {
-                mr_asprintf(&command, "mount | grep -E '^%s'", tmp);
+                mr_asprintf(command, "mount | grep -E '^%s'", tmp);
                 log_msg(3, "command = %s", command);
                 if (run_program_and_log_output(command, 5)) {
                     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);
 
-                    mr_asprintf(&tmp, "mount %s", g_boot_mountpt);
+                    mr_asprintf(tmp, "mount %s", g_boot_mountpt);
                     if (run_program_and_log_output(tmp, 5)) {
                         g_boot_mountpt[0] = '\0';
@@ -1287 +1287 @@
     log_msg(3, "starting");
     if (g_boot_mountpt[0]) {
-        mr_asprintf(&tmp, "umount %s", g_boot_mountpt);
+        mr_asprintf(tmp, "umount %s", g_boot_mountpt);
         if (run_program_and_log_output(tmp, 5)) {
             log_it("WARNING - unable to unmount /boot");
@@ -1319 +1319 @@
     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);
         return (1);
     }
-    mr_asprintf(&tempfile, "%s/mojo-jojo.blah", bkpinfo->tmpdir);
+    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);
     }
-    mr_asprintf(&command, "echo \"%s %s\" >> %s", label, value, tempfile);
+    mr_asprintf(command, "echo \"%s %s\" >> %s", label, value, tempfile);
     paranoid_system(command);
     mr_free(command);
 
-    mr_asprintf(&command, "mv -f %s %s", tempfile, config_file);
+    mr_asprintf(command, "mv -f %s %s", tempfile, config_file);
     paranoid_system(command);
     mr_free(command);
@@ -1463 +1463 @@
 
     if (g_magicdev_command && g_magicdev_command[0]) {
-        mr_asprintf(&tmp, "%s &", g_magicdev_command);
+        mr_asprintf(tmp, "%s &", g_magicdev_command);
         paranoid_system(tmp);
         mr_free(tmp);

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

@@ -93 +93 @@
     assert_string_is_neither_NULL_nor_zerolength(stderr_fname);
 
-    mr_asprintf(&afio_found_changes, "%s.afio", ignorefiles_fname);
+    mr_asprintf(afio_found_changes, "%s.afio", ignorefiles_fname);
     paranoid_system("sync");
 
     log_msg(1, "Now scanning log file for 'afio: ' stuff");
-    mr_asprintf(&command, "grep \"afio: \" %s | sed 's/afio: //' | grep -vE '^/dev/.*$' >> %s", stderr_fname, afio_found_changes);
+    mr_asprintf(command, "grep \"afio: \" %s | sed 's/afio: //' | grep -vE '^/dev/.*$' >> %s", stderr_fname, afio_found_changes);
     log_msg(2, command);
     res = system(command);
@@ -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);
@@ -116 +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);
@@ -167 +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);
@@ -173 +173 @@
     }
     mds = media_descriptor_string(bkpinfo->backup_media_type);
-    mr_asprintf(&tmp, "Verifying %s #%d's tarballs", mds, g_current_media_number);
+    mr_asprintf(tmp, "Verifying %s #%d's tarballs", mds, g_current_media_number);
     mr_free(mds);
 
@@ -269 +269 @@
     log_it("before vsbf");
     mds = media_descriptor_string(bkpinfo->backup_media_type);
-    mr_asprintf(&tmp, "Verifying %s#%d's big files", mds, g_current_media_number);
+    mr_asprintf(tmp, "Verifying %s#%d's big files", mds, g_current_media_number);
     mr_free(mds);
 
@@ -276 +276 @@
 
     log_it("after vsbf");
-    mr_asprintf(&mountpoint, "%s/archives", mtpt);
+    mr_asprintf(mountpoint, "%s/archives", mtpt);
     if (last_bigfile_num == -1) {
         bigfile_num = 0;
@@ -302 +302 @@
                 paranoid_fclose(fin);
             }
-            mr_asprintf(&tmp, "%s/%s", bkpinfo->restore_path, biggiestruct.filename);
+            mr_asprintf(tmp, "%s/%s", bkpinfo->restore_path, biggiestruct.filename);
             log_msg(2, "Opening biggiefile #%ld - '%s'", bigfile_num, tmp);
             forig = fopen(tmp, "r");
@@ -312 +312 @@
                             bkpinfo->restore_path,
                             biggiestruct.filename);
-                mr_asprintf(&tmp, "echo \"%s/%s not found\" >> %s/biggies.changed", bkpinfo->restore_path, biggiestruct.filename, bkpinfo->tmpdir);
+                mr_asprintf(tmp, "echo \"%s/%s not found\" >> %s/biggies.changed", bkpinfo->restore_path, biggiestruct.filename, bkpinfo->tmpdir);
                 system(tmp);
                 mr_free(tmp);
@@ -333 +333 @@
                     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);
+                mr_asprintf(command, "cat %s 2>> %s", slice_fname(bigfile_num, slice_num, mountpoint, ""), MONDO_LOGFILE);
             }
             pin = popen(command, "r");
@@ -432 +432 @@
 
     log_it("Verifying fileset '%s'", tarball_fname);
-    mr_asprintf(&outlog, "%s/afio.log", bkpinfo->tmpdir);
+    mr_asprintf(outlog, "%s/afio.log", bkpinfo->tmpdir);
     /* if programmer forgot to say which compression thingy to use then find out */
     if (strstr(tarball_fname, ".lzo")
@@ -462 +462 @@
         bkpinfo->use_star = TRUE;
         if (strstr(tarball_fname, ".bz2"))
-            mr_asprintf(&command, "star -diff diffopts=mode,size,data file=%s -bz >> %s 2>> %s", tarball_fname, outlog, outlog);
+            mr_asprintf(command, "star -diff diffopts=mode,size,data file=%s %s >> %s 2>> %s", tarball_fname, (strstr(tarball_fname, ".bz2")) ? "-bz" : " ", 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);
@@ -472 +472 @@
 
     if (length_of_file(outlog) < 10) {
-        mr_asprintf(&command, "cat %s >> %s", outlog, MONDO_LOGFILE);
+        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) {
@@ -580 +580 @@
         p++;
     }
-    mr_asprintf(&tmp, "mkdir -p %s/tmpfs", bkpinfo->tmpdir);
+    mr_asprintf(tmp, "mkdir -p %s/tmpfs", bkpinfo->tmpdir);
     paranoid_system(tmp);
     mr_free(tmp);
 
-    mr_asprintf(&tarball_fname, "%s/tmpfs/temporary-%s", bkpinfo->tmpdir, p);
+    mr_asprintf(tarball_fname, "%s/tmpfs/temporary-%s", bkpinfo->tmpdir, p);
     read_file_from_stream_to_file(tarball_fname, size);
     res = verify_a_tarball(tarball_fname);
@@ -639 +639 @@
         p++;
     }
-    mr_asprintf(&test_file, "%s/temporary-%s", bkpinfo->tmpdir, p);
+    mr_asprintf(test_file, "%s/temporary-%s", bkpinfo->tmpdir, p);
     for (res =
          read_header_block_from_stream(&slice_siz, slice_fnam, &ctrl_chr);
@@ -666 +666 @@
         if (strcmp(biggie_cksum, orig_cksum)) {
             log_msg(2, "orig cksum=%s; curr cksum=%s", biggie_cksum, orig_cksum);
-            mr_asprintf(&tmp, "%s has changed on live filesystem", biggie_fname);
+            mr_asprintf(tmp, "%s has changed on live filesystem", biggie_fname);
             log_to_screen(tmp);
             mr_free(tmp);
 
-            mr_asprintf(&tmp, "echo \"%s\" >> %s/biggies.changed", biggie_fname, bkpinfo->tmpdir);
+            mr_asprintf(tmp, "echo \"%s\" >> %s/biggies.changed", biggie_fname, bkpinfo->tmpdir);
             system(tmp);
             mr_free(tmp);
@@ -713 +713 @@
 
     if (g_getfattr) {
-        mr_asprintf(&curr_xattr_list_fname, XATTR_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
+        mr_asprintf(curr_xattr_list_fname, XATTR_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
     }
     if (g_getfacl) {
-        mr_asprintf(&curr_acl_list_fname, ACL_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
+        mr_asprintf(curr_acl_list_fname, ACL_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
     }
     log_to_screen("Verifying regular archives on tape");
@@ -749 +749 @@
          res = read_header_block_from_stream(&size, fname, &ctrl_chr)) {
         if (g_getfattr) {
-            mr_asprintf(&curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ, bkpinfo->tmpdir, current_afioball_number);
+            mr_asprintf(curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ, bkpinfo->tmpdir, current_afioball_number);
         }
         if (g_getfacl) {
-            mr_asprintf(&curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ, bkpinfo->tmpdir, current_afioball_number);
+            mr_asprintf(curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ, bkpinfo->tmpdir, current_afioball_number);
         }
         if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) {
@@ -770 +770 @@
             wrong_marker(BLK_START_AN_AFIO_OR_SLICE, ctrl_chr);
         }
-        mr_asprintf(&tmp, "Verifying fileset #%ld", current_afioball_number);
+        mr_asprintf(tmp, "Verifying fileset #%ld", current_afioball_number);
         update_progress_form(tmp);
         mr_free(tmp);
@@ -776 +776 @@
         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);
@@ -830 +830 @@
 
     if (g_getfattr) {
-        mr_asprintf(&curr_xattr_list_fname, XATTR_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
+        mr_asprintf(curr_xattr_list_fname, XATTR_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
     }
     if (g_getfacl) {
-        mr_asprintf(&curr_acl_list_fname, ACL_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
-    }
-    mr_asprintf(&comment, "Verifying all bigfiles.");
+        mr_asprintf(curr_acl_list_fname, ACL_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
+    }
+    mr_asprintf(comment, "Verifying all bigfiles.");
     log_to_screen(comment);
     res = read_header_block_from_stream(&size, orig_fname, &ctrl_chr);
@@ -878 +878 @@
             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);
 
-        mr_asprintf(&logical_fname, "%s/%s", bkpinfo->restore_path, orig_fname);
+        mr_asprintf(logical_fname, "%s/%s", bkpinfo->restore_path, orig_fname);
         res = verify_a_biggiefile_from_stream(logical_fname, size);
         mr_free(logical_fname);
@@ -901 +901 @@
  * Verify the USB device
  * @param bkpinfo The backup information structure. Fields used:
- * - @c bkpinfo->isodir
  * - @c bkpinfo->media_device
  * - @c bkpinfo->tmpdir
@@ -931 +930 @@
     assert(bkpinfo != NULL);
 
-    mr_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");
-        mr_asprintf(&tmp, "umount %s", fname);
+        mr_asprintf(tmp, "umount %s", fname);
         run_program_and_log_output(tmp, FALSE);
         paranoid_free(tmp);
@@ -941 +940 @@
 
     log_msg(1, "Mounting USB device.");
-    mr_asprintf(&mountpoint, "%s/usb", bkpinfo->tmpdir);
-    mr_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 */
-    mr_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);
@@ -956 +955 @@
     sync();
     log_msg(2, "OK, I've mounted the USB Disk/Key\n");
-    mr_asprintf(&tmp, "%s/archives/NOT-THE-LAST", mountpoint);
+    mr_asprintf(tmp, "%s/archives/NOT-THE-LAST", mountpoint);
     if (!does_file_exist(tmp)) {
         log_msg
@@ -973 +972 @@
     verify_all_slices_on_CD(mountpoint);
 
-    mr_asprintf(&tmp1, "umount %s", mountpoint);
+    mr_asprintf(tmp1, "umount %s", mountpoint);
 #ifdef __FreeBSD__
     ret += system(tmp1);
@@ -982 +981 @@
 #endif
     {
-        mr_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);
@@ -1031 +1030 @@
     assert(bkpinfo != NULL);
 
-    mr_asprintf(&mountpoint, "%s/cdrom", bkpinfo->tmpdir);
-    mr_asprintf(&fname, "%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->nfs_remote_dir, bkpinfo->prefix, g_current_media_number);
+    mr_asprintf(mountpoint, "%s/cdrom", bkpinfo->tmpdir);
+    mr_asprintf(fname, "%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->nfs_remote_dir, bkpinfo->prefix, g_current_media_number);
 
     mkdir(mountpoint, 1777);
@@ -1054 +1053 @@
         mddevice = make_vn(fname);
         if (ret) {
-            mr_asprintf(&tmp, "make_vn of %s failed; unable to verify ISO\n", fname);
+            mr_asprintf(tmp, "make_vn of %s failed; unable to verify ISO\n", fname);
             log_to_screen(tmp);
             mr_free(tmp);
@@ -1061 +1060 @@
             return (1);
         }
-        mr_asprintf(&command, "mount_cd9660 %s %s", mddevice, mountpoint);
+        mr_asprintf(command, "mount_cd9660 %s %s", mddevice, mountpoint);
 #else
-        mr_asprintf(&command, "mount -o loop,ro -t iso9660 %s %s", fname, mountpoint);
+        mr_asprintf(command, "mount -o loop,ro -t iso9660 %s %s", fname, mountpoint);
 #endif
         if (run_program_and_log_output(command, FALSE)) {
-            mr_asprintf(&tmp, "%s failed; unable to mount ISO image\n", command);
+            mr_asprintf(tmp, "%s failed; unable to mount ISO image\n", command);
             log_to_screen(tmp);
             mr_free(tmp);
@@ -1077 +1076 @@
     }
     log_msg(2, "OK, I've mounted the ISO/CD\n");
-    mr_asprintf(&tmp, "%s/archives/NOT-THE-LAST", mountpoint);
+    mr_asprintf(tmp, "%s/archives/NOT-THE-LAST", mountpoint);
     if (!does_file_exist(tmp)) {
         log_msg
@@ -1097 +1096 @@
 #ifdef __FreeBSD__
     ret = 0;
-    mr_asprintf(&command, "umount %s", mountpoint);
+    mr_asprintf(command, "umount %s", mountpoint);
     ret += system(command);
     ret += kick_vn(mddevice);
     if (ret)
 #else
-    mr_asprintf(&command, "umount %s", mountpoint);
+    mr_asprintf(command, "umount %s", mountpoint);
     if (system(command))
 #endif
     {
-        mr_asprintf(&tmp, "%s failed; unable to unmount ISO image\n", command);
+        mr_asprintf(tmp, "%s failed; unable to unmount ISO image\n", command);
         log_to_screen(tmp);
         mr_free(tmp);
@@ -1118 +1117 @@
 
     if (!does_file_exist(fname)) {
-        mr_asprintf(&command, "umount %s", bkpinfo->media_device);
+        mr_asprintf(command, "umount %s", bkpinfo->media_device);
         run_program_and_log_output(command, 2);
         mr_free(command);
@@ -1165 +1164 @@
 /* close tape; exit */
 //  fclose(g_tape_stream); <-- not needed; is handled by closein_tape()
-    mr_asprintf(&tmp, "rm -f %s/biggies.changed %s/changed.files 2> /dev/null", bkpinfo->tmpdir, bkpinfo->tmpdir);
+    mr_asprintf(tmp, "rm -f %s/biggies.changed %s/changed.files 2> /dev/null", bkpinfo->tmpdir, bkpinfo->tmpdir);
     paranoid_system(tmp);
     mr_free(tmp);
 
-    mr_asprintf(&changed_files_fname, "%s/changed.files", bkpinfo->tmpdir);
-    mr_asprintf(&tmp, "grep -E '^%s:.*$' %s | cut -d'\"' -f2 | sort -u | awk '{print \"/\"$0;};' | tr -s '/' '/' | grep -v \"(total of\" | grep -v \"incheckentry.*xwait\" | grep -vE '^/afio:.*$' | grep -vE '^dev/.*$'  > %s", (bkpinfo->use_star) ? "star" : "afio", MONDO_LOGFILE, changed_files_fname);
+    mr_asprintf(changed_files_fname, "%s/changed.files", bkpinfo->tmpdir);
+    mr_asprintf(tmp, "grep -E '^%s:.*$' %s | cut -d'\"' -f2 | sort -u | awk '{print \"/\"$0;};' | tr -s '/' '/' | grep -v \"(total of\" | grep -v \"incheckentry.*xwait\" | grep -vE '^/afio:.*$' | grep -vE '^dev/.*$'  > %s", (bkpinfo->use_star) ? "star" : "afio", MONDO_LOGFILE, changed_files_fname);
     log_msg(2, "Running command to derive list of changed files");
     log_msg(2, tmp);
@@ -1182 +1181 @@
     mr_free(tmp);
 
-    mr_asprintf(&tmp, "cat %s/biggies.changed >> %s", bkpinfo->tmpdir, changed_files_fname);
+    mr_asprintf(tmp, "cat %s/biggies.changed >> %s", bkpinfo->tmpdir, changed_files_fname);
     paranoid_system(tmp);
     mr_free(tmp);
@@ -1188 +1187 @@
     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/mondostructures.h

@@ -421 +421 @@
 
   /**
-   * A filename containing a list of extensions, one per line, to not
-   * compress. If this is set to "", afio will still exclude a set of well-known
-   * compressed files from compression, but biggiefiles that are compressed
-   * will be recompressed again.
-   */
-    char do_not_compress_these[MAX_STR_LEN / 2];
-
-  /**
    * If TRUE, then we should verify a backup.
    */
@@ -465 +457 @@
    * If backup_media_type is anything else, this is ignored.
    */
-    char isodir[MAX_STR_LEN / 4];
+    char *isodir;
 
 /**

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

@@ -276 +276 @@
 char *tmp1 = NULL;
 
-    mr_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) {
-        mr_asprintf(&tmp1,"kill `%s`", tmp);
+        mr_asprintf(tmp1,"kill `%s`", tmp);
         run_program_and_log_output(tmp1, TRUE);
         mr_free(tmp1);
@@ -334 +334 @@
         chdir("/");
         if (g_selfmounted_isodir) {
-            mr_asprintf(&command, "umount %s", g_selfmounted_isodir);
+            mr_asprintf(command, "umount %s", g_selfmounted_isodir);
             run_program_and_log_output(command, 5);
             mr_free(command);
-            mr_asprintf(&command, "rmdir %s", g_selfmounted_isodir);
+            mr_asprintf(command, "rmdir %s", g_selfmounted_isodir);
             run_program_and_log_output(command, 5);
             mr_free(command);
@@ -386 +386 @@
         run_program_and_log_output("umount " MNT_CDROM, FALSE);
         if (g_selfmounted_isodir) {
-            mr_asprintf(&command, "umount %s", g_selfmounted_isodir);
+            mr_asprintf(command, "umount %s", g_selfmounted_isodir);
             run_program_and_log_output(command, 1);
             mr_free(command);
 
-            mr_asprintf(&command, "rmdir %s", g_selfmounted_isodir);
+            mr_asprintf(command, "rmdir %s", g_selfmounted_isodir);
             run_program_and_log_output(command, 1);
             mr_free(command);
@@ -409 +409 @@
             if (strstr(bkpinfo->tmpdir ,"mondo.tmp.") != NULL) {
                 log_msg(8,"erasing tempdir");
-                mr_asprintf(&command, "rm -Rf %s", bkpinfo->tmpdir);
+                mr_asprintf(command, "rm -Rf %s", bkpinfo->tmpdir);
                 system(command);
                 mr_free(command);
@@ -418 +418 @@
             if (strstr(bkpinfo->scratchdir ,"mondo.scratch.") != NULL) {
                 log_msg(8,"erasing scratchdir");
-                mr_asprintf(&command, "rm -Rf %s", bkpinfo->scratchdir);
+                mr_asprintf(command, "rm -Rf %s", bkpinfo->scratchdir);
                 system(command);
                 mr_free(command);
@@ -754 +754 @@
                 /* take default if ENTER was typed */
                 mr_free(output);
-                mr_asprintf(&output, "%s", input);
+                mr_asprintf(output, "%s", input);
             }
             if (output[strlen(output) - 1] == '\n')
@@ -761 +761 @@
         }
 
-        mr_asprintf(&blurb, "%s", b);
+        mr_asprintf(blurb, "%s", b);
         text = newtTextboxReflowed(2, 1, blurb, 48, 5, 5, 0);
         type_here =
@@ -782 +782 @@
 
         if (b_res == b_1) {
-            mr_asprintf(&output, "%s", newtEntryGetValue(type_here));
+            mr_asprintf(output, "%s", newtEntryGetValue(type_here));
         }
         newtPopHelpLine();
@@ -982 +982 @@
             || 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");
+                mr_asprintf(pcline_str, " Working");
                 for (j = 0; j < g_mysterious_dot_counter; j++) {
                     mr_strcat(pcline_str, ".");
@@ -993 +993 @@
                 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) {
-                mr_asprintf(&taskprogress, "TASK:  [");
+                mr_asprintf(taskprogress, "TASK:  [");
                 for (i = 0; i < percentage; i += 5) {
                     mr_strcat(taskprogress, "*");
@@ -1117 +1117 @@
             printf("---progress-form---3--- %s\n", blurb3);
             printf("---progress-form---E---\n");
-            mr_asprintf(&taskprogress, "TASK:  [");
+            mr_asprintf(taskprogress, "TASK:  [");
             for (i = 0; i < percentage; i += 5) {
                 mr_strcat(taskprogress, "*");
@@ -1131 +1131 @@
             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(&percentline_str, " %3d%% done                 %3d%% to go", percentage, 100 - 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(percentline_str, " %3d%% done                 %3d%% to go", percentage, 100 - percentage);
 
             center_string(blurb1, 54);
@@ -1359 +1359 @@
         }
 
-        mr_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);
@@ -1453 +1453 @@
         assert(flentry != NULL);
         if (flentry->severity == 0) {
-            mr_asprintf(&tmp, "0   ");
+            mr_asprintf(tmp, "0   ");
         } else if (flentry->severity == 1) {
-            mr_asprintf(&tmp, "low ");
+            mr_asprintf(tmp, "low ");
         } else if (flentry->severity == 2) {
-            mr_asprintf(&tmp, "med ");
-        } else {
-            mr_asprintf(&tmp, "high");
+            mr_asprintf(tmp, "med ");
+        } else {
+            mr_asprintf(tmp, "high");
         }
         mr_strcat(tmp, "  ");
@@ -1540 +1540 @@
                                    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);
@@ -1546 +1546 @@
         bClose = newtCompactButton(10, 15, " Close  ");
         bSelect = newtCompactButton(30, 15, " Select ");
-        mr_asprintf(&tmp, "%-10s               %-20s", "Priority", "Filename");
+        mr_asprintf(tmp, "%-10s               %-20s", "Priority", "Filename");
         headerMsg = newtLabel(2, 1, tmp);
         mr_free(tmp);
@@ -1571 +1571 @@
                     if (filelist->entries > 0) {
                         severity_of_difference(filelist->el[currline].  filename, reason);
-                        mr_asprintf(&tmp, "%s --- %s", filelist->el[currline].filename, reason);
+                        mr_asprintf(tmp, "%s --- %s", filelist->el[currline].filename, reason);
 
                         popup_and_OK(tmp);

branches/2.2.10/mondo/src/include/mr_mem.h

@@ -19 +19 @@
 #define mr_free(x) mr_free_int((void **)&x,__LINE__,__FILE__)
 #define mr_allocstr(x,y) mr_allocstr_int(x,y,__LINE__,__FILE__)
-#define mr_asprintf(x,y,args...) mr_asprintf_int(x,__LINE__,__FILE__,y,## args)
+#define mr_asprintf(x,y,args...) mr_asprintf_int((char **)&x,__LINE__,__FILE__,y,## args)
 #define mr_getline(x,y) mr_getline_int(x,y,__LINE__,__FILE__)
 #define mr_malloc(x) mr_malloc_int((size_t)x,__LINE__,__FILE__)

branches/2.2.10/mondo/src/lib/mr_conf.c

@@ -108 +108 @@
     CONF = fopen(filename, "r");
 
-    mr_asprintf(&mr_conf_filename, "%s", filename);
+    mr_asprintf(mr_conf_filename, "%s", filename);
 
     /*if file is empty or not exist => error */
@@ -198 +198 @@
     p = mr_conf_read(field_name);
     if (p != NULL) {
-        mr_asprintf(&p1, "%d", p);
+        mr_asprintf(p1, "%d", p);
         }
     return p1;
@@ -210 +210 @@
     p = mr_conf_read(field_name);
     if (p != NULL) {
-        mr_asprintf(&p1, "%f", p);
+        mr_asprintf(p1, "%f", p);
     }
     return p1;
@@ -232 +232 @@
         return(p);
     }
-    mr_asprintf(&q, "%s", p);
+    mr_asprintf(q, "%s", p);
 
     if (*p != '"') {
@@ -275 +275 @@
             (strncasecmp(p, "t" , (size_t)1) == 0) ||
             (strncasecmp(p, "1" , (size_t)1) == 0)) {
-            mr_asprintf(&p1, "%d", TRUE);
+            mr_asprintf(p1, "%d", TRUE);
         } else {
-            mr_asprintf(&p1, "%d", FALSE);
+            mr_asprintf(p1, "%d", FALSE);
         }
     }
@@ -288 +288 @@
     char *p = NULL;
 
-    mr_asprintf(&p, "%d", FALSE);
+    mr_asprintf(p, "%d", FALSE);
     if (strcmp(str,p) != 0) {
         ret = TRUE;

branches/2.2.10/mondo/src/mondoarchive/mondoarchive.c

@@ -209 +209 @@
 
     /* make sure PATH environmental variable allows access to mkfs, fdisk, etc. */
-    mr_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);
     mr_free(tmp1);
 
     /* Add the ARCH environment variable for ia64 purposes */
-    mr_asprintf(&tmp1,"%s",get_architecture());
+    mr_asprintf(tmp1,"%s",get_architecture());
     setenv("ARCH", tmp1, 1);
     mr_free(tmp1);
@@ -352 +352 @@
         retval += res;
         if (res) {
-            mr_asprintf(&say_at_end, "Data archived. Please check the logs, just as a precaution. ");
-        } else {
-            mr_asprintf(&say_at_end, "Data archived OK. ");
+            mr_asprintf(say_at_end, "Data archived. Please check the logs, just as a precaution. ");
+        } else {
+            mr_asprintf(say_at_end, "Data archived OK. ");
         }
     }
@@ -362 +362 @@
         res = verify_data();
         if (res < 0) {
-            mr_asprintf(&tmp, "%d difference%c found.", -res,
+            mr_asprintf(tmp, "%d difference%c found.", -res,
                     (-res != 1) ? 's' : ' ');
-            mr_asprintf(&say_at_end, "%s", tmp);
+            mr_asprintf(say_at_end, "%s", tmp);
             log_to_screen(tmp);
             mr_free(tmp);
@@ -402 +402 @@
         mr_free(say_at_end);
     }
-    mr_asprintf(&tmp, "umount %s/tmpfs", bkpinfo->tmpdir);
+    mr_asprintf(tmp, "umount %s/tmpfs", bkpinfo->tmpdir);
     run_program_and_log_output(tmp, TRUE);
     mr_free(tmp);
     if (bkpinfo->backup_media_type == usb) {
         log_msg(1, "Unmounting USB device.");
-        mr_asprintf(&tmp, "umount %s1", bkpinfo->media_device);
+        mr_asprintf(tmp, "umount %s1", bkpinfo->media_device);
         run_program_and_log_output(tmp, TRUE);
         mr_free(tmp);

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);
@@ -258 +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);
@@ -305 +305 @@
             *q = '\0';
             log_msg(1, "Deleting old entries at /dev/%s", tmp);
-            mr_asprintf(&tmp1, "rm -Rf /dev/%s", tmp);
+            mr_asprintf(tmp1, "rm -Rf /dev/%s", tmp);
             run_program_and_log_output(tmp1, 1);
             mr_free(tmp1);
@@ -335 +335 @@
             log_it("%s... so I'll get creative.", tmp);
             if (lvmversion == 2) {
-                mr_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));
                 mr_free(tmp1);
             } else {
-                mr_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));
                 mr_free(tmp1);
@@ -393 +393 @@
             retval++;
         }
-        mr_asprintf(&tmp1, "echo \"%s\" >> /tmp/out.sh", command);
+        mr_asprintf(tmp1, "echo \"%s\" >> /tmp/out.sh", command);
         system(tmp1);
         mr_free(tmp1);
@@ -484 +484 @@
                  fgets(incoming, MAX_STR_LEN - 1, fin));
             if (!feof(fin)) {
-                mr_asprintf(&tmp, "Investigating %s", old_mountlist->el[lino].device);
+                mr_asprintf(tmp, "Investigating %s", old_mountlist->el[lino].device);
                 log_it(tmp);
                 mr_free(tmp);
@@ -497 +497 @@
                         *p = '\0';
                         for (p--; p > incoming && *(p - 1) > 32; p--);
-                        mr_asprintf(&tmp, "Extrapolating %s", p);
+                        mr_asprintf(tmp, "Extrapolating %s", p);
                         log_it(tmp);
                         mr_free(tmp);
@@ -518 +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);
@@ -582 +582 @@
   }
   // create device list from normal disks followed by spare ones
-  mr_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++) {
-    mr_asprintf(&strtmp, "%s", devices);
+    mr_asprintf(strtmp, "%s", devices);
     paranoid_free(devices);
-    mr_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++) {
-    mr_asprintf(&strtmp, "%s", devices);
+    mr_asprintf(strtmp, "%s", devices);
     paranoid_free(devices);
-    mr_asprintf(&devices, "%s %s", strtmp,
+    mr_asprintf(devices, "%s %s", strtmp,
          raidlist->el[i].spare_disks.el[j].device);
     paranoid_free(strtmp);
@@ -599 +599 @@
   // translate RAID level
   if (raidlist->el[i].raid_level == -2) {
-    mr_asprintf(&level, "multipath");
+    mr_asprintf(level, "multipath");
   } else if (raidlist->el[i].raid_level == -1) {
-    mr_asprintf(&level, "linear");
+    mr_asprintf(level, "linear");
   } else {
-    mr_asprintf(&level, "raid%d", raidlist->el[i].raid_level);
+    mr_asprintf(level, "raid%d", raidlist->el[i].raid_level);
   }
   // create RAID device:
@@ -610 +610 @@
   // - faulty devices ignored
   // - persistent superblock always used as this is recommended
-  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);
+  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) {
-    mr_asprintf(&strtmp, "%s", program);
+    mr_asprintf(strtmp, "%s", program);
     paranoid_free(program);
     switch(raidlist->el[i].parity) {
     case 0:
-      mr_asprintf(&program, "%s --parity=%s", strtmp, "la");
+      mr_asprintf(program, "%s --parity=%s", strtmp, "la");
       break;
     case 1:
-      mr_asprintf(&program, "%s --parity=%s", strtmp, "ra");
+      mr_asprintf(program, "%s --parity=%s", strtmp, "ra");
       break;
     case 2:
-      mr_asprintf(&program, "%s --parity=%s", strtmp, "ls");
+      mr_asprintf(program, "%s --parity=%s", strtmp, "ls");
       break;
     case 3:
-      mr_asprintf(&program, "%s --parity=%s", strtmp, "rs");
+      mr_asprintf(program, "%s --parity=%s", strtmp, "rs");
       break;
     default:
@@ -634 +634 @@
   }
   if (raidlist->el[i].chunk_size != -1) {
-    mr_asprintf(&strtmp, "%s", program);
+    mr_asprintf(strtmp, "%s", program);
     paranoid_free(program);
-    mr_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) {
-    mr_asprintf(&strtmp, "%s", program);
+    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);
   }
-  mr_asprintf(&strtmp, "%s", program);
+  mr_asprintf(strtmp, "%s", program);
   paranoid_free(program);
-  mr_asprintf(&program, "%s %s", strtmp, devices);
+  mr_asprintf(program, "%s %s", strtmp, devices);
   paranoid_free(strtmp);
   res = run_program_and_log_output(program, 1);
@@ -688 +688 @@
 
     if (strstr(format, "raid")) {   // do not form RAID disks; do it to /dev/md* instead
-        mr_asprintf(&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);
         mr_free(tmp);
@@ -700 +700 @@
 #endif
     if (strlen(format) <= 2) {
-        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);
+        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);
         mr_free(tmp);
@@ -706 +706 @@
     }
     if (is_this_device_mounted(device)) {
-        mr_asprintf(&tmp, "%s is mounted - cannot format it       ", device);
+        mr_asprintf(tmp, "%s is mounted - cannot format it       ", device);
         log_to_screen(tmp);
         mr_free(tmp);
@@ -736 +736 @@
             char line[MAX_STR_LEN];
 
-            mr_asprintf(&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);
             mr_free(tmp);
 
             /* 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) {
@@ -753 +753 @@
                     *(strchr(line, '\n')) = '\0';   // get rid of the \n on the end
 
-                mr_asprintf(&tmp, "Initializing plex: %s", line);
+                mr_asprintf(tmp, "Initializing plex: %s", line);
                 open_evalcall_form(tmp);
                 mr_free(tmp);
 
-                mr_asprintf(&tmp, "vinum init %s", line);
+                mr_asprintf(tmp, "vinum init %s", line);
                 system(tmp);
                 mr_free(tmp);
 
                 while (1) {
-                    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);
+                    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");
                     mr_free(tmp);
@@ -782 +782 @@
         }
 #else
-        mr_asprintf(&tmp, "Initializing RAID device %s", device);
+        mr_asprintf(tmp, "Initializing RAID device %s", device);
         log_to_screen(tmp);
         mr_free(tmp);
@@ -798 +798 @@
             log_msg(1, "Creating RAID device %s via mdadm returned %d", device, res);
         } else {
-            mr_asprintf(&program, "mkraid --really-force %s", device);
+            mr_asprintf(program, "mkraid --really-force %s", device);
             res = run_program_and_log_output(program, 1);
             log_msg(1, "%s returned %d", program, res);
@@ -822 +822 @@
     }
     program = which_format_command_do_i_need(format);
-    mr_asprintf(&tmp, "%s %s", program, device);
+    mr_asprintf(tmp, "%s %s", program, device);
     if (strstr(program, "kludge")) {
         mr_strcat(tmp, " /");
@@ -828 +828 @@
     mr_free(program);
 
-    mr_asprintf(&program, "sh -c 'echo -en \"y\\ny\\ny\\n\" | %s'", tmp);
+    mr_asprintf(program, "sh -c 'echo -en \"y\\ny\\ny\\n\" | %s'", tmp);
     mr_free(tmp);
 
-    mr_asprintf(&tmp, "Formatting %s as %s", device, format);
+    mr_asprintf(tmp, "Formatting %s as %s", device, format);
     update_progress_form(tmp);
     mr_free(tmp);
@@ -848 +848 @@
         mr_free(program);
 #ifdef __FreeBSD__
-        mr_asprintf(&program, "newfs_msdos -F 32 %s", device);
+        mr_asprintf(program, "newfs_msdos -F 32 %s", device);
 #else
 #ifdef __IA64__
         /* For EFI partitions take fat16 
          * as we want to make small ones */
-        mr_asprintf(&program, "mkfs -t %s -F 16 %s", format, device);
+        mr_asprintf(program, "mkfs -t %s -F 16 %s", format, device);
 #else
-        mr_asprintf(&program, "mkfs -t %s -F 32 %s", format, device);
+        mr_asprintf(program, "mkfs -t %s -F 32 %s", format, device);
 #endif
 #endif
@@ -911 +911 @@
 
     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);
@@ -939 +939 @@
             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);
@@ -989 +989 @@
         me = &mountlist->el[lino];  // the current mountlist entry
         if (!strcmp(me->mountpoint, "image")) {
-            mr_asprintf(&tmp, "Not formatting %s - it's an image", me->device);
+            mr_asprintf(tmp, "Not formatting %s - it's an image", me->device);
             log_it(tmp);
             mr_free(tmp);
         } else if (!strcmp(me->format, "raid")) {
-            mr_asprintf(&tmp, "Not formatting %s - it's a raid-let", me->device);
+            mr_asprintf(tmp, "Not formatting %s - it's a raid-let", me->device);
             log_it(tmp);
             mr_free(tmp);
             continue;
         } else if (!strcmp(me->format, "lvm")) {
-            mr_asprintf(&tmp, "Not formatting %s - it's an LVM", me->device);
+            mr_asprintf(tmp, "Not formatting %s - it's an LVM", me->device);
             log_it(tmp);
             mr_free(tmp);
             continue;
         } else if (!strncmp(me->device, "/dev/md", 7)) {
-            mr_asprintf(&tmp, "Already formatted %s - it's a soft-RAID dev", me->device);
+            mr_asprintf(tmp, "Already formatted %s - it's a soft-RAID dev", me->device);
             log_it(tmp);
             mr_free(tmp);
@@ -1010 +1010 @@
                    && strncmp(me->device, "/dev/hd", 7)
                    && strncmp(me->device, "/dev/sd", 7)) {
-            mr_asprintf(&tmp, "Not formatting %s yet - doesn't exist - probably an LVM", me->device);
+            mr_asprintf(tmp, "Not formatting %s yet - doesn't exist - probably an LVM", me->device);
             log_it(tmp);
             mr_free(tmp);
@@ -1017 +1017 @@
             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);
@@ -1048 +1048 @@
     }
 
-    mr_asprintf(&tmp, "format_everything () - %s", (retval) ? "failed!" : "finished successfully");
+    mr_asprintf(tmp, "format_everything () - %s", (retval) ? "failed!" : "finished successfully");
     log_it(tmp);
     mr_free(tmp);
@@ -1111 +1111 @@
 
     if (devno_we_must_allow_for >= 5) {
-        mr_asprintf(&tmp, "Making dummy primary 1 on %s", drivename);
+        mr_asprintf(tmp, "Making dummy primary 1 on %s", drivename);
         log_it(tmp);
         mr_free(tmp);
@@ -1127 +1127 @@
     }
     for (; current_devno < devno_we_must_allow_for; current_devno++) {
-        mr_asprintf(&tmp, "Creating dummy partition %d on %s", current_devno, drivename);
+        mr_asprintf(tmp, "Creating dummy partition %d on %s", current_devno, drivename);
         log_it(tmp);
         mr_free(tmp);
@@ -1360 +1360 @@
     for (c = 'a'; c <= 'z'; ++c) {
         int idx;
-        mr_asprintf(&subdev_str, "%s%c", drivename, c);
+        mr_asprintf(subdev_str, "%s%c", drivename, c);
         if ((idx = find_device_in_mountlist(mountlist, subdev_str)) < 0) {
             lp->d_partitions[c - 'a'].p_size = 0;
@@ -1416 +1416 @@
     display_disklabel(ftmp, lp);
     fclose(ftmp);
-    mr_asprintf(&command, "disklabel -wr %s auto", canonical_name(drivename));
+    mr_asprintf(command, "disklabel -wr %s auto", canonical_name(drivename));
     retval += run_program_and_log_output(command, TRUE);
     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);
@@ -1468 +1468 @@
     malloc_string(format);
 
-    mr_asprintf(&tmp, "Partitioning drive %s", drivename);
+    mr_asprintf(tmp, "Partitioning drive %s", drivename);
     log_it(tmp);
     mr_free(tmp);
@@ -1477 +1477 @@
 #else
     make_hole_for_file(FDISK_LOG);
-    mr_asprintf(&tmp, "parted2fdisk %s >> %s 2>> %s", drivename, FDISK_LOG, FDISK_LOG);
+    mr_asprintf(tmp, "parted2fdisk %s >> %s 2>> %s", drivename, FDISK_LOG, FDISK_LOG);
     pout_to_fdisk = popen(tmp, "w");
     mr_free(tmp);
@@ -1500 +1500 @@
                 // try DangerouslyDedicated mode
                 for (c = 'a'; c <= 'z'; c++) {
-                    mr_asprintf(&subdev_str, "%s%c", drivename, c);
+                    mr_asprintf(subdev_str, "%s%c", drivename, c);
                     if (find_device_in_mountlist(mountlist, subdev_str) > 0) {
                         fbsd_part = TRUE;
@@ -1510 +1510 @@
                                                  drivename,
                                                  0);
-                    mr_asprintf(&command, "disklabel -B %s", basename(drivename));
+                    mr_asprintf(command, "disklabel -B %s", basename(drivename));
                     if (system(command)) {
                         log_to_screen
@@ -1522 +1522 @@
             }
             for (c = 'a'; c <= 'z'; c++) {
-                mr_asprintf(&subdev_str, "%s%c", device_str, c);
+                mr_asprintf(subdev_str, "%s%c", device_str, c);
                 if (find_device_in_mountlist(mountlist, subdev_str) > 0) {
                     fbsd_part = TRUE;
@@ -1535 +1535 @@
                 partsize = 0;
                 for (i = 'a'; i < 'z'; ++i) {
-                    mr_asprintf(&subdev_str, "%s%c", device_str, i);
+                    mr_asprintf(subdev_str, "%s%c", device_str, i);
                     line = find_device_in_mountlist(mountlist, subdev_str);
                     mr_free(subdev_str);
@@ -1565 +1565 @@
             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);
@@ -1572 +1572 @@
             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);
@@ -1618 +1618 @@
 #ifdef __FreeBSD__
         if ((current_devno <= 4) && fbsd_part) {
-            mr_asprintf(&tmp, "disklabel -B %s", basename(device_str));
+            mr_asprintf(tmp, "disklabel -B %s", basename(device_str));
             retval += label_drive_or_slice(mountlist, device_str, 0);
             if (system(tmp)) {
@@ -1634 +1634 @@
     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);
@@ -1644 +1644 @@
         log_msg(0,
                 "------------------- fdisk.log looks like this ------------------");
-        mr_asprintf(&tmp, "cat %s >> %s", FDISK_LOG, MONDO_LOGFILE);
+        mr_asprintf(tmp, "cat %s >> %s", FDISK_LOG, MONDO_LOGFILE);
         system(tmp);
         mr_free(tmp);
@@ -1650 +1650 @@
         log_msg(0,
                 "------------------- end of fdisk.log... word! ------------------");
-        mr_asprintf(&tmp, "tail -n6 %s | grep -F \"16: \"", FDISK_LOG);
+        mr_asprintf(tmp, "tail -n6 %s | grep -F \"16: \"", FDISK_LOG);
         if (!run_program_and_log_output(tmp, 5)) {
             g_partition_table_locked_up++;
@@ -1656 +1656 @@
         mr_free(tmp);
 
-        mr_asprintf(&tmp, "partprobe %s", drivename);
+        mr_asprintf(tmp, "partprobe %s", drivename);
         if (!run_program_and_log_output(tmp, 5)) {
             g_partition_table_locked_up--;
@@ -1708 +1708 @@
 
     if (!strncmp(drive, RAID_DEVICE_STUB, strlen(RAID_DEVICE_STUB))) {
-        mr_asprintf(&tmp, "Not partitioning %s - it is a virtual drive", drive);
+        mr_asprintf(tmp, "Not partitioning %s - it is a virtual drive", drive);
         log_it(tmp);
         mr_free(tmp);
@@ -1716 +1716 @@
     partition_name = build_partition_name(drive, partno);
     if (partsize <= 0) {
-        mr_asprintf(&tmp, "Partitioning device %s (max size)", partition_name);
+        mr_asprintf(tmp, "Partitioning device %s (max size)", partition_name);
     } else {
-        mr_asprintf(&tmp, "Partitioning device %s (%lld MB)", partition_name, (long long) partsize / 1024);
+        mr_asprintf(tmp, "Partitioning device %s (%lld MB)", partition_name, (long long) partsize / 1024);
     }
     update_progress_form(tmp);
@@ -1725 +1725 @@
 
     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);
@@ -1737 +1737 @@
     /* BERLIOS: should not be called each time */
     part_table_fmt = which_partition_format(drive);
-    mr_asprintf(&output, "");
+    mr_asprintf(output, "");
     /* make it a primary/extended/logical */
     if (partno <= 4) {
@@ -1769 +1769 @@
     }
     mr_strcat(output, "\n");
-    mr_asprintf(&tmp,"PARTSIZE = +%ld",(long)partsize);
+    mr_asprintf(tmp,"PARTSIZE = +%ld",(long)partsize);
     log_it(tmp);
     mr_free(tmp);
@@ -1777 +1777 @@
     log_it("---end of fdisk---");
 
-    mr_asprintf(&program, "parted2fdisk %s >> %s 2>> %s", drive, MONDO_LOGFILE, MONDO_LOGFILE);
+    mr_asprintf(program, "parted2fdisk %s >> %s 2>> %s", drive, MONDO_LOGFILE, MONDO_LOGFILE);
     if (pout_to_fdisk) {
         log_msg(1, "Doing the new all-in-one fdisk thing");
@@ -1783 +1783 @@
         fput_string_one_char_at_a_time(pout_to_fdisk, output);
         fput_string_one_char_at_a_time(pout_to_fdisk, "\n\np\n");
-        mr_asprintf(&tmp, "%s", last_line_of_file(FDISK_LOG));
+        mr_asprintf(tmp, "%s", last_line_of_file(FDISK_LOG));
         if (strstr(tmp, " (m ")) {
             log_msg(1, "Successfully created partition %d on %s", partno, drive);
@@ -1826 +1826 @@
                                  format, -1);
             if (res) {
-                mr_asprintf(&tmp, "Failed to vacuum-pack %s", partition_name);
+                mr_asprintf(tmp, "Failed to vacuum-pack %s", partition_name);
                 log_it(tmp);
                 mr_free(tmp);
@@ -1840 +1840 @@
                                    partsize);
             if (retval) {
-                mr_asprintf(&tmp, "Partitioned %s but failed to set its type", partition_name);
+                mr_asprintf(tmp, "Partitioned %s but failed to set its type", partition_name);
                 log_it(tmp);
                 mr_free(tmp);
             } else {
                 if (partsize > 0) {
-                    mr_asprintf(&tmp, "Partition %s created+configured OK", partition_name);
+                    mr_asprintf(tmp, "Partition %s created+configured OK", partition_name);
                     log_to_screen(tmp);
                     mr_free(tmp);
@@ -1853 +1853 @@
             }
         } else {
-            mr_asprintf(&tmp, "Failed to partition %s", partition_name);
+            mr_asprintf(tmp, "Failed to partition %s", partition_name);
             if (partsize > 0) {
                 log_to_screen(tmp);
@@ -1997 +1997 @@
     p = (char *) strrchr(partition, '/');
     if (strcmp(format, "swap") == 0) {
-        mr_asprintf(&partcode, "82");
+        mr_asprintf(partcode, "82");
     } else if (strcmp(format, "vfat") == 0) {
         if (partsize / 1024 > 8192) {
-            mr_asprintf(&partcode, "c");
+            mr_asprintf(partcode, "c");
         } else {
-            mr_asprintf(&partcode, "b");
+            mr_asprintf(partcode, "b");
         }
     } else if (strcmp(format, "ext2") == 0
@@ -2010 +2010 @@
                || strcmp(format, "xfs") == 0
                || strcmp(format, "jfs") == 0) {
-        mr_asprintf(&partcode, "83");
+        mr_asprintf(partcode, "83");
     } else if (strcmp(format, "minix") == 0) {
-        mr_asprintf(&partcode, "81");
+        mr_asprintf(partcode, "81");
     } else if (strcmp(format, "vmfs3") == 0) {
-        mr_asprintf(&partcode, "fb");
+        mr_asprintf(partcode, "fb");
     } else if (strcmp(format, "vmkcore") == 0) {
-        mr_asprintf(&partcode, "fc");
+        mr_asprintf(partcode, "fc");
     } else if (strcmp(format, "raid") == 0) {
-        mr_asprintf(&partcode, "fd");
+        mr_asprintf(partcode, "fd");
     } else if (strcmp(format, "ntfs") == 0) {
-        mr_asprintf(&partcode, "7");
+        mr_asprintf(partcode, "7");
     } else if ((strcmp(format, "ufs") == 0)
                || (strcmp(format, "ffs") == 0)) {   /* raid autodetect */
-        mr_asprintf(&partcode, "a5");
+        mr_asprintf(partcode, "a5");
     } else if (strcmp(format, "lvm") == 0) {
-        mr_asprintf(&partcode, "8e");
+        mr_asprintf(partcode, "8e");
     } else if (format[0] == '\0') { /* LVM physical partition */
-        mr_asprintf(&partcode, "");
+        mr_asprintf(partcode, "");
     } else if (strlen(format) >= 1 && strlen(format) <= 2) {
-        mr_asprintf(&partcode, format);
+        mr_asprintf(partcode, format);
     } 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);
 #ifdef __FreeBSD__
-        mr_asprintf(&partcode, format); // was a5
+        mr_asprintf(partcode, format);  // was a5
 #else
-        mr_asprintf(&partcode, format); // was 83
+        mr_asprintf(partcode, format);  // was 83
 #endif
     }
@@ -2052 +2052 @@
                 || strstr(last_line_of_file(FDISK_LOG), " (1-4)")) {
                 log_msg(5, "Specifying partno (%d) - yay", partno);
-                mr_asprintf(&tmp, "%d\n", partno);
+                mr_asprintf(tmp, "%d\n", partno);
                 fput_string_one_char_at_a_time(pout_to_fdisk, tmp);
                 mr_free(tmp);
@@ -2060 +2060 @@
             }
 
-            mr_asprintf(&tmp, "%s\n", partcode);
+            mr_asprintf(tmp, "%s\n", partcode);
             fput_string_one_char_at_a_time(pout_to_fdisk, tmp);
             mr_free(tmp);
@@ -2070 +2070 @@
                     last_line_of_file(FDISK_LOG));
 
-            mr_asprintf(&tmp, "%s", last_line_of_file(FDISK_LOG));
+            mr_asprintf(tmp, "%s", last_line_of_file(FDISK_LOG));
             if (!strstr(tmp, " (m ")) {
                 log_msg(1, "last line = '%s'; part type set failed", tmp);
@@ -2080 +2080 @@
             fput_string_one_char_at_a_time(pout_to_fdisk, "p\n");
         } else {
-            mr_asprintf(&output, "t\n%d\n%s\nw\n", partno, partcode);
-            mr_asprintf(&command, "parted2fdisk %s >> %s 2>> %s", drive,
+            mr_asprintf(output, "t\n%d\n%s\nw\n", partno, partcode);
+            mr_asprintf(command, "parted2fdisk %s >> %s 2>> %s", drive,
                     MONDO_LOGFILE, MONDO_LOGFILE);
             log_msg(5, "output = '%s'", output);
@@ -2123 +2123 @@
         return 1;
     }
-    mr_asprintf(&program, "vinum start -f %s", raid_device);
+    mr_asprintf(program, "vinum start -f %s", raid_device);
 #else
-    mr_asprintf(&program, "raidstart %s", raid_device);
+    mr_asprintf(program, "raidstart %s", raid_device);
 #endif
     log_msg(1, "program = %s", program);
@@ -2168 +2168 @@
         return 1;
     }
-    mr_asprintf(&program, "vinum stop -f %s", raid_device);
+    mr_asprintf(program, "vinum stop -f %s", raid_device);
 #else
     // use raidstop if it exists, otherwise use mdadm
     if (run_program_and_log_output("which raidstop", FALSE)) {
-        mr_asprintf(&program, "mdadm -S %s", raid_device);
+        mr_asprintf(program, "mdadm -S %s", raid_device);
     } else {
-        mr_asprintf(&program, "raidstop %s", raid_device);
+        mr_asprintf(program, "raidstop %s", raid_device);
     }
 #endif
@@ -2320 +2320 @@
     if (strcmp(format, "swap") == 0) {
 #ifdef __FreeBSD__
-        mr_asprintf(&program, "true");
+        mr_asprintf(program, "true");
 #else
-        mr_asprintf(&program, "mkswap");
+        mr_asprintf(program, "mkswap");
 #endif
     } else if (strcmp(format, "vfat") == 0) {
-        mr_asprintf(&program, "format-and-kludge-vfat");
+        mr_asprintf(program, "format-and-kludge-vfat");
 #ifndef __FreeBSD__
     } else if (strcmp(format, "reiserfs") == 0) {
-        mr_asprintf(&program, "mkreiserfs -ff");
+        mr_asprintf(program, "mkreiserfs -ff");
     } else if (strcmp(format, "xfs") == 0) {
-        mr_asprintf(&program, "mkfs.xfs -f -q");
+        mr_asprintf(program, "mkfs.xfs -f -q");
     } else if (strcmp(format, "jfs") == 0) {
-        mr_asprintf(&program, "mkfs.jfs");
+        mr_asprintf(program, "mkfs.jfs");
     } else if (strcmp(format, "ext3") == 0) {
-        mr_asprintf(&program, "mkfs -t ext3 -F -q");
+        mr_asprintf(program, "mkfs -t ext3 -F -q");
     } else if (strcmp(format, "ext4") == 0) {
-        mr_asprintf(&program, "mkfs -t ext4 -F -q");
+        mr_asprintf(program, "mkfs -t ext4 -F -q");
     } else if (strcmp(format, "minix") == 0) {
-        mr_asprintf(&program, "mkfs.minix");
+        mr_asprintf(program, "mkfs.minix");
     } else if (strcmp(format, "vmfs") == 0) {
-        mr_asprintf(&program, "mkfs -t vmfs");
+        mr_asprintf(program, "mkfs -t vmfs");
     } else if (strcmp(format, "ntfs") == 0) { 
         /* 
@@ -2346 +2346 @@
          * so the default "mkfs -t %s -c" command structure fails 
          */ 
-        mr_asprintf(&program, "mkfs -t ntfs");
+        mr_asprintf(program, "mkfs -t ntfs");
     } else if (strcmp(format, "ocfs2") == 0) {
         /*
@@ -2352 +2352 @@
          *
          */
-        mr_asprintf(&program, "mkfs -t ocfs2 -F");
+        mr_asprintf(program, "mkfs -t ocfs2 -F");
 #endif
     } else if (strcmp(format, "ext2") == 0) {
-        mr_asprintf(&program, "mke2fs -F -q");
+        mr_asprintf(program, "mke2fs -F -q");
     } else {
 #ifdef __FreeBSD__
-        mr_asprintf(&program, "newfs_%s", format);
+        mr_asprintf(program, "newfs_%s", format);
 #else
-        mr_asprintf(&program, "mkfs -t %s -c", format); // -c checks for bad blocks
-#endif
-        mr_asprintf(&tmp, "Unknown format (%s) - assuming '%s' will do", format, program);
+        mr_asprintf(program, "mkfs -t %s -c", format);  // -c checks for bad blocks
+#endif
+        mr_asprintf(tmp, "Unknown format (%s) - assuming '%s' will do", format, program);
         log_it(tmp);
         mr_free(tmp);
@@ -2425 +2425 @@
         return;
     }
-    mr_asprintf(&tmp, "Expanding entries to suit drive %s (%ld MB)", drive_name, current_size_of_drive);
+    mr_asprintf(tmp, "Expanding entries to suit drive %s (%ld MB)", drive_name, current_size_of_drive);
     log_to_screen(tmp);
     mr_free(tmp);
@@ -2445 +2445 @@
 
     if (original_size_of_drive <= 0) {
-        mr_asprintf(&tmp, "Cannot resize %s's entries. Drive not found.", drive_name);
+        mr_asprintf(tmp, "Cannot resize %s's entries. Drive not found.", drive_name);
         log_to_screen(tmp);
         mr_free(tmp);
@@ -2451 +2451 @@
     }
     factor = (float) (current_size_of_drive) / (float) (original_size_of_drive);
-    mr_asprintf(&tmp, "Disk %s was %ld MB; is now %ld MB; factor = %f", drive_name, original_size_of_drive, current_size_of_drive, factor);
+    mr_asprintf(tmp, "Disk %s was %ld MB; is now %ld MB; factor = %f", drive_name, original_size_of_drive, current_size_of_drive, factor);
     log_to_screen(tmp);
     mr_free(tmp);
@@ -2478 +2478 @@
         }
 
-        mr_asprintf(&tmp, "Changing %s from %lld KB to %ld KB", drivemntlist->el[partno]->device, drivemntlist->el[partno]->size, newsizL);
+        mr_asprintf(tmp, "Changing %s from %lld KB to %ld KB", drivemntlist->el[partno]->device, drivemntlist->el[partno]->size, newsizL);
         log_to_screen(tmp);
         mr_free(tmp);
@@ -2484 +2484 @@
     }
     final_size = get_phys_size_of_drive(drive_name);
-    mr_asprintf(&tmp, "final_size = %ld MB", final_size);
+    mr_asprintf(tmp, "final_size = %ld MB", final_size);
     log_to_screen(tmp);
     mr_free(tmp);

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

@@ -79 +79 @@
             insist_on_this_cd_number((++g_current_media_number));
         } else {
-            mr_asprintf(&tmp_ptr, "No CD's left. No biggiefiles left. No prob, Bob.");
+            mr_asprintf(tmp_ptr, "No CD's left. No biggiefiles left. No prob, Bob.");
             log_msg(2, tmp_ptr);
             paranoid_free(tmp_ptr);
@@ -86 +86 @@
     }
     if (!(fin = fopen(slice_fname(bigfileno, 0, ARCHIVES_PATH, ""), "r"))) {
-        mr_asprintf(&tmp_ptr, "Cannot open bigfile %ld (%s)'s info file", bigfileno + 1, bigfile_fname_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);
@@ -101 +101 @@
 
     if (!g_text_mode) {
-        mr_asprintf(&tmp_ptr, "Comparing %s", bigfile_fname_ptr);
+        mr_asprintf(tmp_ptr, "Comparing %s", bigfile_fname_ptr);
         newtDrawRootText(0, 22, tmp_ptr);
         paranoid_free(tmp_ptr);
@@ -120 +120 @@
     mr_free(command_ptr);
 
-    mr_asprintf(&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);
@@ -146 +146 @@
         }
     }
-    mr_asprintf(&tmp_ptr, "bigfile #%ld ('%s') ", bigfileno + 1, bigfile_fname_ptr);
+    mr_asprintf(tmp_ptr, "bigfile #%ld ('%s') ", bigfileno + 1, bigfile_fname_ptr);
     if (!strcmp(checksum_ptr, original_cksum_ptr) != 0) {
         mr_strcat(tmp_ptr, " ... OK");
@@ -274 +274 @@
 
     if (use_star) {
-        mr_asprintf(&archiver_exe, "star");
-    } else {
-        mr_asprintf(&archiver_exe, "afio");
+        mr_asprintf(archiver_exe, "star");
+    } else {
+        mr_asprintf(archiver_exe, "afio");
     }
 

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

@@ -472 +472 @@
     char *prompt = NULL;
 
-    mr_asprintf(&prompt, "Please enter the RAID level you want. (concat, striped, raid5)");
+    mr_asprintf(prompt, "Please enter the RAID level you want. (concat, striped, raid5)");
     if (raidrec->raidlevel == -1) {
-        mr_asprintf(&tmp, "concat");
+        mr_asprintf(tmp, "concat");
     } else if (raidrec->raidlevel == 0) {
-        mr_asprintf(&tmp, "striped");
+        mr_asprintf(tmp, "striped");
     } else {
-        mr_asprintf(&tmp, "raid%i", raidrec->raidlevel);
+        mr_asprintf(tmp, "raid%i", raidrec->raidlevel);
     }
     for (out = 999; out == 999;) {
@@ -538 +538 @@
 
     system("grep Pers /proc/mdstat > /tmp/raid-personalities.txt 2> /dev/null");
-    mr_asprintf(&personalities, "%s", last_line_of_file("/tmp/raid-personalities.txt"));
-    mr_asprintf(&prompt, "Please enter the RAID level you want. %s", personalities);
+    mr_asprintf(personalities, "%s", last_line_of_file("/tmp/raid-personalities.txt"));
+    mr_asprintf(prompt, "Please enter the RAID level you want. %s", personalities);
     mr_free(personalities);
 
     if (raidrec->raid_level == -1) {
-        mr_asprintf(&tmp, "linear");
+        mr_asprintf(tmp, "linear");
     } else {
-        mr_asprintf(&tmp, "%d", raidrec->raid_level);
+        mr_asprintf(tmp, "%d", raidrec->raid_level);
     }
     for (out = 999;
@@ -1850 +1850 @@
             char *tmp = NULL;
 
-            mr_asprintf(&tmp, "%i", raidrec->stripesize);
+            mr_asprintf(tmp, "%i", raidrec->stripesize);
             p = popup_and_get_string("Stripe size", "Please enter the stripe size in kilobytes.", tmp);
             mr_free(tmp);
@@ -1899 +1899 @@
     assert(lino >= 0);
 
-    mr_asprintf(&sz_out, "%s", raidrec->additional_vars.el[lino].value);
-    mr_asprintf(&header, "Edit %s", raidrec->additional_vars.el[lino].label);
-    mr_asprintf(&comment, "Please set %s's value (currently '%s')", raidrec->additional_vars.el[lino].label, sz_out);
+    mr_asprintf(sz_out, "%s", raidrec->additional_vars.el[lino].value);
+    mr_asprintf(header, "Edit %s", raidrec->additional_vars.el[lino].label);
+    mr_asprintf(comment, "Please set %s's value (currently '%s')", raidrec->additional_vars.el[lino].label, sz_out);
     p = popup_and_get_string(header, comment, sz_out);
     if (p != NULL) {
@@ -1957 +1957 @@
     assert(raidlist != NULL);
 
-    mr_asprintf(&flaws_str_A, "%s", "         ");
-    mr_asprintf(&flaws_str_B, "%s", "         ");
-    mr_asprintf(&flaws_str_C, "%s", "         ");
+    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!");
@@ -2283 +2283 @@
     log_it("isodir_path = %s", isodir_path);
     if (isodir_device[0] == '\0') {
-        mr_asprintf(&idev, "/dev/");
+        mr_asprintf(idev, "/dev/");
     } else {
-        mr_asprintf(&idev, "%s", isodir_device);
-    }
-
-    if (isodir_path[0] == '\0') {
-        strcpy(isodir_path, "/");
-    }
+        mr_asprintf(idev, "%s", isodir_device);
+    }
+
     if (does_file_exist("/tmp/NFS-SERVER-PATH")) {
         mr_free(idev);
-        mr_asprintf(&idev, "%s", last_line_of_file("/tmp/NFS-SERVER-MOUNT"));
-        mr_asprintf(&isodir_format, "nfs");
-        strcpy(isodir_path, last_line_of_file("/tmp/NFS-SERVER-PATH"));
+        mr_asprintf(idev, "%s", last_line_of_file("/tmp/NFS-SERVER-MOUNT"));
+        mr_asprintf(isodir_format, "nfs");
+        mr_free(isodir_path);
+        mr_asprintf(isodir_path, "%s", last_line_of_file("/tmp/NFS-SERVER-PATH"));
     }
 
@@ -2319 +2317 @@
                     /* modify for the caller */
                     strcpy(isodir_device, p);
-                    strcpy(isodir_path, r);
+                    mr_free(isodir_path);
+                    isodir_path = r;
                     log_it("isodir_device = %s - isodir_format = %s - isodir_path = %s", isodir_device, isodir_format, isodir_path);
-                    mr_free(r);
     
                     ret = TRUE;
@@ -2770 +2768 @@
 
     log_it("Post-malloc");
-    mr_asprintf(&help_text, "   Edit this RAID device's list of partitions. Choose OK or Cancel when done.");
-    mr_asprintf(&header_text, "%-24s    %s", "Device", "Index");
-    mr_asprintf(&title_of_window, "%s contains...", raidrec->raid_device);
+    mr_asprintf(help_text, "   Edit this RAID device's list of partitions. Choose OK or Cancel when done.");
+    mr_asprintf(header_text, "%-24s    %s", "Device", "Index");
+    mr_asprintf(title_of_window, "%s contains...", raidrec->raid_device);
     newtPushHelpLine(help_text);
     for (b_res = (newtComponent) 12345; b_res != bOK && b_res != bCancel;) {
@@ -2827 +2825 @@
                     redraw_disklist(disklist, keylist, partitionsListbox);
                 } else {
-                    mr_asprintf(&tmp, "%s's index is %d. What should it be?", raidrec->raid_device, disklist->el[currline].index);
-                    mr_asprintf(&sz_res, "%d", disklist->el[currline].index);
+                    mr_asprintf(tmp, "%s's index is %d. What should it be?", raidrec->raid_device, disklist->el[currline].index);
+                    mr_asprintf(sz_res, "%d", disklist->el[currline].index);
                     p = popup_and_get_string("Set index", tmp, sz_res);
                     mr_free(tmp);

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

@@ -144 +144 @@
 }
 
-mr_asprintf(&question_ptr, "Should I restore the image of %s ?", incoming_ptr);
+mr_asprintf(question_ptr, "Should I restore the image of %s ?", incoming_ptr);
 
 if (ask_me_yes_or_no(question_ptr)) {
@@ -228 +228 @@
 }
 log_msg(2, "Checking to see if f=%s, file=%s, is in the list of biggiefiles", f, file);
-mr_asprintf(&command, "grep -E '^%s$' %s", file, list_fname);
+mr_asprintf(command, "grep -E '^%s$' %s", file, list_fname);
 res = run_program_and_log_output(command, FALSE);
 mr_free(command);
@@ -260 +260 @@
     char *command = NULL;
     char *mds = NULL;
+    char *p = NULL;
     int retval = 0, i;
     bool already_mounted = FALSE;
     char *isodir_format = NULL;
 
-assert(bkpinfo != NULL);
 g_ISO_restore_mode = TRUE;
 read_cfg_var(g_mondo_cfg_file, "iso-dev", g_isodir_device);
@@ -271 +271 @@
     * Don't let this clobber an existing bkpinfo->isodir */
     if (!bkpinfo->isodir[0]) {
-        strcpy(bkpinfo->isodir, "/tmp/isodir");
+        mr_free(bkpinfo->isodir);
+        mr_asprintf(p, "/tmp/isodir");
+        bkpinfo->isodir = p;
     }
     /* End patch */
-    mr_asprintf(&command, "mkdir -p %s", bkpinfo->isodir);
+    mr_asprintf(command, "mkdir -p %s", bkpinfo->isodir);
     run_program_and_log_output(command, 5);
     mr_free(command);
@@ -290 +292 @@
     already_mounted = TRUE;
 } else {
-    mr_asprintf(&mount_isodir_command, "mount %s", g_isodir_device);
+    mr_asprintf(mount_isodir_command, "mount %s", g_isodir_device);
     if (isodir_format) {
         mr_strcat(mount_isodir_command, " -t %s", isodir_format);
@@ -320 +322 @@
 log_msg(1, "%s #%d has been mounted via loopback mount", mds, i);
 if (i < 0) {
-popup_and_OK
-    ("Cannot find ISO images in the directory you specified.");
-retval = 1;
-}
-log_msg(2, "%ld: bkpinfo->isodir is now %s", __LINE__,
-    bkpinfo->isodir);
+    popup_and_OK("Cannot find ISO images in the directory you specified.");
+    retval = 1;
+}
+log_msg(2, "bkpinfo->isodir is now %s", bkpinfo->isodir);
 return (retval);
 }
@@ -368 +368 @@
 
     if (!strcmp(mpt, "/1")) {
-        mr_asprintf(&mountpoint, "/");
+        mr_asprintf(mountpoint, "/");
         log_msg(3, "Mommm! SME is being a dildo!");
     } else {
-        mr_asprintf(&mountpoint, "%s", mpt);
+        mr_asprintf(mountpoint, "%s", mpt);
     }
 
@@ -380 +380 @@
         return (0);
     }
-    mr_asprintf(&tmp, "Mounting device %s   ", device);
+    mr_asprintf(tmp, "Mounting device %s   ", device);
     log_msg(1, tmp);
     /* Deal with additional params only if not /proc or /sys */
-    mr_asprintf(&additional_parameters, "");
+    mr_asprintf(additional_parameters, "");
     if (strcmp(format, "proc") && strcmp(format, "sys")) {
         if (writeable) {
@@ -399 +399 @@
 
     if (!strcmp(mountpoint, "swap")) {
-        mr_asprintf(&command, "swapon %s", device);
-        mr_asprintf(&mountdir, "swap");
+        mr_asprintf(command, "swapon %s", device);
+        mr_asprintf(mountdir, "swap");
     } else {
         if (!strcmp(mountpoint, "/")) {
-            mr_asprintf(&mountdir, "%s", MNT_RESTORING);
+            mr_asprintf(mountdir, "%s", MNT_RESTORING);
         } else {
-            mr_asprintf(&mountdir, "%s%s", MNT_RESTORING, mountpoint);
-        }
-        mr_asprintf(&command, "mkdir -p %s", mountdir);
+            mr_asprintf(mountdir, "%s%s", MNT_RESTORING, mountpoint);
+        }
+        mr_asprintf(command, "mkdir -p %s", mountdir);
         run_program_and_log_output(command, FALSE);
         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);
     }
@@ -420 +420 @@
         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);
     }
@@ -432 +432 @@
             log_msg(2, "Retrying w/o the '-t' switch");
             mr_free(command);
-            mr_asprintf(&command, "mount %s %s 2>> %s", device, mountdir, MONDO_LOGFILE);
+            mr_asprintf(command, "mount %s %s 2>> %s", device, mountdir, MONDO_LOGFILE);
             log_msg(2, "2nd command = '%s'", command);
             res = run_program_and_log_output(command, TRUE);
@@ -492 +492 @@
                "", mountlist->entries);
 
-    mr_asprintf(&these_failed, "");
+    mr_asprintf(these_failed, "");
     for (lino = 0; lino < mountlist->entries; lino++) {
         if (!strcmp(mountlist->el[lino].device, "/proc")) {
@@ -498 +498 @@
                 "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);
@@ -505 +505 @@
            && strcmp(mountlist->el[lino].mountpoint, "raid")
            && strcmp(mountlist->el[lino].mountpoint, "image")) {
-            mr_asprintf(&tmp, "Mounting %s", mountlist->el[lino].device);
+            mr_asprintf(tmp, "Mounting %s", mountlist->el[lino].device);
             update_progress_form(tmp);
             mr_free(tmp);
@@ -529 +529 @@
                 ("format and restore *without* partitioning first. Sorry for the inconvenience.");
         }
-        mr_asprintf(&tmp, "Could not mount device(s) %s- shall I abort?", these_failed);
+        mr_asprintf(tmp, "Could not mount device(s) %s- shall I abort?", these_failed);
 
         if (!ask_me_yes_or_no(tmp)) {
@@ -570 +570 @@
 * @return 0 for success, nonzero for failure.
 */
-int mount_media()
-{
-char *mount_cmd = NULL;
-int i, res;
+int mount_media() {
+
+    char *mount_cmd = NULL;
+    char *p = NULL;
+    int i, res;
 #ifdef __FreeBSD__
-char mdd[32];
-char *mddev = mdd;
+    char mdd[32];
+    char *mddev = mdd;
 #endif
 
-assert(bkpinfo != NULL);
-
-    if (bkpinfo->backup_media_type == tape
-        || bkpinfo->backup_media_type == udev) {
+    if (bkpinfo->backup_media_type == tape || bkpinfo->backup_media_type == udev) {
         log_msg(8, "Tape/udev. Therefore, no need to mount a media.");
         return 0;
@@ -595 +593 @@
         log_msg(2, "Mounting for NFS thingy");
         log_msg(2, "isodir = %s", bkpinfo->isodir);
-        if ((!bkpinfo->isodir[0] || !strcmp(bkpinfo->isodir, "/"))
-            && am_I_in_disaster_recovery_mode()) {
-            strcpy(bkpinfo->isodir, "/tmp/isodir");
+        if (!strcmp(bkpinfo->isodir, "/") && am_I_in_disaster_recovery_mode()) {
+            mr_free(bkpinfo->isodir);
+            mr_asprintf(p, "/tmp/isodir");
+            bkpinfo->isodir = p;
             log_msg(1, "isodir is being set to %s", bkpinfo->isodir);
         }
 #ifdef __FreeBSD__
-        mr_asprintf(&mount_cmd, "/mnt/isodir/%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->nfs_remote_dir, bkpinfo->prefix, g_current_media_number);
+        mr_asprintf(mount_cmd, "/mnt/isodir/%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->nfs_remote_dir, bkpinfo->prefix, g_current_media_number);
         mddev = make_vn(mount_cmd);
         mr_free(mount_cmd);
 
-        mr_asprintf(&mount_cmd, "mount_cd9660 -r %s " MNT_CDROM, mddev);
+        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
 
     } else if (bkpinfo->backup_media_type == iso) {
 #ifdef __FreeBSD__
-        mr_asprintf(&mount_cmd, "%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->prefix, g_current_media_number);
+        mr_asprintf(mount_cmd, "%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->prefix, g_current_media_number);
         mddev = make_vn(mount_cmd);
         mr_free(mount_cmd);
 
-        mr_asprintf(&mount_cmd, "mount_cd9660 -r %s %s", mddev, MNT_CDROM);
+        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) {
-        mr_asprintf(&mount_cmd, "mount -t vfat %s %s", bkpinfo->media_device, MNT_CDROM);
+        mr_asprintf(mount_cmd, "mount -t vfat %s %s", bkpinfo->media_device, MNT_CDROM);
     } else if (strstr(bkpinfo->media_device, "/dev/")) {
 #ifdef __FreeBSD__
-        mr_asprintf(&mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device, MNT_CDROM);
+        mr_asprintf(mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device, MNT_CDROM);
 #else
-        mr_asprintf(&mount_cmd, "mount %s -t iso9660 -o ro %s", bkpinfo->media_device, MNT_CDROM);
+        mr_asprintf(mount_cmd, "mount %s -t iso9660 -o ro %s", bkpinfo->media_device, MNT_CDROM);
 #endif
     } else {
@@ -638 +637 @@
 
 #ifdef __FreeBSD__
-        mr_asprintf(&mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device, MNT_CDROM);
+        mr_asprintf(mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device, MNT_CDROM);
 #else
-        mr_asprintf(&mount_cmd, "mount %s -t iso9660 -o ro %s", bkpinfo->media_device, MNT_CDROM);
+        mr_asprintf(mount_cmd, "mount %s -t iso9660 -o ro %s", bkpinfo->media_device, MNT_CDROM);
 #endif
     }
@@ -727 +726 @@
 malloc_string(iso_mnt);
 malloc_string(iso_path);
-malloc_string(old_isodir);
 malloc_string(value);
 malloc_string(tmp);
@@ -774 +772 @@
     mr_free(bkpinfo->prefix);
     if (read_cfg_var(cfg_file, "iso-prefix", value) == 0) {
-        mr_asprintf(&tmp1, "%s", value);
+        mr_asprintf(tmp1, "%s", value);
     } else {
-        mr_asprintf(&tmp1, "%s", STD_PREFIX);
+        mr_asprintf(tmp1, "%s", STD_PREFIX);
     }
     bkpinfo->prefix = tmp1;
@@ -784 +782 @@
     mr_free(bkpinfo->prefix);
     if (read_cfg_var(cfg_file, "iso-prefix", value) == 0) {
-        mr_asprintf(&tmp1, "%s", value);
+        mr_asprintf(tmp1, "%s", value);
     } else {
-        mr_asprintf(&tmp1, "%s", STD_PREFIX);
+        mr_asprintf(tmp1, "%s", STD_PREFIX);
     }
     bkpinfo->prefix = tmp1;
@@ -798 +796 @@
         }
         mr_free(bkpinfo->prefix);
-        mr_asprintf(&tmp1, "%s", envtmp1);
+        mr_asprintf(tmp1, "%s", envtmp1);
         bkpinfo->prefix = tmp1;
     }
@@ -863 +861 @@
 read_cfg_var(cfg_file, "acl", value);
 if (strstr(value, "TRUE")) {
-    mr_asprintf(&g_getfacl,"setfacl");
+    mr_asprintf(g_getfacl,"setfacl");
     log_msg(1, "We will restore ACLs");
     if (! find_home_of_exe("setfacl")) {
@@ -871 +869 @@
 read_cfg_var(cfg_file, "xattr", value);
 if (strstr(value, "TRUE")) {
-    mr_asprintf(&g_getfattr,"setfattr");
+    mr_asprintf(g_getfattr,"setfattr");
     log_msg(1, "We will restore XATTRs");
     if (! find_home_of_exe("setfattr")) {
@@ -968 +966 @@
     * isodir in disaster recovery mode
     */
-    strcpy(old_isodir, bkpinfo->isodir);
+    mr_asprintf(old_isodir, "%s", bkpinfo->isodir);
     read_cfg_var(g_mondo_cfg_file, "iso-mnt", iso_mnt);
     read_cfg_var(g_mondo_cfg_file, "isodir", iso_path);
-    sprintf(bkpinfo->isodir, "%s%s", iso_mnt, iso_path);
+    mr_free(bkpinfo->isodir);
+    mr_asprintf(tmp1, "%s%s", iso_mnt, iso_path);
+    bkpinfo->isodir = tmp1;
     if (!bkpinfo->isodir[0]) {
-        strcpy(bkpinfo->isodir, old_isodir);
+        mr_free(bkpinfo->isodir);
+        bkpinfo->isodir = old_isodir;
+    } else {
+        mr_free(old_isodir);
     }
     if (!bkpinfo->disaster_recovery) {
         if (strcmp(old_isodir, bkpinfo->isodir)) {
-            log_it
-                ("user nominated isodir differs from archive, keeping user's choice: %s %s\n",
-                old_isodir, bkpinfo->isodir);
-            strcpy(bkpinfo->isodir, old_isodir);
+            log_it("user nominated isodir %s differs from archive, keeping user's choice: %s\n", bkpinfo->isodir, old_isodir );
+            mr_free(bkpinfo->isodir);
+            bkpinfo->isodir = old_isodir;
+        } else {
+            mr_free(old_isodir);
         }
     }
     read_cfg_var(g_mondo_cfg_file, "iso-dev", g_isodir_device);
-    log_msg(2, "isodir=%s; iso-dev=%s", bkpinfo->isodir,
-            g_isodir_device);
+    log_msg(2, "isodir=%s; iso-dev=%s", bkpinfo->isodir, g_isodir_device);
+
     if (bkpinfo->disaster_recovery) {
         if (is_this_device_mounted(g_isodir_device)) {
             log_msg(2, "NB: isodir is already mounted");
             /* Find out where it's mounted */
-            mr_asprintf(&command, "mount | grep -E '^%s' | tail -n1 | cut -d' ' -f3", g_isodir_device);
+            mr_asprintf(command, "mount | grep -E '^%s' | tail -n1 | cut -d' ' -f3", g_isodir_device);
             log_it("command = %s", command);
             log_it("res of it = %s", call_program_and_get_last_line_of_output(command));
@@ -997 +1001 @@
         } else {
             sprintf(iso_mnt, "/tmp/isodir");
-            mr_asprintf(&tmp1, "mkdir -p %s", iso_mnt);
+            mr_asprintf(tmp1, "mkdir -p %s", iso_mnt);
             run_program_and_log_output(tmp1, 5);
             mr_free(tmp1);
 
-            mr_asprintf(&tmp1, "mount %s %s", g_isodir_device, iso_mnt);
+            mr_asprintf(tmp1, "mount %s %s", g_isodir_device, iso_mnt);
             if (run_program_and_log_output(tmp1, 3)) {
                 log_msg(1,
@@ -1007 +1011 @@
                 bkpinfo->backup_media_type = cdr;
                 strcpy(bkpinfo->media_device, "/dev/cdrom");    /* superfluous */
-                bkpinfo->isodir[0] = iso_mnt[0] = iso_path[0] = '\0';
+                iso_mnt[0] = iso_path[0] = '\0';
                 if (mount_media()) {
                     mr_free(tmp1);
-                    fatal_error
-                        ("Unable to mount isodir. Failed to mount CD-ROM as well.");
+                    fatal_error("Unable to mount isodir. Failed to mount CD-ROM as well.");
                 } else {
-                    log_msg(1,
-                            "You backed up to disk, then burned some CDs.");
+                    log_msg(1, "You backed up to disk, then burned some CDs.");
                 }
             }
@@ -1021 +1023 @@
         /* bkpinfo->isodir should now be the true path to prefix-1.iso etc... */
         if (bkpinfo->backup_media_type == iso) {
-            sprintf(bkpinfo->isodir, "%s%s", iso_mnt, iso_path);
+            mr_free(bkpinfo->isodir);
+            mr_asprintf(tmp1, "%s%s", iso_mnt, iso_path);
+            bkpinfo->isodir = tmp1;
         }
     }
@@ -1047 +1051 @@
 paranoid_free(iso_mnt);
 paranoid_free(iso_path);
-paranoid_free(old_isodir);
 return (0);
 
@@ -1105 +1108 @@
     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);
@@ -1113 +1116 @@
             /* 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);
@@ -1119 +1122 @@
         }
     } else {
-        log_msg(2,
-            "Calling insist_on_this_cd_number; bkpinfo->isodir=%s",
-            bkpinfo->isodir);
+        log_msg(2, "Calling insist_on_this_cd_number; bkpinfo->isodir=%s", bkpinfo->isodir);
         insist_on_this_cd_number(1);
         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);
@@ -1134 +1135 @@
             /* 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);
@@ -1149 +1150 @@
         }
     }
-    mr_asprintf(&command, "cp -f %s %s", MONDO_CFG_FILE_STUB, g_mondo_cfg_file);
+    mr_asprintf(command, "cp -f %s %s", MONDO_CFG_FILE_STUB, g_mondo_cfg_file);
     run_program_and_log_output(command, FALSE);
     mr_free(command);
 
-    mr_asprintf(&command, "cp -f %s/%s %s", bkpinfo->tmpdir, BIGGIELIST_TXT_STUB, g_biggielist_txt);
+    mr_asprintf(command, "cp -f %s/%s %s", bkpinfo->tmpdir, BIGGIELIST_TXT_STUB, g_biggielist_txt);
     log_msg(1, "command = %s", command);
     paranoid_system(command);
     mr_free(command);
 
-    mr_asprintf(&command, "ln -sf %s/%s %s", bkpinfo->tmpdir, FILELIST_FULL_STUB, g_filelist_full);
+    mr_asprintf(command, "ln -sf %s/%s %s", bkpinfo->tmpdir, FILELIST_FULL_STUB, g_filelist_full);
     log_msg(1, "command = %s", command);
     paranoid_system(command);
@@ -1170 +1171 @@
     &&
     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);
@@ -1195 +1196 @@
         log_to_screen("Pre-processing filelist");
         if (!does_file_exist(g_biggielist_txt)) {
-            mr_asprintf(&command, "echo -n > %s", g_biggielist_txt);
+            mr_asprintf(command, "echo -n > %s", g_biggielist_txt);
             paranoid_system(command);
             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);
@@ -1276 +1277 @@
     assert_string_is_neither_NULL_nor_zerolength(filename);
 
-    mr_asprintf(&tmp, "%s/%s", path_root, filename);
-    mr_asprintf(&command, "cp -f %s %s.pristine", tmp, tmp);
+    mr_asprintf(tmp, "%s/%s", path_root, filename);
+    mr_asprintf(command, "cp -f %s %s.pristine", tmp, tmp);
     mr_free(tmp);
 
@@ -1334 +1335 @@
      * the current /dev location 
      */
-    mr_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);
@@ -1361 +1362 @@
 #ifdef __FreeBSD__
     else if (!strcmp(name, "BOOT0")) {
-        mr_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 {
-        mr_asprintf(&tmp, "ls /dev | grep -Eq '^%ss[1-4].*'", device);
+        mr_asprintf(tmp, "ls /dev | grep -Eq '^%ss[1-4].*'", device);
         if (!system(tmp)) {
             mr_free(tmp);
-            mr_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 {
@@ -1452 +1453 @@
     assert_string_is_neither_NULL_nor_zerolength(bd);
     strcpy(editor, find_my_editor());
-    mr_asprintf(&boot_device, "%s", bd);
+    mr_asprintf(boot_device, "%s", bd);
 
     if (offer_to_run_stabgrub
@@ -1469 +1470 @@
                 continue;
             }
-            mr_asprintf(&command, "stabgrub-me %s", p);
+            mr_asprintf(command, "stabgrub-me %s", p);
             mr_free(p);
 
@@ -1489 +1490 @@
                 newtSuspend();
             }
-            mr_asprintf(&tmp, "chroot %s %s /etc/fstab", MNT_RESTORING, editor);
+            mr_asprintf(tmp, "chroot %s %s /etc/fstab", MNT_RESTORING, editor);
             paranoid_system(tmp);
             mr_free(tmp);
 
-            mr_asprintf(&tmp, "chroot %s %s /etc/mtab", MNT_RESTORING, editor);
+            mr_asprintf(tmp, "chroot %s %s /etc/mtab", MNT_RESTORING, editor);
             paranoid_system(tmp);
             mr_free(tmp);
 
-            mr_asprintf(&tmp, "chroot %s %s /boot/grub/menu.lst", MNT_RESTORING, editor);
+            mr_asprintf(tmp, "chroot %s %s /boot/grub/menu.lst", MNT_RESTORING, editor);
             paranoid_system(tmp);
             mr_free(tmp);
 
-            mr_asprintf(&tmp, "chroot %s %s /boot/grub/device.map", MNT_RESTORING, editor);
+            mr_asprintf(tmp, "chroot %s %s /boot/grub/device.map", MNT_RESTORING, editor);
             paranoid_system(tmp);
             mr_free(tmp);
@@ -1513 +1514 @@
         if (!run_program_and_log_output("which grub-MR", FALSE)) {
             log_msg(1, "Yay! grub-MR found...");
-            mr_asprintf(&command, "grub-MR %s /tmp/mountlist.txt", boot_device);
+            mr_asprintf(command, "grub-MR %s /tmp/mountlist.txt", boot_device);
             log_msg(1, "command = %s", command);
         } else {
-            mr_asprintf(&command, "chroot " MNT_RESTORING " grub-install %s", boot_device);
+            mr_asprintf(command, "chroot " MNT_RESTORING " grub-install %s", boot_device);
             log_msg(1, "WARNING - grub-MR not found; using grub-install");
         }
@@ -1591 +1592 @@
                             0,
                             "Modifying fstab and elilo.conf...                             ");
-        mr_asprintf(&command, "stabelilo-me");
+        mr_asprintf(command, "stabelilo-me");
         res = run_program_and_log_output(command, 3);
         mr_free(command);
@@ -1602 +1603 @@
                     newtSuspend();
                 }
-                mr_asprintf(&tmp, "chroot %s %s /etc/fstab", MNT_RESTORING, editor);
+                mr_asprintf(tmp, "chroot %s %s /etc/fstab", MNT_RESTORING, editor);
                 paranoid_system(tmp);
                 mr_free(tmp);
 
-                mr_asprintf(&tmp, "chroot %s %s /etc/elilo.conf", MNT_RESTORING, editor);
+                mr_asprintf(tmp, "chroot %s %s /etc/elilo.conf", MNT_RESTORING, editor);
                 paranoid_system(tmp);
                 mr_free(tmp);
@@ -1667 +1668 @@
                             0,
                             "Modifying fstab and lilo.conf, and running LILO...                             ");
-        mr_asprintf(&command, "stablilo-me");
+        mr_asprintf(command, "stablilo-me");
         res = run_program_and_log_output(command, 3);
         mr_free(command);
@@ -1678 +1679 @@
                     newtSuspend();
                 }
-                mr_asprintf(&tmp, "%s " MNT_RESTORING "/etc/fstab", editor);
+                mr_asprintf(tmp, "%s " MNT_RESTORING "/etc/fstab", editor);
                 paranoid_system(tmp);
                 mr_free(tmp);
 
-                mr_asprintf(&tmp, "%s " MNT_RESTORING "/etc/lilo.conf", editor);
+                mr_asprintf(tmp, "%s " MNT_RESTORING "/etc/lilo.conf", editor);
                 paranoid_system(tmp);
                 mr_free(tmp);
@@ -1770 +1771 @@
 
     strcpy(editor, find_my_editor());
-    mr_asprintf(&boot_device, "%s", bd);
+    mr_asprintf(boot_device, "%s", bd);
 
     if (offer_to_hack_scripts
@@ -1783 +1784 @@
                     newtSuspend();
                 }
-                mr_asprintf(&tmp, "%s " MNT_RESTORING "/etc/fstab", editor);
+                mr_asprintf(tmp, "%s " MNT_RESTORING "/etc/fstab", editor);
                 paranoid_system(tmp);
                 mr_free(tmp);
@@ -1798 +1799 @@
                 continue;
             }
-            mr_asprintf(&command, "stabraw-me %s", p);
+            mr_asprintf(command, "stabraw-me %s", p);
             mr_free(p);
 
@@ -1812 +1813 @@
     } else {
         /* nuke mode */
-        mr_asprintf(&command, "raw-MR %s /tmp/mountlist.txt", boot_device);
+        mr_asprintf(command, "raw-MR %s /tmp/mountlist.txt", boot_device);
         log_msg(2, "run_raw_mbr() --- command='%s'", command);
 
@@ -1939 +1940 @@
     for (i = 0; i < 20; i++) {
         g_current_progress = i;
-        mr_asprintf(&tmp, "You have %d seconds left to abort.", 20 - i);
+        mr_asprintf(tmp, "You have %d seconds left to abort.", 20 - i);
         update_progress_form(tmp);
         mr_free(tmp);
@@ -1991 +1992 @@
     paranoid_system("sync");
 
-    mr_asprintf(&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,
@@ -2010 +2011 @@
             continue;
         }
-        mr_asprintf(&tmp, "Unmounting device %s  ", mountlist->el[lino].device);
+        mr_asprintf(tmp, "Unmounting device %s  ", mountlist->el[lino].device);
 
         update_progress_form(tmp);
@@ -2016 +2017 @@
         if (is_this_device_mounted(mountlist->el[lino].device)) {
             if (!strcmp(mountlist->el[lino].mountpoint, "swap")) {
-                mr_asprintf(&command, "swapoff %s", mountlist->el[lino].device);
+                mr_asprintf(command, "swapoff %s", mountlist->el[lino].device);
             } else {
                 if (!strcmp(mountlist->el[lino].mountpoint, "/1")) {
-                    mr_asprintf(&command, "umount %s/", MNT_RESTORING);
+                    mr_asprintf(command, "umount %s/", MNT_RESTORING);
                     log_msg(3,
                             "Well, I know a certain kitty-kitty who'll be sleeping with Mommy tonight...");
                 } else {
-                    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 
@@ -2090 +2091 @@
     }
 
-    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);
@@ -2101 +2102 @@
             /* 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);
@@ -2148 +2149 @@
     log_msg(2, "gcffa --- starting");
     log_to_screen("I'm thinking...");
-    mr_asprintf(&mountpt, "%s/mount.bootdisk", bkpinfo->tmpdir);
+    mr_asprintf(mountpt, "%s/mount.bootdisk", bkpinfo->tmpdir);
     device[0] = '\0';
     chdir(bkpinfo->tmpdir);
-    mr_asprintf(&cfg_file, "%s", MONDO_CFG_FILE_STUB);
+    mr_asprintf(cfg_file, "%s", MONDO_CFG_FILE_STUB);
     unlink(cfg_file);           // cfg_file[] is missing the '/' at the start, FYI, by intent
     mr_free(cfg_file);
@@ -2157 +2158 @@
     unlink(FILELIST_FULL_STUB);
     unlink(BIGGIELIST_TXT_STUB);
-    mr_asprintf(&command, "mkdir -p %s", mountpt);
+    mr_asprintf(command, "mkdir -p %s", mountpt);
     run_program_and_log_output(command, FALSE);
     mr_free(command);
 
-    mr_asprintf(&cfg_file, "%s/%s", bkpinfo->tmpdir, MONDO_CFG_FILE_STUB);
-    mr_asprintf(&mountlist_file, "%s/%s", bkpinfo->tmpdir, MOUNTLIST_FNAME_STUB);
+    mr_asprintf(cfg_file, "%s/%s", bkpinfo->tmpdir, MONDO_CFG_FILE_STUB);
+    mr_asprintf(mountlist_file, "%s/%s", bkpinfo->tmpdir, MOUNTLIST_FNAME_STUB);
     log_msg(2, "mountpt = %s; cfg_file=%s", mountpt, cfg_file);
     mr_free(mountpt);
@@ -2192 +2193 @@
                 log_msg(2, "media_device is blank; assuming %s");
             }
-            mr_asprintf(&tmp, "%s", bkpinfo->media_device);
+            mr_asprintf(tmp, "%s", bkpinfo->media_device);
             if (extract_cfg_file_and_mountlist_from_tape_dev
                 (bkpinfo->media_device)) {
@@ -2231 +2232 @@
                 log_msg(2,
                         "gcffa --- Plan B, a.k.a. untarring some file from all.tar.gz");
-                mr_asprintf(&command, "tar -zxvf " MNT_CDROM "/images/all.tar.gz ./%s ./%s ./%s ./%s ./%s", MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB);   // add -b TAPE_BLOCK_SIZE if you _really_ think it's necessary
+                mr_asprintf(command, "tar -zxvf " MNT_CDROM "/images/all.tar.gz ./%s ./%s ./%s ./%s ./%s", MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB);    // add -b TAPE_BLOCK_SIZE if you _really_ think it's necessary
                 run_program_and_log_output(command, TRUE);
                 mr_free(command);
@@ -2238 +2239 @@
                     /* 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 -zxvf " MNT_CDROM "/images/all.tar.gz %s %s %s %s %s", MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB); // add -b TAPE_BLOCK_SIZE if you _really_ think it's necessary
+                    mr_asprintf(command, "tar -zxvf " MNT_CDROM "/images/all.tar.gz %s %s %s %s %s", MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB);  // add -b TAPE_BLOCK_SIZE if you _really_ think it's necessary
                     run_program_and_log_output(command, TRUE);
                     mr_free(command);
@@ -2251 +2252 @@
     if (does_file_exist(MONDO_CFG_FILE_STUB)) {
         log_msg(1, "gcffa --- great! We've got the config file");
-        mr_asprintf(&tmp, "%s/%s", call_program_and_get_last_line_of_output("pwd"), MONDO_CFG_FILE_STUB);
-        mr_asprintf(&command, "cp -f %s %s", tmp, cfg_file);
+        mr_asprintf(tmp, "%s/%s", call_program_and_get_last_line_of_output("pwd"), MONDO_CFG_FILE_STUB);
+        mr_asprintf(command, "cp -f %s %s", tmp, cfg_file);
         log_it("%s",command);
         if (strcmp(tmp, cfg_file) && run_program_and_log_output(command, 1)) {
@@ -2261 +2262 @@
         mr_free(command);
 
-        mr_asprintf(&command, "cp -f %s/%s %s", call_program_and_get_last_line_of_output("pwd"),
+        mr_asprintf(command, "cp -f %s/%s %s", call_program_and_get_last_line_of_output("pwd"),
             MOUNTLIST_FNAME_STUB, mountlist_file);
         log_it("%s",command);
@@ -2271 +2272 @@
 
                 mr_free(command);
-                mr_asprintf(&command, "cp -f %s %s", mountlist_file, g_mountlist_fname);
+                mr_asprintf(command, "cp -f %s %s", mountlist_file, g_mountlist_fname);
                 if (run_program_and_log_output(command, 1)) {
                     log_msg(1, "Failed to copy mountlist to /tmp");
@@ -2277 +2278 @@
                     log_msg(1, "Copied mountlist to /tmp as well OK");
                     mr_free(command);
-                    mr_asprintf(&command, "cp -f %s /tmp/",IWANTMYLVM_STUB);
+                    mr_asprintf(command, "cp -f %s /tmp/",IWANTMYLVM_STUB);
                     run_program_and_log_output(command, 1);
                 }
@@ -2301 +2302 @@
             /* 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);
@@ -2307 +2308 @@
     }
 
-    mr_asprintf(&command, "cp -f %s /%s", cfg_file, MONDO_CFG_FILE_STUB);
+    mr_asprintf(command, "cp -f %s /%s", cfg_file, MONDO_CFG_FILE_STUB);
     mr_free(cfg_file);
 
@@ -2314 +2315 @@
 
     if (extract_mountlist_stub) {
-        mr_asprintf(&command, "cp -f %s /%s", mountlist_file, MOUNTLIST_FNAME_STUB);
+        mr_asprintf(command, "cp -f %s /%s", mountlist_file, MOUNTLIST_FNAME_STUB);
         run_program_and_log_output(command, FALSE);
         mr_free(command);
@@ -2320 +2321 @@
     mr_free(mountlist_file);
 
-    mr_asprintf(&command, "cp -f etc/raidtab /etc/");
+    mr_asprintf(command, "cp -f etc/raidtab /etc/");
     run_program_and_log_output(command, FALSE);
     mr_free(command);
 
     if (extract_i_want_my_lvm) {
-        mr_asprintf(&command, "cp -f %s /tmp/",IWANTMYLVM_STUB);
+        mr_asprintf(command, "cp -f %s /tmp/",IWANTMYLVM_STUB);
         run_program_and_log_output(command, FALSE);
         mr_free(command);
@@ -2382 +2383 @@
                 }
                 log_msg(1,"Sync'ing %s (i=%d)", raidlist->el[i].raid_device, i);
-                mr_asprintf(&screen_message, "Sync'ing %s", raidlist->el[i].raid_device);
+                mr_asprintf(screen_message, "Sync'ing %s", raidlist->el[i].raid_device);
                 open_evalcall_form(screen_message);
                 mr_free(screen_message);

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

@@ -280 +280 @@
         }
         if (g_ISO_restore_mode) {
-            mr_asprintf(&tmp, "umount %s", bkpinfo->isodir);
+            mr_asprintf(tmp, "umount %s", bkpinfo->isodir);
             run_program_and_log_output(tmp, FALSE);
             mr_free(tmp);
@@ -361 +361 @@
 
     /* Clean up blkid cache file if they exist */
-    mr_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);
-    mr_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);
@@ -376 +376 @@
 
     /* Clean up multiconf cache file if they exist */
-    mr_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 */
-    mr_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");
@@ -391 +391 @@
 
     if (bkpinfo->restore_mode != nuke) {
-        mr_asprintf(&editor, "%s", find_my_editor());
-        mr_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) {
@@ -490 +490 @@
         if (g_text_mode) {
             save_mountlist_to_disk(mountlist, g_mountlist_fname);
-            mr_asprintf(&tmp1, "%s %s", find_my_editor(), g_mountlist_fname);
+            mr_asprintf(tmp1, "%s %s", find_my_editor(), g_mountlist_fname);
             res = system(tmp1);
             mr_free(tmp1);
@@ -663 +663 @@
             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);
@@ -780 +780 @@
     assert(raidlist != NULL);
 
-    mr_asprintf(&tmpA, "%s", "         ");
-    mr_asprintf(&tmpB, "%s", "         ");
-    mr_asprintf(&tmpC, "%s", "         ");
+    mr_asprintf(tmpA, "%s", "         ");
+    mr_asprintf(tmpB, "%s", "         ");
+    mr_asprintf(tmpC, "%s", "         ");
 
     log_msg(2, "nuke_mode --- starting");
@@ -803 +803 @@
     }
     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);
@@ -895 +895 @@
                         "Using tune2fs to identify your ext2,3 partitions");
 
-    mr_asprintf(&tmp, "label-partitions-as-necessary %s < /tmp/fstab", g_mountlist_fname);
+    mr_asprintf(tmp, "label-partitions-as-necessary %s < /tmp/fstab", g_mountlist_fname);
     res = run_program_and_log_output(tmp, TRUE);
     mr_free(tmp);
@@ -915 +915 @@
             ("Please visit our website at http://www.mondorescue.org for more information.");
     } else {
-        mr_asprintf(&tmp,"%s","Mondo has restored your system.\n\nPlease wait for the command prompt. Then remove the backup media and reboot.\n\nPlease visit our website at http://www.mondorescue.org for more information.");
+        mr_asprintf(tmp,"%s","Mondo has restored your system.\n\nPlease wait for the command prompt. Then remove the backup media and reboot.\n\nPlease visit our website at http://www.mondorescue.org for more information.");
         popup_and_OK(tmp);
         mr_free(tmp);
@@ -1121 +1121 @@
     if (!strncmp(biggiestruct.filename, "/dev/", 5))    // Whether NTFS or not :)
     {
-        mr_asprintf(&outfile_fname, "%s", biggiestruct.filename);
+        mr_asprintf(outfile_fname, "%s", biggiestruct.filename);
     } else {
-        mr_asprintf(&outfile_fname, "%s/%s", bkpinfo->restore_path, biggiestruct.filename);
+        mr_asprintf(outfile_fname, "%s/%s", bkpinfo->restore_path, biggiestruct.filename);
     }
 
@@ -1159 +1159 @@
         use_ntfsprog_hack = TRUE;
         log_msg(2, "Calling ntfsclone in background because %s is an NTFS /dev entry", outfile_fname);
-        mr_asprintf(&sz_devfile, "/tmp/%d.%d.000", (int) (random() % 32768),
+        mr_asprintf(sz_devfile, "/tmp/%d.%d.000", (int) (random() % 32768),
                 (int) (random() % 32768));
         mkfifo(sz_devfile, 0x770);
@@ -1232 +1232 @@
             mr_free(mds);
 
-            mr_asprintf(&tmp, "Restoring from %s #%d", mds, g_current_media_number);
+            mr_asprintf(tmp, "Restoring from %s #%d", mds, g_current_media_number);
             log_to_screen(tmp);
             mr_free(tmp);
@@ -1239 +1239 @@
             log_to_screen("Continuing to restore.");
         } else {
-            mr_asprintf(&tmp, "%s", slice_fname(bigfileno, sliceno, ARCHIVES_PATH, ""));
+            mr_asprintf(tmp, "%s", slice_fname(bigfileno, sliceno, ARCHIVES_PATH, ""));
             if (does_file_exist(tmp) && length_of_file(tmp) == 0) {
                 log_msg(2,
@@ -1251 +1251 @@
                     (slice_fname
                      (bigfileno, sliceno, ARCHIVES_PATH, "lzo"))) {
-                    mr_asprintf(&bzip2_command, "lzop");
+                    mr_asprintf(bzip2_command, "lzop");
                     strcpy(suffix, "lzo");
                 } else
@@ -1257 +1257 @@
                         (slice_fname
                          (bigfileno, sliceno, ARCHIVES_PATH, "gz"))) {
-                    mr_asprintf(&bzip2_command, "gzip");
+                    mr_asprintf(bzip2_command, "gzip");
                     strcpy(suffix, "gz");
                 } else
@@ -1263 +1263 @@
                         (slice_fname
                          (bigfileno, sliceno, ARCHIVES_PATH, "bz2"))) {
-                    mr_asprintf(&bzip2_command, "bzip2");
+                    mr_asprintf(bzip2_command, "bzip2");
                     strcpy(suffix, "bz2");
                 } else
@@ -1269 +1269 @@
                         (slice_fname
                          (bigfileno, sliceno, ARCHIVES_PATH, ""))) {
-                    mr_asprintf(&bzip2_command, "");
+                    mr_asprintf(bzip2_command, "");
                     strcpy(suffix, "");
                 } else {
@@ -1282 +1282 @@
                         slice_fname(bigfileno, sliceno, ARCHIVES_PATH, suffix), MONDO_LOGFILE);
             } else {
-                mr_asprintf(&bzip2_command, "cat %s 2>> %s",
+                mr_asprintf(bzip2_command, "cat %s 2>> %s",
                         slice_fname(bigfileno, sliceno, ARCHIVES_PATH, suffix), MONDO_LOGFILE);
             }
             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);
@@ -1321 +1321 @@
     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);
@@ -1452 +1452 @@
     if (use_ntfsprog) {
         g_loglevel = 4;
-        mr_asprintf(&outfile_fname, "%s", orig_bf_fname);
+        mr_asprintf(outfile_fname, "%s", orig_bf_fname);
         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);
@@ -1475 +1475 @@
         if (!strncmp(orig_bf_fname, "/dev/", 5))    {
             // non-NTFS partition
-            mr_asprintf(&outfile_fname, "%s", orig_bf_fname);
+            mr_asprintf(outfile_fname, "%s", orig_bf_fname);
         } else {
             // biggiefile
-            mr_asprintf(&outfile_fname, "%s/%s", bkpinfo->restore_path, orig_bf_fname);
+            mr_asprintf(outfile_fname, "%s/%s", bkpinfo->restore_path, orig_bf_fname);
         }
         use_ntfsprog_hack = FALSE;
@@ -1492 +1492 @@
     if (dummy_restore) {
         mr_free(outfile_fname);
-        mr_asprintf(&outfile_fname, "/dev/null");
+        mr_asprintf(outfile_fname, "/dev/null");
     }
 
     if (!bkpinfo->zip_exe[0]) {
-        mr_asprintf(&command, "cat > \"%s\"", file_to_openout);
+        mr_asprintf(command, "cat > \"%s\"", file_to_openout);
     } else {
-        mr_asprintf(&command, "%s -dc > \"%s\" 2>> %s", bkpinfo->zip_exe, file_to_openout, MONDO_LOGFILE);
+        mr_asprintf(command, "%s -dc > \"%s\" 2>> %s", bkpinfo->zip_exe, file_to_openout, MONDO_LOGFILE);
         if (strcmp(bkpinfo->zip_exe, "gzip") == 0) {
             /* Ignore SIGPIPE for gzip as it causes errors on big files
@@ -1568 +1568 @@
     if (use_ntfsprog_hack) {
         log_msg(3, "Waiting for ntfsclone to finish");
-        mr_asprintf(&tmp1, " ps | grep \" ntfsclone \" | grep -v grep > /dev/null 2> /dev/null");
+        mr_asprintf(tmp1, " ps | grep \" ntfsclone \" | grep -v grep > /dev/null 2> /dev/null");
         while (system(tmp1) == 0) {
             sleep(1);
@@ -1637 +1637 @@
     log_msg(5, "Entering");
     use_star = (strstr(tarball_fname, ".star")) ? TRUE : FALSE;
-    mr_asprintf(&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);
 
-    mr_asprintf(&filelist_name, MNT_CDROM "/archives/filelist.%ld", current_tarball_number);
+    mr_asprintf(filelist_name, MNT_CDROM "/archives/filelist.%ld", current_tarball_number);
     if (length_of_file(filelist_name) <= 2) {
         log_msg(2, "There are _zero_ files in filelist '%s'", filelist_name);
@@ -1654 +1654 @@
         log_msg(3, "length_of_file(%s) = %llu", tarball_fname, length_of_file(tarball_fname));
         log_msg(3, "count_lines_in_file(%s) = %llu", tarball_fname, count_lines_in_file(tarball_fname));
-        mr_asprintf(&tmp, "Unable to restore fileset #%ld (CD I/O error)", current_tarball_number);
+        mr_asprintf(tmp, "Unable to restore fileset #%ld (CD I/O error)", current_tarball_number);
         log_to_screen(tmp);
         mr_free(tmp);
@@ -1663 +1663 @@
 
     if (filelist) {
-        mr_asprintf(&filelist_subset_fname, "/tmp/filelist-subset-%ld.tmp", current_tarball_number);
+        mr_asprintf(filelist_subset_fname, "/tmp/filelist-subset-%ld.tmp", current_tarball_number);
         if ((matches =
              save_filelist_entries_in_common(filelist_name, filelist,
@@ -1672 +1672 @@
             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);
@@ -1680 +1680 @@
     if (filelist == NULL || matches > 0) {
         if (g_getfattr) {
-            mr_asprintf(&xattr_fname, XATTR_LIST_FNAME_RAW_SZ, MNT_CDROM "/archives", current_tarball_number);
+            mr_asprintf(xattr_fname, XATTR_LIST_FNAME_RAW_SZ, MNT_CDROM "/archives", current_tarball_number);
         }
         if (g_getfacl) {
-            mr_asprintf(&acl_fname, ACL_LIST_FNAME_RAW_SZ, MNT_CDROM "/archives", current_tarball_number);
+            mr_asprintf(acl_fname, ACL_LIST_FNAME_RAW_SZ, MNT_CDROM "/archives", current_tarball_number);
         }
         if (strstr(tarball_fname, ".bz2")) {
-            mr_asprintf(&executable, "bzip2");
+            mr_asprintf(executable, "bzip2");
         } else if (strstr(tarball_fname, ".gz")) {
-            mr_asprintf(&executable, "gzip");
+            mr_asprintf(executable, "gzip");
         } else if (strstr(tarball_fname, ".lzo")) {
-            mr_asprintf(&executable, "lzop");
+            mr_asprintf(executable, "lzop");
         }
         if (executable) {
-            mr_asprintf(&tmp, "which %s > /dev/null 2> /dev/null", executable);
+            mr_asprintf(tmp, "which %s > /dev/null 2> /dev/null", executable);
             res = run_program_and_log_output(tmp, FALSE);
             mr_free(tmp);
@@ -1702 +1702 @@
             }
             tmp = executable;
-            mr_asprintf(&executable, "-P %s -Z", tmp);
+            mr_asprintf(executable, "-P %s -Z", tmp);
             mr_free(tmp);
         }
@@ -1712 +1712 @@
 
         if (use_star) {
-            mr_asprintf(&command, "star -x -force-remove -U " STAR_ACL_SZ " errctl= file=%s", tarball_fname);
+            mr_asprintf(command, "star -x -force-remove -U " STAR_ACL_SZ " errctl= file=%s", tarball_fname);
             if (strstr(tarball_fname, ".bz2")) {
                 mr_strcat(command, " -bz");
@@ -1721 +1721 @@
             } else {
                 if (filelist_subset_fname != NULL) {
-                    mr_asprintf(&command, "afio -i -M 8m -b %ld -c %ld %s -w '%s' %s", TAPE_BLOCK_SIZE, BUFSIZE, executable, filelist_subset_fname, tarball_fname);
+                    mr_asprintf(command, "afio -i -M 8m -b %ld -c %ld %s -w '%s' %s", TAPE_BLOCK_SIZE, BUFSIZE, executable, filelist_subset_fname, tarball_fname);
                 } else {
-                    mr_asprintf(&command, "afio -i -b %ld -c %ld -M 8m %s %s", TAPE_BLOCK_SIZE, BUFSIZE, executable, tarball_fname);
+                    mr_asprintf(command, "afio -i -b %ld -c %ld -M 8m %s %s", TAPE_BLOCK_SIZE, BUFSIZE, executable, tarball_fname);
                 }
             }
@@ -1730 +1730 @@
 
 #undef BUFSIZE
-        mr_asprintf(&temp_log, "/tmp/%d.%d", (int) (random() % 32768), (int) (random() % 32768));
+        mr_asprintf(temp_log, "/tmp/%d.%d", (int) (random() % 32768), (int) (random() % 32768));
 
         mr_strcat(command, " 2>> %s >> %s", temp_log, temp_log);
@@ -1776 +1776 @@
         }
         if (retval) {
-            mr_asprintf(&command, "cat %s >> %s", temp_log, MONDO_LOGFILE);
+            mr_asprintf(command, "cat %s >> %s", temp_log, MONDO_LOGFILE);
             system(command);
             paranoid_free(command);
@@ -1865 +1865 @@
    * in afio or someting; oh darn.. OK, use tmpfs :-)                         *
    ****************************************************************************/
-    mr_asprintf(&afio_fname, "/tmp/tmpfs/archive.tmp.%ld", current_tarball_number);
-    mr_asprintf(&filelist_fname, "%s/filelist.%ld", bkpinfo->tmpdir, current_tarball_number);
-    mr_asprintf(&filelist_subset_fname, "%s/filelist-subset-%ld.tmp", bkpinfo->tmpdir, current_tarball_number);
+    mr_asprintf(afio_fname, "/tmp/tmpfs/archive.tmp.%ld", current_tarball_number);
+    mr_asprintf(filelist_fname, "%s/filelist.%ld", bkpinfo->tmpdir, current_tarball_number);
+    mr_asprintf(filelist_subset_fname, "%s/filelist-subset-%ld.tmp", bkpinfo->tmpdir, current_tarball_number);
 
     res = read_file_from_stream_to_file(afio_fname, size);
@@ -1877 +1877 @@
     }
     if (bkpinfo->compression_level == 0) {
-        mr_asprintf(&executable, "%s", "");
+        mr_asprintf(executable, "%s", "");
     } else {
         if (bkpinfo->use_star) {
-            mr_asprintf(&executable, "%s", " -bz");
+            mr_asprintf(executable, "%s", " -bz");
         } else {
-            mr_asprintf(&executable, "-P %s -Z", bkpinfo->zip_exe);
+            mr_asprintf(executable, "-P %s -Z", bkpinfo->zip_exe);
         }
     }
@@ -1893 +1893 @@
         if (strstr(tarball_fname, ".star.")) {
             use_star = TRUE;
-            mr_asprintf(&command, "star -t file=%s %s", afio_fname, executable);
+            mr_asprintf(command, "star -t file=%s %s", afio_fname, executable);
         } else {
             use_star = FALSE;
-            mr_asprintf(&command, "afio -t -M 8m -b %ld %s %s", TAPE_BLOCK_SIZE, executable, afio_fname);
+            mr_asprintf(command, "afio -t -M 8m -b %ld %s %s", TAPE_BLOCK_SIZE, executable, afio_fname);
         }
         mr_strcat(command, " > %s 2>> %s", filelist_fname, MONDO_LOGFILE);
@@ -1927 +1927 @@
     if (strstr(tarball_fname, ".star.")) {
         // star
-        mr_asprintf(&command, "star -x file=%s %s", afio_fname, executable);
+        mr_asprintf(command, "star -x file=%s %s", afio_fname, executable);
         if (filelist) {
             mr_strcat(command, " list=%s", filelist_subset_fname);
@@ -1933 +1933 @@
     } else {
         // afio
-        mr_asprintf(&command, "afio -i -M 8m -b %ld %s", TAPE_BLOCK_SIZE, executable);
+        mr_asprintf(command, "afio -i -M 8m -b %ld %s", TAPE_BLOCK_SIZE, executable);
         if (filelist) {
             mr_strcat(command, " -w %s", filelist_subset_fname);
@@ -2026 +2026 @@
     assert(bkpinfo != NULL);
 
-    mr_asprintf(&biggies_whose_EXATs_we_should_set, "%s/biggies-whose-EXATs-we-should-set", bkpinfo->tmpdir);
+    mr_asprintf(biggies_whose_EXATs_we_should_set, "%s/biggies-whose-EXATs-we-should-set", bkpinfo->tmpdir);
     if (!(fbw = fopen(biggies_whose_EXATs_we_should_set, "w"))) {
         log_msg(1, "Warning - cannot openout %s", biggies_whose_EXATs_we_should_set);
@@ -2033 +2033 @@
     read_cfg_var(g_mondo_cfg_file, "total-slices", tmp);
     total_slices = atol(tmp);
-    mr_asprintf(&tmp1, "Reassembling large files      ");
+    mr_asprintf(tmp1, "Reassembling large files      ");
     mvaddstr_and_log_it(g_currentY, 0, tmp1);
     mr_free(tmp1);
@@ -2066 +2066 @@
             } else if (does_file_exist(MNT_CDROM "/archives/NOT-THE-LAST")) {
                 insist_on_this_cd_number(++g_current_media_number);
-                mr_asprintf(&tmp1, "Restoring from %s #%d", mds, g_current_media_number);
+                mr_asprintf(tmp1, "Restoring from %s #%d", mds, g_current_media_number);
                 log_to_screen(tmp1);
                 mr_free(tmp1);
@@ -2081 +2081 @@
         } else {
             just_changed_cds = FALSE;
-            mr_asprintf(&tmp1, "Restoring big file %ld", bigfileno + 1);
+            mr_asprintf(tmp1, "Restoring big file %ld", bigfileno + 1);
             update_progress_form(tmp1);
             mr_free(tmp1);
@@ -2098 +2098 @@
         fclose(fbw);
         if (g_getfattr) {
-            mr_asprintf(&xattr_fname, XATTR_BIGGLST_FNAME_RAW_SZ, ARCHIVES_PATH);
+            mr_asprintf(xattr_fname, XATTR_BIGGLST_FNAME_RAW_SZ, ARCHIVES_PATH);
             if (length_of_file(xattr_fname) > 0) {
                 set_fattr_list(biggies_whose_EXATs_we_should_set, xattr_fname);
@@ -2105 +2105 @@
         }
         if (g_getfacl) {
-            mr_asprintf(&acl_fname, ACL_BIGGLST_FNAME_RAW_SZ, ARCHIVES_PATH);
+            mr_asprintf(acl_fname, ACL_BIGGLST_FNAME_RAW_SZ, ARCHIVES_PATH);
             if (length_of_file(acl_fname) > 0) {
                 set_acl_list(biggies_whose_EXATs_we_should_set, acl_fname);
@@ -2177 +2177 @@
 
     mds = media_descriptor_string(bkpinfo->backup_media_type);
-    mr_asprintf(&progress_str, "Restoring from %s #%d", mds, g_current_media_number);
+    mr_asprintf(progress_str, "Restoring from %s #%d", mds, g_current_media_number);
 
     log_to_screen(progress_str);
@@ -2189 +2189 @@
         mr_free(progress_str);
 
-        mr_asprintf(&tarball_fname, MNT_CDROM "/archives/%ld.afio.bz2", current_tarball_number);
+        mr_asprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.bz2", current_tarball_number);
         if (!does_file_exist(tarball_fname)) {
             mr_free(tarball_fname);
-            mr_asprintf(&tarball_fname, MNT_CDROM "/archives/%ld.afio.gz", current_tarball_number);
+            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.gz", current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
             mr_free(tarball_fname);
-            mr_asprintf(&tarball_fname, MNT_CDROM "/archives/%ld.afio.lzo", current_tarball_number);
+            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.lzo", current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
             mr_free(tarball_fname);
-            mr_asprintf(&tarball_fname, MNT_CDROM "/archives/%ld.afio.", current_tarball_number);
+            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.", current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
             mr_free(tarball_fname);
-            mr_asprintf(&tarball_fname, MNT_CDROM "/archives/%ld.star.bz2", current_tarball_number);
+            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%ld.star.bz2", current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
             mr_free(tarball_fname);
-            mr_asprintf(&tarball_fname, MNT_CDROM "/archives/%ld.star.", current_tarball_number);
+            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%ld.star.", current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
@@ -2224 +2224 @@
             }
             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++) {
@@ -2235 +2235 @@
                                               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");
@@ -2319 +2319 @@
     total_slices = atol(tmp);
     if (g_getfattr) {
-        mr_asprintf(&xattr_fname, XATTR_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
+        mr_asprintf(xattr_fname, XATTR_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
     }
     if (g_getfacl) {
-        mr_asprintf(&acl_fname, ACL_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
-    }
-    mr_asprintf(&tmp1, "Reassembling large files      ");
+        mr_asprintf(acl_fname, ACL_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
+    }
+    mr_asprintf(tmp1, "Reassembling large files      ");
     mvaddstr_and_log_it(g_currentY, 0, tmp1);
     mr_free(tmp1);
 
-    mr_asprintf(&biggies_whose_EXATs_we_should_set, "%s/biggies-whose-EXATs-we-should-set", bkpinfo->tmpdir);
+    mr_asprintf(biggies_whose_EXATs_we_should_set, "%s/biggies-whose-EXATs-we-should-set", bkpinfo->tmpdir);
     if (!(fbw = fopen(biggies_whose_EXATs_we_should_set, "w"))) {
         log_msg(1, "Warning - cannot openout %s", biggies_whose_EXATs_we_should_set);
@@ -2364 +2364 @@
             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);
@@ -2479 +2479 @@
     run_program_and_log_output("pwd", 5);
 
-    mr_asprintf(&progress_str, "Restoring from media #%d", g_current_media_number);
+    mr_asprintf(progress_str, "Restoring from media #%d", g_current_media_number);
     log_to_screen(progress_str);
     open_progress_form("Restoring from archives",
@@ -2501 +2501 @@
         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);
         }
         if (g_getfacl) {
-            mr_asprintf(&acl_fname, "%s/acl-subset-%ld.tmp", bkpinfo->tmpdir, current_afioball_number);
+            mr_asprintf(acl_fname, "%s/acl-subset-%ld.tmp", bkpinfo->tmpdir, current_afioball_number);
             unlink(acl_fname);
         }
@@ -2519 +2519 @@
         retval += res;
         if (res) {
-            mr_asprintf(&tmp, "Fileset %ld - errors occurred", current_afioball_number);
+            mr_asprintf(tmp, "Fileset %ld - errors occurred", current_afioball_number);
             log_to_screen(tmp);
             mr_free(tmp);
@@ -2534 +2534 @@
 
         mr_free(progress_str);
-        mr_asprintf(&progress_str, "Restoring from fileset #%ld on %s #%d", current_afioball_number, mds, g_current_media_number);
+        mr_asprintf(progress_str, "Restoring from fileset #%ld on %s #%d", current_afioball_number, mds, g_current_media_number);
         mr_free(mds);
         res = read_header_block_from_stream(&tmp_size, tmp_fname, &ctrl_chr);
@@ -2594 +2594 @@
     g_current_media_number = 1;
     getcwd(cwd, MAX_STR_LEN - 1);
-    mr_asprintf(&tmp, "mkdir -p %s", bkpinfo->restore_path);
+    mr_asprintf(tmp, "mkdir -p %s", bkpinfo->restore_path);
     run_program_and_log_output(tmp, FALSE);
     mr_free(tmp);
@@ -2666 +2666 @@
 {
     log_msg(0, "-------------- Mondo Restore v%s -------------", PACKAGE_VERSION);
-    log_msg(0,
-            "DON'T PANIC! Mondorestore logs almost everything, so please ");
-    log_msg(0,
-            "don't break out in a cold sweat just because you see a few  ");
-    log_msg(0,
-            "error messages in the log. Read them; analyze them; see if  ");
-    log_msg(0,
-            "they are significant; above all, verify your backups! Please");
-    log_msg(0,
-            "attach a compressed copy of this log to any e-mail you send ");
-    log_msg(0,
-            "to the Mondo mailing list when you are seeking technical    ");
-    log_msg(0,
-            "support. Without it, we can't help you.            - DevTeam");
-    log_msg(0,
-            "------------------------------------------------------------");
-    log_msg(0,
-            "BTW, despite (or perhaps because of) the wealth of messages,");
-    log_msg(0,
-            "some users are inclined to stop reading this log.  If Mondo ");
-    log_msg(0,
-            "stopped for some reason, chances are it's detailed here.    ");
-    log_msg(0,
-            "More than likely there's a message at the very end of this  ");
-    log_msg(0,
-            "log that will tell you what is wrong.  Please read it!      ");
-    log_msg(0,
-            "------------------------------------------------------------");
+    log_msg(0, "DON'T PANIC! Mondorestore logs almost everything, so please ");
+    log_msg(0, "don't break out in a cold sweat just because you see a few  ");
+    log_msg(0, "error messages in the log. Read them; analyze them; see if  ");
+    log_msg(0, "they are significant; above all, verify your backups! Please");
+    log_msg(0, "attach a compressed copy of this log to any e-mail you send ");
+    log_msg(0, "to the Mondo mailing list when you are seeking technical    ");
+    log_msg(0, "support. Without it, we can't help you.            - DevTeam");
+    log_msg(0, "------------------------------------------------------------");
+    log_msg(0, "BTW, despite (or perhaps because of) the wealth of messages,");
+    log_msg(0, "some users are inclined to stop reading this log.  If Mondo ");
+    log_msg(0, "stopped for some reason, chances are it's detailed here.    ");
+    log_msg(0, "More than likely there's a message at the very end of this  ");
+    log_msg(0, "log that will tell you what is wrong.  Please read it!      ");
+    log_msg(0, "------------------------------------------------------------");
 }
 
@@ -2768 +2754 @@
 
     /* Backup original mountlist.txt */
-    mr_asprintf(&tmp, "%s.orig", g_mountlist_fname);
+    mr_asprintf(tmp, "%s.orig", g_mountlist_fname);
     if (!does_file_exist(g_mountlist_fname)) {
         log_msg(2, "%ld: Warning - g_mountlist_fname (%s) does not exist yet", __LINE__, g_mountlist_fname);
     } else if (!does_file_exist(tmp)) {
         mr_free(tmp);
-        mr_asprintf(&tmp, "cp -f %s %s.orig", g_mountlist_fname, g_mountlist_fname);
+        mr_asprintf(tmp, "cp -f %s %s.orig", g_mountlist_fname, g_mountlist_fname);
         run_program_and_log_output(tmp, FALSE);
     }
@@ -2948 +2934 @@
         log_msg(2, "Still here. Yay.");
         if ((strlen(bkpinfo->tmpdir) > 0) && (strstr(bkpinfo->tmpdir,"mondo.tmp.") != NULL)) {
-            mr_asprintf(&tmp, "rm -Rf %s/*", bkpinfo->tmpdir);
+            mr_asprintf(tmp, "rm -Rf %s/*", bkpinfo->tmpdir);
             run_program_and_log_output(tmp, FALSE);
             mr_free(tmp);
@@ -2971 +2957 @@
                 && !is_this_device_mounted(bkpinfo->nfs_mount)) {
                 log_msg(1, "Mounting nfs dir");
-                sprintf(bkpinfo->isodir, "/tmp/isodir");
+                mr_free(bkpinfo->isodir);
+                mr_asprintf(tmp, "/tmp/isodir");
+                bkpinfo->isodir = tmp;
                 run_program_and_log_output("mkdir -p /tmp/isodir", 5);
-                mr_asprintf(&tmp, "mount %s -t nfs -o nolock,ro /tmp/isodir", bkpinfo->nfs_mount);
+                mr_asprintf(tmp, "mount %s -t nfs -o nolock,ro /tmp/isodir", bkpinfo->nfs_mount);
                 run_program_and_log_output(tmp, 1);
                 mr_free(tmp);
@@ -3070 +3058 @@
       } else {
         log_msg(1, "Re-mounted partitions for post-nuke stuff");
-        mr_asprintf(&tmp, "post-nuke %s %d", bkpinfo->restore_path, retval);
+        mr_asprintf(tmp, "post-nuke %s %d", bkpinfo->restore_path, retval);
         log_msg(2, "Calling '%s'", tmp);
         if ((res = run_program_and_log_output(tmp, 0))) {
@@ -3091 +3079 @@
     set_signals(FALSE);
     log_to_screen("Restore log (%s) copied to /var/log on your hard disk", MONDO_LOGFILE);
-    mr_asprintf(&tmp, "Mondo-restore is exiting (retval=%d)                                      ", retval);
+    mr_asprintf(tmp, "Mondo-restore is exiting (retval=%d)                                      ", retval);
     log_to_screen(tmp);
     mr_free(tmp);
 
-    mr_asprintf(&tmp, "umount %s", bkpinfo->isodir);
+    mr_asprintf(tmp, "umount %s", bkpinfo->isodir);
     run_program_and_log_output(tmp, 5);
     mr_free(tmp);
@@ -3105 +3093 @@
     }                           // for b0rken distros
     if (strstr(bkpinfo->tmpdir,"mondo.tmp.") != NULL) {
-        mr_asprintf(&tmp, "rm -Rf %s", bkpinfo->tmpdir);
+        mr_asprintf(tmp, "rm -Rf %s", bkpinfo->tmpdir);
         system(tmp);
         mr_free(tmp);

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

@@ -55 +55 @@
 bool ret = FALSE;
 
-mr_asprintf(&MONDO_LOGFILE,"/tmp/mrtest-mountlist.log");
+mr_asprintf(MONDO_LOGFILE,"/tmp/mrtest-mountlist.log");
 
 /* Globals */
@@ -71 +71 @@
 
 setup_newt_stuff();
-mr_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);
@@ -82 +82 @@
 log_it("after edit_mountlist");
 
-mr_asprintf(&tmpA, "%s", "         ");
-mr_asprintf(&tmpB, "%s", "         ");
-mr_asprintf(&tmpC, "%s", "         ");
+mr_asprintf(tmpA, "%s", "         ");
+mr_asprintf(tmpB, "%s", "         ");
+mr_asprintf(tmpC, "%s", "         ");
 ret = evaluate_mountlist(mountlist, tmpA, tmpB, tmpC);
 log_it("after evaluate_mountlist");

branches/2.2.10/mondo/test/test-truncname.c

@@ -66 +66 @@
 int i;
 
-mr_asprintf(&MONDO_LOGFILE,"/tmp/mrtest-truncname.log");
+mr_asprintf(MONDO_LOGFILE,"/tmp/mrtest-truncname.log");
 
 /* Globals */
@@ -76 +76 @@
 for (i=0; list[i] != NULL; i++) {
     log_it("%d: partition %s ...",i, list[i]);
-    mr_asprintf(&part,"%s",list[i]);
+    mr_asprintf(part,"%s",list[i]);
     disk = truncate_to_drive_name(part);
     log_it("...belongs to disk %s",disk);