Changeset 181 in MondoRescue for trunk/mondo

Timestamp:

Dec 13, 2005, 1:35:27 AM (18 years ago)

Author:

bcornec

Message:

merge -r177:180 $SVN_M/branches/2.05

Location:

trunk/mondo

Files:

• configure.in (modified) (1 diff)
• mondo.spec (modified) (2 diffs)
• mondo/Makefile.am (modified) (1 diff)
• mondo/mondorestore/mondo-restore.c (modified) (1 diff)
• mondo/mondorestore/mondo-rstr-newt.c (modified) (46 diffs)
• mondo/restore-scripts/Makefile.am (modified) (1 diff)
• mondo/restore-scripts/mondo/Makefile.am (modified) (1 diff)
• mondo/restore-scripts/usr.bin/Makefile.am (modified) (1 diff)
• mondo/restore-scripts/usr/bin/Makefile.am (modified) (1 diff)
• sbminst (deleted)

trunk/mondo/configure.in

@@ -1 @@
-dnl Autoconfigure file for Mondo Rescue v2.0x_berlios
+dnl Autoconfigure file for Mondo Rescue v2.0x
 dnl Mondo by Hugo Rabson
 dnl This script by Joshua Oreman

trunk/mondo/mondo.spec

@@ -119 +119 @@
 
 %attr(755,root,root) %{_sbindir}/*
-%attr(755,root,root) %{_datadir}/%{name}/restore-scripts/%{name}
-%{_datadir}/%{name}
+%attr(755,root,root) %{_libdir}/%{name}/restore-scripts/%{name}
+%{_libdir}/%{name}
 %{_mandir}/*
 %{_libdir}/*
@@ -127 +127 @@
 * Tue Oct 06 2005 Bruno Cornec <bcornec@users.berlios.de> 2.05_berlios
 - Memory management revision
+- use libdir instead of datadir
 
 * Tue Sep 06 2005 Bruno Cornec <bcornec@users.berlios.de> 2.04_berlios

trunk/mondo/mondo/Makefile.am

@@ -1 +1 @@
 SUBDIRS        = common mondoarchive mondorestore docs restore-scripts
 
-pkgdata_DATA   = do-not-compress-these
+pkglib_DATA   = do-not-compress-these
 
 install-data-hook: post-nuke.sample
-    cp -R post-nuke.sample $(pkgdatadir)/
+    cp -R post-nuke.sample $(pkglibdir)/

trunk/mondo/mondo/mondorestore/mondo-restore.c

@@ -3375 +3375 @@
         toggle_node_selection(filelist, FALSE);
         toggle_all_root_dirs_on(filelist);
+        // BERLIOS: /usr/lib ???
         toggle_path_selection(filelist, "/usr/share", TRUE);
 //      show_filelist(filelist);

trunk/mondo/mondo/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$
 */
 
@@ -131 +57 @@
 {
     /** buffers ***********************************************************/
-    char tmp[MAX_STR_LEN];
+    char *tmp;
 
     /** newt **************************************************************/
@@ -157 +83 @@
     newtPushHelpLine
         ("   Add one of the following unallocated RAID partitions to this RAID device.");
-    sprintf(tmp, "%-26s %s", "Device", "Size");
+    asprintf(&tmp, "%-26s %s", "Device", "Size");
     headerMsg = newtLabel(1, 1, tmp);
+    paranoid_free(tmp);
+
     partitionsListbox =
         newtListbox(1, 2, 6, NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
@@ -196 +124 @@
 
 
-
-
 /**
  * Add an entry to @p mountlist.
@@ -232 +158 @@
 
     /** buffers **********************************************************/
-    char drive_to_add[MAX_STR_LEN];
-    char mountpoint_str[MAX_STR_LEN];
-    char size_str[MAX_STR_LEN];
-    char device_str[MAX_STR_LEN];
-    char format_str[MAX_STR_LEN];
+    char *drive_to_add;
+    char *mountpoint_str;
+    char *size_str = NULL;
+    char *device_str;
+    char *format_str;
 
     /** pointers *********************************************************/
@@ -249 +175 @@
     assert(keylist != NULL);
 
-    strcpy(device_str, "/dev/");
-    strcpy(mountpoint_str, "/");
+    asprintf(&device_str, "/dev/");
+    asprintf(&mountpoint_str, "/");
 #ifdef __FreeBSD__
-    strcpy(format_str, "ufs");
+    asprintf(&format_str, "ufs");
 #else
-    strcpy(format_str, "ext2");
+    asprintf(&format_str, "ext2");
 #endif
-    size_str[0] = '\0';
-    /* sprintf(size_str,""); */
     newtOpenWindow(20, 5, 48, 10, "Add entry");
     label0 = newtLabel(2, 1, "Device:    ");
@@ -267 +191 @@
     mountpointComp =
         newtEntry(14, 2, mountpoint_str, 30, (void *) &mountpoint_here, 0);
+
     formatComp =
         newtEntry(14, 4, format_str, 15, (void *) &format_here, 0);
@@ -280 +205 @@
     for (b_res = NULL; b_res != bOK && b_res != bCancel;) {
         b_res = newtRunForm(myForm);
-        strcpy(device_str, device_here);
-        strcpy(mountpoint_str, mountpoint_here);
-        strcpy(format_str, format_here);
-        strcpy(size_str, size_here);
-//      log_it ("Originals = %s,%s,%s,%s", device_str, mountpoint_str, format_str, size_str);
+
+        paranoid_free(device_str);
+        asprintf(&device_str, device_here);
         strip_spaces(device_str);
+
+        paranoid_free(format_str);
+        asprintf(&format_str, format_here);
+        strip_spaces(format_str);
+
+        paranoid_free(mountpoint_str);
+        asprintf(&mountpoint_str, mountpoint_here);
         strip_spaces(mountpoint_str);
-        strip_spaces(format_str);
+
+        paranoid_free(size_str);
+        asprintf(&size_str, size_here);
         strip_spaces(size_str);
-//      log_it ("Modified = %s,%s,%s,%s", device_str, mountpoint_str, format_str, size_str);
+
         if (b_res == bOK) {
             if (device_str[strlen(device_str) - 1] == '/') {
@@ -308 +240 @@
         return;
     }
-    strcpy(drive_to_add, device_str);
+    asprintf(&drive_to_add, device_str);
     for (i = strlen(drive_to_add); isdigit(drive_to_add[i - 1]); i--);
     num_to_add = atoi(drive_to_add + i);
     drive_to_add[i] = '\0';
+    paranoid_free(drive_to_add);
+
     currline = mountlist->entries;
     strcpy(mountlist->el[currline].device, device_str);
     strcpy(mountlist->el[currline].mountpoint, mountpoint_str);
+    paranoid_free(mountpoint_str);
+
     strcpy(mountlist->el[currline].format, format_str);
+    paranoid_free(format_str);
+
     mountlist->el[currline].size = atol(size_str) * 1024;
+    paranoid_free(size_str);
+
     mountlist->entries++;
     if (strstr(mountlist->el[currline].device, RAID_DEVICE_STUB)) {
@@ -322 +262 @@
                                     device_str);
     }
+    paranoid_free(device_str);
     redraw_mountlist(mountlist, keylist, listbox);
 }
@@ -336 +277 @@
 
     /** buffers ***********************************************************/
-    char sz_out[MAX_STR_LEN];
+    char *sz_out = NULL;
 
     /** int ****************************************************************/
@@ -344 +285 @@
     assert(raidrec != NULL);
 
-    sz_out[0] = '\0';
     if (popup_and_get_string
         ("Add variable", "Enter the name of the variable to add", sz_out,
@@ -396 +336 @@
 
     /** buffers ***********************************************************/
-    char tmp[MAX_STR_LEN];
+    char *tmp;
+    char *devname;
 
 
@@ -405 +346 @@
          && strcmp(raidlist->el[i].volname, basename(raid_device)); i++);
     if (i == raidlist->entries) {
-        sprintf(tmp,
+        asprintf(&tmp,
                 "Cannot calc size of raid device %s - cannot find it in raidlist",
                 raid_device);
         log_it(tmp);
+        paranoid_free(tmp);
         return (0);             // Isn't this more sensible than 999999999? If the raid dev !exists,
         // then it has no size, right?
@@ -420 +362 @@
         int k = 0, l = 0;
         for (k = 0; k < raidrec->plex[j].subdisks; ++k) {
-            char devname[64];
-            strcpy(devname, raidrec->plex[j].sd[k].which_device);
+            asprintf(&devname, raidrec->plex[j].sd[k].which_device);
             for (l = 0; l < raidlist->disks.entries; ++l) {
                 if (!strcmp(devname, raidlist->disks.el[l].name)) {
@@ -449 +390 @@
                 }
             }
+            paranoid_free(devname);
         }
 
@@ -469 +411 @@
     }
 
-    sprintf(tmp, "I have calculated %s's real size to be %ld", raid_device,
+    asprintf(&tmp, "I have calculated %s's real size to be %ld", raid_device,
             (long) smallest_plex);
     log_it(tmp);
+    paranoid_free(tmp);
     return (smallest_plex);
 #else
@@ -489 +432 @@
 
     /** buffers ***********************************************************/
-    char tmp[MAX_STR_LEN];
+    char *tmp;
 
     assert(mountlist != NULL);
@@ -499 +442 @@
          && strcmp(raidlist->el[i].raid_device, raid_device); i++);
     if (i == raidlist->entries) {
-        sprintf(tmp,
+        asprintf(&tmp,
                 "Cannot calc size of raid device %s - cannot find it in raidlist",
                 raid_device);
         log_it(tmp);
+        paranoid_free(tmp);
         return (999999999);
     }
@@ -525 +469 @@
         total_size = smallest_partition * (noof_partitions - 1);
     }
-    sprintf(tmp, "I have calculated %s's real size to be %ld", raid_device,
+    asprintf(&tmp, "I have calculated %s's real size to be %ld", raid_device,
             (long) total_size);
     log_it(tmp);
+    paranoid_free(tmp);
     return (total_size);
 #endif
@@ -550 +495 @@
 
     /** buffers ***********************************************************/
-    char tmp[MAX_STR_LEN];
-    char prompt[MAX_STR_LEN];
-    char sz[MAX_STR_LEN];
-
-    sprintf(prompt,
+    char *tmp;
+    char *prompt;
+    char *sz;
+
+    asprintf(&prompt,
             "Please enter the RAID level you want. (concat, striped, raid5)");
     if (raidrec->raidlevel == -1) {
-        strcpy(tmp, "concat");
+        asprintf(&tmp, "concat");
     } else if (raidrec->raidlevel == 0) {
-        strcpy(tmp, "striped");
+        asprintf(&tmp, "striped");
     } else {
-        sprintf(tmp, "raid%i", raidrec->raidlevel);
+        asprintf(&tmp, "raid%i", raidrec->raidlevel);
     }
     for (out = 999; out == 999;) {
@@ -570 +515 @@
         strip_spaces(tmp);
         if (tmp[0] == '[' && tmp[strlen(tmp) - 1] == ']') {
-            strcpy(sz, tmp);
+            asprintf(&sz, tmp);
             strncpy(tmp, sz + 1, strlen(sz) - 2);
             tmp[strlen(sz) - 2] = '\0';
+            paranoid_free(sz);
         }
         if (!strcmp(tmp, "concat")) {
@@ -582 +528 @@
         }
         log_it(tmp);
+        paranoid_free(tmp);
         if (is_this_raid_personality_registered(out)) {
             log_it
@@ -593 +540 @@
         }
     }
+    paranoid_free(prompt);
     raidrec->raidlevel = out;
 #else
     /** buffers ***********************************************************/
-    char tmp[MAX_STR_LEN];
+    char *tmp;
     char personalities[MAX_STR_LEN];
-    char prompt[MAX_STR_LEN];
-    char sz[MAX_STR_LEN];
+    char *prompt;
+    char *sz;
     int out = 0, res = 0;
 
@@ -608 +556 @@
     strcpy(personalities,
            last_line_of_file("/tmp/raid-personalities.txt"));
-    sprintf(prompt, "Please enter the RAID level you want. %s",
+    asprintf(&prompt, "Please enter the RAID level you want. %s",
             personalities);
     if (raidrec->raid_level == -1) {
-        strcpy(tmp, "linear");
+        asprintf(&tmp, "linear");
     } else {
-        sprintf(tmp, "%d", raidrec->raid_level);
+        asprintf(&tmp, "%d", raidrec->raid_level);
     }
     for (out = 999;
@@ -624 +572 @@
         strip_spaces(tmp);
         if (tmp[0] == '[' && tmp[strlen(tmp) - 1] == ']') {
-            strcpy(sz, tmp);
+            asprintf(&sz, tmp);
             strncpy(tmp, sz + 1, strlen(sz) - 2);
             tmp[strlen(sz) - 2] = '\0';
+            paranoid_free(sz);
         }
         if (!strcmp(tmp, "linear")) {
@@ -636 +585 @@
         }
         log_it(tmp);
+        paranoid_free(tmp);
         if (is_this_raid_personality_registered(out)) {
             log_it
@@ -647 +597 @@
         }
     }
+    paranoid_free(prompt);
     raidrec->raid_level = out;
 #endif
 }
-
 
 
@@ -672 +622 @@
 
     /** buffers ***********************************************************/
-    char tmp[MAX_STR_LEN];
+    char *tmp;
 
     assert(mountlist != NULL);
@@ -684 +634 @@
              pos++);
         if (pos < mountlist->entries) {
-            sprintf(tmp,
+            asprintf(&tmp,
                     "Deleting partition %s cos it was part of a now-defunct RAID",
                     mountlist->el[pos].device);
             log_it(tmp);
+            paranoid_free(tmp);
             memcpy((void *) &mountlist->el[pos],
                    (void *) &mountlist->el[mountlist->entries - 1],
@@ -695 +646 @@
     }
 }
-
 
 
@@ -715 +665 @@
 
     /** buffers ***********************************************************/
-    char tmp[MAX_STR_LEN];
+    char *tmp;
 
     assert(disklist != NULL);
     assert_string_is_neither_NULL_nor_zerolength(raid_device);
 
-    sprintf(tmp, "Delete %s from RAID device %s - are you sure?",
+    asprintf(&tmp, "Delete %s from RAID device %s - are you sure?",
             disklist->el[currline].device, raid_device);
     if (!ask_me_yes_or_no(tmp)) {
+        paranoid_free(tmp);
         return;
     }
+    paranoid_free(tmp);
     for (pos = currline; pos < disklist->entries - 1; pos++) {
         /* memcpy((void*)&disklist->el[pos], (void*)&disklist->el[pos+1], sizeof(struct s_disk)); */
@@ -731 +683 @@
     disklist->entries--;
 }
-
 
 
@@ -754 +705 @@
 
     /** buffers ***********************************************************/
-    char tmp[MAX_STR_LEN];
-    char device[MAX_STR_LEN];
-
+    char *tmp;
+    char *device;
 
     assert(mountlist != NULL);
@@ -768 +718 @@
                                                   device);
     if (pos >= 0) {
-        sprintf(tmp, "Cannot delete %s: it is in use by RAID device %s",
+        asprintf(&tmp, "Cannot delete %s: it is in use by RAID device %s",
                 mountlist->el[currline].device,
                 raidlist->el[pos].OSSWAP(raid_device, volname));
         popup_and_OK(tmp);
+        paranoid_free(tmp);
         return;
     }
-    sprintf(tmp, "Delete %s - are you sure?",
+    asprintf(&tmp, "Delete %s - are you sure?",
             mountlist->el[currline].device);
     if (!ask_me_yes_or_no(tmp)) {
+        paranoid_free(tmp);
         return;
     }
+    paranoid_free(tmp);
+
     if (strstr(mountlist->el[currline].device, RAID_DEVICE_STUB)) {
-        strcpy(device, mountlist->el[currline].device);
+        asprintf(&device, mountlist->el[currline].device);
         delete_raidlist_entry(mountlist, raidlist, device);
         for (currline = 0;
@@ -788 +742 @@
         if (currline == mountlist->entries) {
             log_it("Dev is gone. I can't delete it. Ho-hum");
+            paranoid_free(device);
             return;
         }
+        paranoid_free(device);
     }
     memcpy((void *) &mountlist->el[currline],
@@ -819 +775 @@
 
     /** buffers ***********************************************************/
-    char tmp[MAX_STR_LEN];
+    char *tmp;
 
     assert(mountlist != NULL);
@@ -829 +785 @@
         return;
     }
-    sprintf(tmp, "Do you want me to delete %s's partitions, too?", device);
+    asprintf(&tmp, "Do you want me to delete %s's partitions, too?", device);
     delete_partitions_too = ask_me_yes_or_no(tmp);
     if (delete_partitions_too) {
@@ -873 +829 @@
         items--;
     }
+    paranoid_free(tmp);
+
     raidlist->entries = items;
 }
@@ -888 +846 @@
 
     /** buffers ************************************************************/
-    char tmp[MAX_STR_LEN];
+    char *tmp;
 
     /** structures *********************************************************/
@@ -896 +854 @@
 
     av = &raidrec->additional_vars;
-    sprintf(tmp, "Delete %s - are you sure?", av->el[lino].label);
+    asprintf(&tmp, "Delete %s - are you sure?", av->el[lino].label);
     if (ask_me_yes_or_no(tmp)) {
         if (!strcmp(av->el[lino].label, "persistent-superblock")
             || !strcmp(av->el[lino].label, "chunk-size")) {
-            sprintf(tmp, "%s must not be deleted. It would be bad.",
+            paranoid_free(tmp);
+            asprintf(&tmp, "%s must not be deleted. It would be bad.",
                     av->el[lino].label);
             popup_and_OK(tmp);
@@ -908 +867 @@
         }
     }
+    paranoid_free(tmp);
 }
 #endif
@@ -934 +894 @@
 
     /** buffers **********************************************************/
-    static char current_filename[MAX_STR_LEN];
-    char tmp[MAX_STR_LEN + 2];
+    static char *current_filename;
+    char *tmp;
 
     /** bool *************************************************************/
@@ -966 +926 @@
                 if (!warned_already) {
                     warned_already = TRUE;
-                    sprintf(tmp,
+                    asprintf(&tmp,
                             "Too many lines. Displaying first %d entries only. Close a directory to see more.",
                             ARBITRARY_MAXIMUM);
                     popup_and_OK(tmp);
+                    paranoid_free(tmp);
                 }
             } else {
@@ -988 +949 @@
                 (g_strings_of_flist_window[i],
                  g_strings_of_flist_window[i - 1]) < 0) {
-                strcpy(tmp, g_strings_of_flist_window[i]);
+                asprintf(&tmp, g_strings_of_flist_window[i]);
                 strcpy(g_strings_of_flist_window[i],
                        g_strings_of_flist_window[i - 1]);
                 strcpy(g_strings_of_flist_window[i - 1], tmp);
+                paranoid_free(tmp);
+
                 dummybool = g_is_path_selected[i];
                 g_is_path_selected[i] = g_is_path_selected[i - 1];
@@ -1001 +964 @@
         newtListboxClear(listbox);
         for (i = 0; i < lines_in_flist_window; i++) {
-            sprintf(tmp, "%c%c %-80s", (g_is_path_selected[i] ? '*' : ' '),
+            asprintf(&tmp, "%c%c %-80s", (g_is_path_selected[i] ? '*' : ' '),
                     (g_is_path_expanded[i] ? '+' : '-'),
                     strip_path(g_strings_of_flist_window[i]));
-            tmp[70] = '\0';
+            // BERLIOS: this is dangerous now 
+            if (strlen(tmp) > 71) {
+                tmp[70] = '\0';
+            }
             keylist[i] = (void *) i;
             newtListboxAppendEntry(listbox, tmp, keylist[i]);
+            paranoid_free(tmp);
         }
         return (lines_in_flist_window);

trunk/mondo/mondo/restore-scripts/Makefile.am

@@ -1 +1 @@
 SUBDIRS = mondo usr
 
-restoreetcdir       = $(pkgdatadir)/restore-scripts/etc
+restoreetcdir       = $(pkglibdir)/restore-scripts/etc
 restoreetc_DATA     = etc/multipath.conf.sample etc/raid0.conf.sample \
                       etc/raid1.conf.sample etc/raid4.conf.sample \

trunk/mondo/mondo/restore-scripts/mondo/Makefile.am

@@ -1 @@
-restoremondodir      = $(pkgdatadir)/restore-scripts/mondo
+restoremondodir      = $(pkglibdir)/restore-scripts/mondo
 restoremondo_SCRIPTS = ISO ask-me-a-question compare-me compare-subroutine-me \
                        edit-mountlist grub-MR hack-fstab hack-grub hack-lilo hack-elilo \

trunk/mondo/mondo/restore-scripts/usr.bin/Makefile.am

@@ -1 @@
-restoreusrbindir      = $(pkgdatadir)/restore-scripts/usr/bin
+restoreusrbindir      = $(pkglibdir)/restore-scripts/usr/bin
 #restoreusrbin_SCRIPTS = # petris pico nano

trunk/mondo/mondo/restore-scripts/usr/bin/Makefile.am

@@ -1 @@
-restoreusrbindir      = $(pkgdatadir)/restore-scripts/usr/bin
+restoreusrbindir      = $(pkglibdir)/restore-scripts/usr/bin
 #restoreusrbin_SCRIPTS = petris nano