Changeset 1080 in MondoRescue for branches/stable/mondo/src/mondorestore

Timestamp:

Jan 28, 2007, 7:04:41 PM (17 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/mondo/src/mondorestore

Files:

• mondo-prep.c (modified) (42 diffs)
• mondo-restore.c (modified) (19 diffs)
• mondo-rstr-compare.c (modified) (8 diffs)
• mondo-rstr-newt.c (modified) (6 diffs)
• mondo-rstr-tools.c (modified) (35 diffs)

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);
+}