Changeset 3185 in MondoRescue

Timestamp:

Sep 20, 2013, 2:29:57 PM (11 years ago)

Author:

Bruno Cornec

Message:

Simplify the interface of mr_getline and mr_asprintf. With 3.1 compatibility now will allow backports from this branch into 3.0

Location:

branches/3.0/mondo

Files:

• src/common/libmondo-archive.c (modified) (93 diffs)
• src/common/libmondo-cli.c (modified) (13 diffs)
• src/common/libmondo-devices.c (modified) (47 diffs)
• src/common/libmondo-fifo.c (modified) (6 diffs)
• src/common/libmondo-filelist.c (modified) (35 diffs)
• src/common/libmondo-fork.c (modified) (6 diffs)
• src/common/libmondo-mountlist.c (modified) (40 diffs)
• src/common/libmondo-raid.c (modified) (10 diffs)
• src/common/libmondo-stream.c (modified) (28 diffs)
• src/common/libmondo-string.c (modified) (2 diffs)
• src/common/libmondo-tools.c (modified) (38 diffs)
• src/common/libmondo-verify.c (modified) (6 diffs)
• src/common/newt-specific.c (modified) (12 diffs)
• src/include/mr_mem.h (modified) (1 diff)
• src/lib/mr_conf.c (modified) (6 diffs)
• src/lib/mr_mem.c (modified) (1 diff)
• src/mondoarchive/mondoarchive.c (modified) (4 diffs)
• src/mondorestore/mondo-prep.c (modified) (21 diffs)
• src/mondorestore/mondo-rstr-compare.c (modified) (6 diffs)
• src/mondorestore/mondo-rstr-newt.c (modified) (1 diff)
• src/mondorestore/mondo-rstr-tools.c (modified) (12 diffs)
• src/mondorestore/mondorestore.c (modified) (8 diffs)
• test/test-mountlist.c (modified) (2 diffs)
• test/test-truncname.c (modified) (2 diffs)

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

@@ -200 +200 @@
 
     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);
@@ -206 +206 @@
     }
 
-    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);
@@ -213 +213 @@
     paranoid_free(tmp);
 
-    mr_asprintf(&command, "star H=exustar list=%s -c -sparse " STAR_ACL_SZ " file=%s",
+    mr_asprintf(command, "star H=exustar list=%s -c -sparse " STAR_ACL_SZ " file=%s",
             filelist, fname);
     if (bkpinfo->use_lzo) {
@@ -227 +227 @@
         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)
@@ -307 +307 @@
 
     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);
@@ -313 +313 @@
         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);
@@ -322 +322 @@
 
     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)) {
@@ -333 +333 @@
         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",
+    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);
@@ -545 +545 @@
                         "Calling MINDI to create boot+data disks");
     open_evalcall_form("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
@@ -557 +557 @@
     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);
+        mr_asprintf(tape_size_sz, "%ld", bkpinfo->media_size);
         ntapedev = get_non_rewind_dev(bkpinfo->media_device);
         if ((bkpinfo->use_obdr) && (ntapedev != NULL)) {
@@ -572 +572 @@
         }
         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");
     }
 
@@ -617 +617 @@
 
 #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/'"));
         }
@@ -627 +627 @@
         /* 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
@@ -636 +636 @@
             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
@@ -645 +645 @@
         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"));
             }
@@ -660 +660 @@
             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);
@@ -667 +667 @@
         }
         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);
@@ -690 +690 @@
     }
     if (bkpinfo->boot_loader == 'L') {
-        mr_asprintf(&bootldr_str, "LILO");
+        mr_asprintf(bootldr_str, "LILO");
         if (!does_file_exist("/etc/lilo.conf")) {
             fatal_error
@@ -696 +696 @@
         }
     } 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")) {
@@ -706 +706 @@
                 ("The de facto standard location for your boot loader's config file is /boot/grub/menu.lst, /boot/grub/grub.cfg, or /boot/grub2/grub.cfg but I cannot find it there. What is wrong with your Linux distribution?");
         }
-        mr_asprintf(&bootldr_ver, "%s", call_program_and_get_last_line_of_output("grub --version"));
+        mr_asprintf(bootldr_ver, "%s", call_program_and_get_last_line_of_output("grub --version"));
     } 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")
@@ -739 +739 @@
         }
     } 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);
     if (bootldr_ver != NULL) {
-        mr_asprintf(&tmp, "Boot loader version string: %s", bootldr_ver);
+        mr_asprintf(tmp, "Boot loader version string: %s", bootldr_ver);
         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 netfs:
-        mr_asprintf(&value, "netfs");
+        mr_asprintf(value, "netfs");
         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/BOOTLOADER.VER", bkpinfo->tmpdir);
+    mr_asprintf(tmp, "%s/BOOTLOADER.VER", bkpinfo->tmpdir);
     if (write_one_liner_data_file(tmp, bootldr_ver)) {
         res++;
@@ -832 +832 @@
     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");
@@ -841 +841 @@
 
     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",
@@ -849 +849 @@
     }
     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",
@@ -857 +857 @@
     }
     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",
@@ -868 +868 @@
         size_of_all_biggiefiles_K(bkpinfo) / bkpinfo->optimal_set_size + 1;
     /* add netfs stuff here? */
-    mr_asprintf(&command, "mkdir -p %s/images", bkpinfo->scratchdir);
+    mr_asprintf(command, "mkdir -p %s/images", bkpinfo->scratchdir);
     if (system(command)) {
         res++;
@@ -880 +880 @@
 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",*/
-    mr_asprintf(&command, "mindi %s --custom %s %s/images '%s' '%s' \
+    mr_asprintf(command, "mindi %s --custom %s %s/images '%s' '%s' \
 '%s' %ld '%s' '%s' '%s' \
 '%s' %s %ld '%s' '%s' '%s' '%s' %ld %d '%s'", tmp2, bkpinfo->tmpdir,    // parameter #2
@@ -929 +929 @@
     if (!res) {
         log_to_screen("Boot+data disks were created OK");
-        mr_asprintf(&command, "cp -f %s/images/mindi.iso %s/mondorescue.iso",
+        mr_asprintf(command, "cp -f %s/images/mindi.iso %s/mondorescue.iso",
                 bkpinfo->scratchdir, MINDI_CACHE);
         log_msg(2, command);
@@ -936 +936 @@
 
         if (bkpinfo->nonbootable_backup) {
-            mr_asprintf(&command, "cp -f %s/all.tar.gz %s/images",
+            mr_asprintf(command, "cp -f %s/all.tar.gz %s/images",
                     bkpinfo->tmpdir, bkpinfo->scratchdir);
             if (system(command)) {
@@ -946 +946 @@
         /* 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,
+            mr_asprintf(tmp, "cp -f %s/images/all.tar.gz %s", bkpinfo->scratchdir,
                 bkpinfo->tmpdir);
             if (system(tmp)) {
@@ -964 +964 @@
     } 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);
 
@@ -1470 +1470 @@
                     sleep(5);
                 }
-                mr_asprintf(&media_usage_comment, "%s", percent_media_full_comment());
+                mr_asprintf(media_usage_comment, "%s", percent_media_full_comment());
                 /* copy to CD (scratchdir) ... and an actual CD-R if necessary */
                 if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
@@ -1513 +1513 @@
                 mr_free(media_usage_comment);
                 if (res) {
-                    mr_asprintf(&tmp, "Failed to add archive %ld's files to CD dir\n",
+                    mr_asprintf(tmp, "Failed to add archive %ld's files to CD dir\n",
                         storing_set_no);
                     log_to_screen(tmp);
@@ -1526 +1526 @@
     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++) {
@@ -1596 +1596 @@
     log_msg(2, "make_usb_fs --- scratchdir=%s", bkpinfo->scratchdir);
     tmp1 = getcwd(old_pwd, MAX_STR_LEN - 1);
-    mr_asprintf(&tmp, "chmod 700 %s", bkpinfo->scratchdir);
+    mr_asprintf(tmp, "chmod 700 %s", bkpinfo->scratchdir);
     run_program_and_log_output(tmp, FALSE);
     paranoid_free(tmp);
@@ -1604 +1604 @@
 
     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);
@@ -1618 +1618 @@
 
     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);
@@ -1634 +1634 @@
 
         /* 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);
@@ -1647 +1647 @@
 
         /* 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);
@@ -1655 +1655 @@
 
     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);
@@ -1744 +1744 @@
 
     if (bkpinfo->call_before_iso[0] != '\0') {
-        mr_asprintf(&message_to_screen, "Running pre-ISO call for CD#%d",
+        mr_asprintf(message_to_screen, "Running pre-ISO call for CD#%d",
                 g_current_media_number);
         res =
@@ -1765 +1765 @@
         sprintf(tmp, "%s/archives/NOT-THE-LAST", bkpinfo->scratchdir);
         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);
 
@@ -1810 +1810 @@
                 }
                 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 =
@@ -1864 +1864 @@
     } 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 (find_home_of_exe("genisoimage")) {
-            mr_asprintf(&isofs_cmd, "%s", MONDO_GENISOIMAGE_CMD);
+            mr_asprintf(isofs_cmd, "%s", MONDO_GENISOIMAGE_CMD);
         } else {
-            mr_asprintf(&isofs_cmd, "%s", MONDO_MKISOFS_CMD);
+            mr_asprintf(isofs_cmd, "%s", MONDO_MKISOFS_CMD);
         }
         if (bkpinfo->nonbootable_backup) {
             log_msg(1, "Making nonbootable backup");
-            mr_asprintf(&full_isofs_cmd, "%s%s-o '_ISO_' -V _CD#_ .",isofs_cmd,MONDO_MKISOFS);
+            mr_asprintf(full_isofs_cmd, "%s%s-o '_ISO_' -V _CD#_ .",isofs_cmd,MONDO_MKISOFS);
             res = eval_call_to_make_ISO(full_isofs_cmd,
                                       destfile, g_current_media_number,
@@ -1894 +1894 @@
 #ifdef __IA64__
                 log_msg(1, "IA64 --> elilo");
-                mr_asprintf(&full_isofs_cmd, "%s%s-o '_ISO_' -V _CD#_ .",isofs_cmd,MONDO_MKISOFS_REGULAR_ELILO);
+                mr_asprintf(full_isofs_cmd, "%s%s-o '_ISO_' -V _CD#_ .",isofs_cmd,MONDO_MKISOFS_REGULAR_ELILO);
                 res = eval_call_to_make_ISO(full_isofs_cmd,
                                             destfile,
@@ -1903 +1903 @@
 #else
                 log_msg(1, "Non-ia64 --> lilo");
-                mr_asprintf(&full_isofs_cmd, "%s%s-b images/mindi-bootroot.2880.img -c boot.cat -o '_ISO_' -J -V _CD#_ .",isofs_cmd,MONDO_MKISOFS);
+                mr_asprintf(full_isofs_cmd, "%s%s-b images/mindi-bootroot.2880.img -c boot.cat -o '_ISO_' -J -V _CD#_ .",isofs_cmd,MONDO_MKISOFS);
                 res =
                     // FIXME: fixed boot size probably wrong. lilo to be removed
@@ -1915 +1915 @@
                 log_msg(1, "make_cd_use_lilo = FALSE");
                 log_msg(1, "Isolinux");
-                mr_asprintf(&full_isofs_cmd, "%s%s-o '_ISO_' -V _CD#_ .",isofs_cmd,MONDO_MKISOFS_REGULAR_SYSLINUX);
+                mr_asprintf(full_isofs_cmd, "%s%s-o '_ISO_' -V _CD#_ .",isofs_cmd,MONDO_MKISOFS_REGULAR_SYSLINUX);
                 res =
                     eval_call_to_make_ISO(full_isofs_cmd,
@@ -1951 +1951 @@
         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);
@@ -1971 +1971 @@
     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 =
@@ -2007 +2007 @@
     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);
 
@@ -2083 +2083 @@
         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);
@@ -2127 +2127 @@
                         "Calling ntfsclone in background because %s is an NTFS partition",
                         bigfile_fname);
-                mr_asprintf(&sz_devfile, "%s/%d.%d.000", bkpinfo->tmpdir,
+                mr_asprintf(sz_devfile, "%s/%d.%d.000", bkpinfo->tmpdir,
                         (int) (random() % 32768),
                         (int) (random() % 32768));
@@ -2186 +2186 @@
                 p = bigfile_fname;
             }
-            mr_asprintf(&tmp, "Archiving %s ... ", bigfile_fname);
+            mr_asprintf(tmp, "Archiving %s ... ", bigfile_fname);
             if (res) {
                 mr_strcat(tmp, "Failed!");
@@ -2247 +2247 @@
     for (;;) {
         /* 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);
@@ -2253 +2253 @@
         }
 
-        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);
         }
@@ -2271 +2271 @@
         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);
         }
 
-        mr_asprintf(&media_usage_comment, "%s", percent_media_full_comment());
+        mr_asprintf(media_usage_comment, "%s", percent_media_full_comment());
 
         /* copy to CD (scratchdir) ... and an actual CD-R if necessary */
@@ -2323 +2323 @@
 
         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);
@@ -2334 +2334 @@
     }
     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).");
@@ -2420 +2420 @@
     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);
@@ -2443 +2443 @@
     if (g_getfattr) {
         get_fattr_list(biggielist, xattr_fname);
-        mr_asprintf(&command, "cp %s %s/archives/", xattr_fname,
+        mr_asprintf(command, "cp %s %s/archives/", xattr_fname,
             bkpinfo->scratchdir);
         paranoid_system(command);
@@ -2450 +2450 @@
     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);
@@ -2457 +2457 @@
     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);
@@ -2533 +2533 @@
             continue;
         }
-        mr_asprintf(&curr_file, "%s", cf);
+        mr_asprintf(curr_file, "%s", cf);
         if (!does_file_exist(curr_file)) {
             log_msg(1,
@@ -2562 +2562 @@
             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);
@@ -2636 +2636 @@
             continue;
         }
-        mr_asprintf(&curr_file, "%s", cf);
+        mr_asprintf(curr_file, "%s", cf);
         if (!does_file_exist(curr_file)) {
             log_msg(1,
@@ -2687 +2687 @@
     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.");
@@ -2753 +2753 @@
 
     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);
@@ -2771 +2771 @@
       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);
@@ -2777 +2777 @@
         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);
@@ -2807 +2807 @@
 
             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",
+            mr_asprintf(our_serial_str, "%s",
                    call_program_and_get_last_line_of_output(tmp));
             mr_free(tmp);
@@ -2849 +2849 @@
         }
         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.", 
+        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);
@@ -2994 +2994 @@
     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;
     }
@@ -3014 +3014 @@
             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); 
@@ -3024 +3024 @@
         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"))) {
@@ -3049 +3049 @@
     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) {
@@ -3067 +3067 @@
     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);
@@ -3089 +3089 @@
     }
     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(&tmp, "%s", percent_media_full_comment());
+        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(tmp, "%s", percent_media_full_comment());
         update_progress_form(tmp);
         paranoid_free(tmp);
@@ -3124 +3124 @@
             }
             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))) {
@@ -3131 +3131 @@
                 //          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;
@@ -3147 +3147 @@
             }
             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,
+                mr_asprintf(tmp, "%s - Bigfile #%ld, slice #%ld compressed OK          ", biggie_filename, biggie_file_number + 1,
                         slice_num);
             }
@@ -3164 +3164 @@
             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;
@@ -3190 +3190 @@
         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);
@@ -3200 +3200 @@
     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");
@@ -3234 +3234 @@
     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);
@@ -3507 +3507 @@
         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);
@@ -3532 +3532 @@
             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);
@@ -3539 +3539 @@
             }
         }
-        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);
         res = 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);
         res = system(tmp);
         mr_free(tmp);
@@ -3552 +3552 @@
         }
     }
-    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/3.0/mondo/src/common/libmondo-cli.c

@@ -97 +97 @@
     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);
@@ -246 +246 @@
         }
 
-        mr_asprintf(&tmp1, "%s", flag_val['I']);
+        mr_asprintf(tmp1, "%s", flag_val['I']);
         p = tmp1;
         q = tmp1;
@@ -448 +448 @@
         if (p == NULL) {
             /* protocol not found assuming NFS for compatibility */
-            mr_asprintf(&q,"nfs");
+            mr_asprintf(q,"nfs");
 
             p = strchr(bkpinfo->netfs_mount, ':');
@@ -460 +460 @@
             /* Isolate the protocol */
             *p = '\0';
-            mr_asprintf(&q,"%s",bkpinfo->netfs_mount);
+            mr_asprintf(q,"%s",bkpinfo->netfs_mount);
 
             /* Skip proto now */
@@ -484 +484 @@
             p--;
             *p = '\0';
-            mr_asprintf(&q,"%s",bkpinfo->netfs_mount);
+            mr_asprintf(q,"%s",bkpinfo->netfs_mount);
             bkpinfo->netfs_user = q;
             strcpy(bkpinfo->netfs_mount,tmp);
@@ -578 +578 @@
     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");
         }
     }
@@ -595 +595 @@
             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;
@@ -656 +656 @@
 
     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') {
@@ -730 +730 @@
 
     if ((flag_set['n']) && (! bkpinfo->restore_data)) {
-        mr_asprintf(&tmp1,"%s/%s/.dummy.txt", bkpinfo->isodir,bkpinfo->netfs_remote_dir);
+        mr_asprintf(tmp1,"%s/%s/.dummy.txt", bkpinfo->isodir,bkpinfo->netfs_remote_dir);
         if ((bkpinfo->netfs_user) && (strstr(bkpinfo->netfs_proto,"nfs"))) {
             sprintf(tmp, "su - %s -c \"echo hi > %s\"", bkpinfo->netfs_user, tmp1);
@@ -1003 +1003 @@
             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);
                 paranoid_free(tmp);
@@ -1019 +1019 @@
                         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);
                             paranoid_free(tmp);
@@ -1032 +1032 @@
     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);
         paranoid_free(tmp);
@@ -1063 +1063 @@
     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/3.0/mondo/src/common/libmondo-devices.c

@@ -131 +131 @@
 
     malloc_string(comment);
-    mr_asprintf(&tmp, "%s", where_is_root_mounted());
+    mr_asprintf(tmp, "%s", where_is_root_mounted());
     sprintf(comment, "root is mounted at %s\n", tmp);
     log_msg(0, comment);
@@ -555 +555 @@
     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)) {
@@ -563 +563 @@
                 "%s -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep -E '[D|C][V|D]' | cut -d' ' -f2 | head -n1",
                 cdr_exe);
-        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));
     }
     if ((tmp == NULL) || (strlen(tmp) < 2)) {
@@ -653 +653 @@
 
     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';
@@ -876 +876 @@
             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));
     if (strlen(tmp1) > 0) {
         strcpy(output, tmp1);
@@ -1134 +1134 @@
         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);
@@ -1145 +1145 @@
         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);
 
@@ -1165 +1165 @@
     mr_free(device_with_tab);
     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);
     mr_free(device_with_space);
     log_msg(4, "tmp (command) = '%s'", tmp);
@@ -1309 +1309 @@
     }
 #ifndef __FreeBSD__
-    mr_asprintf(&options, "ro");
+    mr_asprintf(options, "ro");
 #endif
 
@@ -1315 +1315 @@
 
 #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);
         }
@@ -1332 +1332 @@
 
 #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
@@ -1407 +1407 @@
     } else if (bkpinfo->backup_media_type == iso) {
         if (bkpinfo->subdir) {
-            mr_asprintf(&mountdir, "%s/%s", bkpinfo->isodir, bkpinfo->subdir);
+            mr_asprintf(mountdir, "%s/%s", bkpinfo->isodir, bkpinfo->subdir);
         } else {
-            mr_asprintf(&mountdir, "%s", bkpinfo->isodir);
+            mr_asprintf(mountdir, "%s", bkpinfo->isodir);
         }
 #ifdef __FreeBSD__
@@ -1673 +1673 @@
     ********/
     /* 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));
     paranoid_free(command);
 
@@ -1683 +1683 @@
 
     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));
         paranoid_free(command);
 
@@ -1770 +1770 @@
     log_msg(4, "  %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));
     paranoid_free(command);
 
@@ -1796 +1796 @@
     * 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(5, "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));
     paranoid_free(command);
     log_msg(4, "Partition list for %s: %s", dsf, partition_list);
@@ -1816 +1816 @@
             mr_free(token);
         }
-        mr_asprintf(&ndsf, "%s", dsf);
+        mr_asprintf(ndsf, "%s", dsf);
     }
     mr_free(partition_list);
@@ -1862 +1862 @@
         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}}'", 
           ndsf, partitions[i]);
         log_msg(5, "  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));
         paranoid_free(command);
         log_msg(5, "  Return value: %s", tmp);
@@ -1875 +1875 @@
         } 
         /* 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));
         paranoid_free(command);
         if (strlen(tmp)) {
@@ -1893 +1893 @@
         log_msg(4, "  It's not mounted. Checking to see if it's LVM...");
         /* Check for LVM */
-        mr_asprintf(&command, "pvdisplay -c %s 2> /dev/null", partitions[i]);
+        mr_asprintf(command, "pvdisplay -c %s 2> /dev/null", partitions[i]);
         log_msg(5, "  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));
         paranoid_free(command);
         if (strlen(tmp)) {
             log_msg(4, "Found an LVM partition at %s. Find the VG it's in...", partitions[i]);
             /* 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(5, "  Running: %s", command);
             strcpy(VG, call_program_and_get_last_line_of_output(command));
@@ -1908 +1908 @@
                 /* 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(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));
                 paranoid_free(command);
                 log_msg(4, "  VG %s mount_list: %s", VG, mount_list);
@@ -1931 +1931 @@
                 paranoid_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));
                 paranoid_free(command);
                 log_msg(4, "  Software raid device list: %s", mount_list);
                 lastpos = 0;
                 while ((token = mr_strtok(mount_list, token_chars, &lastpos)) != NULL) {
-                    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);
                     paranoid_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));
                     paranoid_free(command);
                     log_msg(4, "Number of Software raid device: %s", tmp);
@@ -1972 +1972 @@
          ********/
         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));
         paranoid_free(command);
         if (!strlen(tmp)) {
@@ -1983 +1983 @@
         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));
         paranoid_free(command);
         log_msg(4, "  Software raid device list: %s", mount_list);
@@ -1991 +1991 @@
         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);
             paranoid_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));
             paranoid_free(command);
             if (!atoi(tmp)) {
@@ -2088 +2088 @@
                     mr_strcat(bkpinfo->exclude_paths,"|%s",mounted_on_dsf);
                 } else {
-                    mr_asprintf(&(bkpinfo->exclude_paths),"%s",mounted_on_dsf);
+                    mr_asprintf(bkpinfo->exclude_paths,"%s",mounted_on_dsf);
                 }
                 if (bkpinfo->exclude_devs) {
                     mr_strcat(bkpinfo->exclude_devs,"|%s",token);
                 } else {
-                    mr_asprintf(&(bkpinfo->exclude_devs),"%s",token);
+                    mr_asprintf(bkpinfo->exclude_devs,"%s",token);
                 }
             }
@@ -2107 +2107 @@
                     mr_strcat(bkpinfo->exclude_paths, "|%s",not_mounted_on_dsf);
                 } else {
-                    mr_asprintf(&(bkpinfo->exclude_paths),"%s",not_mounted_on_dsf);
+                    mr_asprintf(bkpinfo->exclude_paths,"%s",not_mounted_on_dsf);
                 }
             }
@@ -2119 +2119 @@
     case -1:
         /*  Adds a | to ensure correct detection even at both ends */
-        mr_asprintf(&tmp1,"|%s",token);
-        mr_asprintf(&tmp2,"|%s|",token);
+        mr_asprintf(tmp1,"|%s",token);
+        mr_asprintf(tmp2,"|%s|",token);
         if (mode == 'E') {
             /*  Add the token if not already in the list */
-            mr_asprintf(&tmp,"|%s|",bkpinfo->exclude_paths);
+            mr_asprintf(tmp,"|%s|",bkpinfo->exclude_paths);
             if (strstr(tmp,tmp2) == NULL) {
                 if (bkpinfo->exclude_paths) {
@@ -2134 +2134 @@
         } else {
             /*  Add the token if not already in the list */
-            mr_asprintf(&tmp,"|%s|",bkpinfo->include_paths);
+            mr_asprintf(tmp,"|%s|",bkpinfo->include_paths);
             if (strstr(tmp,tmp2) == NULL) {
                 strcat(bkpinfo->include_paths,tmp1);
@@ -2219 +2219 @@
          */
 #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,vmhgfs,smbfs,smb,cifs,afs,gfs,ocfs,ocfs2,mvfs,nsspool,nssvol | grep -vE \"none|Filesystem\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -nr | awk '{print $NF;}' | while read x ; do test -w $x && echo $x && break ; done"));
+        mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output("LANGUAGE=C df -m -P -t nonfs,msdosfs,ntfs,ntfs-3g,vmhgfs,smbfs,smb,cifs,afs,gfs,ocfs,ocfs2,mvfs,nsspool,nssvol | grep -vE \"none|Filesystem\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -nr | awk '{print $NF;}' | while read x ; do test -w $x && echo $x && break ; done"));
 #else
-        mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output("LANGUAGE=C df -m -P -x nfs -x nfs4 -x fuse.sshfs -x fuse -x vfat -x ntfs -x ntfs-3g -x vmhgfs -x smbfs -x smb -x cifs -x afs -x gfs -x ocfs -x ocfs2 -x mvfs -x nsspool -x nssvol -x iso9660 | grep -vE \"none|Filesystem|/dev/shm\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -nr | awk '{print $NF;}' | while read x ; do test -w $x && echo $x && break ; done"));
+        mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output("LANGUAGE=C df -m -P -x nfs -x nfs4 -x fuse.sshfs -x fuse -x vfat -x ntfs -x ntfs-3g -x vmhgfs -x smbfs -x smb -x cifs -x afs -x gfs -x ocfs -x ocfs2 -x mvfs -x nsspool -x nssvol -x iso9660 | grep -vE \"none|Filesystem|/dev/shm\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -nr | awk '{print $NF;}' | while read x ; do test -w $x && echo $x && break ; done"));
 #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);
         }
@@ -2337 +2337 @@
             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)) {
@@ -2405 +2405 @@
         }
         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';
@@ -2420 +2420 @@
             }
         }
-        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");
@@ -2535 +2535 @@
         /*  Force NFS to be the protocol by default */
         if (bkpinfo->netfs_proto == NULL) {
-            mr_asprintf(&(bkpinfo->netfs_proto), "nfs");
+            mr_asprintf(bkpinfo->netfs_proto, "nfs");
         }
         if (bkpinfo->disaster_recovery) {
@@ -2549 +2549 @@
         }
         mr_free(bkpinfo->netfs_proto);
-        mr_asprintf(&(bkpinfo->netfs_proto), "%s", tmp1);
+        mr_asprintf(bkpinfo->netfs_proto, "%s", tmp1);
         if (!popup_and_get_string
             ("Network share", "Which remote share should I mount?",
@@ -2570 +2570 @@
         mr_free(bkpinfo->netfs_user);
         if (strcmp(tmp1, "") != 0) {
-            mr_asprintf(&(bkpinfo->netfs_user), "%s", tmp1);
+            mr_asprintf(bkpinfo->netfs_user, "%s", tmp1);
         }
     
@@ -2585 +2585 @@
             if (bkpinfo->restore_data) {
                 /*  mount th FS read-only in restore mode to avoid any erase of whatever */
-                mr_asprintf(&tmpro, "-o ro");
+                mr_asprintf(tmpro, "-o ro");
             } else {
-                mr_asprintf(&tmpro, "");
+                mr_asprintf(tmpro, "");
             }
 
             /*  Build the mount string */
             if (strstr(bkpinfo->netfs_proto, "smbfs")) {
-                mr_asprintf(&tmp, "mount -t cifs %s %s %s",bkpinfo->netfs_mount, bkpinfo->isodir,tmpro);
+                mr_asprintf(tmp, "mount -t cifs %s %s %s",bkpinfo->netfs_mount, bkpinfo->isodir,tmpro);
                 if (bkpinfo->netfs_user) {
                     mr_strcat(tmp, " -o user=%s", bkpinfo->netfs_user);
@@ -2598 +2598 @@
             else {
                 if (strstr(bkpinfo->netfs_proto, "sshfs")) {
-                    mr_asprintf(&tmp, "sshfs %s ",tmpro);
+                    mr_asprintf(tmp, "sshfs %s ",tmpro);
                 } else {
-                    mr_asprintf(&tmp, "mount -t %s -o nolock %s ", bkpinfo->netfs_proto,tmpro);
+                    mr_asprintf(tmp, "mount -t %s -o nolock %s ", bkpinfo->netfs_proto,tmpro);
                 }
                 if (bkpinfo->netfs_user) {
@@ -2788 +2788 @@
         }
         mr_free(bkpinfo->exclude_paths);
-        mr_asprintf(&tmp, "%s", p);
+        mr_asprintf(tmp, "%s", p);
         bkpinfo->exclude_paths = tmp;
 
@@ -2815 +2815 @@
         if (ask_me_yes_or_no("Do you want to backup extended attributes?")) {
             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");
             }
             log_it("Backup of extended attributes");
@@ -2934 +2934 @@
     char *exclude_these_directories = NULL;
 
-    mr_asprintf(&exclude_these_directories,"%s", call_program_and_get_last_line_of_output("mount -t coda,ncpfs,fuse.sshfs,nfs,nfs4,vmhgfs,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,fuse.sshfs,nfs,nfs4,vmhgfs,smbfs,cifs,afs,gfs,ocfs,ocfs2,mvfs,nsspool,nssvol | tr -s '\t' ' ' | cut -d' ' -f3 | tr -s '\n' '|' | awk '{print $0;}'"));
     log_msg(9,"list_of_NETFS_mounts_only returns %s\n",exclude_these_directories);
     return(exclude_these_directories);
@@ -3033 +3033 @@
 //  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);
@@ -3043 +3043 @@
     }
 
-    mr_asprintf(&mountdev, "%s", bkpinfo->media_device);
+    mr_asprintf(mountdev, "%s", bkpinfo->media_device);
     if (!mountdev[0]) {
         log_it
@@ -3177 +3177 @@
     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);
 
@@ -3219 +3219 @@
     } 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);
 
@@ -3322 +3322 @@
             log_msg(1, "curr_fname = %s", curr_fname);
             sprintf(command, "file %s", curr_fname);
-            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));
             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';
@@ -3373 +3373 @@
     sprintf(fdisk, "/sbin/parted2fdisk");
     sprintf(command, "%s -l %s | grep 'EFI GPT'", fdisk, drive);
-    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));
     if (strstr(tmp, "GPT") == NULL) {
         strcpy(output, "MBR");

branches/3.0/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,
+        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');
@@ -96 +96 @@
     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);
@@ -120 +120 @@
     }
     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);
@@ -132 +132 @@
     }
     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.");
@@ -138 +138 @@
     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;
@@ -167 +167 @@
     }
     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/3.0/mondo/src/common/libmondo-filelist.c

@@ -96 +96 @@
     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);
@@ -107 +107 @@
     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");
@@ -157 +157 @@
     }                           // 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);
@@ -167 +167 @@
     } 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);
@@ -237 +237 @@
     curr_set_no = 0;
     curr_set_size = 0;
-    mr_asprintf(&outfname, "%s/filelist.%ld", outdir, curr_set_no);
-    mr_asprintf(&biggie_fname, "%s/biggielist.txt", outdir);
+    mr_asprintf(outfname, "%s/filelist.%ld", outdir, curr_set_no);
+    mr_asprintf(biggie_fname, "%s/biggielist.txt", outdir);
     log_it("outfname=%s; biggie_fname=%s", outfname, biggie_fname);
     if (!(fbig = fopen(biggie_fname, "w"))) {
@@ -255 +255 @@
     }
 
-    mr_getline(&incoming, fin);
+    mr_getline(incoming, fin);
     while (!feof(fin)) {
         lino++;
@@ -288 +288 @@
                 curr_set_size = 0;
 
-                mr_asprintf(&outfname, "%s/filelist.%ld", outdir, curr_set_no);
+                mr_asprintf(outfname, "%s/filelist.%ld", outdir, curr_set_no);
                 if (!(fout = fopen(outfname, "w"))) {
                     log_OS_error("Unable to openout outfname");
@@ -301 +301 @@
         }
         mr_free(incoming);
-        mr_getline(&incoming, fin);
+        mr_getline(incoming, fin);
     }
     mr_free(incoming);
@@ -320 +320 @@
     mr_free(biggie_fname);
 
-    mr_asprintf(&outfname, "%s/LAST-FILELIST-NUMBER", outdir);
-    mr_asprintf(&tmp, "%ld", curr_set_no);
+    mr_asprintf(outfname, "%s/LAST-FILELIST-NUMBER", outdir);
+    mr_asprintf(tmp, "%ld", curr_set_no);
     if (write_one_liner_data_file(outfname, tmp)) {
         log_OS_error
@@ -331 +331 @@
 
     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(&syscall, "%s '%s' 2>> /dev/null", syscall_sprintf, tmp);   // " MONDO_LOGFILE);
+        mr_asprintf(syscall, "%s '%s' 2>> /dev/null", syscall_sprintf, tmp);    // " MONDO_LOGFILE);
         paranoid_free(tmp);
         log_msg(20,"calling %s\n",syscall);
@@ -490 +490 @@
 
     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);
@@ -506 +506 @@
 
     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);
@@ -538 +538 @@
         if (strstr(executable,"acl")) {
             /*  setfacl needs no additional option for physical walk */
-            mr_asprintf(&tmp,"");
+            mr_asprintf(tmp,"");
         } else {
             /*  setfattr needs option -h for physical walk */
-            mr_asprintf(&tmp,"-h");
-        }
-        mr_asprintf(&command, "gzip -dc %s | %s %s --restore - 2>> %s", original_exat_fname, executable, tmp, MONDO_LOGFILE);
+            mr_asprintf(tmp,"-h");
+        }
+        mr_asprintf(command, "gzip -dc %s | %s %s --restore - 2>> %s", original_exat_fname, executable, tmp, MONDO_LOGFILE);
         mr_free(tmp);
         log_msg(1, "command = %s", command);
@@ -560 +560 @@
     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);
@@ -568 +568 @@
     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");
@@ -579 +579 @@
     }
 
-    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");
@@ -720 +720 @@
 
     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);
@@ -882 +882 @@
     }
     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));
@@ -902 +902 @@
     (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");
@@ -1284 +1284 @@
     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') {
@@ -1352 +1352 @@
         }
     }
-    mr_asprintf(&find_excludes, " ");
+    mr_asprintf(find_excludes, " ");
 
     if (!depth) {
@@ -1370 +1370 @@
 #if linux
         // 2.6 has /sys as a proc-type thing -- must be excluded
-        mr_asprintf(&strtmp, "find '%s' -maxdepth %d -fstype mvfs -prune -o -fstype devpts -prune -o -fstype tmpfs -prune -o -fstype devtmpfs -prune -o -fstype proc -prune -o -fstype selinuxfs -prune -o -fstype securityfs -prune -o -fstype hugetlbfs -o -fstype cgroup -prune -prune -o -fstype mqueue -prune -o -fstype debugfs -prune -o -fstype sysfs -prune -o -fstype rpc_pipefs -prune -o -fstype none -prune -o %s -type d -print > %s 2> /dev/null", dir, MAX_SKEL_DEPTH, find_excludes, g_skeleton_filelist);
+        mr_asprintf(strtmp, "find '%s' -maxdepth %d -fstype mvfs -prune -o -fstype devpts -prune -o -fstype tmpfs -prune -o -fstype devtmpfs -prune -o -fstype proc -prune -o -fstype selinuxfs -prune -o -fstype securityfs -prune -o -fstype hugetlbfs -o -fstype cgroup -prune -prune -o -fstype mqueue -prune -o -fstype debugfs -prune -o -fstype sysfs -prune -o -fstype rpc_pipefs -prune -o -fstype none -prune -o %s -type d -print > %s 2> /dev/null", dir, MAX_SKEL_DEPTH, find_excludes, g_skeleton_filelist);
 #else
         // On BSD, for example, /sys is the kernel sources -- don't exclude
-        mr_asprintf(&strtmp, "find '%s' -maxdepth %d -fstype mvfs -prune -o -path /proc -prune -o %s -type d -print > %s 2> /dev/null", dir, MAX_SKEL_DEPTH, find_excludes, g_skeleton_filelist);
+        mr_asprintf(strtmp, "find '%s' -maxdepth %d -fstype mvfs -prune -o -path /proc -prune -o %s -type d -print > %s 2> /dev/null", dir, MAX_SKEL_DEPTH, find_excludes, g_skeleton_filelist);
 #endif
         paranoid_free(find_excludes);
@@ -1379 +1379 @@
         paranoid_system(strtmp);
         paranoid_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));
@@ -1411 +1411 @@
                     int cols, rows;
                     newtGetScreenSize(&cols, &rows);
-                    mr_asprintf(&tmp, "Reading %-*s", cols, dir1);
+                    mr_asprintf(tmp, "Reading %-*s", cols, dir1);
                     newtDrawRootText(0, g_noof_rows - 3, tmp);
                     mr_free(tmp);
@@ -1424 +1424 @@
 
 //  log_msg(0, "Cataloguing %s", dir);
-    mr_asprintf(&skip_these, "|%s|", sth);
+    mr_asprintf(skip_these, "|%s|", sth);
     
-    mr_asprintf(&new_with_pipe, "|%s|", dir1);
+    mr_asprintf(new_with_pipe, "|%s|", dir1);
     if ((dip = opendir(dir1)) == NULL) {
-        mr_asprintf(&tmp,"opendir %s", dir1);
+        mr_asprintf(tmp,"opendir %s", dir1);
         log_OS_error(tmp);
         paranoid_free(tmp);
@@ -1440 +1440 @@
             i++;
             if (strcmp(dir1, "/")) {
-                mr_asprintf(&new,"%s/%s",dir1,dit->d_name);
+                mr_asprintf(new,"%s/%s",dir1,dit->d_name);
             } else {
-                mr_asprintf(&new,"%s%s",dir1,dit->d_name);
+                mr_asprintf(new,"%s%s",dir1,dit->d_name);
             }
             paranoid_free(new_with_pipe);
-            mr_asprintf(&new_with_pipe, "|%s|", new);
+            mr_asprintf(new_with_pipe, "|%s|", new);
             if (strstr(skip_these, new_with_pipe)) {
                 fprintf(fout, "%s\n", new);
@@ -1467 +1467 @@
                                 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) {
@@ -1536 +1536 @@
     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
@@ -1542 +1542 @@
     }
 // make hole for filelist
-    mr_asprintf(&command, "mkdir -p %s/archives", scratchdir);
+    mr_asprintf(command, "mkdir -p %s/archives", scratchdir);
     paranoid_system(command);
     mr_free(command);
 
-    mr_asprintf(&sz_filelist, "%s/tmpfs/filelist.full", tmpdir);
+    mr_asprintf(sz_filelist, "%s/tmpfs/filelist.full", 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);
@@ -1557 +1557 @@
         // 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);
@@ -1582 +1582 @@
                 "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);
@@ -1591 +1591 @@
         log_msg(2, "include_paths = '%s'", include_paths);
         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);
         }
         paranoid_free(tmp1);
 
-        mr_asprintf(&exclude_paths, MONDO_CACHE"|%s|%s|%s|.|..|"MNT_CDROM"|"MNT_FLOPPY"|/media|/tmp|/proc|/sys|/run|/dev/shm|"MINDI_CACHE, tmp2, (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
+        mr_asprintf(exclude_paths, MONDO_CACHE"|%s|%s|%s|.|..|"MNT_CDROM"|"MNT_FLOPPY"|/media|/tmp|/proc|/sys|/run|/dev/shm|"MINDI_CACHE, tmp2, (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
         if (excp != NULL) {
             mr_strcat(exclude_paths,"|%s",excp);
@@ -1640 +1640 @@
     }
     log_msg(2, "Copying new filelist to scratchdir");
-    mr_asprintf(&command, "mkdir -p %s/archives", scratchdir);
+    mr_asprintf(command, "mkdir -p %s/archives", scratchdir);
     paranoid_system(command);
     mr_free(command);
 
-    mr_asprintf(&command, "cp -f %s %s/archives/", sz_filelist, scratchdir);
+    mr_asprintf(command, "cp -f %s %s/archives/", sz_filelist, scratchdir);
     paranoid_system(command);
     mr_free(command);
 
-    mr_asprintf(&command, "mv -f %s %s", sz_filelist, tmpdir);
+    mr_asprintf(command, "mv -f %s %s", sz_filelist, tmpdir);
     paranoid_system(command);
     mr_free(command);

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

@@ -134 +134 @@
 
     if ((bkpinfo->netfs_user) && (strstr(bkpinfo->netfs_proto,"nfs"))) {
-        mr_asprintf(&tmp1, "su - %s -c \"%s\"", bkpinfo->netfs_user, basic_call);
+        mr_asprintf(tmp1, "su - %s -c \"%s\"", bkpinfo->netfs_user, basic_call);
     } else {
-        mr_asprintf(&tmp1, "%s", basic_call);
+        mr_asprintf(tmp1, "%s", basic_call);
     }
 
@@ -285 +285 @@
         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 = ' ';
@@ -301 +301 @@
     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");
@@ -307 +307 @@
     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) {
@@ -378 +378 @@
     sprintf(lockfile, "%s/mojo-jojo.bla.bla", bkpinfo->tmpdir);
 
-    mr_asprintf(&command,
+    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);
@@ -388 +388 @@
     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);

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

@@ -72 +72 @@
     /*@ initialize ***************************************************** */
     prev_part_no = 0;
-    mr_asprintf(&flaws_str, "%s", "");
+    mr_asprintf(flaws_str, "%s", "");
 
 
@@ -78 +78 @@
 
     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);
@@ -103 +103 @@
             /* 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);
@@ -117 +117 @@
             }
             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);
@@ -128 +128 @@
             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);
@@ -141 +141 @@
                 && 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);
@@ -149 +149 @@
             /* 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);
@@ -181 +181 @@
             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);
@@ -188 +188 @@
                 } 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);
@@ -200 +200 @@
             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);
@@ -214 +214 @@
             }
             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);
@@ -225 +225 @@
             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);
@@ -238 +238 @@
                 && 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);
@@ -246 +246 @@
             /* 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);
@@ -263 +263 @@
                 /* 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);
@@ -277 +277 @@
                 }
                 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);
@@ -288 +288 @@
                 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);
@@ -301 +301 @@
                     && 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);
@@ -310 +310 @@
                 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);
@@ -327 +327 @@
         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);
@@ -349 +349 @@
     /* Over-allocated the disk? Unallocated space on disk? */
     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", "");
 
     malloc_string(device);
@@ -398 +398 @@
     if (physical_drive_size < 0) {
         if (strstr(drive,"/dev/dm-") == NULL) {
-            mr_asprintf(&tmp, " %s does not exist.", drive);
+            mr_asprintf(tmp, " %s does not exist.", drive);
             log_it(tmp);
             mr_strcat(flaws_str, "%s", tmp);
@@ -405 +405 @@
             goto endoffunc;
         } else {
-            mr_asprintf(&tmp, " %s (dm) will be setup later on", drive);
+            mr_asprintf(tmp, " %s (dm) will be setup later on", drive);
             log_it(tmp);
             mr_free(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);
         mr_free(tmp);
@@ -425 +425 @@
         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);
@@ -432 +432 @@
             } 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);
@@ -445 +445 @@
         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);
@@ -459 +459 @@
         }
         if (device_copies > 1) {
-            mr_asprintf(&tmp, " %s %s's.", number_to_text(device_copies),
+            mr_asprintf(tmp, " %s %s's.", number_to_text(device_copies),
                     device);
             if (!strstr(flaws_str, tmp)) {
@@ -471 +471 @@
         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);
@@ -483 +483 @@
             && 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);
@@ -491 +491 @@
         /* 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);
@@ -504 +504 @@
     /* 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);
@@ -511 +511 @@
         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);
@@ -570 +570 @@
             (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);
@@ -588 +588 @@
     /* Look for duplicate mountpoints in mountlist. */
     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++) {
             if (!strcmp(mountlist->el[i].mountpoint, curr_mountpoint)
@@ -599 +599 @@
         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_msg(8,"Adding: %s to flaws_str", tmp);
@@ -666 +666 @@
     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);
@@ -753 +753 @@
                        (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);
@@ -874 +874 @@
             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);
@@ -1033 +1033 @@
     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/3.0/mondo/src/common/libmondo-raid.c

@@ -51 +51 @@
     int res;
 
-    mr_asprintf(&command, "grep \"");
+    mr_asprintf(command, "grep \"");
     if (raidno == -1) {
         mr_strcat(command, "linear");
@@ -198 +198 @@
     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);
@@ -587 +587 @@
     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);
@@ -739 +739 @@
         }
         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);
@@ -1032 +1032 @@
             }
             // get RAID device name
-            mr_asprintf(&strtmp,"%s%s", device_prefix, token);
+            mr_asprintf(strtmp,"%s%s", device_prefix, token);
             strncpy(raidlist->el[raidlist->entries].raid_device, strtmp, 63);
             raidlist->el[raidlist->entries].raid_device[63] = '\0';
@@ -1040 +1040 @@
             v = raidlist->el[raidlist->entries].additional_vars.entries;
             strcpy(raidlist->el[raidlist->entries].additional_vars.el[v].label, "UUID");
-            mr_asprintf(&cmd,"mdadm --detail %s | grep UUID | cut -d: -f2- | sed 's/^ *//'", raidlist->el[raidlist->entries].raid_device);
-            mr_asprintf(&strtmp, "%s", call_program_and_get_last_line_of_output(cmd));
+            mr_asprintf(cmd,"mdadm --detail %s | grep UUID | cut -d: -f2- | sed 's/^ *//'", raidlist->el[raidlist->entries].raid_device);
+            mr_asprintf(strtmp, "%s", call_program_and_get_last_line_of_output(cmd));
             strcpy(raidlist->el[raidlist->entries].additional_vars.el[v].value, strtmp);
             mr_free(strtmp);
@@ -1047 +1047 @@
             // store the Version value in the additional_vars structure
             strcpy(raidlist->el[raidlist->entries].additional_vars.el[v].label, "Version");
-            mr_asprintf(&cmd,"mdadm --detail %s | grep Version | cut -d: -f2- | sed 's/^ *//'", raidlist->el[raidlist->entries].raid_device);
-            mr_asprintf(&strtmp, "%s", call_program_and_get_last_line_of_output(cmd));
+            mr_asprintf(cmd,"mdadm --detail %s | grep Version | cut -d: -f2- | sed 's/^ *//'", raidlist->el[raidlist->entries].raid_device);
+            mr_asprintf(strtmp, "%s", call_program_and_get_last_line_of_output(cmd));
             strcpy(raidlist->el[raidlist->entries].additional_vars.el[v].value, strtmp);
             mr_free(strtmp);
@@ -1128 +1128 @@
                 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);
                     mr_free(strtmp);
@@ -1135 +1135 @@
                 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);
                     mr_free(strtmp);
@@ -1142 +1142 @@
                 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);
                     mr_free(strtmp);

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

@@ -242 +242 @@
     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);
@@ -276 +276 @@
         strcpy(cdr_exe, "dvdrecord");
     }
-    mr_asprintf(&command, "%s -scanbus 2> /dev/null | grep -i tape | wc -l",
+    mr_asprintf(command, "%s -scanbus 2> /dev/null | grep -i tape | wc -l",
             cdr_exe);
     strcpy(tmp, call_program_and_get_last_line_of_output(command));
@@ -287 +287 @@
         return 1;
     }
-    mr_asprintf(&command,
+    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);
@@ -297 +297 @@
         return 1;
     }
-    mr_asprintf(&command,
+    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);
@@ -383 +383 @@
         }
         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);
         }
@@ -413 +413 @@
         }
         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);
         }
@@ -479 +479 @@
     log_it("Insisting on tape #%d", tapeno);
     if (g_current_media_number != tapeno) {
-        mr_asprintf(&tmp,
+        mr_asprintf(tmp,
                 "When the tape drive goes quiet, please insert volume %d in this series.",
                 tapeno);
@@ -549 +549 @@
         suffix[0] = '\0';
     }
-    mr_asprintf(&tmpdir, "%s/tmpfs/backcatalog", td);
+    mr_asprintf(tmpdir, "%s/tmpfs/backcatalog", td);
     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",
@@ -579 +579 @@
 
     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);
@@ -619 +619 @@
         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);
@@ -688 +688 @@
 
     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);
@@ -715 +715 @@
     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);
@@ -725 +725 @@
     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);
@@ -732 +732 @@
     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);
@@ -739 +739 @@
 
     /* restore compression mode on */
-    mr_asprintf(&command, "mt -f %s compression on",bkpinfo->media_device);
+    mr_asprintf(command, "mt -f %s compression on",bkpinfo->media_device);
     res = run_program_and_log_output(command, 1);
     paranoid_free(command);
@@ -805 +805 @@
 
     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);
 
@@ -874 +874 @@
         // FIXME
     }
-    mr_asprintf(&tmp, "tar -zxf %s ./tmp/mondo-restore.cfg 2> /dev/null",
+    mr_asprintf(tmp, "tar -zxf %s ./tmp/mondo-restore.cfg 2> /dev/null",
             outfname);
     paranoid_system(tmp);
@@ -904 +904 @@
 
     /*  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;
@@ -1078 +1078 @@
     }
     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);
@@ -1141 +1141 @@
     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 {
@@ -1151 +1151 @@
     }
     if (strcmp(temp_cksum, actual_cksum)) {
-        mr_asprintf(&tmp, "actual cksum=%s; recorded cksum=%s", actual_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,
+        mr_asprintf(tmp, "%s (%ld K) is corrupt on tape", temp_fname,
                 (long) orig_size >> 10);
         log_to_screen(tmp);
@@ -1494 +1494 @@
     insist_on_this_tape_number(g_current_media_number + 1); // will increment g_current_media, too
     if (bkpinfo->backup_media_type == cdstream) {
-        mr_asprintf(&command,
+        mr_asprintf(command,
                 "cdrecord -eject dev=%s speed=%d fs=24m -waiti - >> %s 2>> %s",
                 bkpinfo->media_device, bkpinfo->cdrw_speed, MONDO_LOGFILE,
@@ -1549 +1549 @@
     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);
@@ -1602 +1602 @@
     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);
@@ -1700 +1700 @@
         p++;
     }
-    mr_asprintf(&tmp, "Writing file '%s' to tape (%ld KB)", p,
+    mr_asprintf(tmp, "Writing file '%s' to tape (%ld KB)", p,
             (long) filesize >> 10);
     log_it(tmp);
@@ -1745 +1745 @@
     }
     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);
@@ -1808 +1808 @@
         fwrite(tempblock, 1, (size_t) TAPE_BLOCK_SIZE,
                g_tape_stream) / 1024;
-    mr_asprintf(&tmp, "%s (fname=%s, size=%ld K)",
+    mr_asprintf(tmp, "%s (fname=%s, size=%ld K)",
             marker_to_string(control_char), p,
             (long) length_of_incoming_file >> 10);
@@ -1837 +1837 @@
 
     /*@ 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/3.0/mondo/src/common/libmondo-string.c

@@ -817 +817 @@
 
     assert_string_is_neither_NULL_nor_zerolength(partition);
-    mr_asprintf(&trunc, "%s", partition);
+    mr_asprintf(trunc, "%s", partition);
 
 #ifdef __FreeBSD__
@@ -1122 +1122 @@
     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 netfs:
-        mr_asprintf(&type_of_backup, "%s", bkpinfo->netfs_proto);
+        mr_asprintf(type_of_backup, "%s", bkpinfo->netfs_proto);
         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/3.0/mondo/src/common/libmondo-tools.c

@@ -224 +224 @@
 
     uname(&utsn);
-    mr_asprintf(&tmp, "%s", utsn.machine);
+    mr_asprintf(tmp, "%s", utsn.machine);
     return (tmp);
 }
@@ -400 +400 @@
         }
         log_msg(1, "Tape");
-        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)) {
@@ -446 +446 @@
         }
         if (bkpinfo->nonbootable_backup) {
-            mr_asprintf(&mondo_mkisofs_sz, MONDO_GROWISOFS_NONBOOT);
+            mr_asprintf(mondo_mkisofs_sz, MONDO_GROWISOFS_NONBOOT);
         } else if
 #ifdef __FreeBSD__
@@ -455 +455 @@
 #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) {
@@ -478 +478 @@
         }
         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);
@@ -494 +494 @@
         || 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 (extra_cdrom_params == NULL) {
             // If not initialized earlier, do it now
-            mr_asprintf(&extra_cdrom_params, " ");
+            mr_asprintf(extra_cdrom_params, " ");
         }
         if (find_home_of_exe("cdrecord")) {
@@ -511 +511 @@
         }
         if (find_home_of_exe("genisoimage")) {
-            mr_asprintf(&isofs_cmd, "%s", MONDO_GENISOIMAGE_CMD);
+            mr_asprintf(isofs_cmd, "%s", MONDO_GENISOIMAGE_CMD);
         } else {
-            mr_asprintf(&isofs_cmd, "%s", MONDO_MKISOFS_CMD);
+            mr_asprintf(isofs_cmd, "%s", MONDO_MKISOFS_CMD);
         }
         if (bkpinfo->nonbootable_backup) {
-            mr_asprintf(&mondo_mkisofs_sz, "%s%s", isofs_cmd, MONDO_MKISOFS);
+            mr_asprintf(mondo_mkisofs_sz, "%s%s", isofs_cmd, MONDO_MKISOFS);
         } else if
 #ifdef __FreeBSD__
@@ -525 +525 @@
 #ifdef __IA64__
     {
-        mr_asprintf(&mondo_mkisofs_sz, "%s%s -V _CD#_", isofs_cmd, MONDO_MKISOFS_REGULAR_ELILO);
+        mr_asprintf(mondo_mkisofs_sz, "%s%s -V _CD#_", isofs_cmd, MONDO_MKISOFS_REGULAR_ELILO);
     }
 #else
     {
-        mr_asprintf(&mondo_mkisofs_sz, "%s%s -V _CD#_", isofs_cmd, MONDO_MKISOFS_REGULAR_LILO);
+        mr_asprintf(mondo_mkisofs_sz, "%s%s -V _CD#_", isofs_cmd, MONDO_MKISOFS_REGULAR_LILO);
     }
 #endif
         else
         {
-            mr_asprintf(&mondo_mkisofs_sz, "%s%s -V _CD#_", isofs_cmd, MONDO_MKISOFS_REGULAR_SYSLINUX);
+            mr_asprintf(mondo_mkisofs_sz, "%s%s -V _CD#_", isofs_cmd, MONDO_MKISOFS_REGULAR_SYSLINUX);
         }
         mr_free(isofs_cmd);
@@ -577 +577 @@
 
         log_it("isodir = %s", bkpinfo->isodir);
-        mr_asprintf(&command, "df -P %s | tail -n1 | cut -d' ' -f1",
+        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);
@@ -599 +599 @@
 
         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 {
             // If iso_mnt is only / then iso_path is the full dir
             // (the formula bellow doesn't work in this case)
             if (strcmp(iso_mnt, "/") == 0) {
-                mr_asprintf(&iso_path, "%s", iso_tmp);
+                mr_asprintf(iso_path, "%s", iso_tmp);
             // else it's a part of iso_tmp
             } else {
-                mr_asprintf(&iso_path, "%s", iso_tmp + strlen(iso_mnt));
+                mr_asprintf(iso_path, "%s", iso_tmp + strlen(iso_mnt));
             }
         }
@@ -615 +615 @@
         mr_free(iso_mnt);
 
-        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);
@@ -622 +622 @@
         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);
@@ -646 +646 @@
                 colon++;
                 hent = gethostbyname(colon);
-                mr_asprintf(&(bkpinfo->netfs_user),"%s", hostname);
+                mr_asprintf(bkpinfo->netfs_user,"%s", hostname);
             } else {
                 hent = gethostbyname(hostname);
@@ -655 +655 @@
                 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->netfs_mount, ':'));
                 strcpy(bkpinfo->netfs_mount, ip_address);
@@ -709 +709 @@
     }
 
-    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);
@@ -750 +750 @@
         if (strstr(bkpinfo->tmpdir,"mondo.tmp.") != NULL) {
             log_it("Purging old tmpdir %s", bkpinfo->tmpdir);
-            mr_asprintf(&tmp,"rm -Rf %s",bkpinfo->tmpdir);
+            mr_asprintf(tmp,"rm -Rf %s",bkpinfo->tmpdir);
         } else {
             log_it("Purging old tmpdir %s/mondo.tmp.*", bkpinfo->tmpdir);
-            mr_asprintf(&tmp,"rm -Rf %s/mondo.tmp.*",bkpinfo->tmpdir);
+            mr_asprintf(tmp,"rm -Rf %s/mondo.tmp.*",bkpinfo->tmpdir);
         }
         paranoid_system(tmp);
@@ -761 +761 @@
     /* Always take in account arg first, then env, then default */
     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("MRTMP")) {
-        mr_asprintf(&tmp, "%s/mondo.tmp.XXXXXX", getenv("MRTMP"));
+        mr_asprintf(tmp, "%s/mondo.tmp.XXXXXX", getenv("MRTMP"));
     } else {
-        mr_asprintf(&tmp, "/tmp/mondo.tmp.XXXXXX");
+        mr_asprintf(tmp, "/tmp/mondo.tmp.XXXXXX");
     }
     p = mkdtemp(tmp);
@@ -777 +777 @@
     paranoid_free(tmp);
 
-    mr_asprintf(&tmp, "mkdir -p %s/tmpfs", bkpinfo->tmpdir);
+    mr_asprintf(tmp, "mkdir -p %s/tmpfs", bkpinfo->tmpdir);
     paranoid_system(tmp);
     mr_free(tmp);
@@ -794 +794 @@
         if (strstr(bkpinfo->scratchdir,"mondo.scratch.") != NULL) {
             log_it("Purging old scratchdir %s", bkpinfo->scratchdir);
-            mr_asprintf(&tmp,"rm -Rf %s",bkpinfo->scratchdir);
+            mr_asprintf(tmp,"rm -Rf %s",bkpinfo->scratchdir);
         } else {
             log_it("Purging old scratchdir %s/mondo.scratch.*", bkpinfo->scratchdir);
-            mr_asprintf(&tmp,"rm -Rf %s/mondo.scratch.*",bkpinfo->scratchdir);
+            mr_asprintf(tmp,"rm -Rf %s/mondo.scratch.*",bkpinfo->scratchdir);
         }
         paranoid_system(tmp);
@@ -805 +805 @@
     /* Always take in account arg first, then env, then default */
     if (path != NULL) {
-        mr_asprintf(&tmp, "%s/mondo.scratch.XXXXXX", path);
+        mr_asprintf(tmp, "%s/mondo.scratch.XXXXXX", path);
     } else if (getenv("MRSCRATCH")) {
-        mr_asprintf(&tmp, "%s/mondo.scratch.XXXXXX", getenv("MRSCRATCH"));
+        mr_asprintf(tmp, "%s/mondo.scratch.XXXXXX", getenv("MRSCRATCH"));
     } else {
-        mr_asprintf(&tmp, "/tmp/mondo.scratch.XXXXXX");
+        mr_asprintf(tmp, "/tmp/mondo.scratch.XXXXXX");
     }
     p = mkdtemp(tmp);
@@ -819 +819 @@
     paranoid_free(tmp);
 
-    mr_asprintf(&tmp, "mkdir -p %s", bkpinfo->scratchdir);
+    mr_asprintf(tmp, "mkdir -p %s", bkpinfo->scratchdir);
     paranoid_system(tmp);
     mr_free(tmp);
@@ -909 +909 @@
     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);
@@ -916 +916 @@
     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);
 
@@ -962 +962 @@
             ("ln -sf `which mkfs.msdos` /sbin/mkfs.vfat", FALSE);
     }
-    mr_asprintf(&tmp, "%s",
+    mr_asprintf(tmp, "%s",
            call_program_and_get_last_line_of_output
            ("free | grep Mem | head -n1 | tr -s ' ' '\t' | cut -f2"));
@@ -1028 +1028 @@
     run_program_and_log_output
         ("umount `mount | grep cdr | cut -d' ' -f3 | tr '\n' ' '`", 5);
-    mr_asprintf(&tmp, "%s",
+    mr_asprintf(tmp, "%s",
            call_program_and_get_last_line_of_output
            ("mount | grep -E \"cdr(om|w)\""));
@@ -1063 +1063 @@
         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
@@ -1111 +1111 @@
     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",
+        mr_asprintf(tmp, "(read_cfg_var) Cannot find %s config file",
                 config_file);
         log_to_screen(tmp);
@@ -1122 +1122 @@
         return (0);
     } else {
-        mr_asprintf(&command, "grep '%s .*' %s| cut -d' ' -f2,3,4,5",
+        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));
@@ -1206 +1206 @@
         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");
@@ -1228 +1228 @@
         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");
@@ -1251 +1251 @@
     g_boot_mountpt[0] = '\0';
     log_msg(4, "Done. Great. Seeting command to something");
-    mr_asprintf(&command, "%s",
+    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);
 
@@ -1260 +1260 @@
     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, call_program_and_get_last_line_of_output(command));
+        mr_asprintf(tmp, call_program_and_get_last_line_of_output(command));
         mr_free(command);
 
@@ -1274 +1274 @@
                 }
             } 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,
+                    mr_asprintf(tmp,
                             "%s (your /boot partition) is not mounted. I'll mount it before backing up",
                             g_boot_mountpt);
@@ -1285 +1285 @@
                     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';
@@ -1316 +1316 @@
     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");
@@ -1348 +1348 @@
     assert(value != NULL);
     if (!does_file_exist(config_file)) {
-        mr_asprintf(&tmp, "(write_cfg_file) Cannot find %s config file",
+        mr_asprintf(tmp, "(write_cfg_file) Cannot find %s config file",
                 config_file);
         log_to_screen(tmp);
@@ -1354 +1354 @@
         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",
+        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);
@@ -1536 +1536 @@
 
     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/3.0/mondo/src/common/libmondo-verify.c

@@ -333 +333 @@
                             bkpinfo->restore_path,
                             biggiestruct.filename);
-                mr_asprintf(&mds, "echo \"%s/%s not found\" >> %s/biggies.changed",
+                mr_asprintf(mds, "echo \"%s/%s not found\" >> %s/biggies.changed",
                             bkpinfo->restore_path,
                             biggiestruct.filename,
@@ -981 +981 @@
     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);
@@ -991 +991 @@
 
     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);
@@ -1006 +1006 @@
     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
@@ -1023 +1023 @@
     verify_all_slices_on_CD(mountpoint);
 
-    mr_asprintf(&tmp1, "umount -d %s", mountpoint);
+    mr_asprintf(tmp1, "umount -d %s", mountpoint);
 #ifdef __FreeBSD__
     ret += system(tmp1);
@@ -1032 +1032 @@
 #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);

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

@@ -296 +296 @@
 char *tmp1 = NULL;
 
-    mr_asprintf(&tmp,"ps %s | grep \" %s \" | grep -v \"grep\" | awk '{print %s;}'", ps_options, str , ps_proc_id);
+    mr_asprintf(tmp,"ps %s | grep \" %s \" | grep -v \"grep\" | awk '{print %s;}'", 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);
         paranoid_free(tmp1);
@@ -434 +434 @@
         run_program_and_log_output("umount -d " MNT_CDROM, FALSE);
         if (g_selfmounted_isodir) {
-            mr_asprintf(&command, "umount -d %s", g_selfmounted_isodir);
+            mr_asprintf(command, "umount -d %s", g_selfmounted_isodir);
             run_program_and_log_output(command, 1);
             paranoid_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);
             paranoid_free(command);
@@ -456 +456 @@
             if (strstr(bkpinfo->tmpdir ,"mondo.tmp.") != NULL) {
                 log_msg(8,"erasing tempdir %s",bkpinfo->tmpdir);
-                mr_asprintf(&command, "rm -Rf %s", bkpinfo->tmpdir);
+                mr_asprintf(command, "rm -Rf %s", bkpinfo->tmpdir);
                 paranoid_system(command);
                 mr_free(command);
@@ -465 +465 @@
             if (strstr(bkpinfo->scratchdir ,"mondo.scratch.") != NULL) {
                 log_msg(8,"erasing scratchdir %s",bkpinfo->scratchdir);
-                mr_asprintf(&command, "rm -Rf %s", bkpinfo->scratchdir);
+                mr_asprintf(command, "rm -Rf %s", bkpinfo->scratchdir);
                 paranoid_system(command);
                 mr_free(command);
@@ -515 +515 @@
         }
         if (grep_for_me[0] != '\0') {
-            mr_asprintf(&command, "grep '%s' %s | tail -n%d",
+            mr_asprintf(command, "grep '%s' %s | tail -n%d",
                     grep_for_me, filename, g_noof_log_lines);
         } else {
-            mr_asprintf(&command, "tail -n%d %s", g_noof_log_lines,
+            mr_asprintf(command, "tail -n%d %s", g_noof_log_lines,
                     filename);
         }
@@ -536 +536 @@
                     */
                     if (!strncmp(err_log_lines[i], "root:", 5)) {
-                        mr_asprintf(&tmp, "%s", err_log_lines[i] + 6);
+                        mr_asprintf(tmp, "%s", err_log_lines[i] + 6);
                         strncpy(err_log_lines[i], tmp, (size_t)MAX_NEWT_COMMENT_LEN);
                         mr_free(tmp);
@@ -1074 +1074 @@
                     (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, ".");
@@ -1083 +1083 @@
                 mr_strcat(pcline_str, " %c", special_dot_char(g_mysterious_dot_counter));
             } else {
-                mr_asprintf(&pcline_str, " %3d%% done              %3d%% to go",
+                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, "*");
@@ -1234 +1234 @@
             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, "*");
@@ -1443 +1443 @@
         newtPopWindow();
         if (b_res == b1) {
-            mr_asprintf(&output, "%s", "bzip2");
+            mr_asprintf(output, "%s", "bzip2");
         } else if (b_res == b2) {
-            mr_asprintf(&output, "%s", "gzip");
+            mr_asprintf(output, "%s", "gzip");
         } else if (b_res == b3) {
-            mr_asprintf(&output, "%s", "lzo");
+            mr_asprintf(output, "%s", "lzo");
         //} else if (b_res == b4) {
-            //mr_asprintf(&output, "%s", "lzma");
+            //mr_asprintf(output, "%s", "lzma");
         }
         newtPopHelpLine();
@@ -1540 +1540 @@
         }
 
-        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);
@@ -1637 +1637 @@
         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, "  ");

branches/3.0/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_getline(x,y) mr_getline_int(x,y,__LINE__,__FILE__)
+#define mr_asprintf(x,y,args...) mr_asprintf_int((char **)&x,__LINE__,__FILE__,y,## args)
+#define mr_getline(x,y) mr_getline_int((char **)&x,y,__LINE__,__FILE__)
 #define mr_malloc(x) mr_malloc_int((size_t)x,__LINE__,__FILE__)
 #define mr_setenv(x,y) mr_setenv_int(x,y,__LINE__,__FILE__)

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

@@ -107 +107 @@
     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 */
@@ -199 +199 @@
     p = mr_conf_read(field_name);
     if (p != NULL) {
-        mr_asprintf(&p1, "%d", p);
+        mr_asprintf(p1, "%d", p);
         }
     return p1;
@@ -211 +211 @@
     p = mr_conf_read(field_name);
     if (p != NULL) {
-        mr_asprintf(&p1, "%f", p);
+        mr_asprintf(p1, "%f", p);
     }
     return p1;
@@ -233 +233 @@
         return(p);
     }
-    mr_asprintf(&q, "%s", p);
+    mr_asprintf(q, "%s", p);
 
     if (*p != '"') {
@@ -276 +276 @@
             (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);
         }
     }
@@ -289 +289 @@
     char *p = NULL;
 
-    mr_asprintf(&p, "%d", FALSE);
+    mr_asprintf(p, "%d", FALSE);
     if (strcmp(str,p) != 0) {
         ret = TRUE;

branches/3.0/mondo/src/lib/mr_mem.c

@@ -122 +122 @@
  */
 void mr_strcat_int(char **in, int line, const char *file, const char *fmt, ...) {
-
     char *fmt2 = NULL;
     va_list args;

branches/3.0/mondo/src/mondoarchive/mondoarchive.c

@@ -206 +206 @@
 
     /* 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);
     paranoid_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);
     paranoid_free(tmp1);
@@ -382 +382 @@
         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. ");
         }
     }
@@ -392 +392 @@
         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);
@@ -432 +432 @@
         paranoid_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/3.0/mondo/src/mondorestore/mondo-prep.c

@@ -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));
                 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));
                 free(tmp1);
@@ -586 +586 @@
     // create device list from normal disks followed by spare ones
     if (raidlist->el[i].data_disks.el[0].device != NULL) {
-        mr_asprintf(&devices, "%s", raidlist->el[i].data_disks.el[0].device);
+        mr_asprintf(devices, "%s", raidlist->el[i].data_disks.el[0].device);
         log_msg(4, "Adding device %s to list", raidlist->el[i].data_disks.el[0].device);
     } else {
@@ -602 +602 @@
     // 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:
@@ -614 +614 @@
     // - 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);
     mr_free(level);
     log_msg(4, "cmd built: %s", program);
@@ -718 +718 @@
 
     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);
         paranoid_free(tmp);
@@ -733 +733 @@
 #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);
         paranoid_free(tmp);
@@ -740 +740 @@
     }
     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);
         paranoid_free(tmp);
@@ -771 +771 @@
             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);
             paranoid_free(tmp);
@@ -789 +789 @@
                     *(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);
                 paranoid_free(tmp);
 
-                mr_asprintf(&tmp, "vinum init %s", line);
+                mr_asprintf(tmp, "vinum init %s", line);
                 paranoid_system(tmp);
                 paranoid_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");
                     paranoid_free(tmp);
@@ -820 +820 @@
         }
 #else
-        mr_asprintf(&tmp, "Initializing RAID device %s", device);
+        mr_asprintf(tmp, "Initializing RAID device %s", device);
         log_to_screen(tmp);
         paranoid_free(tmp);
@@ -871 +871 @@
     }
     res = which_format_command_do_i_need(format, program);
-    mr_asprintf(&tmp, "%s %s", program, device);
+    mr_asprintf(tmp, "%s %s", program, device);
     if (strstr(program, "kludge")) {
         mr_strcat(tmp, " /");
@@ -878 +878 @@
     paranoid_free(tmp);
 
-    mr_asprintf(&tmp, "Formatting %s as %s", device, format);
+    mr_asprintf(tmp, "Formatting %s as %s", device, format);
     update_progress_form(tmp);
     paranoid_free(tmp);
@@ -892 +892 @@
 
     if (res && strstr(program, "kludge")) {
-        mr_asprintf(&tmp, "Kludge failed; using regular mkfs.%s to format %s",
+        mr_asprintf(tmp, "Kludge failed; using regular mkfs.%s to format %s",
                 format, device);
 #ifdef __FreeBSD__
@@ -1705 +1705 @@
         paranoid_system(tmp);
         // mark relevant partition as bootable
-        mr_asprintf(&tmp1,"make-me-bootable /tmp/mountlist.txt %s",drivename);
+        mr_asprintf(tmp1,"make-me-bootable /tmp/mountlist.txt %s",drivename);
         call_program_and_get_last_line_of_output(tmp1);
         mr_free(tmp1);
@@ -1817 +1817 @@
     /* 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) {
@@ -2169 +2169 @@
             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(output, "t\n%d\n%s\nw\n", partno, partcode);
             sprintf(command, "parted2fdisk %s >> %s 2>> %s", drive,
                     MONDO_LOGFILE, MONDO_LOGFILE);
@@ -2519 +2519 @@
         return;
     }
-    mr_asprintf(&tmp, "Expanding entries to suit drive %s (%lld MB)", drive_name, current_size_of_drive / 1024);
+    mr_asprintf(tmp, "Expanding entries to suit drive %s (%lld MB)", drive_name, current_size_of_drive / 1024);
     log_to_screen(tmp);
     mr_free(tmp);
@@ -2539 +2539 @@
 
     if (original_size_of_drive <= 0LL) {
-        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);
@@ -2545 +2545 @@
     }
     factor = ((float)current_size_of_drive/(float)original_size_of_drive);
-    mr_asprintf(&tmp, "Disk %s was %lld MB; is now %lld MB; Proportionally resizing partitions (factor ~= %.5f)",
+    mr_asprintf(tmp, "Disk %s was %lld MB; is now %lld MB; Proportionally resizing partitions (factor ~= %.5f)",
             drive_name, original_size_of_drive/1024, current_size_of_drive/1024, factor);
     log_to_screen(tmp);
@@ -2572 +2572 @@
         totalsizL += newsizL;
 
-        mr_asprintf(&tmp, "Changing %s from %lld KB to %lld KB", drivemntlist->el[partno]->device, drivemntlist->el[partno]->size, newsizL);
+        mr_asprintf(tmp, "Changing %s from %lld KB to %lld KB", drivemntlist->el[partno]->device, drivemntlist->el[partno]->size, newsizL);
         log_to_screen(tmp);
         mr_free(tmp);
@@ -2579 +2579 @@
     // Ensures over-allocation alert and prompt for interactive mode does not happen
     if (totalsizL > current_size_of_drive) {
-        mr_asprintf(&tmp, "Last partition size calculated would be over-allocated, reducing %s from %lld KB to %lld KB.", drivemntlist->el[lastpart]->device, drivemntlist->el[lastpart]->size, drivemntlist->el[lastpart]->size - (totalsizL - current_size_of_drive));
+        mr_asprintf(tmp, "Last partition size calculated would be over-allocated, reducing %s from %lld KB to %lld KB.", drivemntlist->el[lastpart]->device, drivemntlist->el[lastpart]->size, drivemntlist->el[lastpart]->size - (totalsizL - current_size_of_drive));
         drivemntlist->el[drivemntlist->entries-1]->size -= (totalsizL - current_size_of_drive);
     } else if (totalsizL < current_size_of_drive) {
-        mr_asprintf(&tmp, "Last partition size calculated would be under-allocated, increasing %s from %lld KB to %lld KB.",drivemntlist->el[lastpart]->device, drivemntlist->el[lastpart]->size, drivemntlist->el[lastpart]->size + (current_size_of_drive - totalsizL));
+        mr_asprintf(tmp, "Last partition size calculated would be under-allocated, increasing %s from %lld KB to %lld KB.",drivemntlist->el[lastpart]->device, drivemntlist->el[lastpart]->size, drivemntlist->el[lastpart]->size + (current_size_of_drive - totalsizL));
         drivemntlist->el[drivemntlist->entries-1]->size += (current_size_of_drive - totalsizL);
     }
     log_to_screen(tmp);
     mr_free(tmp);
-    mr_asprintf(&tmp, "final_size = %lld MB", current_size_of_drive / 1024);
+    mr_asprintf(tmp, "final_size = %lld MB", current_size_of_drive / 1024);
     log_to_screen(tmp);
     mr_free(tmp);

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

@@ -81 +81 @@
             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);
@@ -88 +88 @@
     }
     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);
@@ -105 +105 @@
 
     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);
@@ -121 +121 @@
     }
     log_msg(2, 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);
@@ -149 +149 @@
         }
     }
-    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");
@@ -280 +280 @@
 
     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/3.0/mondo/src/mondorestore/mondo-rstr-newt.c

@@ -1974 +1974 @@
         /* flaws_str can be NULL */
         if ((flaws_str == NULL) || (strlen(flaws_str) == 0)) {
-            mr_asprintf(&flaws_str_A, "");
+            mr_asprintf(flaws_str_A, "");
         } else {
-            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--);
-            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';
         } else {
-            mr_asprintf(&flaws_str_B, "");
+            mr_asprintf(flaws_str_B, "");
         }
         if (strlen(flaws_str_B) >= 74) {
             for (i = 74; flaws_str_B[i] != ' '; i--);
-            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';
         } else {
-            mr_asprintf(&flaws_str_C, "");
+            mr_asprintf(flaws_str_C, "");
         }
 

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

@@ -330 +330 @@
                 if (HDD) {
                     /*  We need an additional param */
-                    mr_asprintf(&(bkpinfo->subdir), "%s", bkpinfo->isodir);
+                    mr_asprintf(bkpinfo->subdir, "%s", bkpinfo->isodir);
                     strcpy(bkpinfo->isodir, "/tmp/isodir");
                     log_it("Now bkpinfo->isodir = %s and subdir = ", bkpinfo->isodir, bkpinfo->subdir);
@@ -383 +383 @@
     log_to_screen("WARNING - isodir is already mounted");
 } else {
-    mr_asprintf(&mount_isodir_command, "mount %s", g_isodir_device);
+    mr_asprintf(mount_isodir_command, "mount %s", g_isodir_device);
     if (strlen(g_isodir_format) > 1) {
         mr_strcat(mount_isodir_command, " -t %s", g_isodir_format);
@@ -478 +478 @@
     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) {
@@ -586 +586 @@
                "", mountlist->entries);
 
-    mr_asprintf(&these_failed, "");
+    mr_asprintf(these_failed, "");
     for (lino = 0; lino < mountlist->entries; lino++) {
         if (!strcmp(mountlist->el[lino].device, "/proc")) {
@@ -766 +766 @@
     bkpinfo->please_dont_eject = TRUE;
     if (read_cfg_var(cfg_file, "netfs-proto", value) == 0) {
-        mr_asprintf(&(bkpinfo->netfs_proto),"%s", value);
+        mr_asprintf(bkpinfo->netfs_proto,"%s", value);
     } else {
         /* For compatibility, force protocol in old nfs case to be transparent */
-        mr_asprintf(&(bkpinfo->netfs_proto), "nfs");
+        mr_asprintf(bkpinfo->netfs_proto, "nfs");
     }
     if (read_cfg_var(cfg_file, "netfs-server-user", value) == 0) {
-        mr_asprintf(&(bkpinfo->netfs_user),"%s", value);
+        mr_asprintf(bkpinfo->netfs_user,"%s", value);
     }
     if (read_cfg_var(cfg_file, "iso-prefix", value) == 0) {
@@ -851 +851 @@
 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")) {
@@ -859 +859 @@
 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")) {
@@ -1370 +1370 @@
      * 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);
@@ -1385 +1385 @@
     read_cfg_var(g_mondo_cfg_file, "bootloader.device", device);
     read_cfg_var(g_mondo_cfg_file, "bootloader.name", name);
-    mr_asprintf(&tmp, "run_boot_loader: device='%s', name='%s'", device, name);
+    mr_asprintf(tmp, "run_boot_loader: device='%s', name='%s'", device, name);
     log_msg(2, tmp);
     paranoid_free(tmp);
@@ -1402 +1402 @@
 #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)) {
             paranoid_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 {
@@ -2056 +2056 @@
     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,
@@ -2075 +2075 @@
             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);

branches/3.0/mondo/src/mondorestore/mondorestore.c

@@ -354 +354 @@
 
     /* 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);
@@ -369 +369 @@
 
     /* 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");
@@ -384 +384 @@
 
     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) {
@@ -1670 +1670 @@
     use_star = (strstr(tarball_fname, ".star")) ? TRUE : FALSE;
 //  sprintf(files_to_restore_this_time_fname, "/tmp/ftrttf.%d.%d", (int)getpid(), (int)random());
-    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);
@@ -1757 +1757 @@
 //      if (strstr(tarball_fname, ".star."))
         if (use_star) {
-            mr_asprintf(&command, "star -x -force-remove -sparse -U " STAR_ACL_SZ " file=%s", tarball_fname);
+            mr_asprintf(command, "star -x -force-remove -sparse -U " STAR_ACL_SZ " file=%s", tarball_fname);
             if (strstr(tarball_fname, ".bz2")) {
                 mr_strcat(command, " -bz");
@@ -1763 +1763 @@
         } else {
             if (filelist_subset_fname[0] != '\0') {
-                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);
             }
         }
@@ -1818 +1818 @@
         // Be verbose for star
         if (retval || use_star) {
-            mr_asprintf(&command, "cat %s >> %s", temp_log, MONDO_LOGFILE);
+            mr_asprintf(command, "cat %s >> %s", temp_log, MONDO_LOGFILE);
             paranoid_system(command);
             paranoid_free(command);
@@ -2310 +2310 @@
                                               filelist);
             }
-            mr_asprintf(&tmp1, "%s #%d, fileset #%ld - restore ",
+            mr_asprintf(tmp1, "%s #%d, fileset #%ld - restore ",
                     mds, g_current_media_number, current_tarball_number);
             if (res) {

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

@@ -56 +56 @@
 char *flaws_str = NULL;
 
-mr_asprintf(&MONDO_LOGFILE,"/tmp/mrtest-mountlist.log");
+mr_asprintf(MONDO_LOGFILE,"/tmp/mrtest-mountlist.log");
 
 /* Globals */
@@ -72 +72 @@
 
 setup_newt_stuff();
-mr_asprintf(&g_mountlist_fname, MOUNTLIST_TEST);
+mr_asprintf(g_mountlist_fname, MOUNTLIST_TEST);
 log_it("before mountlist");
 load_mountlist(mountlist, g_mountlist_fname);

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

@@ -67 +67 @@
 int i;
 
-mr_asprintf(&MONDO_LOGFILE,"/tmp/mrtest-truncname.log");
+mr_asprintf(MONDO_LOGFILE,"/tmp/mrtest-truncname.log");
 
 /* Globals */
@@ -77 +77 @@
 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);