Changeset 1080 in MondoRescue for branches/stable/mondo/src/mondorestore/mondo-prep.c

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

File:

• branches/stable/mondo/src/mondorestore/mondo-prep.c (modified) (42 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);
 }