Changeset 1080 in MondoRescue

Timestamp:

Jan 28, 2007, 7:04:41 PM (18 years ago)

Author:

Bruno Cornec

Message:

• Fix mindi install messages (reported by Andree Leidenfrost)
• remove paranoid_free/free for mr_free
• mr_asprintf used everywhere
• mr_malloc used everywhere

Location:

branches/stable

Files:

• mindi/install.sh (modified) (3 diffs)
• mondo/src/common/libmondo-archive.c (modified) (37 diffs)
• mondo/src/common/libmondo-devices.c (modified) (34 diffs)
• mondo/src/common/libmondo-fifo.c (modified) (2 diffs)
• mondo/src/common/libmondo-filelist.c (modified) (24 diffs)
• mondo/src/common/libmondo-files.c (modified) (5 diffs)
• mondo/src/common/libmondo-fork.c (modified) (9 diffs)
• mondo/src/common/libmondo-mountlist.c (modified) (11 diffs)
• mondo/src/common/libmondo-raid.c (modified) (24 diffs)
• mondo/src/common/libmondo-stream.c (modified) (20 diffs)
• mondo/src/common/libmondo-string.c (modified) (8 diffs)
• mondo/src/common/libmondo-tools.c (modified) (7 diffs)
• mondo/src/common/libmondo-verify.c (modified) (14 diffs)
• mondo/src/common/newt-specific.c (modified) (40 diffs)
• mondo/src/include/my-stuff.h (modified) (3 diffs)
• mondo/src/mondoarchive/main.c (modified) (3 diffs)
• mondo/src/mondoarchive/mondo-cli.c (modified) (9 diffs)
• mondo/src/mondorestore/mondo-prep.c (modified) (42 diffs)
• mondo/src/mondorestore/mondo-restore.c (modified) (19 diffs)
• mondo/src/mondorestore/mondo-rstr-compare.c (modified) (8 diffs)
• mondo/src/mondorestore/mondo-rstr-newt.c (modified) (6 diffs)
• mondo/src/mondorestore/mondo-rstr-tools.c (modified) (35 diffs)
• tools/quality (modified) (1 diff)

branches/stable/mindi/install.sh

@@ -12 +12 @@
     local=${HEAD}$PREFIX
     sublocal=$PREFIX
-    if [ -f /usr/local/sbin/mindi ]; then
-        echo "WARNING: /usr/local/sbin/mindi exists. You should probably remove your manual installation !"
-    fi
     if [ "_$CONFDIR" != "_" ]; then
         conf=${HEAD}$CONFDIR/mindi
@@ -22 +19 @@
         exit -1
     fi
-    echo $PATH | grep /usr/sbin > /dev/null || echo "Warning - your PATH environmental variable is BROKEN. Please add /usr/sbin to your PATH."
 else
     local=/usr/local
@@ -129 +125 @@
 install -m 644 ChangeLog COPYING README README.busybox README.ia64 README.pxe TODO INSTALL svn.log $DOCDIR
 
-if [ ! -f $locallib/mindi/rootfs/bin/busybox ]; then
+if [ "_$PREFIX" = "_" && ! -f $locallib/mindi/rootfs/bin/busybox ]; then
         echo "WARNING: no busybox found, mindi will not work on this arch ($ARCH)"
 fi

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

@@ -267 +267 @@
     }
 
-    paranoid_free(command);
-    paranoid_free(zipparams);
-    paranoid_free(tmp);
+    mr_free(command);
+    mr_free(zipparams);
+    mr_free(tmp);
     return (retval);
 }
@@ -403 +403 @@
         }
     }
-    paranoid_free(command);
-    paranoid_free(zipparams);
-    paranoid_free(tmp);
+    mr_free(command);
+    mr_free(zipparams);
+    mr_free(tmp);
     return (retval);
 }
@@ -496 +496 @@
         sleep(2);
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
     return (retval);
 }
@@ -565 +565 @@
 
     assert(bkpinfo != NULL);
-    command = malloc(1200);
+    command = mr_malloc(1200);
     malloc_string(tmp);
     malloc_string(scratchdir);
@@ -814 +814 @@
 
     if (g_getfattr) {
-        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",
                 __LINE__);
         }
-        paranoid_free(tmp1);
+        mr_free(tmp1);
     }
     if (g_getfacl) {
-        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",
                 __LINE__);
         }
-        paranoid_free(tmp1);
+        mr_free(tmp1);
     }
 
@@ -849 +849 @@
 
     if (bkpinfo->backup_media_type == usb) {
-        asprintf(&tmp2, "--usb %s", bkpinfo->media_device);
+        mr_asprintf(&tmp2, "--usb %s", bkpinfo->media_device);
     } else {
-        asprintf(&tmp2,"");
+        mr_asprintf(&tmp2,"");
     }
 
@@ -935 +935 @@
         }
     }
-    paranoid_free(tmp);
-    paranoid_free(use_lzo_sz);
-    paranoid_free(use_gzip_sz);
-    paranoid_free(scratchdir);
-    paranoid_free(use_comp_sz);
-    paranoid_free(bootldr_str);
-    paranoid_free(tape_device);
-    paranoid_free(last_filelist_number);
-    paranoid_free(broken_bios_sz);
-    paranoid_free(cd_recovery_sz);
-    paranoid_free(tape_size_sz);
-    paranoid_free(devs_to_exclude);
-    paranoid_free(use_lilo_sz);
-    paranoid_free(value);
-    paranoid_free(bootdev);
-    paranoid_free(command);
-    paranoid_free(use_star_sz);
+    mr_free(tmp);
+    mr_free(use_lzo_sz);
+    mr_free(use_gzip_sz);
+    mr_free(scratchdir);
+    mr_free(use_comp_sz);
+    mr_free(bootldr_str);
+    mr_free(tape_device);
+    mr_free(last_filelist_number);
+    mr_free(broken_bios_sz);
+    mr_free(cd_recovery_sz);
+    mr_free(tape_size_sz);
+    mr_free(devs_to_exclude);
+    mr_free(use_lilo_sz);
+    mr_free(value);
+    mr_free(bootdev);
+    mr_free(command);
+    mr_free(use_star_sz);
     return (res);
 }
@@ -1122 +1122 @@
     log_msg(3, "%s[%d:%d] - exiting", FORTY_SPACES, getpid(),
             this_thread_no);
-    paranoid_free(archiving_filelist_fname);
-    paranoid_free(archiving_afioball_fname);
-    paranoid_free(curr_xattr_list_fname);
-    paranoid_free(curr_acl_list_fname);
-    paranoid_free(tmp);
+    mr_free(archiving_filelist_fname);
+    mr_free(archiving_afioball_fname);
+    mr_free(curr_xattr_list_fname);
+    mr_free(curr_acl_list_fname);
+    mr_free(tmp);
     pthread_exit(NULL);
 }
@@ -1259 +1259 @@
                                      BLK_START_OF_BACKUP);
     }
-    paranoid_free(command);
-    paranoid_free(tmpfile);
-    paranoid_free(data_disks_file);
+    mr_free(command);
+    mr_free(tmpfile);
+    mr_free(data_disks_file);
     return (retval);
 }
@@ -1350 +1350 @@
     }
     unlink(tempfile);
-    paranoid_free(command);
-    paranoid_free(tempfile);
+    mr_free(command);
+    mr_free(tempfile);
     return (res);
 }
@@ -1379 +1379 @@
     assert_string_is_neither_NULL_nor_zerolength(device);
     malloc_string(title);
-    command = malloc(1000);
+    command = mr_malloc(1000);
     if (!system("which superformat > /dev/null 2> /dev/null")) {
         sprintf(command, "superformat %s", device);
@@ -1395 +1395 @@
         }
     }
-    paranoid_free(title);
-    paranoid_free(command);
+    mr_free(title);
+    mr_free(command);
     return (res);
 }
@@ -1485 +1485 @@
     log_msg(8, "here");
     assert(bkpinfo != NULL);
-    tmp = malloc(MAX_STR_LEN * 2);
+    tmp = mr_malloc(MAX_STR_LEN * 2);
     malloc_string(result_str);
     malloc_string(curr_xattr_list_fname);
@@ -1493 +1493 @@
     malloc_string(storing_afioball_fname);
     transfer_block =
-        malloc(sizeof(struct s_bkpinfo) + BKPINFO_LOC_OFFSET + 64);
+        mr_malloc(sizeof(struct s_bkpinfo) + BKPINFO_LOC_OFFSET + 64);
     memset((void *) transfer_block, 0,
            sizeof(struct s_bkpinfo) + BKPINFO_LOC_OFFSET + 64);
@@ -1654 +1654 @@
     }
     log_to_screen(tmp);
-    paranoid_free(transfer_block);
-    paranoid_free(result_str);
-    paranoid_free(storing_filelist_fname);
-    paranoid_free(media_usage_comment);
-    paranoid_free(storing_afioball_fname);
-    paranoid_free(curr_xattr_list_fname);
-    paranoid_free(curr_acl_list_fname);
+    mr_free(transfer_block);
+    mr_free(result_str);
+    mr_free(storing_filelist_fname);
+    mr_free(media_usage_comment);
+    mr_free(storing_afioball_fname);
+    mr_free(curr_xattr_list_fname);
+    mr_free(curr_acl_list_fname);
     return (retval);
 }
@@ -1718 +1718 @@
     malloc_string(sz_blank_disk);
     malloc_string(fnam);
-    tmp = malloc(1200);
-    tmp2 = malloc(1200);
-    tmp3 = malloc(1200);
+    tmp = mr_malloc(1200);
+    tmp2 = mr_malloc(1200);
+    tmp3 = mr_malloc(1200);
     assert(bkpinfo != NULL);
     assert_string_is_neither_NULL_nor_zerolength(destfile);
@@ -1754 +1754 @@
        }
      */
-    free(tmp2);
-    free(tmp3);
-    tmp2 = NULL;
-    tmp3 = NULL;
+    mr_free(tmp2);
+    mr_free(tmp3);
     if (bkpinfo->backup_media_type == iso && bkpinfo->manual_cd_tray) {
         popup_and_OK("Please insert new media and press Enter.");
@@ -2007 +2005 @@
         log_msg(1, "WARNING - make_iso_fs returned an error");
     }
-    paranoid_free(old_pwd);
-    paranoid_free(result_sz);
-    paranoid_free(message_to_screen);
-    paranoid_free(sz_blank_disk);
-    paranoid_free(fnam);
-    paranoid_free(tmp);
+    mr_free(old_pwd);
+    mr_free(result_sz);
+    mr_free(message_to_screen);
+    mr_free(sz_blank_disk);
+    mr_free(fnam);
+    mr_free(tmp);
     return (retval);
 }
@@ -2220 +2218 @@
     close_progress_form();
     paranoid_fclose(fin);
-    paranoid_free(tmp);
-    paranoid_free(bigfile_fname);
-    paranoid_free(sz_devfile);
+    mr_free(tmp);
+    mr_free(bigfile_fname);
+    mr_free(sz_devfile);
     return (retval);
 }
@@ -2255 +2253 @@
     malloc_string(curr_acl_list_fname);
 
-    tmp = malloc(MAX_STR_LEN * 2);
+    tmp = mr_malloc(MAX_STR_LEN * 2);
 
     sprintf(tmp, "%s/archives/filelist.full", bkpinfo->scratchdir);
@@ -2360 +2358 @@
     }
     log_to_screen(tmp);
-    paranoid_free(tmp);
-    paranoid_free(curr_filelist_fname);
-    paranoid_free(curr_afioball_fname);
-    paranoid_free(media_usage_comment);
-    paranoid_free(curr_xattr_list_fname);
-    paranoid_free(curr_acl_list_fname);
+    mr_free(tmp);
+    mr_free(curr_filelist_fname);
+    mr_free(curr_afioball_fname);
+    mr_free(media_usage_comment);
+    mr_free(curr_xattr_list_fname);
+    mr_free(curr_acl_list_fname);
     return (retval);
 }
@@ -2446 +2444 @@
     malloc_string(xattr_fname);
     malloc_string(acl_fname);
-    command = malloc(1200);
+    command = mr_malloc(1200);
     mvaddstr_and_log_it(g_currentY, 0,
                         "Archiving large files to media           ");
@@ -2496 +2494 @@
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     }
-    paranoid_free(blah);
-    paranoid_free(biggielist);
-    paranoid_free(command);
-    paranoid_free(xattr_fname);
-    paranoid_free(acl_fname);
+    mr_free(blah);
+    mr_free(biggielist);
+    mr_free(command);
+    mr_free(xattr_fname);
+    mr_free(acl_fname);
     return (retval);
 }
@@ -2552 +2550 @@
     assert(bkpinfo != NULL);
     malloc_string(curr_file);
-    tmp = malloc(1200);
+    tmp = mr_malloc(1200);
     would_occupy = space_occupied_by_cd(bkpinfo->scratchdir);
     va_start(ap, files_to_add); // initialize the variable arguments
@@ -2606 +2604 @@
                 "Warning - errors occurred while I was adding files to CD dir");
     }
-    paranoid_free(tmp);
-    paranoid_free(curr_file);
+    mr_free(tmp);
+    mr_free(curr_file);
     return (retval);
 }
@@ -2768 +2766 @@
         }
     }
-    paranoid_free(tmp);
-    paranoid_free(comment);
-    paranoid_free(bootdisk_dev);
-    paranoid_free(datadisk_dev);
+    mr_free(tmp);
+    mr_free(comment);
+    mr_free(bootdisk_dev);
+    mr_free(datadisk_dev);
     return (res);
 }
@@ -2913 +2911 @@
                 "Warning - errors occurred while I was adding file to tape");
     }
-    paranoid_free(curr_file);
+    mr_free(curr_file);
     return (retval);
 }
@@ -2973 +2971 @@
     }
 //  retract_CD_tray_and_defeat_autorun();
-    paranoid_free(tmp);
-    paranoid_free(cdrecord);
-    paranoid_free(bkp);
+    mr_free(tmp);
+    mr_free(cdrecord);
+    mr_free(bkp);
     return (res);
 }
@@ -3136 +3134 @@
     log_to_screen("Proceeding w/ %s in drive.",
                   media_descriptor_string(g_backup_media_type));
-    paranoid_free(tmp);
-    paranoid_free(szmsg);
-    paranoid_free(cdrom_dev);
-    paranoid_free(cdrw_dev);
-    paranoid_free(mtpt);
-    paranoid_free(szcdno);
-    paranoid_free(szserfname);
-    paranoid_free(our_serial_str);
-    paranoid_free(szunmount);
+    mr_free(tmp);
+    mr_free(szmsg);
+    mr_free(cdrom_dev);
+    mr_free(cdrw_dev);
+    mr_free(mtpt);
+    mr_free(szcdno);
+    mr_free(szserfname);
+    mr_free(our_serial_str);
+    mr_free(szunmount);
     if (pmountable) {
         if (attempt_to_mount_returned_this) {
@@ -3265 +3263 @@
     malloc_string(file_to_archive);
     malloc_string(suffix);
-    command = malloc(MAX_STR_LEN * 8);
+    command = mr_malloc(MAX_STR_LEN * 8);
 
     biggiestruct.for_backward_compatibility = '\n';
     biggiestruct.use_ntfsprog = use_ntfsprog;
-    if (!(tempblock = (char *) malloc(256 * 1024))) {
-        fatal_error("malloc error 256*1024");
-    }
+    tempblock = (char *) mr_malloc(256 * 1024);
     optimal_set_size = bkpinfo->optimal_set_size;
     if (is_this_file_compressed(biggie_filename)
@@ -3338 +3334 @@
                 biggie_filename);
         log_to_screen(tmp);
-        paranoid_free(tempblock);
-        paranoid_free(tmp);
-        paranoid_free(checksum_line);
-        paranoid_free(command);
+        mr_free(tempblock);
+        mr_free(tmp);
+        mr_free(checksum_line);
+        mr_free(command);
         return (1);
     }
@@ -3473 +3469 @@
     }
     log_msg(1, tmp);
-    paranoid_free(tempblock);
-    paranoid_free(tmp);
-    paranoid_free(checksum_line);
-    paranoid_free(command);
-    paranoid_free(curr_slice_fname_uncompressed);
-    paranoid_free(curr_slice_fname_compressed);
-    paranoid_free(file_to_archive);
-    paranoid_free(suffix);
+    mr_free(tempblock);
+    mr_free(tmp);
+    mr_free(checksum_line);
+    mr_free(command);
+    mr_free(curr_slice_fname_uncompressed);
+    mr_free(curr_slice_fname_compressed);
+    mr_free(file_to_archive);
+    mr_free(suffix);
     return (retval);
 }
@@ -3525 +3521 @@
     sprintf(tmp, "ls -l %s", dir);
     run_program_and_log_output(tmp, FALSE);
-    paranoid_free(tmp);
-    paranoid_free(dir);
+    mr_free(tmp);
+    mr_free(dir);
 }
 
@@ -3573 +3569 @@
 #endif
     log_msg(2, "Returning from writing final ISO (res=%d)", res);
-    paranoid_free(tmp);
+    mr_free(tmp);
     return (res);
 }
@@ -3740 +3736 @@
 
     bkpinfo->verify_data = orig_vfy_flag_val;
-    paranoid_free(tmp);
-    paranoid_free(cdno_fname);
-    paranoid_free(lastcd_fname);
-    paranoid_free(isofile);
+    mr_free(tmp);
+    mr_free(cdno_fname);
+    mr_free(lastcd_fname);
+    mr_free(isofile);
     return (0);
 }
@@ -3843 +3839 @@
         }
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
     return (retval);
 }
@@ -3931 +3927 @@
     paranoid_fclose(fin);
     paranoid_fclose(fout);
-    paranoid_free(tmp);
-    paranoid_free(title);
+    mr_free(tmp);
+    mr_free(title);
     close_evalcall_form();
     return (res);

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

@@ -139 +139 @@
         is_this_a_ramdisk = TRUE;
     }
-    paranoid_free(tmp);
-    paranoid_free(comment);
+    mr_free(tmp);
+    mr_free(comment);
     log_msg(1, "Is this a ramdisk? result = %d", is_this_a_ramdisk);
     return (is_this_a_ramdisk);
@@ -228 +228 @@
     log_msg(3, "Ejecting %s", dev);
     res2 = run_program_and_log_output(command, 1);
-    paranoid_free(command);
+    mr_free(command);
     if (res1 && res2) {
         return (1);
@@ -260 +260 @@
 #endif
     i = run_program_and_log_output(command, FALSE);
-    paranoid_free(command);
+    mr_free(command);
     return (i);
 }
@@ -287 +287 @@
         ret = TRUE;
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
     return (ret);
 }
@@ -365 +365 @@
         log_OS_error("Cannot pclose fin");
     }
-    paranoid_free(program);
-    paranoid_free(incoming);
-    paranoid_free(searchstr);
-    paranoid_free(tmp);
+    mr_free(program);
+    mr_free(incoming);
+    mr_free(searchstr);
+    mr_free(tmp);
     return (res);
 }
@@ -398 +398 @@
             dev, str);
     i = system(command);
-    paranoid_free(command);
+    mr_free(command);
     if (i) {
         return (FALSE);
@@ -425 +425 @@
             dev, n, str);
     i = system(command);
-    paranoid_free(command);
+    mr_free(command);
     if (i) {
         return (FALSE);
@@ -487 +487 @@
         log_msg(1, "mount succeeded with %s", dev);
     }
-    paranoid_free(dev);
+    mr_free(dev);
     return (res);
 }
@@ -522 +522 @@
         strcpy(cdrw_device, g_cdrw_drive_is_here);
         log_msg(3, "Been there, done that. Returning %s", cdrw_device);
-        paranoid_free(comment);
-        paranoid_free(tmp);
-        paranoid_free(cdr_exe);
-        paranoid_free(command);
+        mr_free(comment);
+        mr_free(tmp);
+        mr_free(cdr_exe);
+        mr_free(command);
         return (0);
     }
@@ -531 +531 @@
         log_msg(1,
                 "This is dumb. You're calling find_cdrw_device() but you're backing up to DVD. WTF?");
-        paranoid_free(comment);
-        paranoid_free(tmp);
-        paranoid_free(cdr_exe);
-        paranoid_free(command);
+        mr_free(comment);
+        mr_free(tmp);
+        mr_free(cdr_exe);
+        mr_free(command);
         return (1);
     }
@@ -551 +551 @@
     }
     if (strlen(tmp) < 2) {
-        paranoid_free(comment);
-        paranoid_free(tmp);
-        paranoid_free(cdr_exe);
-        paranoid_free(command);
+        mr_free(comment);
+        mr_free(tmp);
+        mr_free(cdr_exe);
+        mr_free(command);
         return 1;
     } else {
@@ -561 +561 @@
         log_it(comment);
         strcpy(g_cdrw_drive_is_here, cdrw_device);
-        paranoid_free(comment);
-        paranoid_free(tmp);
-        paranoid_free(cdr_exe);
-        paranoid_free(command);
+        mr_free(comment);
+        mr_free(tmp);
+        mr_free(cdr_exe);
+        mr_free(command);
         return (0);
     }
@@ -872 +872 @@
     }
   end_of_find_cdrom_device:
-    paranoid_free(tmp);
-    paranoid_free(cdr_exe);
-    paranoid_free(phrase_one);
-    paranoid_free(phrase_two);
-    paranoid_free(command);
-    paranoid_free(dvd_last_resort);
-    paranoid_free(mountpoint);
+    mr_free(tmp);
+    mr_free(cdr_exe);
+    mr_free(phrase_one);
+    mr_free(phrase_two);
+    mr_free(command);
+    mr_free(dvd_last_resort);
+    mr_free(mountpoint);
     return (retval);
 }
@@ -1120 +1120 @@
                 outL = tempLa * tempLb / 1024 * tempLc / 1024;
                 if (outL > 100) {
-                    paranoid_free(tmp);
-                    paranoid_free(command);
+                    mr_free(tmp);
+                    mr_free(command);
                     return (outL);
                 }
@@ -1134 +1134 @@
     strcpy(tmp, call_program_and_get_last_line_of_output(command));
     if (atol(tmp) > 0) {
-        paranoid_free(tmp);
-        paranoid_free(command);
+        mr_free(tmp);
+        mr_free(command);
         return (atol(tmp));
     }
@@ -1144 +1144 @@
         strcpy(tmp, p + 1);
     } else {
-        paranoid_free(tmp);
-        paranoid_free(command);
+        mr_free(tmp);
+        mr_free(command);
         return (-1);
     }
@@ -1163 +1163 @@
         log_msg(3, "Cannot find %s's size: dmesg isn't helping either.",
                 drive);
-        paranoid_free(tmp);
-        paranoid_free(command);
+        mr_free(tmp);
+        mr_free(command);
         return (-1);
     }
@@ -1172 +1172 @@
     outL = atol(p);
     if (outL <= 0) {
-        paranoid_free(tmp);
-        paranoid_free(command);
+        mr_free(tmp);
+        mr_free(command);
         return (-1);
     }
@@ -1179 +1179 @@
         outL = outL * 1024;
     }
-    paranoid_free(tmp);
-    paranoid_free(command);
+    mr_free(tmp);
+    mr_free(command);
     return (outL * 19 / 20);
 #endif
@@ -1238 +1238 @@
         }
     }
-    paranoid_free(good_formats);
-    paranoid_free(command);
-    paranoid_free(format_sz);
+    mr_free(good_formats);
+    mr_free(command);
+    mr_free(format_sz);
     return (retval);
 }
@@ -1318 +1318 @@
     }
   end_of_func:
-    paranoid_free(incoming);
-    paranoid_free(device_with_tab);
-    paranoid_free(device_with_space);
-    paranoid_free(tmp);
+    mr_free(incoming);
+    mr_free(device_with_tab);
+    mr_free(device_with_space);
+    mr_free(tmp);
     return (retval);
 }
@@ -1454 +1454 @@
     log_msg(1, "system(%s) returned %d", command, retval);
 
-    paranoid_free(command);
-    paranoid_free(dev);
-    paranoid_free(options);
+    mr_free(command);
+    mr_free(dev);
+    mr_free(options);
     return (retval);
 }
@@ -1571 +1571 @@
         g_current_media_number = cd_number_i_want;
     }
-    paranoid_free(tmp);
-    paranoid_free(request);
+    mr_free(tmp);
+    mr_free(request);
 }
 
@@ -2173 +2173 @@
         }
     }
-    paranoid_free(tmp);
-    paranoid_free(sz_size);
-    paranoid_free(command);
-    paranoid_free(comment);
-    paranoid_free(prompt);
+    mr_free(tmp);
+    mr_free(sz_size);
+    mr_free(command);
+    mr_free(comment);
+    mr_free(prompt);
     return (0);
 }
@@ -2209 +2209 @@
     sprintf(result_sz, "%s %s", exclude_these_directories,
             exclude_these_devices);
-    paranoid_free(exclude_these_devices);
-    paranoid_free(exclude_these_directories);
+    mr_free(exclude_these_devices);
+    mr_free(exclude_these_directories);
     return (result_sz);
 }
@@ -2238 +2238 @@
            ("tr -s '\t' ' ' < /etc/fstab | grep -E '( (coda|ncpfs|nfs|smbfs|cifs|mvfs) )' | cut -d' ' -f1 | tr -s '\n' ' ' | awk '{print $0;}'"));
     sprintf(result_sz, "%s", exclude_these_directories);
-    paranoid_free(exclude_these_devices);
-    paranoid_free(exclude_these_directories);
+    mr_free(exclude_these_devices);
+    mr_free(exclude_these_directories);
     return (result_sz);
 }
@@ -2269 +2269 @@
     sprintf(tmp, "chmod 770 %s", store_name_here);
     paranoid_system(tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 }
 
@@ -2323 +2323 @@
     sprintf(command, "rm -Rf %s/tmp.mondo.* %s/mondo.scratch.*", tmp, tmp);
     paranoid_system(command);
-    paranoid_free(tmp);
-    paranoid_free(command);
-    paranoid_free(sz);
+    mr_free(tmp);
+    mr_free(command);
+    mr_free(sz);
 }
 
@@ -2404 +2404 @@
         cd_number = atoi(last_line_of_file(mountdev));
 //      log_it("cd_number = %d", cd_number);
-        paranoid_free(mountdev);
-        paranoid_free(tmp);
+        mr_free(mountdev);
+        mr_free(tmp);
         return (cd_number);
     }
@@ -2421 +2421 @@
         atoi(last_line_of_file(MNT_CDROM "/archives/THIS-CD-NUMBER"));
 //  log_it("cd_number..later.. = %d", cd_number);
-    paranoid_free(mountdev);
-    paranoid_free(tmp);
+    mr_free(mountdev);
+    mr_free(tmp);
     return (cd_number);
 }
@@ -2550 +2550 @@
     if (!(pdrives = popen(list_drives_cmd, "r"))) {
         log_OS_error("Unable to open list of drives");
-        paranoid_free(list_drives_cmd);
-        paranoid_free(current_drive);
+        mr_free(list_drives_cmd);
+        mr_free(current_drive);
         return ('\0');
     }
@@ -2573 +2573 @@
     }
     log_it("%d grubs and %d lilos\n", count_grubs, count_lilos);
-    paranoid_free(list_drives_cmd);
-    paranoid_free(current_drive);
+    mr_free(list_drives_cmd);
+    mr_free(current_drive);
     if (count_grubs && !count_lilos) {
         return ('G');
@@ -2674 +2674 @@
         log_it("resolved %s to %s", incoming, output);
     }
-    paranoid_free(command);
-    paranoid_free(curr_fname);
-    paranoid_free(tmp);
+    mr_free(command);
+    mr_free(curr_fname);
+    mr_free(tmp);
     return (output);
 }
@@ -2709 +2709 @@
     }
     log_msg(0, "Found %s partition table format type", output);
-    paranoid_free(command);
-    paranoid_free(tmp);
-    paranoid_free(fdisk);
+    mr_free(command);
+    mr_free(tmp);
+    mr_free(fdisk);
     return (output);
 }

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

@@ -146 +146 @@
     }
 
-    paranoid_free(command);
-    paranoid_free(tmp);
+    mr_free(command);
+    mr_free(tmp);
     return (fres);
 }
@@ -179 +179 @@
         run_program_and_log_output(command, TRUE);
     }
-    paranoid_free(tmp);
-    paranoid_free(command);
+    mr_free(tmp);
+    mr_free(command);
 }
 

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

@@ -18 +18 @@
 #include "libmondo-tools-EXT.h"
 #include "mr_str.h"
+#include "mr_mem.h"
 
 #include <time.h>
@@ -148 +149 @@
 
   end_of_func:
-    paranoid_free(filelist);
-    paranoid_free(tempfile);
-    paranoid_free(cksumlist);
-    paranoid_free(dev);
-    paranoid_free(tmp);
+    mr_free(filelist);
+    mr_free(tempfile);
+    mr_free(cksumlist);
+    mr_free(dev);
+    mr_free(tmp);
     return (retval);
 }
@@ -191 +192 @@
         }
     }
-    paranoid_free(tmp_fname);
-    paranoid_free(command);
+    mr_free(tmp_fname);
+    mr_free(command);
     log_msg(1, "Finished sorting file %s", orig_fname);
     return (retval);
@@ -243 +244 @@
     malloc_string(outfname);
     malloc_string(biggie_fname);
-    incoming = malloc(MAX_STR_LEN * 2);
+    incoming = mr_malloc(MAX_STR_LEN * 2);
     malloc_string(tmp);
     malloc_string(acl_fname);
@@ -364 +365 @@
 #endif
   end_of_func:
-    paranoid_free(outfname);
-    paranoid_free(biggie_fname);
-    paranoid_free(incoming);
-    paranoid_free(tmp);
-    paranoid_free(acl_fname);
-    paranoid_free(xattr_fname);
+    mr_free(outfname);
+    mr_free(biggie_fname);
+    mr_free(incoming);
+    mr_free(tmp);
+    mr_free(acl_fname);
+    mr_free(xattr_fname);
     return (err ? 0 : curr_set_no + 1);
 }
@@ -419 +420 @@
     }
     filelist->ch = '\0';
-    paranoid_free(filelist);
+    mr_free(filelist);
     depth--;
     if (depth == 0) {
@@ -448 +449 @@
     }
     paranoid_pclose(pattr);
-    paranoid_free(tmp);
+    mr_free(tmp);
     return (0);
 }
@@ -474 +475 @@
         log_msg(1, "Cannot openout auxlist_fname %s", auxlist_fname);
         fclose(fin);
-        paranoid_free(pout_command);
+        mr_free(pout_command);
         return (4);
     }
@@ -487 +488 @@
         asprintf(&strtmp, syscall_sprintf, mr_stresc(file_to_analyze, "`$\\\"", '\\'));
         asprintf(&syscall, "%s 2>> /dev/null", strtmp); // " MONDO_LOGFILE);
-        paranoid_free(strtmp);
+        mr_free(strtmp);
         call_exe_and_pipe_output_to_fd(syscall, pout);
-        paranoid_free(syscall);
+        mr_free(syscall);
     }
     paranoid_fclose(fin);
     paranoid_pclose(pout);
-    paranoid_free(file_to_analyze);
-    paranoid_free(pout_command);
+    mr_free(file_to_analyze);
+    mr_free(pout_command);
     return (0);
 }
@@ -514 +515 @@
         iamhere(command);
         retval = system(command);
-        paranoid_free(command);
+        mr_free(command);
     }
     return (retval);
@@ -529 +530 @@
         sprintf(command, "touch %s", fattr_fname);
         run_program_and_log_output(command, 8);
-        paranoid_free(command);
+        mr_free(command);
 //      sort_file(filelist); // FIXME - filelist chopper sorts, so this isn't necessary
         retval =
@@ -561 +562 @@
         log_msg(1, "command = %s", command);
         retval = system(command);
-        paranoid_free(command);
+        mr_free(command);
         log_msg(1, "Returning w/ retval=%d", retval);
         return (retval);
@@ -569 +570 @@
                 "original_exat_fname %s is empty or missing, so no need to set EXAT list",
                 original_exat_fname);
-        paranoid_free(command);
+        mr_free(command);
         return (0);
     }
@@ -679 +680 @@
 
     unlink(masklist);
-    paranoid_free(current_subset_file);
-    paranoid_free(current_master_file);
-    paranoid_free(syscall_pout);
-    paranoid_free(syscall_pin);
-    paranoid_free(masklist);
-    paranoid_free(incoming);
-    paranoid_free(command);
+    mr_free(current_subset_file);
+    mr_free(current_master_file);
+    mr_free(syscall_pout);
+    mr_free(syscall_pin);
+    mr_free(masklist);
+    mr_free(incoming);
+    mr_free(command);
     return (retval);
 }
@@ -805 +806 @@
 
 /* add here */
-    if (!(newnode = (struct s_node *) malloc(sizeof(struct s_node)))) {
-        log_to_screen("failed to malloc");
-        depth--;
-        return (1);
-    }
+    newnode = (struct s_node *) mr_malloc(sizeof(struct s_node));
     if (char_to_add < node->ch) // add to the left of node
     {
@@ -835 +832 @@
     log_msg(6, "Adding remaining chars ('%s')", string_to_add + 1);
     for (i = 1; i < noof_chars; i++) {
-        if (!
-            (node->down =
-             (struct s_node *) malloc(sizeof(struct s_node)))) {
-            log_to_screen("%s - failed to malloc", string_to_add);
-            return (1);
+            node->down = (struct s_node *) mr_malloc(sizeof(struct s_node));
         }
         node = node->down;
@@ -901 +894 @@
     }
     g_original_noof_lines_in_filelist = lines_in_filelist;
-    if (!(filelist = (struct s_node *) malloc(sizeof(struct s_node)))) {
-        return (NULL);
-    }
+    filelist = (struct s_node *) mr_malloc(sizeof(struct s_node));
     filelist->ch = '/';
     filelist->right = NULL;
-    filelist->down = malloc(sizeof(struct s_node));
+    filelist->down = mr_malloc(sizeof(struct s_node));
     filelist->expanded = filelist->selected = FALSE;
     (filelist->down)->ch = '\0';
@@ -1396 +1387 @@
         while((token = mr_strtok (sth, delims, &lastpos))) {
           asprintf(&strtmp,"%s", find_excludes);
-          paranoid_free(find_excludes);
+          mr_free(find_excludes);
           asprintf(&find_excludes,"%s -path %s -prune -o", strtmp, token);
-          paranoid_free(strtmp);
-          paranoid_free(token);
+          mr_free(strtmp);
+          mr_free(token);
         }
 #if linux
@@ -1412 +1403 @@
                 dir, MAX_SKEL_DEPTH, find_excludes, g_skeleton_filelist);
 #endif
-        paranoid_free(find_excludes);
+        mr_free(find_excludes);
         log_msg(5, "find command = %s", strtmp);
         system(strtmp);
-        paranoid_free(strtmp);
+        mr_free(strtmp);
         sprintf(tmp, "wc -l %s | awk '{print $1;}'", g_skeleton_filelist);
         g_skeleton_entries =
@@ -1520 +1511 @@
     if (!depth) {
         close_evalcall_form();
-        paranoid_free(name_of_evalcall_form);
-        paranoid_free(find_skeleton_marker);
+        mr_free(name_of_evalcall_form);
+        mr_free(find_skeleton_marker);
         unlink(g_skeleton_filelist);
         log_msg(5, "g_skeleton_entries = %ld", g_skeleton_entries);
     }
-    paranoid_free(tmp);
-    paranoid_free(sth_B);
-    paranoid_free(ith_B);
-    paranoid_free(new_with_spaces);
+    mr_free(tmp);
+    mr_free(sth_B);
+    mr_free(ith_B);
+    mr_free(new_with_spaces);
     return (0);
 }
@@ -1593 +1584 @@
     malloc_string(sz_filelist);
     malloc_string(g_skeleton_filelist);
-    if (!(exclude_paths = malloc(1000))) {
-        fatal_error("Cannot malloc exclude_paths");
-    }
+    exclude_paths = mr_malloc(1000);
     log_msg(3, "Trying to write test string to exclude_paths");
     strcpy(exclude_paths, "/blah /froo");
@@ -1688 +1677 @@
     paranoid_system(command);
     log_msg(2, "Freeing variables");
-    paranoid_free(sz_filelist);
-    paranoid_free(command);
-    paranoid_free(exclude_paths);
-    paranoid_free(tmp);
-    paranoid_free(g_skeleton_filelist);
+    mr_free(sz_filelist);
+    mr_free(command);
+    mr_free(exclude_paths);
+    mr_free(tmp);
+    mr_free(g_skeleton_filelist);
     log_msg(2, "Exiting");
     return (0);
@@ -1838 +1827 @@
     paranoid_fclose(fout);
     paranoid_fclose(fin);
-    paranoid_free(fname);
-    paranoid_free(tmp);
+    mr_free(fname);
+    mr_free(tmp);
     return (retval);
 }
@@ -1895 +1884 @@
     }
     paranoid_fclose(fin);
-    paranoid_free(tmp);
+    mr_free(tmp);
     return (0);
 }

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

@@ -282 +282 @@
             fatal_error("Mindi gave a fatal error. Please check '/var/log/mindi.log'.");
         }
-        paranoid_free(command);
+        mr_free(command);
     }
     log_it("Calling Mindi with kernel path of '%s'", kernel);
@@ -334 +334 @@
     if (incoming[0] == '\0') {
         if (system("which file > /dev/null 2> /dev/null")) {
-            paranoid_free(incoming);
-            paranoid_free(command);
+            mr_free(incoming);
+            mr_free(command);
             output[0] = '\0';
             return (NULL);      // forget it :)
@@ -359 +359 @@
         log_msg(4, "find_home_of_exe() --- Could not find %s", fname);
     }
-    paranoid_free(incoming);
-    paranoid_free(command);
+    mr_free(incoming);
+    mr_free(command);
     if (!output[0]) {
         return (NULL);
@@ -865 +865 @@
     paranoid_fclose(fin);
     log_it("Finished calculating total size of all biggiefiles");
-    paranoid_free(fname);
-    paranoid_free(biggielist);
-    paranoid_free(comment);
-    paranoid_free(tmp);
-    paranoid_free(command);
+    mr_free(fname);
+    mr_free(biggielist);
+    mr_free(comment);
+    mr_free(tmp);
+    mr_free(command);
     return (scratchL);
 }
@@ -1403 +1403 @@
         retval = 1;
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
     return (retval);
 }

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

@@ -5 +5 @@
 
 #include "my-stuff.h"
+#include "mr_mem.h"
 #include "mondostructures.h"
 #include "libmondo-fork.h"
@@ -106 +107 @@
     assert_string_is_neither_NULL_nor_zerolength(isofile);
     assert_string_is_neither_NULL_nor_zerolength(logstub);
-    if (!(midway_call = malloc(1200))) {
-        fatal_error("Cannot malloc midway_call");
-    }
-    if (!(ultimate_call = malloc(1200))) {
-        fatal_error("Cannot malloc ultimate_call");
-    }
-    if (!(tmp = malloc(1200))) {
-        fatal_error("Cannot malloc tmp");
-    }
-    if (!(command = malloc(1200))) {
-        fatal_error("Cannot malloc command");
-    }
+    midway_call = mr_malloc(1200);
+    ultimate_call = mr_malloc(1200);
+    tmp = mr_malloc(1200);
+    command = mr_malloc(1200);
     malloc_string(incoming);
     malloc_string(old_stderr);
@@ -178 +171 @@
     }
 
-    paranoid_free(midway_call);
-    paranoid_free(ultimate_call);
-    paranoid_free(tmp);
-    paranoid_free(command);
-    paranoid_free(incoming);
-    paranoid_free(old_stderr);
-    paranoid_free(cd_number_str);
+    mr_free(midway_call);
+    mr_free(ultimate_call);
+    mr_free(tmp);
+    mr_free(command);
+    mr_free(incoming);
+    mr_free(old_stderr);
+    mr_free(cd_number_str);
 /*
   if (bkpinfo->backup_media_type == dvd && !bkpinfo->please_dont_eject_when_restoring)
@@ -424 +417 @@
     tmp[0] = '\0';
     bufcap = 256L * 1024L;
-    if (!(buf = malloc(bufcap))) {
-        fatal_error("Failed to malloc() buf");
-    }
+    buf = mr_malloc(bufcap);
 
     if (direction == 'w') {
@@ -529 +520 @@
     }
 
-    paranoid_free(buf);
-    paranoid_free(tmp);
+    mr_free(buf);
+    mr_free(tmp);
     log_msg(3, "Successfully copied %ld bytes", bytes_written_out);
     return (retval);
@@ -559 +550 @@
     sprintf(command, "ntfsclone --force --save-image --overwrite %s %s", output_fname, input_device);
     res = run_program_and_log_output(command, 5);
-    paranoid_free(command);
+    mr_free(command);
     unlink(output_fname);
     return (res);
@@ -627 +618 @@
     }
     unlink(tempfile);
-    paranoid_free(command);
-    paranoid_free(tempfile);
-    paranoid_free(title);
+    mr_free(command);
+    mr_free(tempfile);
+    mr_free(title);
     return (res);
 }
@@ -721 +712 @@
     }
     log_msg(3, "Parent res = %d", res);
-    paranoid_free(command);
-    paranoid_free(title);
+    mr_free(command);
+    mr_free(title);
     return (res);
 }
@@ -747 +738 @@
     sprintf(command, "ntfsclone --force --restore-image --overwrite %s %s", output_device, input_fifo);
     res = run_program_and_log_output(command, 5);
-    paranoid_free(command);
+    mr_free(command);
     return (res);
 }

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

@@ -1 @@
-/* libmondo-mountlist.c                            subroutines for handling mountlist
+/* subroutines for handling mountlist
    $Id$
 */
@@ -18 +18 @@
 #include "libmondo-string-EXT.h"
 #include "libmondo-gui-EXT.h"
+#include "mr_mem.h"
 
 /*@unused@*/
@@ -488 +489 @@
 
   endoffunc:
-    paranoid_free(tmp);
-    paranoid_free(device);
-    paranoid_free(mountpoint);
+    mr_free(tmp);
+    mr_free(device);
+    mr_free(mountpoint);
 
     if (res) {
@@ -528 +529 @@
     /*@ initialize ******************************************************* */
 
-    drivelist = malloc(sizeof(struct list_of_disks));
+    drivelist = mr_malloc(sizeof(struct list_of_disks));
     malloc_string(tmp);
     malloc_string(flaws_str);
@@ -591 +592 @@
          && strcmp(mountlist->el[i].device, device) != 0; i++);
 
-    paranoid_free(tmp);
-    paranoid_free(flaws_str);
+    mr_free(tmp);
+    mr_free(flaws_str);
 
     if (i == mountlist->entries) {
@@ -651 +652 @@
         }
     }
-    paranoid_free(curr_mountpoint);
-    paranoid_free(tmp);
+    mr_free(curr_mountpoint);
+    mr_free(tmp);
     return (res);
 }
@@ -702 +703 @@
         }
     }
-    paranoid_free(tmp);
-    paranoid_free(format_sz);
+    mr_free(tmp);
+    mr_free(format_sz);
     return (res);
 }
@@ -783 +784 @@
     drivelist->entries = noof_drives;
     log_msg(8, "Made list of drives");
-    paranoid_free(drive);
-    paranoid_free(tmp);
+    mr_free(drive);
+    mr_free(tmp);
 
     return (noof_drives);
@@ -844 +845 @@
     output_list->entries = items;
     log_it("MLUORP -- ending");
-    paranoid_free(tmp);
+    mr_free(tmp);
 }
 
@@ -911 +912 @@
         log_it("Unable to open mountlist - '%s'", fname);
         log_to_screen("Cannot open mountlist");
-        paranoid_free(incoming);
-        paranoid_free(siz);
-        paranoid_free(tmp);
+        mr_free(incoming);
+        mr_free(siz);
+        mr_free(tmp);
         return (1);
     }
@@ -999 +1000 @@
     sprintf(tmp, "%d entries in mountlist", items);
     log_it(tmp);
-    paranoid_free(incoming);
-    paranoid_free(siz);
-    paranoid_free(tmp);
+    mr_free(incoming);
+    mr_free(siz);
+    mr_free(tmp);
     return (0);
 }

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

@@ -18 +18 @@
 #include "libmondo-raid.h"
 #include "mr_str.h"
+#include "mr_mem.h"
 
 #ifdef __FreeBSD__
@@ -49 +50 @@
     int res;
 
-    command = malloc(MAX_STR_LEN * 2);
+    command = mr_malloc(MAX_STR_LEN * 2);
     strcpy(command, "grep \" /proc/mdstat");
     if (raidno == -1) {
@@ -59 +60 @@
     log_it("Is raid %d registered? Command = '%s'", raidno, command);
     res = system(command);
-    paranoid_free(command);
+    mr_free(command);
     if (res) {
         return (FALSE);
@@ -200 +201 @@
     strcpy(raidrec->additional_vars.el[lino].label, label);
     strcpy(raidrec->additional_vars.el[lino].value, sz_value);
-    paranoid_free(sz_value);
+    mr_free(sz_value);
 }
 #endif
@@ -436 +437 @@
     label[0] = value[0] = '\0';
     if (feof(fin)) {
-        paranoid_free(incoming);
+        mr_free(incoming);
         return (1);
     }
@@ -452 +453 @@
         strcpy(label, incoming);
         strcpy(value, p);
-        paranoid_free(incoming);
+        mr_free(incoming);
         return (0);
     }
@@ -480 +481 @@
         log_it("Raidtab is very small or non-existent. Ignoring it.");
         raidlist->entries = 0;
-        paranoid_free(tmp);
+        mr_free(tmp);
         return (0);
     }
     if (!(fin = fopen(fname, "r"))) {
         log_it("Cannot open raidtab");
-        paranoid_free(tmp);
+        mr_free(tmp);
         return (1);
     }
@@ -590 +591 @@
     sprintf(tmp, "%d RAID devices in raidtab", raidlist->entries);
     log_it(tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
     return (0);
 }
@@ -616 +617 @@
         log_it("Raidtab is very small or non-existent. Ignoring it.");
         raidlist->entries = 0;
-        paranoid_free(tmp);
-        paranoid_free(label);
-        paranoid_free(value);
+        mr_free(tmp);
+        mr_free(label);
+        mr_free(value);
         return (0);
     }
     if (!(fin = fopen(fname, "r"))) {
         log_it("Cannot open raidtab");
-        paranoid_free(tmp);
-        paranoid_free(label);
-        paranoid_free(value);
+        mr_free(tmp);
+        mr_free(label);
+        mr_free(value);
         return (1);
     }
@@ -661 +662 @@
     log_msg(1, "Raidtab loaded successfully.");
     log_msg(1, "%d RAID devices in raidtab", items);
-    paranoid_free(tmp);
-    paranoid_free(label);
-    paranoid_free(value);
+    mr_free(tmp);
+    mr_free(label);
+    mr_free(value);
     return (0);
 }
@@ -762 +763 @@
         raidrec->additional_vars.entries = ++v;
     }
-    paranoid_free(tmp);
-    paranoid_free(labelB);
-    paranoid_free(valueB);
+    mr_free(tmp);
+    mr_free(labelB);
+    mr_free(valueB);
 }
 #endif
@@ -820 +821 @@
     static char *argv[64];
     char **ap;
-    char *line = (char *) malloc(MAX_STR_LEN);
-    if (!line)
-        errx(1,
-             "unable to allocate %i bytes of memory for `char *line' at %s:%i",
-             MAX_STR_LEN, __FILE__, __LINE__);
+    char *line = (char *) mr_malloc(MAX_STR_LEN);
     (void) fgets(line, MAX_STR_LEN, f);
     if (feof(f)) {
@@ -868 +865 @@
     int i, j;
     static char **ret;
-    ret = (char **) malloc(nval * sizeof(char *));
+    ret = (char **) mr_malloc(nval * sizeof(char *));
     for (i = 0; i < (argc - nval); ++i) {
         if (!strcmp(argv[i], option)) {
             for (j = 0; j < nval; ++j) {
-                ret[j] = (char *) malloc(strlen(argv[i + j + 1]) + 1);
+                ret[j] = (char *) mr_malloc(strlen(argv[i + j + 1]) + 1);
                 strcpy(ret[j], argv[i + j + 1]);
             }
@@ -1014 +1011 @@
     asprintf(&strtmp, pos);
     strcpy(string, strtmp);
-    paranoid_free(strtmp);
+    mr_free(strtmp);
     // if we have newline after only spaces, this is a blank line, update
     // counters, otherwise do normal parsing
@@ -1035 +1032 @@
     asprintf(&strtmp,"%s%s", device_prefix, token);
     strcpy(raidlist->el[raidlist->entries].raid_device, strtmp);
-    paranoid_free(strtmp);
-    paranoid_free(token);
+    mr_free(strtmp);
+    mr_free(token);
     // skip ':' and status
     token = mr_strtok (string, delims, &lastpos);
-    paranoid_free(token);
+    mr_free(token);
     token = mr_strtok (string, delims, &lastpos);
     if (!strcmp(token, "inactive")) {
       log_msg(1, "RAID device '%s' inactive.\n",
          raidlist->el[raidlist->entries].raid_device);
-      paranoid_free(string);
-      paranoid_free(token);
+      mr_free(string);
+      mr_free(token);
       return 1;
     }
-    paranoid_free(token);
+    mr_free(token);
 
     // get RAID level
@@ -1070 +1067 @@
     } else {
       log_msg(1, "Unknown RAID level '%s'.\n", token);
-      paranoid_free(string);
-      paranoid_free(token);
+      mr_free(string);
+      mr_free(token);
       return 1;
     }
-    paranoid_free(token);
+    mr_free(token);
 
     // get RAID devices (type, index, device)
@@ -1094 +1091 @@
         asprintf(&strtmp,"%s%s", device_prefix, token);
         strcpy(raidlist->el[raidlist->entries].data_disks.el[raidlist->el[raidlist->entries].data_disks.entries].device, strtmp);
-        paranoid_free(strtmp);
+        mr_free(strtmp);
         raidlist->el[raidlist->entries].data_disks.entries++;
         break;
@@ -1101 +1098 @@
         asprintf(&strtmp,"%s%s", device_prefix, token);
         strcpy(raidlist->el[raidlist->entries].spare_disks.el[raidlist->el[raidlist->entries].spare_disks.entries].device, strtmp);
-        paranoid_free(strtmp);
+        mr_free(strtmp);
         raidlist->el[raidlist->entries].spare_disks.entries++;
         break;
@@ -1108 +1105 @@
         asprintf(&strtmp,"%s%s", device_prefix, token);
         strcpy(raidlist->el[raidlist->entries].failed_disks.el[raidlist->el[raidlist->entries].failed_disks.entries].device, strtmp);
-        paranoid_free(strtmp);
+        mr_free(strtmp);
         raidlist->el[raidlist->entries].failed_disks.entries++;
         log_it("At least one failed disk found in RAID array.\n");
@@ -1114 +1111 @@
       default: // error
         log_msg(1, "Unknown device type '%c'\n", type);
-        paranoid_free(string);
-        paranoid_free(token);
+        mr_free(string);
+        mr_free(token);
         return 1;
         break;
       }
-      paranoid_free(token);
+      mr_free(token);
     }
 
@@ -1172 +1169 @@
         if (pos < string) {
           log_it("String underflow!\n");
-          paranoid_free(string);
+          mr_free(string);
           return 1;
         }
@@ -1197 +1194 @@
         if (pos < string) {
           printf("ERROR: String underflow!\n");
-          paranoid_free(string);
+          mr_free(string);
           return 1;
         }
@@ -1214 +1211 @@
   fclose(fin);
   // free string
-  paranoid_free(string);
+  mr_free(string);
   // return success
   return 0;
@@ -1228 +1225 @@
     int retval = 0;
 
-    raidlist = malloc(sizeof(struct raidlist_itself));
+    raidlist = mr_malloc(sizeof(struct raidlist_itself));
 
     // FIXME: Prefix '/dev/' should really be dynamic!

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

@@ -13 +13 @@
 
 #include "my-stuff.h"
+#include "mr_mem.h"
 #include "mondostructures.h"
 #include "libmondo-devices.h"
@@ -111 +112 @@
     int i;
 
-    blk = (char *) malloc(256 * 1024);
+    blk = (char *) mr_malloc(256 * 1024);
 
     log_it("closein_tape() -- entering");
@@ -141 +142 @@
         eject_device(bkpinfo->media_device);
     }
-    paranoid_free(blk);
-    paranoid_free(g_tapecatalog);
+    mr_free(blk);
+    mr_free(g_tapecatalog);
     return (retval);
 }
@@ -170 +171 @@
     char *blk;
 
-    blk = (char *) malloc(256 * 1024);
+    blk = (char *) mr_malloc(256 * 1024);
 
     sleep(1);
@@ -218 +219 @@
     //  if (!bkpinfo->please_dont_eject)
     //    { eject_device(bkpinfo->media_device); }
-    paranoid_free(blk);
-    paranoid_free(g_tapecatalog);
+    mr_free(blk);
+    mr_free(g_tapecatalog);
     return (retval);
 }
@@ -233 +234 @@
     sprintf(command, "mt -f %s status", dev);
     res = run_program_and_log_output(command, 1);
-    paranoid_free(command);
+    mr_free(command);
     if (res) {
         return (FALSE);
@@ -596 +597 @@
     sprintf(tmp, "mt -f %s setblk %ld", tapedev, internal_tape_block_size);
     res = run_program_and_log_output(tmp, 3);
-    paranoid_free(tmp);
+    mr_free(tmp);
     return (res);
 }
@@ -636 +637 @@
 
     assert_string_is_neither_NULL_nor_zerolength(bkpinfo->media_device);
-    if (!(g_tapecatalog = malloc(sizeof(struct s_tapecatalog)))) {
-        fatal_error("Cannot alloc mem for tape catalog");
-    }
+    g_tapecatalog = mr_malloc(sizeof(struct s_tapecatalog));
     g_tapecatalog->entries = 0;
     g_tape_posK = 0;
@@ -672 +671 @@
         return (-1);
     }
-    if (!(datablock = (char *) malloc(256 * 1024))) {
-        log_to_screen("Unable to malloc 256*1024");
-        exit(1);
-    }
+    datablock = (char *) mr_malloc(256 * 1024);
     for (i = 0; i < 32; i++) {
         for (j = 0; j < 4; j++) {
@@ -692 +688 @@
     }
     paranoid_fclose(fout);
-    paranoid_free(datablock);
+    mr_free(datablock);
 /* find initial blocks */
     res = read_header_block_from_stream(&size, fname, &ctrl_chr);
@@ -738 +734 @@
 /*  initialise the catalog */
     g_current_media_number = 1;
-    if (!(g_tapecatalog = malloc(sizeof(struct s_tapecatalog)))) {
-        fatal_error("Cannot alloc mem for tape catalog");
-    }
+    g_tapecatalog = mr_malloc(sizeof(struct s_tapecatalog));
     g_tapecatalog->entries = 0;
 /* log stuff */
@@ -771 +765 @@
         return (0);
     }
-    if (!(g_tapecatalog = malloc(sizeof(struct s_tapecatalog)))) {
-        fatal_error("Cannot alloc mem for tape catalog");
-    }
+    g_tapecatalog = mr_malloc(sizeof(struct s_tapecatalog));
     g_tapecatalog->entries = 0;
     g_tape_posK = 0;
@@ -898 +890 @@
     malloc_string(temp_cksum);
     malloc_string(actual_cksum);
-    datablock = malloc(TAPE_BLOCK_SIZE);
+    datablock = mr_malloc(TAPE_BLOCK_SIZE);
     crc16 = 0;
     crctt = 0;
@@ -995 +987 @@
         /*      log_it(tmp); */
     }
-    paranoid_free(datablock);
-    paranoid_free(tmp);
-    paranoid_free(temp_fname);
-    paranoid_free(temp_cksum);
-    paranoid_free(actual_cksum);
+    mr_free(datablock);
+    mr_free(tmp);
+    mr_free(temp_fname);
+    mr_free(temp_cksum);
+    mr_free(actual_cksum);
     return (retval);
 }
@@ -1028 +1020 @@
     /*@ end vars *************************************************** */
 
-    tempblock = (char *) malloc((size_t) TAPE_BLOCK_SIZE);
+    tempblock = (char *) mr_malloc((size_t) TAPE_BLOCK_SIZE);
 
     for (i = 0; i < (int) TAPE_BLOCK_SIZE; i++) {
@@ -1065 +1057 @@
             marker_to_string(*pcontrol_char), tempblock + 1000,
             (long) (*plen) >> 10);
-    paranoid_free(tempblock);
+    mr_free(tempblock);
     return (retval);
 }
@@ -1172 +1164 @@
     long bytes_to_write;
 
-    datablock = malloc(TAPE_BLOCK_SIZE);
+    datablock = mr_malloc(TAPE_BLOCK_SIZE);
     malloc_string(temp_fname);
     pB = strrchr(the_file_I_was_reading, '/');
@@ -1265 +1257 @@
     log_msg(2, "Reading %s (it matches %s)", temp_fname,
             the_file_I_was_reading);
-    paranoid_free(temp_fname);
-    paranoid_free(datablock);
+    mr_free(temp_fname);
+    mr_free(datablock);
     return (0);
 }
@@ -1313 +1305 @@
         log_msg(3, "Next tape opened OK. Whoopee!");
     }
-    paranoid_free(sz_msg);
+    mr_free(sz_msg);
     return (res);
 }
@@ -1413 +1405 @@
         }
     }
-    paranoid_free(fname);
+    mr_free(fname);
     log_msg(2, "Finished writing back catalog to tape");
     return (res);

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

@@ -8 +8 @@
 
 #include "my-stuff.h"
+#include "mr_mem.h"
 #include "mondostructures.h"
 #include "libmondo-string.h"
@@ -220 +221 @@
     malloc_string(tmp);
     if (!incoming[0]) {
-        free(tmp);
+        mr_free(tmp);
         return (0);
     }
@@ -254 +255 @@
         fatal_error(tmp);
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
     return (outval);
 }
@@ -512 +513 @@
     char *p;
 
-    input = malloc(2000);
+    input = mr_malloc(2000);
     assert_string_is_neither_NULL_nor_zerolength(ip);
     assert_string_is_neither_NULL_nor_zerolength(token);
@@ -526 +527 @@
         strcat(output, p);
     }
-    paranoid_free(input);
+    mr_free(input);
 }
 
@@ -796 +797 @@
     }
     in_out[i] = '\0';
-    paranoid_free(tmp);
+    mr_free(tmp);
 /*  for(i=strlen(in_out); i>0 && in_out[i-1]<=32; i--) {in_out[i-1]='\0';} */
 }
@@ -1018 +1019 @@
         strcpy(out_reason, reason);
     }
-    paranoid_free(filename);
-    paranoid_free(reason);
+    mr_free(filename);
+    mr_free(reason);
     return (sev);
 }
@@ -1112 +1113 @@
     j = (int) strlen(outstr);
     sprintf(outstr + j, "] %d%% used", percentage);
-    paranoid_free(pos_w_commas);
-    paranoid_free(tmp);
+    mr_free(pos_w_commas);
+    mr_free(tmp);
     return (outstr);
 }

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

@@ -10 +10 @@
 
 #include "my-stuff.h"
+#include "mr_mem.h"
 #include "mondostructures.h"
 #include "lib-common-externs.h"
@@ -175 +176 @@
 else { print $0;};}' $file.old  > $file ; fi ; done");
     run_program_and_log_output(tmp, 5);
-    paranoid_free(tmp);
+    mr_free(tmp);
 }
 
@@ -724 +725 @@
     chmod(bkpinfo->tmpdir, 0700);
     g_backup_media_type = bkpinfo->backup_media_type;
-    paranoid_free(mtpt);
-    paranoid_free(extra_cdrom_params);
-    paranoid_free(mondo_mkisofs_sz);
-    paranoid_free(command);
-    paranoid_free(hostname);
-    paranoid_free(ip_address);
-    paranoid_free(cdr_exe);
-    paranoid_free(tmp);
-    paranoid_free(iso_dev);
-    paranoid_free(iso_mnt);
-    paranoid_free(iso_tmp);
-    paranoid_free(iso_path);
+    mr_free(mtpt);
+    mr_free(extra_cdrom_params);
+    mr_free(mondo_mkisofs_sz);
+    mr_free(command);
+    mr_free(hostname);
+    mr_free(ip_address);
+    mr_free(cdr_exe);
+    mr_free(tmp);
+    mr_free(iso_dev);
+    mr_free(iso_mnt);
+    mr_free(iso_tmp);
+    mr_free(iso_path);
     return (retval);
 }
@@ -1390 +1391 @@
     }
     depth--;
-    paranoid_free(tmp);
+    mr_free(tmp);
 }
 
@@ -1404 +1405 @@
  * @bug This function seems orphaned. Please remove.
  */
-#define do_alloc_or_free_depending(x,y) { if(y) {x=malloc(MAX_STR_LEN);} else {paranoid_free(x);} }
+#define do_alloc_or_free_depending(x,y) { if(y) {x=mr_malloc(MAX_STR_LEN);} else {mr_free(x);} }
 
 /**
@@ -1422 +1423 @@
     } else {
         iamhere("Freeing globals");
-        paranoid_free(g_boot_mountpt);
-        paranoid_free(g_mondo_home);
-        paranoid_free(g_tmpfs_mountpt);
-        paranoid_free(g_erase_tmpdir_and_scratchdir);
-        paranoid_free(g_serial_string);
-        paranoid_free(g_magicdev_command);
+        mr_free(g_boot_mountpt);
+        mr_free(g_mondo_home);
+        mr_free(g_tmpfs_mountpt);
+        mr_free(g_erase_tmpdir_and_scratchdir);
+        mr_free(g_serial_string);
+        mr_free(g_magicdev_command);
     }
 
@@ -1509 +1510 @@
         paranoid_system(tmp);
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
 }
 

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

@@ -9 +9 @@
 
 #include "my-stuff.h"
+#include "mr_mem.h"
 #include "mondostructures.h"
 #include "libmondo-verify.h"
@@ -59 +60 @@
     long afio_diffs = 0;
 
-    command = malloc(2000);
-    afio_found_changes = malloc(500);
+    command = mr_malloc(2000);
+    afio_found_changes = mr_malloc(500);
     assert_string_is_neither_NULL_nor_zerolength(changedfiles_fname);
     assert_string_is_neither_NULL_nor_zerolength(ignorefiles_fname);
@@ -100 +101 @@
     log_msg(2, command);
     paranoid_system(command);
-    paranoid_free(command);
-    paranoid_free(afio_found_changes);
+    mr_free(command);
+    mr_free(afio_found_changes);
     return (afio_diffs);
 }
@@ -179 +180 @@
     g_last_afioball_number = set_number - 1;
     close_evalcall_form();
-    paranoid_free(tmp);
+    mr_free(tmp);
     return (retval);
 }
@@ -229 +230 @@
     malloc_string(sz_exe);
     if (!bufblkA) {
-        if (!(bufblkA = malloc(maxbufsize))) {
-            fatal_error("Cannot malloc bufblkA");
-        }
+        bufblkA = mr_malloc(maxbufsize);
     }
     if (!bufblkB) {
-        if (!(bufblkB = malloc(maxbufsize))) {
-            fatal_error("Cannot malloc bufblkB");
-        }
+        bufblkB = mr_malloc(maxbufsize);
     }
 
@@ -369 +366 @@
     close_evalcall_form();
     if (bufblkA) {
-        paranoid_free(bufblkA);
+        mr_free(bufblkA);
     }
     if (bufblkB) {
-        paranoid_free(bufblkB);
-    }
-    paranoid_free(tmp);
-    paranoid_free(command);
-    paranoid_free(sz_exe);
-    paranoid_free(mountpoint);
+        mr_free(bufblkB);
+    }
+    mr_free(tmp);
+    mr_free(command);
+    mr_free(sz_exe);
+    mr_free(mountpoint);
     return (0);
 }
@@ -413 +410 @@
 
 
-    command = malloc(2000);
+    command = mr_malloc(2000);
     malloc_string(outlog);
     malloc_string(tmp);
@@ -506 +503 @@
     //  paranoid_system (tmp);
     //  unlink ("/tmp/mondo-verify.err");
-    paranoid_free(command);
-    paranoid_free(outlog);
-    paranoid_free(tmp);
+    mr_free(command);
+    mr_free(outlog);
+    mr_free(tmp);
     return (0);
 }
@@ -596 +593 @@
     }
     unlink(tarball_fname);
-    paranoid_free(tmp);
-    paranoid_free(tarball_fname);
+    mr_free(tmp);
+    mr_free(tarball_fname);
     return (retval);
 }
@@ -688 +685 @@
         }
     }
-    paranoid_free(test_file);
-    paranoid_free(biggie_cksum);
-    paranoid_free(orig_cksum);
-    paranoid_free(tmp);
-    paranoid_free(slice_fnam);
+    mr_free(test_file);
+    mr_free(biggie_cksum);
+    mr_free(orig_cksum);
+    mr_free(tmp);
+    mr_free(slice_fnam);
     return (retval);
 }
@@ -798 +795 @@
     log_msg(1, "All done with afioballs");
     close_progress_form();
-    paranoid_free(tmp);
-    paranoid_free(fname);
-    paranoid_free(curr_xattr_list_fname);
-    paranoid_free(curr_acl_list_fname);
+    mr_free(tmp);
+    mr_free(fname);
+    mr_free(curr_xattr_list_fname);
+    mr_free(curr_acl_list_fname);
     return (retval);
 }
@@ -900 +897 @@
     }
     close_progress_form();
-    paranoid_free(orig_fname);
-    paranoid_free(logical_fname);
-    paranoid_free(curr_xattr_list_fname);
-    paranoid_free(curr_acl_list_fname);
-    paranoid_free(comment);
-    paranoid_free(tmp);
+    mr_free(orig_fname);
+    mr_free(logical_fname);
+    mr_free(curr_xattr_list_fname);
+    mr_free(curr_acl_list_fname);
+    mr_free(comment);
+    mr_free(tmp);
     return (retval);
 }
@@ -946 +943 @@
 #endif
 
-    command = malloc(2000);
+    command = mr_malloc(2000);
     malloc_string(mountpoint);
     malloc_string(tmp);
@@ -1037 +1034 @@
         }
     }
-    paranoid_free(command);
-    paranoid_free(mountpoint);
-    paranoid_free(tmp);
-    paranoid_free(fname);
+    mr_free(command);
+    mr_free(mountpoint);
+    mr_free(tmp);
+    mr_free(fname);
     return (retval);
 }

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

@@ -19 +19 @@
 
 #include "my-stuff.h"
+#include "mr_mem.h"
 #include "mondostructures.h"
 #include "newt-specific.h"
@@ -120 +121 @@
         int i;
 
-         tmp = malloc(MAX_NEWT_COMMENT_LEN);
+         tmp = mr_malloc(MAX_NEWT_COMMENT_LEN);
          assert_string_is_neither_NULL_nor_zerolength(prompt);
 
@@ -138 +139 @@
                 }
                 if (strstr("yesYES", tmp)) {
-                    paranoid_free(tmp);
+                    mr_free(tmp);
                     return (TRUE);
                 } else if (strstr("NOno", tmp)) {
-                    paranoid_free(tmp);
+                    mr_free(tmp);
                     return (FALSE);
                 } else {
@@ -150 +151 @@
             }
         } else {
-            paranoid_free(tmp);
+            mr_free(tmp);
             return (popup_with_buttons(prompt, "Yes", "No"));
         }
@@ -168 +169 @@
         int i;
 
-        tmp = malloc(MAX_NEWT_COMMENT_LEN);
+        tmp = mr_malloc(MAX_NEWT_COMMENT_LEN);
         assert_string_is_neither_NULL_nor_zerolength(prompt);
         if (g_text_mode) {
@@ -184 +185 @@
             }
             if (strstr("okOKOkYESyes", tmp)) {
-                paranoid_free(tmp);
+                mr_free(tmp);
                 return (TRUE);
             } else {
-                paranoid_free(tmp);
+                mr_free(tmp);
                 return (FALSE);
             }
         } else {
-            paranoid_free(tmp);
+            mr_free(tmp);
             return (popup_with_buttons(prompt, " Okay ", "Cancel"));
         }
@@ -259 +260 @@
 asprintf(&tmp,"kill `ps %s | grep \" %s \" | awk '{print %s;}' | grep -vx \"\\?\"`", ps_options, str , ps_proc_id);
 run_program_and_log_output(tmp, TRUE);
-paranoid_free(tmp);
+mr_free(tmp);
 }
 
@@ -281 +282 @@
 
         malloc_string(command);
-        tmp = malloc(MAX_NEWT_COMMENT_LEN);
+        tmp = mr_malloc(MAX_NEWT_COMMENT_LEN);
         set_signals(FALSE);     // link to external func
         g_exiting = TRUE;
@@ -289 +290 @@
             log_msg(2, "mastermind %d is exiting", (int) getpid());
             kill(g_main_pid, SIGTERM);
-            paranoid_free(tmp);
+            mr_free(tmp);
             finish(1);
         }
@@ -297 +298 @@
                 log_msg(2, "non-m/m %d is exiting", (int) getpid());
                 kill(g_main_pid, SIGTERM);
-                paranoid_free(tmp);
+                mr_free(tmp);
                 finish(1);
             }
@@ -305 +306 @@
         if (already_exiting) {
             log_msg(3, "...I'm already exiting. Give me time, Julian!");
-            paranoid_free(tmp);
+            mr_free(tmp);
             finish(1);
         }
@@ -360 +361 @@
             log_msg(3, "FYI - g_main_pid is blank");
         }
-        paranoid_free(tmp);
-        paranoid_free(command);
+        mr_free(tmp);
+        mr_free(command);
         finish(254);
     }
@@ -445 +446 @@
 
         if (!does_file_exist(filename)) {
-            paranoid_free(command);
-            paranoid_free(tmp);
+            mr_free(command);
+            mr_free(tmp);
             return;
         }
@@ -478 +479 @@
         }
         refresh_log_screen();
-        paranoid_free(command);
-        paranoid_free(tmp);
+        mr_free(command);
+        mr_free(tmp);
     }
 
@@ -533 +534 @@
             refresh_log_screen();
         }
-        paranoid_free(output);
+        mr_free(output);
     }
 
@@ -606 +607 @@
         }
         update_evalcall_form(0);
-        paranoid_free(tmp);
-        paranoid_free(title);
+        mr_free(tmp);
+        mr_free(title);
     }
 
@@ -680 +681 @@
         }
         update_progress_form_full(blurb1, blurb2, blurb3);
-        paranoid_free(b1c);
-        paranoid_free(blurb1);
-        paranoid_free(blurb2);
-        paranoid_free(blurb3);
+        mr_free(b1c);
+        mr_free(blurb1);
+        mr_free(blurb2);
+        mr_free(blurb3);
     }
 
@@ -733 +734 @@
         char *original_contents;
 
-        blurb = malloc(MAX_NEWT_COMMENT_LEN);
-        original_contents = malloc(MAX_NEWT_COMMENT_LEN);
+        blurb = mr_malloc(MAX_NEWT_COMMENT_LEN);
+        original_contents = mr_malloc(MAX_NEWT_COMMENT_LEN);
         assert_string_is_neither_NULL_nor_zerolength(title);
         assert(b != NULL);
@@ -746 +747 @@
             if (output[strlen(output) - 1] == '\n')
                 output[strlen(output) - 1] = '\0';
-            paranoid_free(blurb);
-            paranoid_free(original_contents);
+            mr_free(blurb);
+            mr_free(original_contents);
             return (TRUE);
         }
@@ -778 +779 @@
         if (b_res == b_2) {
             strcpy(output, original_contents);
-            paranoid_free(blurb);
-            paranoid_free(original_contents);
+            mr_free(blurb);
+            mr_free(original_contents);
             return (FALSE);
         } else {
-            paranoid_free(blurb);
-            paranoid_free(original_contents);
+            mr_free(blurb);
+            mr_free(original_contents);
             return (TRUE);
         }
@@ -808 +809 @@
         newtComponent text;
 
-        prompt = malloc(MAX_NEWT_COMMENT_LEN);
-        tmp = malloc(MAX_NEWT_COMMENT_LEN);
+        prompt = mr_malloc(MAX_NEWT_COMMENT_LEN);
+        tmp = mr_malloc(MAX_NEWT_COMMENT_LEN);
         assert_string_is_neither_NULL_nor_zerolength(p);
         assert(button1 != NULL);
@@ -826 +827 @@
             }
             if (!strcmp(tmp, button1)) {
-                paranoid_free(tmp);
-                paranoid_free(prompt);
+                mr_free(tmp);
+                mr_free(prompt);
                 return (TRUE);
             } else {
-                paranoid_free(tmp);
-                paranoid_free(prompt);
+                mr_free(tmp);
+                mr_free(prompt);
                 return (FALSE);
             }
@@ -862 +863 @@
         newtPopWindow();
         if (b_res == b_1) {
-            paranoid_free(tmp);
-            paranoid_free(prompt);
+            mr_free(tmp);
+            mr_free(prompt);
             return (TRUE);
         } else {
-            paranoid_free(tmp);
-            paranoid_free(prompt);
+            mr_free(tmp);
+            mr_free(prompt);
             return (FALSE);
         }
@@ -927 +928 @@
 
         err_log_lines =
-            (char **) malloc(sizeof(char *) * g_noof_log_lines);
+            (char **) mr_malloc(sizeof(char *) * g_noof_log_lines);
         if (!err_log_lines) {
             fatal_error("Out of memory");
@@ -933 +934 @@
 
         for (i = 0; i < g_noof_log_lines; i++) {
-            err_log_lines[i] = (char *) malloc(MAX_NEWT_COMMENT_LEN);
+            err_log_lines[i] = (char *) mr_malloc(MAX_NEWT_COMMENT_LEN);
             if (!err_log_lines[i]) {
                 fatal_error("Out of memory");
@@ -1043 +1044 @@
             newtRefresh();
         }
-        paranoid_free(timeline_str);
-        paranoid_free(pcline_str);
-        paranoid_free(taskprogress);
+        mr_free(timeline_str);
+        mr_free(pcline_str);
+        mr_free(taskprogress);
     }
 
@@ -1104 +1105 @@
 
 //  log_msg(1, "'%s' '%s' '%s'", blurb1, blurb2, blurb3);
-        percentline_str = malloc(MAX_NEWT_COMMENT_LEN);
-        timeline_str = malloc(MAX_NEWT_COMMENT_LEN);
-        taskprogress = malloc(MAX_NEWT_COMMENT_LEN);
+        percentline_str = mr_malloc(MAX_NEWT_COMMENT_LEN);
+        timeline_str = mr_malloc(MAX_NEWT_COMMENT_LEN);
+        taskprogress = mr_malloc(MAX_NEWT_COMMENT_LEN);
         malloc_string(tmp);
         if (!g_text_mode) {
@@ -1190 +1191 @@
             newtRefresh();
         }
-        paranoid_free(percentline_str);
-        paranoid_free(timeline_str);
-        paranoid_free(taskprogress);
-        paranoid_free(tmp);
+        mr_free(percentline_str);
+        mr_free(timeline_str);
+        mr_free(taskprogress);
+        mr_free(tmp);
     }
 
@@ -1246 +1247 @@
         newtComponent myForm;
 
-        title_sz = malloc(MAX_NEWT_COMMENT_LEN);
-        minimsg_sz = malloc(MAX_NEWT_COMMENT_LEN);
-        outstr = malloc(MAX_NEWT_COMMENT_LEN);
+        title_sz = mr_malloc(MAX_NEWT_COMMENT_LEN);
+        minimsg_sz = mr_malloc(MAX_NEWT_COMMENT_LEN);
+        outstr = mr_malloc(MAX_NEWT_COMMENT_LEN);
         if (g_text_mode) {
             for (backup_type = none; backup_type == none;) {
@@ -1265 +1266 @@
                 }
             }
-            paranoid_free(title_sz);
-            paranoid_free(minimsg_sz);
-            paranoid_free(outstr);
+            mr_free(title_sz);
+            mr_free(minimsg_sz);
+            mr_free(outstr);
             return (backup_type);
         }
@@ -1315 +1316 @@
         }
         newtPopHelpLine();
-        paranoid_free(title_sz);
-        paranoid_free(minimsg_sz);
-        paranoid_free(outstr);
+        mr_free(title_sz);
+        mr_free(minimsg_sz);
+        mr_free(outstr);
         return (output);
     }
@@ -1403 +1404 @@
             log_msg(2, "Can't open %s; therefore, cannot popup list",
                     source_file);
-            paranoid_free(tmp);
+            mr_free(tmp);
             return (1);
         }
@@ -1437 +1438 @@
         if (filelist->entries >= ARBITRARY_MAXIMUM) {
             log_to_screen("Arbitrary limits suck, man!");
-            paranoid_free(tmp);
+            mr_free(tmp);
             return (1);
         }
@@ -1465 +1466 @@
             }
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
         iamhere("leaving");
         return (0);
@@ -1498 +1499 @@
         tmp[98] = '\0';
         strcpy(comment, tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
         iamhere("leaving");
         return (comment);
@@ -1539 +1540 @@
         struct s_filelist *filelist;
         malloc_string(reason);
-        tmp = malloc(5000);
+        tmp = mr_malloc(5000);
         malloc_string(differ_sz);
         assert_string_is_neither_NULL_nor_zerolength(source_file);
@@ -1551 +1552 @@
         if (lng < 1) {
             log_msg(2, "No lines in file. Therefore, no popup list.");
-            paranoid_free(reason);
+            mr_free(reason);
             goto free_to_go;
         } else if (lng >= ARBITRARY_MAXIMUM) {
@@ -1558 +1559 @@
         }
 
-        filelist = (struct s_filelist *) malloc(sizeof(struct s_filelist));
+        filelist = (struct s_filelist *) mr_malloc(sizeof(struct s_filelist));
         fileListbox =
             newtListbox(2, 2, 12, NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
@@ -1566 +1567 @@
             log_msg(2, "Can't open %s; therefore, cannot popup list",
                     source_file);
-            paranoid_free(reason);
+            mr_free(reason);
             return;
         }
@@ -1618 +1619 @@
         newtPopHelpLine();
       free_to_go:
-        paranoid_free(reason);
-        paranoid_free(tmp);
-        paranoid_free(differ_sz);
+        mr_free(reason);
+        mr_free(tmp);
+        mr_free(differ_sz);
         return;
     }

branches/stable/mondo/src/include/my-stuff.h

@@ -14 +14 @@
 #define NOOF_ERR_LINES  6   
 
-#define paranoid_free(exp) mr_free(exp)
-
 /**
  * @file
@@ -22 +20 @@
 
 #include <stdio.h>
+#include "mr_mem.h"
 
 #if !defined(bool) && !defined(__cplusplus)
@@ -286 +285 @@
  * Malloc @p x to be MAX_STR_LEN bytes and call fatal_error() if we're out of memory.
  */
-#define malloc_string(x) { x = (char *)malloc(MAX_STR_LEN); if (!x) { fatal_error("Unable to malloc"); } x[0] = x[1] = '\0'; }
+#define malloc_string(x) { x = (char *)mr_malloc(MAX_STR_LEN); x[0] = x[1] = '\0'; }
 
 /**

branches/stable/mondo/src/mondoarchive/main.c

@@ -1 +1 @@
 /***************************************************************************
-                          main.c  -  description
-                             -------------------
-    begin                : Fri Apr 19 16:40:35 EDT 2002
-    copyright            : (C) 2002 by Stan Benoit
-    email                : troff@nakedsoul.org
-    cvsid                : $Id$
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-/** change log ****** MONDO-DEVEL
-
-
-12/10
-- disable stopping/starting of autofs
-
-10/01
-- update g_erase_tmpdir_and_scratchdir to delete user-specified tmpdir, scratchdir
-
-06/19
-- added AUX_VER
-
-06/14/2004
-- use mondorescue.iso, not mindi.iso
-
-02/10/2004
-- tell users where BusyBox's sources are
-
-11/14/2003
-- cleaned up logging at end#
-
-10/23
-- don't try to test-read tape ... That's already
-  handled by post_param_configuration()
-  
-10/19
-- if your PATH var is too long, abort
-
-09/23
-- added some comments
-- malloc/free global strings in new subroutines - malloc_libmondo_global_strings()
-  and free_libmondo_global_strings() - which are in libmondo-tools.c
-- better magicdev support
-
-
-09/16
-- delete /var/log/partimagehack-debug.log at start of main()
-
-09/15
-- added askbootloader
-
-09/09
-- if your tape is weird, I'll pause between backup and verify
-- fixed silly bug in main() - re: say_at_end
-
-01/01 - 08/31
-- call 'dmesg -n1' at start, to shut the kernel logger up
-- moved g_erase_tmpdir_and_scratchdir to common/newt-specific.c
-- added 'don't panic' msg to start of logfile
-- added 'nice(20)' to main()
-- added lots of assert()'s and log_OS_error()'s
-- clean-up (Hugo)
-- make post_param_configuration() setup g_erase_tmpdir_and_scratchdir
-- if --version then print & exit quickly
-- re-run g_erase_tmpdir_and_scratchdir via system() at very end
-
-Year: 2002
-- if user goes root with 'su' instead of 'su -' then
-  workaround it by setting PATH correctly
-- wipe mondoarchive.log at very beginning
-- cleaned up code
-- if changed.files.N exists then copy to changes.files for display
-- run_program_and_log_output() now takes boolean operator to specify
-  whether it will log its activities in the event of _success_
-- added popup list of changed files
-- removed 'beta-quality' warnings
-- if kernel not found and mondo in graphics mode then popup and ask
-  for kernel path+filename
-- fixed tmp[] 'too small' bug
-- unmount and eject CD at end of verify cycle
-- moved interactively_obtain...() to libmondo-stream.c
-- wrote stuff to autodetect tape+cdrw+etc.
-- renamed from main.c to mondo-archive.c
-- fore+after warnings that this code is beta-quality
-- abort if running from ramdisk
-- remount floppy at end & unmount at start if Mandrake
-- took out #debug stuff
-- add 2> /dev/null to 'find' command
-- add support for bkpinfo->nonbootable_backup
-- add main function begin comment and debug conditional
-  compilation - Stan Benoit
-- add debug statements to build a run tree. Stan Benoit
-**** end change log **********/
+* $Id$
+*/
 
 
@@ -286 +188 @@
     say_at_end[0] = '\0';
     printf("Initializing...\n");
-    if (!(bkpinfo = malloc(sizeof(struct s_bkpinfo)))) {
-        fatal_error("Cannot malloc bkpinfo");
-    }
+    bkpinfo = mr_malloc(sizeof(struct s_bkpinfo));
 
     /* initialize log file with time stamp */
@@ -538 +438 @@
     system(g_erase_tmpdir_and_scratchdir);
     free_libmondo_global_strings();
-    paranoid_free(say_at_end);
-    paranoid_free(tmp);
-    paranoid_free(bkpinfo);
+    mr_free(say_at_end);
+    mr_free(tmp);
+    mr_free(bkpinfo);
 
     unlink("/tmp/filelist.full");

branches/stable/mondo/src/mondoarchive/mondo-cli.c

@@ -1 +1 @@
 /***************************************************************************
-mondo-cli.c
--------------------
-begin                : Fri Apr 19 16:40:35 EDT 2002
-copyright        : (C) 2002 Mondo  Hugo Rabson
-email                : Hugo Rabson <hugorabson@msn.com>
-edited by            : by Stan Benoit 4/2002
-email                : troff@nakedsoul.org
-cvsid                : $Id$
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-/***************************************************************************
-UPDATE LOG
-
-
-08/04
-- if user specifies a dumb -T value, abort
-
-07/22
-- handle -Q sensibly (don't abort if only -Q supplied)
-
-07/17
-- better checking of NFS dir's validity
-
-06/19
-- added AUX_VER
-
-04/17
-- added '-b' support
-04/03
-- added star support
-
-02/06
-- fixed "Please give /dev entry" error msg
-
-01/20/2004
-- added 2.6.x-kernel "device = /dev/...." support to param reader
-- better handling of SCSI and /dev entries
-- touch /boot/boot.b if necessary
-
-09/26/2003
-- typo in command-line handling of 'r'
-
-09/25
-- added DVD write support
-
-09/24
-- if tape backup (-t) but user doesn't specify tape drive then
-  make an educated guess using find_tape_device_and_size()
-
-09/18
-- insist on partimagehack being present if -x found
-
-09/16
-- added support for multiple -I's and -E's in call to mondoarchive
-- the '-D' flag doesn't take a value now
-
-07/14
-- fatal error if -E too short
-
-05/14
-- if 'n' and user doesn't have rights to write to output dir
-  then error out
-
-05/05
-- added Joshua Oreman's FreeBSD patches
-
-05/04
-- added Herman Kuster's multi-level bkp patch
-
-05/02
-- write errors to screen, not just to log
-
-04/25
-- added lots of assert()'s and log_OS_error()'s
-
-04/21
-- line 570 --- resolve boot device if softlink
-
-04/08
-- changed a bunch of fprintf(stderr,...)'s to log_it()'s
-- fixed final / removal in retrieve_switches_from_command_line()
-
-04/04
-- added -e
-
-03/15
-- reject relative paths if -d flag (Alessandro Polverini)
-
-01/02/2003
-- added -J flag (to let user specify incoming filelist)
-
-12/13/2002
-- various strcpy() calls replaced with strncpy() calls
-
-12/10
-- added g_loglevel
-
-11/25
-- line 614 --- if commmand-line param ends in '/' then drop that '/'
-
-11/19
-- rewrote finish() to kill processes more softly
-- if user calls with '-l RAW' then 
-
-09/01 - 09/30
-- added -N to let user exclude all NFS-related mounts and devices
-- run_program_and_log_output() now takes boolean operator to specify
-  whether it will log its activities in the event of _success_
-
-08/01 - 08/31
-- if no device specified when backing up to tape streamer then assume /dev/st0
-- abort if tape user specifies tape size (just for testing porpoises)
-- tape users no longer need to specify tape size
-- added some comments
-- added bkpinfo->backup_media_type
-- renamed from mondo-archive.c to mondo-cli.c
-
-07/01 - 07/31
-- better check for mkfs.vfat
-- more sanity-checking for -d flag
-- if isodir does not exist then abort
-- removed "the rest are..." comment from log
-- do not permit '-H' and '-t' in the same command line
-- if not '-o' then insist on vfat-friendly kernel
-
-06/01 - 06/30
-- added signal-trapping
-- added '-W' (won't make bootable CD or floppies) flag
-- added missing 'j++' to -s switch's code
-- expanded -s switch
-- added -u switch
-- if dvdrecord exists and cdrecord doesn't then use
-  dvdrecord instead of cdrecord
-
-04/01 - 04/30
-- if CD-ROM is supermounted then unmount, run, and remount
-- replace MONDO_VERSION #define with VERSION from ../config.h
-- if CD-ROM is mounted at start then abort
-- improved homedir-locating code
-- improved "backup will occupy N CD's" calculation a bit
-- added -m (manual CD tray) flag
-
-
+$Id$
 *******************************************************************/
 
@@ -166 +15 @@
 #include "mondo-cli-EXT.h"
 #include "../common/libmondo.h"
+#include "mr_mem.h"
 
 //static char cvsid[] = "$Id$";
@@ -282 +132 @@
         store_nfs_config(bkpinfo);
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
     return (retval);
 }
@@ -440 +290 @@
             strcat(bkpinfo->include_paths, " ");
         }
-        asprintf(&tmp1, flag_val['I']);
+        mr_asprintf(&tmp1, flag_val['I']);
         p = tmp1;
         q = tmp1;
@@ -462 +312 @@
             }
         }
-        paranoid_free(tmp1);
+        mr_free(tmp1);
 
         strncpy(bkpinfo->include_paths + strlen(bkpinfo->include_paths),
@@ -684 +534 @@
     if (flag_set['z']) {
         if (find_home_of_exe("getfattr")) {
-            asprintf(&g_getfattr,"getfattr");
+            mr_asprintf(&g_getfattr,"getfattr");
         }
         if (find_home_of_exe("getfacl")) {
-            asprintf(&g_getfacl,"getfacl");
+            mr_asprintf(&g_getfacl,"getfacl");
         }
     }
@@ -700 +550 @@
             strcat(bkpinfo->exclude_paths, " ");
         }
-        asprintf(&tmp1, flag_val['E']);
+        mr_asprintf(&tmp1, flag_val['E']);
         p = tmp1;
         q = tmp1;
@@ -728 +578 @@
             }
         }
-        paranoid_free(tmp1);
+        mr_free(tmp1);
 
         strncpy(bkpinfo->exclude_paths + strlen(bkpinfo->exclude_paths),
@@ -1005 +855 @@
 /* and finally... */
 
-    paranoid_free(tmp);
-    paranoid_free(psz);
+    mr_free(tmp);
+    mr_free(psz);
     return (retval);
 }

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

@@ -1 +1 @@
 /***************************************************************************
-mondo-prep.c  -  description
------------------
-
-begin: Fri Apr 19 16:40:35 EDT 2002
-copyright : (C) 2002 Mondo  Hugo Rabson
-email     : Hugo Rabson <hugorabson@msn.com>
-edited by : by Stan Benoit 4/2002
-email     : troff@nakedsoul.org
-cvsid     : $Id$
-***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-/* mondo-prep.c             Hugo Rabson
-
-
-
-07/20
-- when starting RAID, don't do it twice :)
-- moved Joshua's new get_phys_size_of_drive() code
-  from resize_drive... into get_phys_size_of_drive()
-
-06/29
-- make sure software RAID devices are formatted IF user says they're to be
-- drivelist is struct now, not char[][]
-
-06/26
-- drop make_relevant_partition_bootable(); do it yourself in C (mostly)
-- offer to reboot if partition table is locked up by the kernel
-
-06/22
-- be sure not to resize non-NTFS images when restoring
-- set non-NTFS images' partition types properly
-
-06/19
-- shut down all LVMs and VGs before prepping
-
-05/07
-- usage of parted2fdisk instead of fdisk alone (ia32/ia64 compatibility)
-  BCO
-
-03/31
-- rewrote partitioning and formatting code to call fdisk once per disk
-
-10/21/2003
-- suspend/resume Newt gui before/after calling do_my_funky_lvm_stuff()
-
-10/20
-- rewrote format_everything() - what a mess it was.
-  It now does things in three phases:-
-  - formats software RAID devices (/dev/md0, etc.)
-  - formats and configures LVM devices
-  - formats regular partitions (/dev/hda1, /dev/sdb2, etc.) 
-    and any LVMs recently prepped
-
-10/07
-- use strstr(format, "raid") instead of strcmp(format,"raid") to determin
-  if partition is a RAID component
-
-09/23
-- better comments
-
-09/18
-- better logging of RAID activity
-
-05/05
-- added Joshua Oreman's FreeBSD patches
-
-04/30
-- added textonly mode
-
-04/24
-- added lots of assert()'s and log_OS_error()'s
-
-04/21
-- format_everything() --- don't let bar go too far
-- mkfs -c to check for bad blocks when formatting
-
-04/04
-- misc clean-up (Tom Mortell)
-
-01/15/2003
-- added code for LVM and SW Raid (Brian Borgeson)
-
-12/10/2002
-- line 1238: friendlier output
-
-11/20
-- when wiping a given device in preparation for partitioning + formatting
-  it, don't wipe the MBR; just the partition table. That allows for
-  stupid-ass Compaq users who like to play with their MBR's.
-- disable mountlist.txt-->mountlist.txt.pre-resize copying (superfluous)
-
-09/09
-- run_program_and_log_output() now takes boolean operator to specify
-  whether it will log its activities in the event of _success_
-
-07/01 - 07/31
-- added hooks to libmondo
-- RAID enhancements (Philippe de Muyter)
-
-01/01 - 03/31
-- partition_device() will refuse to partition /dev/mdX now (cos it's a
-  virtual drive); however, it will return 0 (i.e. not an error)
-- make_list_of_drives() will exclude /dev/md* from list
-- mkreiserfs -ff instead of -q (Andy Glass)
-- don't resize drive if drive not found (or if its size cannot be det'd)
-- when generating list of drives from mountlist, skip the 'p' at the end
-  of drive name if /dev/ida/ or /dev/cciss/; just do it (Michael Eisenberg)
-- don't specify journal size when formatting ext3
-  (used to have -Jsize=10 in the call to mkfs)
-- handles files >2GB in size
-- format interactively, if Interactive Mode
-- removed reference to g_tape_size
-- when executing /tmp/i-want-my-lvm, only record the error# if the command
-  was _not_ an 'insmod' command
-- pass partition size to fdisk in Kilobytes now, not Megabytes
-- log fdisk's output to /tmp/mondo-restore.log if it fails
-- don't try to format partitions of type 'image'
-- don't type to set types of 'image' partitions
-- if format code is 1 or 2 chars then assume it is a hex string
-- took out all '/ /' comments
-- don't extrapolate/add partition from RAID dev to mountlist if it's already
-  present in mountlist
-- less repetitive logging in the event of vacuum-packing of last part'n
-- no extrapolation at all: RAID partitions should be listed in mountlist
-  already, thanks to either Mindi v0.5x or the mountlist editor itself
-- no longer say, 'and logging to...' when setting a partition's type
-- don't run mkfs on RAID partitions (/dev/hd*, /dev/sd*); just set type
-- the setting of a partition's type now takes place in a separate subroutine
-  from the subroutine that actually creates the partition
-- no need to set type if 83: 83 is the default (under fdisk)
-- turned on '-Wall'; cleaned up some cruft
-- if vacuum-packing partition (i.e. size=0MB --> max) then say, "(maximum)"
-  not, "(0 MB)"
-
-11/22/2001
-- preliminary code review
-- created on Nov 22nd, 2001
+ * $Id$
 */
 
@@ -162 +17 @@
 #include <linux/hdreg.h>
 #include <math.h>
+#include "mr_mem.h"
 
 
@@ -220 +76 @@
     malloc_string(command);
     malloc_string(tmp);
-    buf = malloc(blocksize);
+    buf = mr_malloc(blocksize);
     if (does_file_exist("/tmp/i-want-my-lvm"))  // FIXME - cheating :)
     {
-        drivelist = malloc(sizeof(struct list_of_disks));
+        drivelist = mr_malloc(sizeof(struct list_of_disks));
         make_list_of_drives_in_mountlist(mountlist, drivelist);
         for (lino = 0; lino < drivelist->entries; lino++) {
@@ -274 +130 @@
     }
 // Still here? Cool!
-    paranoid_free(command);
-    paranoid_free(tmp);
+    mr_free(command);
+    mr_free(tmp);
     log_msg(1, "Cool. I didn't have to wipe anything.");
 }
@@ -384 +240 @@
     malloc_string(vgremove_sz);
 //  malloc_string(do_this_last); // postpone lvcreate call if necessary
-    command = malloc(512);
+    command = mr_malloc(512);
 
 //  do_this_last[0] = '\0';
@@ -549 +405 @@
     log_msg(1, "Closed i-want-my-lvm. Finished doing funky stuff.");
   end_of_i_want_my_lvm:
-    paranoid_free(tmp);
-    paranoid_free(incoming);
-    paranoid_free(command);
-    paranoid_free(lvscan_sz);
-    paranoid_free(lvremove_sz);
-    paranoid_free(vgscan_sz);
-    paranoid_free(pvscan_sz);
-    paranoid_free(vgcreate_sz);
-    paranoid_free(vgchange_sz);
-    paranoid_free(vgremove_sz);
-//  paranoid_free(do_this_last);
+    mr_free(tmp);
+    mr_free(incoming);
+    mr_free(command);
+    mr_free(lvscan_sz);
+    mr_free(lvremove_sz);
+    mr_free(vgscan_sz);
+    mr_free(pvscan_sz);
+    mr_free(vgcreate_sz);
+    mr_free(vgchange_sz);
+    mr_free(vgremove_sz);
+//  mr_free(do_this_last);
     system("sync");
     system("sync");
@@ -686 +542 @@
         }
     }
-    paranoid_free(incoming);
-    paranoid_free(tmp);
+    mr_free(incoming);
+    mr_free(tmp);
 
     return (0);
@@ -734 +590 @@
   for (j = 1; j < raidlist->el[i].data_disks.entries; j++) {
     asprintf(&strtmp, "%s", devices);
-    paranoid_free(devices);
+    mr_free(devices);
     asprintf(&devices, "%s %s", strtmp,
          raidlist->el[i].data_disks.el[j].device);
-    paranoid_free(strtmp);
+    mr_free(strtmp);
   }
   for (j = 0; j < raidlist->el[i].spare_disks.entries; j++) {
     asprintf(&strtmp, "%s", devices);
-    paranoid_free(devices);
+    mr_free(devices);
     asprintf(&devices, "%s %s", strtmp,
          raidlist->el[i].spare_disks.el[j].device);
-    paranoid_free(strtmp);
+    mr_free(strtmp);
   }
   // translate RAID level
@@ -765 +621 @@
   if (raidlist->el[i].parity != -1) {
     asprintf(&strtmp, "%s", program);
-    paranoid_free(program);
+    mr_free(program);
     switch(raidlist->el[i].parity) {
     case 0:
@@ -783 +639 @@
       break;
     }
-    paranoid_free(strtmp);
+    mr_free(strtmp);
   }
   if (raidlist->el[i].chunk_size != -1) {
     asprintf(&strtmp, "%s", program);
-    paranoid_free(program);
+    mr_free(program);
     asprintf(&program, "%s --chunk=%d", strtmp, raidlist->el[i].chunk_size);
-    paranoid_free(strtmp);
+    mr_free(strtmp);
   }
   if (raidlist->el[i].spare_disks.entries > 0) {
     asprintf(&strtmp, "%s", program);
-    paranoid_free(program);
+    mr_free(program);
     asprintf(&program, "%s --spare-devices=%d", strtmp,
          raidlist->el[i].spare_disks.entries);
-    paranoid_free(strtmp);
+    mr_free(strtmp);
   }
   asprintf(&strtmp, "%s", program);
-  paranoid_free(program);
+  mr_free(program);
   asprintf(&program, "%s %s", strtmp, devices);
-  paranoid_free(strtmp);
+  mr_free(strtmp);
   res = run_program_and_log_output(program, 1);
   // free memory
-  paranoid_free(devices);
-  paranoid_free(level);
-  paranoid_free(program);
+  mr_free(devices);
+  mr_free(level);
+  mr_free(program);
   // return to calling instance
   return res;
@@ -845 +701 @@
         sprintf(tmp, "Not formatting %s (it is a RAID disk)", device);
         log_it(tmp);
-        paranoid_free(program);
-        paranoid_free(tmp);
+        mr_free(program);
+        mr_free(tmp);
         return (0);
     }
@@ -852 +708 @@
     if (strcmp(format, "swap") == 0) {
         log_it("Not formatting %s - it's swap", device);
-        paranoid_free(program);
-        paranoid_free(tmp);
+        mr_free(program);
+        mr_free(tmp);
         return (0);
     }
@@ -862 +718 @@
                 device, format);
         log_it(tmp);
-        paranoid_free(program);
-        paranoid_free(tmp);
+        mr_free(program);
+        mr_free(tmp);
         return (0);
     }
@@ -869 +725 @@
         sprintf(tmp, "%s is mounted - cannot format it       ", device);
         log_to_screen(tmp);
-        paranoid_free(program);
-        paranoid_free(tmp);
+        mr_free(program);
+        mr_free(tmp);
         return (1);
     }
@@ -986 +842 @@
     if (!strcmp(format, "lvm")) {
         log_msg(1, "Don't format %s - it's part of an lvm volume", device);
-        paranoid_free(program);
-        paranoid_free(tmp);
+        mr_free(program);
+        mr_free(tmp);
         return (0);
     }
@@ -1026 +882 @@
 
     log_to_screen(tmp);
-    paranoid_free(program);
-    paranoid_free(tmp);
+    mr_free(program);
+    mr_free(tmp);
     system("sync");
     sleep(1);
@@ -1253 +1109 @@
     system("clear");
     newtResume();
-    paranoid_free(tmp);
+    mr_free(tmp);
     return (retval);
 }
@@ -1308 +1164 @@
         previous_devno = current_devno;
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
     return (previous_devno);
 }
@@ -1649 +1505 @@
     if (!pout_to_fdisk) {
         log_to_screen("Cannot call parted2fdisk to configure %s", drivename);
-        paranoid_free(device_str);
-        paranoid_free(format);
-        paranoid_free(tmp);
+        mr_free(device_str);
+        mr_free(format);
+        mr_free(tmp);
         return (1);
     }
@@ -1686 +1542 @@
                             ("Warning! Unable to make the drive bootable.");
                     }
-                    paranoid_free(device_str);
-                    paranoid_free(format);
-                    paranoid_free(tmp);
+                    mr_free(device_str);
+                    mr_free(format);
+                    mr_free(tmp);
                     return r;
                 }
@@ -1777 +1633 @@
             log_to_screen
                 ("You must leave at least one partition spare as the Extended partition.");
-            paranoid_free(device_str);
-            paranoid_free(format);
-            paranoid_free(tmp);
+            mr_free(device_str);
+            mr_free(format);
+            mr_free(tmp);
             return (1);
         }
@@ -1825 +1681 @@
         }
     }
-    paranoid_free(device_str);
-    paranoid_free(format);
-    paranoid_free(tmp);
+    mr_free(device_str);
+    mr_free(format);
+    mr_free(tmp);
     return (retval);
 }
@@ -1877 +1733 @@
         sprintf(tmp, "Not partitioning %s - it is a virtual drive", drive);
         log_it(tmp);
-        paranoid_free(program);
-        paranoid_free(partition_name);
-        paranoid_free(tmp);
-        paranoid_free(logfile);
-        paranoid_free(output);
+        mr_free(program);
+        mr_free(partition_name);
+        mr_free(tmp);
+        mr_free(logfile);
+        mr_free(output);
         return (0);
     }
@@ -1898 +1754 @@
                 partition_name);
         log_to_screen(tmp);
-        paranoid_free(program);
-        paranoid_free(partition_name);
-        paranoid_free(tmp);
-        paranoid_free(logfile);
-        paranoid_free(output);
+        mr_free(program);
+        mr_free(partition_name);
+        mr_free(tmp);
+        mr_free(logfile);
+        mr_free(output);
         return (1);
 /*
@@ -1933 +1789 @@
                     log_to_screen
                         ("You need to leave at least one partition free, for 'extended/logical'");
-                    paranoid_free(program);
-                    paranoid_free(partition_name);
-                    paranoid_free(tmp);
-                    paranoid_free(logfile);
-                    paranoid_free(output);
+                    mr_free(program);
+                    mr_free(partition_name);
+                    mr_free(tmp);
+                    mr_free(logfile);
+                    mr_free(output);
                     return (1);
                 } else {
@@ -2056 +1912 @@
     g_current_progress++;
     log_it("partition_device() --- leaving");
-    paranoid_free(program);
-    paranoid_free(partition_name);
-    paranoid_free(tmp);
-    paranoid_free(logfile);
-    paranoid_free(output);
+    mr_free(program);
+    mr_free(partition_name);
+    mr_free(tmp);
+    mr_free(logfile);
+    mr_free(output);
     return (retval);
 }
@@ -2087 +1943 @@
     /** end ************************************************************/
 
-    drivelist = malloc(sizeof(struct list_of_disks));
+    drivelist = mr_malloc(sizeof(struct list_of_disks));
     assert(mountlist != NULL);
 
@@ -2146 +2002 @@
     system("clear");
     newtResume();
-    paranoid_free(drivelist);
+    mr_free(drivelist);
     return (retval);
 }
@@ -2290 +2146 @@
     }
 
-    paranoid_free(partition);
-    paranoid_free(command);
-    paranoid_free(output);
-    paranoid_free(tmp);
-    paranoid_free(partcode);
-    paranoid_free(logfile);
+    mr_free(partition);
+    mr_free(command);
+    mr_free(output);
+    mr_free(tmp);
+    mr_free(partcode);
+    mr_free(logfile);
 
     return (res);
@@ -2448 +2304 @@
              "r");
         if (!fin) {
-            paranoid_free(dev);
-            paranoid_free(incoming);
+            mr_free(dev);
+            mr_free(incoming);
             return (1);
         }
@@ -2460 +2316 @@
         if (!fin) {
             log_OS_error("/proc/mdstat");
-            paranoid_free(dev);
-            paranoid_free(incoming);
+            mr_free(dev);
+            mr_free(incoming);
             return (1);
         }
@@ -2482 +2338 @@
         log_msg(1, "Warning - unable to stop some RAID devices");
     }
-    paranoid_free(dev);
-    paranoid_free(incoming);
+    mr_free(dev);
+    mr_free(incoming);
     system("sync");
     system("sync");
@@ -2546 +2402 @@
         res = 0;
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
     return (res);
 }
@@ -2588 +2444 @@
     }
     original_size_of_drive = original_size_of_drive / 1024;
-    paranoid_free(tmp);
+    mr_free(tmp);
     return (original_size_of_drive);
 }
@@ -2638 +2494 @@
         if (strncmp(drive_name, RAID_DEVICE_STUB, strlen(RAID_DEVICE_STUB))
             == 0) {
-            paranoid_free(tmp);
+            mr_free(tmp);
             return;
         }
@@ -2652 +2508 @@
     if (current_size_of_drive <= 0) {
         log_it("Not resizing to match %s - can't find drive", drive_name);
-        paranoid_free(tmp);
+        mr_free(tmp);
         return;
     }
@@ -2659 +2515 @@
     log_to_screen(tmp);
 
-    drivemntlist = malloc(sizeof(struct mountlist_reference));
+    drivemntlist = mr_malloc(sizeof(struct mountlist_reference));
     drivemntlist->el =
-        malloc(sizeof(struct mountlist_line *) * MAX_TAPECATALOG_ENTRIES);
-
-    if (!drivemntlist) {
-        fatal_error("Cannot malloc temporary mountlist\n");
-    }
+        mr_malloc(sizeof(struct mountlist_line *) * MAX_TAPECATALOG_ENTRIES);
+
     create_mountlist_for_drive(mountlist, drive_name, drivemntlist);
 
@@ -2677 +2530 @@
                 drive_name);
         log_to_screen(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
         return;
     }
@@ -2712 +2565 @@
     final_size = get_phys_size_of_drive(drive_name);
     sprintf(tmp, "final_size = %ld MB", final_size);
-    paranoid_free(tmp);
+    mr_free(tmp);
     log_to_screen(tmp);
 }
@@ -2734 +2587 @@
     /** end *************************************************************/
 
-    drivelist = malloc(sizeof(struct list_of_disks));
-    assert(mountlist != NULL);
+    drivelist = mr_malloc(sizeof(struct list_of_disks));
 
     if (g_mountlist_fname[0] == '\0') {
@@ -2753 +2605 @@
     }
     log_to_screen("Mountlist adjusted to suit current hard drive(s)");
-    paranoid_free(drivelist);
+    mr_free(drivelist);
 }
 
@@ -2798 +2650 @@
     }
     if (tmp_drive_name)
-        free(tmp_drive_name);
+        mr_free(tmp_drive_name);
 }
 

branches/stable/mondo/src/mondorestore/mondo-restore.c

@@ -1 +1 @@
 /***************************************************************************
-$Id$
-restores mondoarchive data
+* restores mondoarchive data
+* $Id$
 ***************************************************************************/
 
@@ -20 +20 @@
 #include "mondo-rstr-compare-EXT.h"
 #include "mondo-rstr-tools-EXT.h"
+#include "mr_mem.h"
 
 extern void twenty_seconds_til_yikes(void);
@@ -313 +314 @@
         retval += compare_mode(bkpinfo, mountlist, raidlist);
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
     return (retval);
 }
@@ -631 +632 @@
     }
   end_of_func:
-    paranoid_free(tmp);
-    paranoid_free(fstab_fname);
-    paranoid_free(old_restpath);
+    mr_free(tmp);
+    mr_free(fstab_fname);
+    mr_free(old_restpath);
     iamhere("Leaving interactive_mode()");
     return (retval);
@@ -912 +913 @@
     assert(bkpinfo != NULL);
     malloc_string(old_restpath);
-    mountlist = malloc(sizeof(struct mountlist_itself));
-    raidlist = malloc(sizeof(struct raidlist_itself));
-    if (!mountlist || !raidlist) {
-        fatal_error("Cannot malloc() mountlist and/or raidlist");
-    }
+    mountlist = mr_malloc(sizeof(struct mountlist_itself));
+    raidlist = mr_malloc(sizeof(struct raidlist_itself));
 
     strcpy(bkpinfo->restore_path, "/");
@@ -966 +964 @@
         eject_device(bkpinfo->media_device);
     }
-    paranoid_free(old_restpath);
-    free(mountlist);
-    free(raidlist);
+    mr_free(old_restpath);
+    mr_free(mountlist);
+    mr_free(raidlist);
     return (retval);
 }
@@ -1038 +1036 @@
 
     pathname_of_last_file_restored[0] = '\0';
-    if (!(bigblk = malloc(TAPE_BLOCK_SIZE))) {
-        fatal_error("Cannot malloc bigblk");
-    }
+    bigblk = mr_malloc(TAPE_BLOCK_SIZE);
 
     if (!(fin = fopen(slice_fname(bigfileno, 0, ARCHIVES_PATH, ""), "r"))) {
@@ -1295 +1291 @@
         utime(outfile_fname, ubuf);
     }
-    paranoid_free(bigblk);
-    paranoid_free(checksum);
-    paranoid_free(outfile_fname);
-    paranoid_free(tmp);
-    paranoid_free(bzip2_command);
-    paranoid_free(ntfsprog_command);
-    paranoid_free(suffix);
-    paranoid_free(sz_devfile);
+    mr_free(bigblk);
+    mr_free(checksum);
+    mr_free(outfile_fname);
+    mr_free(tmp);
+    mr_free(bzip2_command);
+    mr_free(ntfsprog_command);
+    mr_free(suffix);
+    mr_free(sz_devfile);
 
     return (retval);
@@ -1553 +1549 @@
     }
 
-    paranoid_free(tmp);
-    paranoid_free(outfile_fname);
-    paranoid_free(command);
-    paranoid_free(ntfsprog_command);
-    paranoid_free(sz_devfile);
-    paranoid_free(ntfsprog_fifo);
+    mr_free(tmp);
+    mr_free(outfile_fname);
+    mr_free(command);
+    mr_free(ntfsprog_command);
+    mr_free(sz_devfile);
+    mr_free(ntfsprog_fifo);
     g_loglevel = old_loglevel;
     return (retval);
@@ -1786 +1782 @@
 
   leave_sub:
-    paranoid_free(command);
-    paranoid_free(tmp);
-    paranoid_free(filelist_name);
-    paranoid_free(filelist_subset_fname);
-    paranoid_free(executable);
-    paranoid_free(temp_log);
-    paranoid_free(xattr_fname);
-    paranoid_free(acl_fname);
+    mr_free(command);
+    mr_free(tmp);
+    mr_free(filelist_name);
+    mr_free(filelist_subset_fname);
+    mr_free(executable);
+    mr_free(temp_log);
+    mr_free(xattr_fname);
+    mr_free(acl_fname);
     log_msg(5, "Leaving");
     return (retval);
@@ -1988 +1984 @@
     unlink(afio_fname);
 
-    paranoid_free(filelist_subset_fname);
-    paranoid_free(filelist_fname);
-    paranoid_free(afio_fname);
-    paranoid_free(command);
-    paranoid_free(tmp);
+    mr_free(filelist_subset_fname);
+    mr_free(filelist_fname);
+    mr_free(afio_fname);
+    mr_free(command);
+    mr_free(tmp);
     return (retval);
 }
@@ -2137 +2133 @@
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     }
-    paranoid_free(xattr_fname);
-    paranoid_free(acl_fname);
-    paranoid_free(tmp);
-    paranoid_free(biggies_whose_EXATs_we_should_set);
-    paranoid_free(pathname_of_last_biggie_restored);
+    mr_free(xattr_fname);
+    mr_free(acl_fname);
+    mr_free(tmp);
+    mr_free(biggies_whose_EXATs_we_should_set);
+    mr_free(pathname_of_last_biggie_restored);
     return (retval);
 }
@@ -2286 +2282 @@
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     }
-    paranoid_free(tmp);
-    paranoid_free(tarball_fname);
-    paranoid_free(progress_str);
-    paranoid_free(comment);
+    mr_free(tmp);
+    mr_free(tarball_fname);
+    mr_free(progress_str);
+    mr_free(comment);
 
     return (retval);
@@ -2457 +2453 @@
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     }
-    paranoid_free(biggies_whose_EXATs_we_should_set);
-    paranoid_free(pathname_of_last_biggie_restored);
-    paranoid_free(biggie_fname);
-    paranoid_free(biggie_cksum);
-    paranoid_free(xattr_fname);
-    paranoid_free(acl_fname);
-    paranoid_free(tmp);
+    mr_free(biggies_whose_EXATs_we_should_set);
+    mr_free(pathname_of_last_biggie_restored);
+    mr_free(biggie_fname);
+    mr_free(biggie_cksum);
+    mr_free(xattr_fname);
+    mr_free(acl_fname);
+    mr_free(tmp);
     return (retval);
 }
@@ -2603 +2599 @@
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     }
-    paranoid_free(tmp);
-    paranoid_free(progress_str);
-    paranoid_free(tmp_fname);
-    paranoid_free(xattr_fname);
-    paranoid_free(acl_fname);
+    mr_free(tmp);
+    mr_free(progress_str);
+    mr_free(tmp_fname);
+    mr_free(xattr_fname);
+    mr_free(acl_fname);
     return (retval);
 }
@@ -2692 +2688 @@
     kill_petris();
     log_msg(2, "restore_everything() --- leaving");
-    paranoid_free(cwd);
-    paranoid_free(newpath);
-    paranoid_free(tmp);
+    mr_free(cwd);
+    mr_free(newpath);
+    mr_free(tmp);
     return (resA + resB);
 }
@@ -2914 +2910 @@
         g_text_mode = FALSE;
     }                           // newt :-)
-    if (!
-        (bkpinfo = g_bkpinfo_DONTUSETHIS =
-         malloc(sizeof(struct s_bkpinfo)))) {
-        fatal_error("Cannot malloc bkpinfo");
-    }
-    if (!(mountlist = malloc(sizeof(struct mountlist_itself)))) {
-        fatal_error("Cannot malloc mountlist");
-    }
-    if (!(raidlist = malloc(sizeof(struct raidlist_itself)))) {
-        fatal_error("Cannot malloc raidlist");
-    }
+    bkpinfo = g_bkpinfo_DONTUSETHIS = mr_malloc(sizeof(struct s_bkpinfo));
+    mountlist = mr_malloc(sizeof(struct mountlist_itself));
+    raidlist = mr_malloc(sizeof(struct raidlist_itself));
 
     malloc_libmondo_global_strings();
@@ -3344 +3332 @@
     sprintf(tmp, "umount %s", bkpinfo->isodir);
     run_program_and_log_output(tmp, 5);
-    paranoid_free(mountlist);
-    paranoid_free(raidlist);
+    mr_free(mountlist);
+    mr_free(raidlist);
     if (am_I_in_disaster_recovery_mode()) {
         run_program_and_log_output("mount / -o remount,rw", 2);
@@ -3351 +3339 @@
     paranoid_MR_finish(retval); // frees global stuff plus bkpinfo
     free_libmondo_global_strings(); // it's fine to have this here :) really :)
-    paranoid_free(a);
-    paranoid_free(b);
-    paranoid_free(tmp);
+    mr_free(a);
+    mr_free(b);
+    mr_free(tmp);
 
     unlink("/tmp/filelist.full");

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

@@ -1 +1 @@
 /***************************************************************************
-       mondo-compare.c  -  compares mondoarchive data
-                             -------------------
-    begin                : Fri Apr 25 2003
-    copyright            : (C) 2000 by Hugo Rabson
-    email                : Hugo Rabson <hugorabson@msn.com>
-    cvsid                : $Id$
-***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-/***************************************************************************
- *                         Change Log                                      *
- ***************************************************************************
-.
-
-
-
-10/21/2003
-- changed "/mnt/cdrom" to MNT_CDROM
-
-10/18
-- don't say unknown compressor if no compressor at all
-
-09/17
-- cleaned up logging & conversion-to-changed.txt
-- cleaned up compare_mode()
-
-09/16
-- fixed bad malloc(),free() pairs in compare_a_biggiefile()
-
-09/14
-- compare_mode() --- a couple of strings were the wrong way round,
-  e.g. changed.txt and changed.files
-
-05/05
-- exclude /dev/ * from list of changed files
-
-04/30
-- added textonly mode
-
-04/27
-- improved compare_mode() to allow for ISO/cd/crazy people
-
-04/25
-- first incarnation
+* compares mondoarchive data
+* $Id$
 */
-
 
 #include <pthread.h>
@@ -207 +156 @@
     }
 
-    paranoid_free(original_cksum_ptr);
-    paranoid_free(original_cksum);
-    paranoid_free(bigfile_fname_ptr);
-    paranoid_free(bigfile_fname);
-    paranoid_free(checksum_ptr);
-    paranoid_free(checksum);
-    paranoid_free(command_ptr);
-    paranoid_free(command);
-    paranoid_free(tmp_ptr);
-    paranoid_free(tmp);
+    mr_free(original_cksum_ptr);
+    mr_free(original_cksum);
+    mr_free(bigfile_fname_ptr);
+    mr_free(bigfile_fname);
+    mr_free(checksum_ptr);
+    mr_free(checksum);
+    mr_free(command_ptr);
+    mr_free(command);
+    mr_free(tmp_ptr);
+    mr_free(tmp);
 
     return (retval);
@@ -395 +344 @@
     }
     unlink(logfile);
-    paranoid_free(command);
-    paranoid_free(tmp);
-    paranoid_free(filelist_name);
-    paranoid_free(logfile);
+    mr_free(command);
+    mr_free(tmp);
+    mr_free(filelist_name);
+    mr_free(logfile);
     malloc_string(archiver_exe);
     malloc_string(compressor_exe);
@@ -494 +443 @@
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     }
-    paranoid_free(tarball_fname);
-    paranoid_free(progress_str);
-    paranoid_free(tmp);
+    mr_free(tarball_fname);
+    mr_free(progress_str);
+    mr_free(tmp);
     return (retval);
 }
@@ -555 +504 @@
     }
 
-    paranoid_free(tmp);
-    paranoid_free(cwd);
-    paranoid_free(new);
-    paranoid_free(command);
+    mr_free(tmp);
+    mr_free(cwd);
+    mr_free(new);
+    mr_free(command);
 
     return (resA + resB);
@@ -663 +612 @@
     }
     kill_petris();
-    paranoid_free(tmp);
+    mr_free(tmp);
     return (retval);
 }
@@ -717 +666 @@
 
     mvaddstr_and_log_it(g_currentY++, 74, "Done.");
-    paranoid_free(dir);
-    paranoid_free(command);
+    mr_free(dir);
+    mr_free(command);
     return (res);
 }
@@ -761 +710 @@
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     }
-    paranoid_free(dir);
-    paranoid_free(command);
+    mr_free(dir);
+    mr_free(command);
     return (res);
 }

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

@@ -1 +1 @@
 /***************************************************************************
-mondo-rstr-newt.c  -  description
------------------
-
-begin: Fri Apr 19 16:40:35 EDT 2002
-copyright : (C) 2002 Mondo  Hugo Rabson
-email     : Hugo Rabson <hugorabson@msn.com>
-edited by : by Stan Benoit 4/2002
-email     : troff@nakedsoul.org
-cvsid     : $Id$
-***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-/* mondo-rstr-newt.c               Hugo Rabson
-
-
-07/12
-- wider mountlist entry editor window
-
-03/28/2004
-- removed g_mountlist_fname
-
-07/02/2003
-- fixed calls to popup_and_get_string()
-
-06/05
-- cleaned up get_isodir_info()
-
-05/02
-- added strip_path() to improve file list display for long paths (Conor)
-
-04/24
-- added lots of assert()'s and log_OS_error()'s
-
-04/08/2003
-- commented out call to sort_mountlist_by_device(), just in case it's 
-  futzing with LVM/RAID users
-
-08/21/2002
-- fix MOUNTLIST_FNAME and RAIDTAB_FNAME if Reload button finds them empty
-
-08/19
-- fixed what_number_cd_is_this() to take bkpinfo as parameter
-
-07/01 - 07/31
-- renamed from mondo-newt.c to mondo-rstr-newt.c
-- moved lots of subroutines to libmondo-newt.c
-- added hooks to libmondo
-- better handling of yes/no/YES/NO
-- better "% done" feedback (Philippe de Muyter)
-
-05/01 - 06/30
-- trim trailing \n from fgets() in a couple of functions
-- expanded "May I write mountlist?" message
-- replace scanf() with a properly restricted fgets() (Troff)
-
-02/01 - 02/28/2002
-- allow up to 50 chars in popup_and_get_string()'s input field
-- if g_current_progress > g_maximum_progress then g_current_progress=g_max...
-  to stop the progress bar from shooting off the RHS of the screen :)
-- beefed up the RAID-related logging a bit
-- don't complain if partition format is a number (1-255)
-- if hard disk does not exist then warn user when editing mountlist
-- when running 'eject -t', log its output
-
-[...]
-
-08/09/2001
-- created
+ * $Id$
 */
+
+#include "mr_mem.h"
 
 
@@ -1650 +1578 @@
     malloc_string(sz_parity_disks);
     malloc_string(sz_failed_disks);
-    if (!(bkp_raidrec = malloc(sizeof(struct raid_device_record)))) {
-        fatal_error("Cannot malloc space for raidrec");
-    }
+    bkp_raidrec = mr_malloc(sizeof(struct raid_device_record));
 
     log_it("Started edit_raidlist_entry");
@@ -1727 +1653 @@
         calculate_raid_device_size(mountlist, raidlist,
                                    raidrec->raid_device);
-    paranoid_free(title_of_editraidForm_window);
-    paranoid_free(sz_raid_level);
-    paranoid_free(sz_data_disks);
-    paranoid_free(sz_spare_disks);
-    paranoid_free(sz_parity_disks);
-    paranoid_free(sz_failed_disks);
-    paranoid_free(bkp_raidrec);
+    mr_free(title_of_editraidForm_window);
+    mr_free(sz_raid_level);
+    mr_free(sz_data_disks);
+    mr_free(sz_spare_disks);
+    mr_free(sz_parity_disks);
+    mr_free(sz_failed_disks);
+    mr_free(bkp_raidrec);
 #endif
 }
@@ -1781 +1707 @@
     struct mountlist_itself *unallocparts;
 
-    unallocparts = malloc(sizeof(struct mountlist_itself));
+    unallocparts = mr_malloc(sizeof(struct mountlist_itself));
 
     log_it("Started edit_raidlist_entry");
@@ -2816 +2742 @@
     malloc_string(sz_res);
     malloc_string(header_text);
-    if (!(bkp_raidrec = malloc(sizeof(struct raid_device_record)))) {
-        fatal_error("Cannot malloc space for raidrec");
-    }
-    if (!(bkp_disklist = malloc(sizeof(struct list_of_disks)))) {
-        fatal_error("Cannot malloc space for disklist");
-    }
-    if (!(bkp_raidlist = malloc(sizeof(struct raidlist_itself)))) {
-        fatal_error("Cannot malloc space for raidlist");
-    }
-    if (!
-        (unallocated_raid_partitions =
-         malloc(sizeof(struct mountlist_itself)))) {
-        fatal_error("Cannot malloc space for unallocated_raid_partitions");
-    }
+    bkp_raidrec = mr_malloc(sizeof(struct raid_device_record));
+    bkp_disklist = mr_malloc(sizeof(struct list_of_disks));
+    bkp_raidlist = mr_malloc(sizeof(struct raidlist_itself));
+    unallocated_raid_partitions = mr_malloc(sizeof(struct mountlist_itself));
 
     memcpy((void *) bkp_raidlist, (void *) raidlist,
@@ -2920 +2836 @@
                sizeof(struct list_of_disks));
     }
-    paranoid_free(tmp);
-    paranoid_free(help_text);
-    paranoid_free(title_of_window);
-    paranoid_free(sz_res);
-    paranoid_free(header_text);
-    paranoid_free(bkp_raidrec);
-    paranoid_free(bkp_disklist);
-    paranoid_free(bkp_raidlist);
-    paranoid_free(unallocated_raid_partitions);
+    mr_free(tmp);
+    mr_free(help_text);
+    mr_free(title_of_window);
+    mr_free(sz_res);
+    mr_free(header_text);
+    mr_free(bkp_raidrec);
+    mr_free(bkp_disklist);
+    mr_free(bkp_raidlist);
+    mr_free(unallocated_raid_partitions);
 }
 #endif

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

@@ -1 +1 @@
 /***************************************************************************
-mondo-rstr-tools.c  -  description
------------------
-
-begin: Sun Sep 21 16:40:35 EDT 2003
-copyright : (C) 2002 Mondo  Hugo Rabson
-email     : Hugo Rabson <hugorabson@msn.com>
-edited by : by Stan Benoit ?/2003
-email     : troff@nakedsoul.org
-cvsid     : $Id: mondo-rstr-tools.c
-***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-/* mondo-rstr-tools.c               Hugo Rabson
-
-
-07/27
-- if the user is foolish enough to use /dev/md0 as boot device,
-  call lilo -M /dev/hda to make sure lilo does its job properly
-- better NFS+nuke support
-
-07/20
-- use backup's i-want-my-lvm file
-- be sure to use archives' raidtab when restoring
-
-07/18
-- use /tmp/isodir for NFS if DR mode
-- better support of users who boot from LVM CD and nuke-restore non-LVM backups
-
-07/12
-- bugfix to allow user to burn ISOs to CDs and restore from CDs (not original src)
-
-06/29
-- mount ext3 partitions as ext2, just in case :)
-
-06/26
-- delete make_relevant_partition_bootable()
-
-06/19
-- futzed with the call to mount floppy, to stop it from locking up on my AMD64 system
-
-06/14
-- shell out to /mnt/RESTORING chroot in order to let user install GRUB
-  manually if automatic GRUB installation fails
-
-06/15
-- Added check for different 'isodir' chosen by user than stored in the archive
-  Conor Daly <conor.daly@met.ie>
-
-04/17
-- replaced INTERNAL_TAPE_BLK_SIZE with bkpinfo->internal_tape_block_size
-
-04/09
-- don't try to mount CD if tape bkp
-
-04/03
-- trying to copy tmp/mondo-restore.cfg to itself - silly! - fixed
-
-04/02
-- when extracting cfg file and mountlist from all.tar.gz (tape copy),
-  use block size of INTERNAL_TAPE_BLK_SIZE, not TAPE_BLOCK_SIZE
-
-02/21
-- don't use 'mv -v' cos Busybox won't support it
-
-02/09
-- make hole for cfg file before moving it (line 2094 or so)
-
-02/03
-- changed a couple of refs to filelist.full, to filelist.full.gz
-
-01/16/2004
-- instead of copying filelist, use 'ln -sf' to link to original;
-  saves space
-
-11/20/2003
-- also retrieve /tmp/mountlist.txt if user wants
-
-11/16
-- fixed NFS path bug affecting the extractions of filelist/biggielist
-  during selective restore
-
-11/02
-- fixed mount_cdrom() to run properly w/ nfs restores
-- mount_device() returns 0 if swap mount fails cos swap isn't crucial
-
-10/17
-- run_grub() uses MNT_RESTORING instead of "/mnt/RESTORING"
-
-10/26
-- cleaned up run_grub()
-
-10/25
-- fixed mount_cdrom() to run properly w/ nfs restores
-
-10/21
-- mount_device() returns 0 if swap mount fails cos swap isn't crucial
-
-10/15
-- run_grub() now uses its initiative instead
-  of calling grub-install
-
-10/10
-- don't leave copies of filelist.full lying around, clogging up
-  the ramdisk, there's a good fellow :-)
-
-10/02
-- added 'dvd' to the range of media types I'll understand
-- fixed iso->cdr problem (thanks, Stan Benoit & Fred Beondo)
-
-09/24
-- try lots of tape devs if /dev/st0 fails
-
-09/23/2003
-- first incarnation
+ * $Id$
 */
 
@@ -132 +12 @@
 //#include "mondo-rstr-compare-EXT.h"
 #include "mondo-rstr-tools.h"
+#include "mr_mem.h"
 
 extern bool g_sigpipe_caught;
@@ -174 +55 @@
 void free_MR_global_filenames()
 {
-    paranoid_free(g_biggielist_txt);
-    paranoid_free(g_filelist_full);
-    paranoid_free(g_filelist_imagedevs);
-//  paranoid_free (g_imagedevs_pot );
-    paranoid_free(g_imagedevs_restthese);
-    paranoid_free(g_mondo_cfg_file);
-    paranoid_free(g_mountlist_fname);
-    paranoid_free(g_mondo_home);
-    paranoid_free(g_tmpfs_mountpt);
-    paranoid_free(g_isodir_device);
-    paranoid_free(g_isodir_format);
+    mr_free(g_biggielist_txt);
+    mr_free(g_filelist_full);
+    mr_free(g_filelist_imagedevs);
+//  mr_free (g_imagedevs_pot );
+    mr_free(g_imagedevs_restthese);
+    mr_free(g_mondo_cfg_file);
+    mr_free(g_mountlist_fname);
+    mr_free(g_mondo_home);
+    mr_free(g_tmpfs_mountpt);
+    mr_free(g_isodir_device);
+    mr_free(g_isodir_format);
 
 }
@@ -213 +94 @@
     assert_string_is_neither_NULL_nor_zerolength(outfname);
 
-    incoming_ptr = malloc(sizeof(incoming));
-    if (incoming_ptr == NULL) {
-        fprintf(stderr, "Out of Memory\n");
-        exit(EXIT_FAILURE);
-    }
-
-    question_ptr = malloc(sizeof(question));
-    if (question_ptr == NULL) {
-        fprintf(stderr, "Out of Memory\n");
-        exit(EXIT_FAILURE);
-    }
+    incoming_ptr = mr_malloc(sizeof(incoming));
+    question_ptr = mr_malloc(sizeof(question));
 
     memset(incoming_ptr, '\0', sizeof(incoming));
@@ -253 +125 @@
 
   /*** free memory ***********/
-    paranoid_free(incoming_ptr);
+    mr_free(incoming_ptr);
     incoming_ptr = NULL;
-    paranoid_free(question_ptr);
+    mr_free(question_ptr);
     question_ptr = NULL;
 
@@ -341 +213 @@
         retval = 0;
     }
-    paranoid_free(mountpt);
-    paranoid_free(command);
-    paranoid_free(orig_fname);
+    mr_free(mountpt);
+    mr_free(command);
+    mr_free(orig_fname);
     return (retval);
 
@@ -406 +278 @@
     sprintf(command, "grep -E '^%s$' %s", file, list_fname);
     res = run_program_and_log_output(command, FALSE);
-    paranoid_free(command);
-    paranoid_free(file);
-    paranoid_free(tmp);
+    mr_free(command);
+    mr_free(file);
+    mr_free(tmp);
     if (res) {
         return (FALSE);
@@ -500 +372 @@
     log_msg(2, "%ld: bkpinfo->isodir is now %s", __LINE__,
             bkpinfo->isodir);
-    paranoid_free(mount_isodir_command);
-    paranoid_free(tmp);
-    paranoid_free(command);
+    mr_free(mount_isodir_command);
+    mr_free(tmp);
+    mr_free(command);
     return (retval);
 }
@@ -519 +391 @@
             "kill `ps 2> /dev/null | grep petris 2> /dev/null | grep -v grep | cut -d' ' -f2` 2> /dev/null");
     paranoid_system(command);
-    paranoid_free(command);
+    mr_free(command);
 }
 
@@ -556 +428 @@
     }
     if (!does_file_exist(rclocal_fname)) {
-        paranoid_free(rclocal_fname);
-        paranoid_free(newfile_fname);
-        paranoid_free(tmp);
+        mr_free(rclocal_fname);
+        mr_free(newfile_fname);
+        mr_free(tmp);
         return (1);
     }
@@ -582 +454 @@
     sprintf(tmp, "chmod +x \"%s\"", newfile_fname);
     run_program_and_log_output(tmp, FALSE);
-    paranoid_free(rclocal_fname);
-    paranoid_free(newfile_fname);
-    paranoid_free(tmp);
+    mr_free(rclocal_fname);
+    mr_free(newfile_fname);
+    mr_free(tmp);
     return (0);
 }
@@ -613 +485 @@
     malloc_string(these_failed);
     assert(p_external_copy_of_mountlist != NULL);
-    mountlist = malloc(sizeof(struct mountlist_itself));
+    mountlist = mr_malloc(sizeof(struct mountlist_itself));
     memcpy((void *) mountlist, (void *) p_external_copy_of_mountlist,
            sizeof(struct mountlist_itself));
@@ -684 +556 @@
     }
     run_program_and_log_output("df -m", 3);
-    paranoid_free(mountlist);
-    paranoid_free(tmp);
-    paranoid_free(format);
-    paranoid_free(these_failed);
+    mr_free(mountlist);
+    mr_free(tmp);
+    mr_free(format);
+    mr_free(these_failed);
     return (retval);
 }
@@ -720 +592 @@
         || bkpinfo->backup_media_type == udev) {
         log_msg(8, "Tape/udev. Therefore, no need to mount CDROM.");
-        paranoid_free(mount_cmd);
+        mr_free(mount_cmd);
         return 0;
     }
@@ -726 +598 @@
     if (!run_program_and_log_output("mount | grep -F " MNT_CDROM, FALSE)) {
         log_msg(2, "mount_cdrom() - CD already mounted. Fair enough.");
-        paranoid_free(mount_cmd);
+        mr_free(mount_cmd);
         return (0);
     }
@@ -807 +679 @@
         log_msg(2, "Mounted CD-ROM drive OK");
     }
-    paranoid_free(mount_cmd);
+    mr_free(mount_cmd);
     return (res);
 }
@@ -918 +790 @@
     }
 
-    paranoid_free(tmp);
-    paranoid_free(command);
-    paranoid_free(mountdir);
-    paranoid_free(mountpoint);
-    paranoid_free(additional_parameters);
+    mr_free(tmp);
+    mr_free(command);
+    mr_free(mountdir);
+    mr_free(mountpoint);
+    mr_free(additional_parameters);
 
     return (res);
@@ -1107 +979 @@
     read_cfg_var(cfg_file, "acl", value);
     if (strstr(value, "TRUE")) {
-        asprintf(&g_getfacl,"setfacl");
+        mr_asprintf(&g_getfacl,"setfacl");
         log_msg(1, "We will restore ACLs");
         if (! find_home_of_exe("setfacl")) {
@@ -1115 +987 @@
     read_cfg_var(cfg_file, "xattr", value);
     if (strstr(value, "TRUE")) {
-        asprintf(&g_getfattr,"setfattr");
+        mr_asprintf(&g_getfattr,"setfattr");
         log_msg(1, "We will restore XATTRs");
         if (! find_home_of_exe("setfattr")) {
@@ -1290 +1162 @@
     }
     g_backup_media_type = bkpinfo->backup_media_type;
-    paranoid_free(value);
-    paranoid_free(tmp);
-    paranoid_free(command);
-    paranoid_free(iso_mnt);
-    paranoid_free(iso_path);
-    paranoid_free(old_isodir);
+    mr_free(value);
+    mr_free(tmp);
+    mr_free(command);
+    mr_free(iso_mnt);
+    mr_free(iso_path);
+    mr_free(old_isodir);
     return (0);
 
@@ -1480 +1352 @@
     }
 
-    paranoid_free(command);
-    paranoid_free(tmp);
+    mr_free(command);
+    mr_free(tmp);
     return (filelist);
 }
@@ -1514 +1386 @@
 
     res = run_program_and_log_output(command, 5);
-    paranoid_free(tmp);
-    paranoid_free(command);
+    mr_free(tmp);
+    mr_free(command);
     return (res);
 }
@@ -1593 +1465 @@
         log_to_screen("Your boot loader ran OK");
     }
-    paranoid_free(device);
-    paranoid_free(tmp);
-    paranoid_free(name);
+    mr_free(device);
+    mr_free(tmp);
+    mr_free(name);
     return (retval);
 }
@@ -1739 +1611 @@
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     }
-    paranoid_free(rootdev);
-    paranoid_free(rootdrive);
-    paranoid_free(conffile);
-    paranoid_free(command);
-    paranoid_free(boot_device);
-    paranoid_free(tmp);
-    paranoid_free(editor);
+    mr_free(rootdev);
+    mr_free(rootdrive);
+    mr_free(conffile);
+    mr_free(command);
+    mr_free(boot_device);
+    mr_free(tmp);
+    mr_free(editor);
 
     return (res);
@@ -1813 +1685 @@
         res = TRUE;
     }
-    paranoid_free(command);
-    paranoid_free(tmp);
-    paranoid_free(editor);
+    mr_free(command);
+    mr_free(tmp);
+    mr_free(editor);
     return (res);
 }
@@ -1924 +1796 @@
                                    " lilo -M /dev/sda", 3);
     }
-    paranoid_free(command);
-    paranoid_free(tmp);
-    paranoid_free(editor);
+    mr_free(command);
+    mr_free(tmp);
+    mr_free(editor);
     return (res);
 }
@@ -2006 +1878 @@
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     }
-    paranoid_free(command);
-    paranoid_free(boot_device);
-    paranoid_free(tmp);
-    paranoid_free(editor);
+    mr_free(command);
+    mr_free(boot_device);
+    mr_free(tmp);
+    mr_free(editor);
     return (res);
 }
@@ -2129 +2001 @@
     paranoid_fclose(fout);
     paranoid_fclose(fin);
-    paranoid_free(incoming);
+    mr_free(incoming);
 }
 
@@ -2177 +2049 @@
     }
     close_progress_form();
-    paranoid_free(tmp);
+    mr_free(tmp);
 }
 
@@ -2222 +2094 @@
     assert(p_external_copy_of_mountlist != NULL);
 
-    mountlist = malloc(sizeof(struct mountlist_itself));
+    mountlist = mr_malloc(sizeof(struct mountlist_itself));
     memcpy((void *) mountlist, (void *) p_external_copy_of_mountlist,
            sizeof(struct mountlist_itself));
@@ -2306 +2178 @@
         log_to_screen("All partitions were unmounted OK.");
     }
-    free(mountlist);
-    paranoid_free(command);
-    paranoid_free(tmp);
+    mr_free(mountlist);
+    mr_free(command);
+    mr_free(tmp);
     return (retval);
 }
@@ -2346 +2218 @@
         res = 0;
     }
-    paranoid_free(command);
+    mr_free(command);
     return (res);
 }
@@ -2610 +2482 @@
     run_program_and_log_output(command, FALSE);
     g_backup_media_type = bkpinfo->backup_media_type;
-    paranoid_free(device);
-    paranoid_free(command);
-    paranoid_free(tmp);
-    paranoid_free(cfg_file);
-    paranoid_free(mounted_cfgf_path);
-    paranoid_free(mountpt);
-    paranoid_free(ramdisk_fname);
-    paranoid_free(mountlist_file);
+    mr_free(device);
+    mr_free(command);
+    mr_free(tmp);
+    mr_free(cfg_file);
+    mr_free(mounted_cfgf_path);
+    mr_free(mountpt);
+    mr_free(ramdisk_fname);
+    mr_free(mountlist_file);
     return (retval);
 }
@@ -2649 +2521 @@
 
     malloc_string(screen_message);
-    raidlist = malloc(sizeof(struct raidlist_itself));
+    raidlist = mr_malloc(sizeof(struct raidlist_itself));
 
     assert(wait_for_percentage <= 100);
@@ -2684 +2556 @@
         }
     }
-    paranoid_free(screen_message);
-    paranoid_free(raidlist);
-}
+    mr_free(screen_message);
+    mr_free(raidlist);
+}

branches/stable/tools/quality

@@ -28 +28 @@
 
 # How many sprintf/strcat/strcpy vs asprintf are they
-for s in asprintf mr_asprintf sprintf strcat strcpy strncpy fgets malloc mr_malloc malloc_string getline mr_getline MAX_STR_LEN getcwd goto free mr_free; do
+for s in asprintf mr_asprintf sprintf strcat strcpy strncpy fgets malloc mr_malloc malloc_string getline mr_getline MAX_STR_LEN getcwd goto free mr_free paranoid_free; do
     echo "monodrescue $s usage : "
     tot=0