Changeset 3147 in MondoRescue for branches/3.1/mondo

Timestamp:

Jun 19, 2013, 8:34:46 AM (11 years ago)

Author:

Bruno Cornec

Message:

• First pass on svn merge -r 2935:3146 ../3.0

Location:

branches/3.1/mondo

Files:

• COPYING (modified) (2 diffs)
• ChangeLog (copied) (copied from branches/3.0/mondo/ChangeLog )
• NEWS (copied) (copied from branches/3.0/mondo/NEWS )
• bootstrap (modified) (2 diffs)
• configure.in (modified) (4 diffs)
• mondo_icon.png (deleted)
• mondo_icon.xpm (copied) (copied from branches/3.0/mondo/mondo_icon.xpm )
• src/common/libmondo-archive.c (modified) (19 diffs)
• src/common/libmondo-cli.c (modified) (11 diffs)
• src/common/libmondo-devices.c (modified) (13 diffs)
• src/common/libmondo-filelist.c (modified) (13 diffs)
• src/common/libmondo-files.c (modified) (10 diffs)
• src/common/libmondo-fork.c (modified) (4 diffs)
• src/common/libmondo-mountlist.c (modified) (8 diffs)
• src/common/libmondo-raid-EXT.h (modified) (1 diff)
• src/common/libmondo-raid.c (modified) (11 diffs)
• src/common/libmondo-raid.h (modified) (1 diff)
• src/common/libmondo-stream.c (modified) (18 diffs)
• src/common/libmondo-string-EXT.h (modified) (1 diff)
• src/common/libmondo-string.c (modified) (2 diffs)
• src/common/libmondo-string.h (modified) (1 diff)
• src/common/libmondo-tools.c (modified) (5 diffs)
• src/common/libmondo-verify.c (modified) (6 diffs)
• src/common/mondostructures.h (modified) (2 diffs)
• src/common/newt-specific.c (modified) (13 diffs)
• src/include/my-stuff.h (modified) (3 diffs)
• src/lib/mr_conf.c (modified) (2 diffs)
• src/lib/mr_str.c (modified) (1 diff)
• src/mondoarchive/mondoarchive.c (modified) (5 diffs)
• src/mondoarchive/mondoarchive.h (modified) (1 diff)
• src/mondorestore/mondo-prep.c (modified) (42 diffs)
• src/mondorestore/mondo-rstr-compare.c (modified) (12 diffs)
• src/mondorestore/mondo-rstr-newt.c (modified) (6 diffs)
• src/mondorestore/mondo-rstr-tools.c (modified) (19 diffs)
• src/mondorestore/mondoprep.h (modified) (1 diff)
• src/mondorestore/mondorestore.c (modified) (19 diffs)
• src/restore-scripts/mondo/grub-MR (modified) (3 diffs)
• src/restore-scripts/mondo/label-partitions-as-necessary (modified) (3 diffs)
• src/restore-scripts/mondo/make-me-bootable (modified) (2 diffs)
• src/restore-scripts/mondo/stabgrub-me (modified) (4 diffs)
• test/Makefile.am (modified) (2 diffs)
• test/README (copied) (copied from branches/3.0/mondo/test/README )
• test/mondo-test (copied) (copied from branches/3.0/mondo/test/mondo-test )
• test/mountlist-md.txt (copied) (copied from branches/3.0/mondo/test/mountlist-md.txt )
• test/raidtab-md.txt (copied) (copied from branches/3.0/mondo/test/raidtab-md.txt )
• test/test-mountlist.c (modified) (6 diffs)
• test/test-mr_stresc.c (copied) (copied from branches/3.0/mondo/test/test-mr_stresc.c )
• test/test-truncname.c (modified) (2 diffs)

branches/3.1/mondo/COPYING

@@ -3 +3 @@
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
+               51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
@@ -283 +283 @@
 
              END OF TERMS AND CONDITIONS
+
+
+    Appendix: How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) 19yy  <name of author>
+
+    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.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.

branches/3.1/mondo/bootstrap

@@ -26 +26 @@
 fi
 
+autoscan
 make maintainer-clean >/dev/null 2>&1
 libtoolize -f -c --automake
@@ -31 +32 @@
 autoheader
 automake --add-missing --copy
-autoconf
+autoconf -W all
 rm -rf autom4te.cache

branches/3.1/mondo/configure.in

@@ -10 +10 @@
 define(MONDO_REV,m4_normalize(rPBREV)))
 define(MONDO_TAG,MONDO_VER-MONDO_REV)
-AC_INIT([Mondo Rescue],MONDO_TAG,[mondo-devel@lists.sourceforge.net])
+AC_INIT([Mondo Rescue],[MONDO_TAG],[mondo-devel@lists.sourceforge.net])
 AC_CONFIG_SRCDIR([src/mondoarchive/mondoarchive.c])
 AC_CONFIG_MACRO_DIR([m4])
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS([config.h])
 
+AC_PREREQ([2.68])
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
@@ -20 +21 @@
 
 AM_INIT_AUTOMAKE([mondo], MONDO_VER)
-AM_MAINTAINER_MODE
-
 LT_INIT
 
@@ -27 +26 @@
 AC_PROG_AWK
 AC_PROG_CC
-#AC_PROG_RANLIB
 AC_PROG_LIBTOOL
 AC_PROG_CPP
@@ -120 +118 @@
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS([fcntl.h stddef.h stdlib.h string.h sys/ioctl.h sys/param.h sys/time.h unistd.h])
+AC_HEADER_STDBOOL
+AC_CHECK_HEADERS([arpa/inet.h fcntl.h libintl.h locale.h netdb.h netinet/in.h stddef.h stdlib.h string.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h unistd.h utime.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
+AC_C_INLINE
+AC_PROG_GCC_TRADITIONAL
+AC_TYPE_MODE_T
 AC_TYPE_OFF_T
 AC_TYPE_PID_T
+AC_TYPE_SIZE_T
+AC_TYPE_SSIZE_T
+AC_STRUCT_ST_BLOCKS
 
 # Checks for library functions.
 AC_FUNC_CHOWN
 AC_FUNC_FORK
-AC_PROG_GCC_TRADITIONAL
+AC_FUNC_FSEEKO
 AC_FUNC_LSTAT
 AC_FUNC_MALLOC
-AC_TYPE_SIGNAL
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([bzero getcwd memmove memset mkdir mkfifo getopt setenv strcasecmp strchr strerror strrchr strstr mkdtemp])
+AC_CHECK_FUNCS([bzero getcwd gethostbyname inet_ntoa memmove memset mkdir mkdtemp mkfifo getopt setenv strcasecmp strcspn strchr strdup strerror strncasecmp strrchr strspn strstr uname utime])
 
-AC_OUTPUT([Makefile src/Makefile src/lib/Makefile src/common/Makefile src/mondoarchive/Makefile src/mondorestore/Makefile src/restore-scripts/Makefile src/restore-scripts/mondo/Makefile src/post-nuke.sample/Makefile src/post-nuke.sample/usr/Makefile src/post-nuke.sample/usr/bin/Makefile test/Makefile deplist.d/Makefile])
+AC_CONFIG_FILES([Makefile src/Makefile src/lib/Makefile src/common/Makefile src/mondoarchive/Makefile src/mondorestore/Makefile src/restore-scripts/Makefile src/restore-scripts/mondo/Makefile src/post-nuke.sample/Makefile src/post-nuke.sample/usr/Makefile src/post-nuke.sample/usr/bin/Makefile test/Makefile deplist.d/Makefile])
+AC_OUTPUT

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

@@ -213 +213 @@
     paranoid_free(tmp);
 
-    mr_asprintf(command, "star H=exustar list=%s -c " STAR_ACL_SZ " file=%s", filelist, fname);
+    mr_asprintf(command, "star H=exustar list=%s -c -sparse " STAR_ACL_SZ " file=%s", filelist, fname);
     if (bkpinfo->use_lzo) {
         mr_free(command);
@@ -511 +511 @@
     char *use_star_sz = NULL;
     char *bootldr_str = NULL;
+    char *bootldr_ver = NULL;
     char *tape_device = NULL;
     char *broken_bios_sz = NULL;
@@ -682 +683 @@
             run_program_and_log_output("ln -sf /boot/grub/grub.conf /boot/grub/menu.lst", 5);
         }
-        if ((!does_file_exist("/boot/grub/menu.lst")) && (!does_file_exist("/boot/grub/grub.cfg"))) {
-            fatal_error("The de facto standard location for your boot loader's config file is /boot/grub/menu.lst or /boot/grub/grub.cfg but I cannot find it there. What is wrong with your Linux distribution?");
-        }
+        if ((!does_file_exist("/boot/grub/menu.lst")) && (!does_file_exist("/boot/grub/grub.cfg")) && (!does_file_exist("/boot/grub2/grub.cfg"))) {
+            fatal_error("The de facto standard location for your boot loader's config file is /boot/grub/menu.lst, /boot/grub/grub.cfg, or /boot/grub2/grub.cfg but I cannot find it there. What is wrong with your Linux distribution?");
+        }
+        mr_asprintf(&bootldr_ver, "%s", call_program_and_get_last_line_of_output("grub --version"));
     } else if (bkpinfo->boot_loader == 'E') {
         mr_asprintf(bootldr_str, "ELILO");
@@ -719 +721 @@
     }
     log_to_screen("Your boot loader is %s and it boots from %s", bootldr_str, bkpinfo->boot_device);
+    if (bootldr_ver != NULL) {
+        mr_asprintf(&tmp, "Boot loader version string: %s", bootldr_ver);
+        log_to_screen(tmp);
+        mr_free(tmp);
+    }
 
     mr_asprintf(tmp, "%s/BOOTLOADER.DEVICE", bkpinfo->tmpdir);
@@ -927 +934 @@
     char *curr_acl_list_fname = NULL;
 
-    struct s_bkpinfo *bkpinfo_bis;
     char *tmp = NULL;
     int res = 0, retval = 0;
@@ -940 +946 @@
     p_next_set_to_archive = (int *) (inbuf + 8);
     p_list_of_fileset_flags = (char *) (inbuf + 12);
-    bkpinfo_bis = (struct s_bkpinfo *) (inbuf + BKPINFO_LOC_OFFSET);
 
     mr_asprintf(archiving_filelist_fname, FILELIST_FNAME_RAW_SZ, bkpinfo->tmpdir, 0L);
@@ -1474 +1479 @@
 
     log_msg(2, "make_usb_fs --- scratchdir=%s", bkpinfo->scratchdir);
-    (void) getcwd(old_pwd, MAX_STR_LEN - 1);
+    tmp1 = getcwd(old_pwd, MAX_STR_LEN - 1);
     mr_asprintf(tmp, "chmod 700 %s", bkpinfo->scratchdir);
     run_program_and_log_output(tmp, FALSE);
     mr_free(tmp);
-    (void)chdir(bkpinfo->scratchdir);
+    if (chdir(bkpinfo->scratchdir)) {
+        // FIXME
+    }
 
     mds = media_descriptor_string(bkpinfo->backup_media_type);
@@ -1542 +1549 @@
     }
 
-    (void)chdir(old_pwd);
+    if (chdir(old_pwd)) {
+        // FIXME
+    }
     if (retval) {
         log_msg(1, "WARNING - make_usb_fs returned an error");
@@ -1599 +1608 @@
 
     log_msg(2, "make_iso_fs --- scratchdir=%s --- destfile=%s", bkpinfo->scratchdir, destfile);
-    (void) getcwd(old_pwd, MAX_STR_LEN - 1);
+    tmp2 = getcwd(old_pwd, MAX_STR_LEN - 1);
     mr_asprintf(tmp, "chmod 700 %s", bkpinfo->scratchdir);
     run_program_and_log_output(tmp, FALSE);
     mr_free(tmp);
 
-    chdir(bkpinfo->scratchdir);
+    if (chdir(bkpinfo->scratchdir)) {
+        // FIXME
+    }
 
     if (bkpinfo->call_before_iso) {
@@ -1813 +1824 @@
     }
 
-    chdir(old_pwd);
+    if (chdir(old_pwd)) {
+        // FIXME
+    }
     if (retval) {
         log_msg(1, "WARNING - make_iso_fs returned an error");
@@ -1866 +1879 @@
     /*@ pointers ******************************************* */
     FILE *fin = NULL;
+    char *q;
 
     /*@ buffers ******************************************** */
@@ -2411 +2425 @@
     /*@ long long ****************************************************** */
     off_t length_of_incoming_file = (off_t)0;
-    t_archtype type;
     va_list ap;
 
@@ -2433 +2446 @@
         write_header_block_to_stream(length_of_incoming_file, curr_file,
                                      start_chr);
-        if (strstr(curr_file, ".afio.") || strstr(curr_file, ".star.")) {
-            type = fileset;
-        } else if (strstr(curr_file, "slice")) {
-            type = biggieslice;
-        } else {
-            type = other;
-        }
         res = write_file_to_stream_from_file(curr_file);
         retval += res;
@@ -2798 +2804 @@
     mr_free(tmp);
 
-    (void) fwrite((void *) &biggiestruct, 1, sizeof(biggiestruct), fout);
-    fclose(fout);
-
+    res = fwrite((void *) &biggiestruct, 1, sizeof(biggiestruct), fout);
+    if (fout != NULL) {
+        paranoid_fclose(fout);
+    }
     log_msg(1, "Opening in %s; slicing it and writing to CD/tape", file_to_openin);
     if (!(fin = fopen(file_to_openin, "r"))) {
@@ -2839 +2846 @@
                 if (blksize > 0) {
                     totalread = totalread + blksize;
-                    (void) fwrite(tempblock, 1, blksize, fout);
+                    res = fwrite(tempblock, 1, blksize, fout);
                 } else {
                     break;
@@ -3131 +3138 @@
             log_to_screen("Please reboot from the 1st %s in Compare Mode, as a precaution.", mds);
             mr_free(mds);
-            chdir("/");
+            if (chdir("/")) {
+                // FIXME
+            }
             log_it("Before calling verification of image()");
             if (bkpinfo->backup_media_type == usb) {
@@ -3209 +3218 @@
     assert(bkpinfo != NULL);
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-        chdir("/");
+        if (chdir("/")) {
+            // FIXME
+        }
         mvaddstr_and_log_it(g_currentY, 0,
                             "Verifying archives against live filesystem");
@@ -3232 +3243 @@
             bkpinfo->media_device = find_cdrom_device(FALSE);   // replace 0,0,0 with /dev/cdrom
         }
-        chdir("/");
+        if (chdir("/")) {
+            // FIXME
+        }
         for (cdno = 1; cdno < 99 && bkpinfo->verify_data; cdno++) {
             if (cdno != g_current_media_number) {
@@ -3253 +3266 @@
         }
         mr_asprintf(tmp, "grep 'afio: ' %s | sed 's/afio: //' | grep -vE '^/dev/.*$' >> %s/changed.files", MONDO_LOGFILE, MONDO_CACHE);
-        (void)system(tmp);
+        res = system(tmp);
         mr_free(tmp);
 
         mr_asprintf(tmp, "grep 'star: ' %s | sed 's/star: //' | grep -vE '^/dev/.*$' >> %s/changed.files", MONDO_LOGFILE, MONDO_CACHE);
-        (void)system(tmp);
+        res = system(tmp);
         mr_free(tmp);
         run_program_and_log_output("umount " MNT_CDROM, FALSE);

branches/3.1/mondo/src/common/libmondo-cli.c

@@ -20 +20 @@
 extern int g_loglevel;
 extern bool g_text_mode;
+extern bool g_fail_immediately;
 extern char g_startdir[MAX_STR_LEN];    ///< ????? @bug ?????
 extern char *MONDO_OPTIONS;
@@ -53 +54 @@
 
 extern void free_MR_global_filenames(void);
+
+long g_max_biggie_size = BIGGIEMAXSIZE;
 
 /**
@@ -101 +104 @@
     mr_free(tmp);
 
+    /*  Before erasing dirs go into a safe place */
+    if (chdir("/tmp")) {
+        // FIXME
+    }
+    mr_asprintf(tmp, "rm -Rf %s/tmp.mondo.*", bkpinfo->tmpdir);
+    paranoid_system(tmp);
+    mr_free(tmp);
+
     mr_asprintf(tmp, "mkdir -p %s", bkpinfo->scratchdir);
     paranoid_system(tmp);
@@ -162 +173 @@
     int i = 0;
     int retval = 0;
-    int percent = 0;
-    int lastpos = 0;
 
     /*@ buffers ** */
@@ -355 +364 @@
         mr_free(p);
         log_to_screen("You didn't specify a tape streamer device. I'm assuming %s", flag_val['d']);
-        percent = 0;
     }
 
@@ -498 +506 @@
                 if (strstr(bkpinfo->netfs_proto, "sshfs")) {
                     mr_asprintf(tmp1, "sshfs %s@%s", bkpinfo->netfs_user, bkpinfo->netfs_mount);
+                } else if (strstr(bkpinfo->netfs_proto, "smbfs")) {
+                    sprintf(tmp, "mount -t cifs %s -o user=%s", bkpinfo->netfs_mount, bkpinfo->netfs_user);
                 } else if (strstr(bkpinfo->netfs_proto, "nfs")) {
                     mr_asprintf(tmp1, "mount %s@%s", bkpinfo->netfs_user, bkpinfo->netfs_mount);
@@ -507 +517 @@
                 if (strstr(bkpinfo->netfs_proto, "sshfs")) {
                     mr_asprintf(tmp1, "sshfs %s", bkpinfo->netfs_mount);
+                } else if (strstr(bkpinfo->netfs_proto, "smbfs")) {
+                    sprintf(tmp, "mount -t cifs %s", bkpinfo->netfs_mount);
                 } else if (strstr(bkpinfo->netfs_proto, "nfs")) {
                     mr_asprintf(tmp1, "mount %s", bkpinfo->netfs_mount);
@@ -629 +641 @@
         }
         mr_free(tmp1);
-        lastpos = 0;
 
         mr_make_devlist_from_pathlist(flag_val['E'], 'E');
@@ -637 +648 @@
     if (flag_set['e']) {
         bkpinfo->please_dont_eject = TRUE;
+    }
+
+    if (flag_set['M']) {
+        g_max_biggie_size = atol(flag_val['M']);
+        log_msg(1, "Max size for biggie file is now %ld KB", g_max_biggie_size);
     }
 
@@ -778 +794 @@
         /* Before changing remove old ones if any */
         if (bkpinfo->scratchdir) {
-            chdir("/tmp");
+            if (chdir("/tmp")) {
+                // FIXME
+            }
             mr_asprintf(tmp1, "rm -Rf %s", bkpinfo->scratchdir);
             paranoid_system(tmp1);
@@ -859 +877 @@
             log_to_screen("Please install LZOP. You can't use '-L' until you do.\n");
         }
+    }
+
+    if (flag_set['F']) {
+        log_msg(3, "-F means we will fail immediately at the first interaction request");
+        g_fail_immediately = TRUE;
     }
 

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

@@ -331 +331 @@
     char *searchstr = NULL;
     char *tmp = NULL;
+    char *p;
 
     /*@ ints ******************************************************* */
@@ -816 +817 @@
     }
 
-    mr_asprintf(command, "%s -scanbus | grep \"[0-9],[0-9],[0-9]\" | grep \"[D|C][V|D]\" | grep -n \"\" | grep \"%s\" | cut -d':' -f2", cdr_exe, g_cdrw_drive_is_here);
+    mr_asprintf(command, "%s -scanbus | grep \"[0-9],[0-9],[0-9]\" | grep -E \"[D|C][V|D]\" | grep -n \"\" | grep \"%s\" | cut -d':' -f2", cdr_exe, g_cdrw_drive_is_here);
     mr_free(cdr_exe);
 
@@ -848 +849 @@
     }
 
-    tmp = call_program_and_get_last_line_of_output("dvdrecord -scanbus 2> /dev/null | grep \") '\" | grep -n \"\" | grep -E '[D|C][V|D]' | cut -d':' -f1",TRUE);
+    tmp = call_program_and_get_last_line_of_output("dvdrecord -scanbus 2> /dev/null | grep -E '\)\ \'' | grep -n '' | grep -E '[D|C][V|D]' | cut -d':' -f1",TRUE);
     log_msg(5, "tmp = '%s'", tmp);
     if (!tmp[0])
         mr_free(tmp);
-        tmp = call_program_and_get_last_line_of_output("cdrecord -scanbus 2> /dev/null | grep \") '\" | grep -n \"\" | grep -E '[D|C][V|D]' | cut -d':' -f1",TRUE);
+        tmp = call_program_and_get_last_line_of_output("cdrecord -scanbus 2> /dev/null | grep \)\ \' | grep -n '' | grep -E '[D|C][V|D]' | cut -d':' -f1",TRUE);
     if (tmp[0]) {
         devno = atoi(tmp) - 1;
@@ -886 +887 @@
 #if linux
     unsigned long long s = 0;
-    int fileid, cylinders = 0, cylindersleft = 0;
+    int fileid, cylinders = 0;
     int cylindersize = 0;
     int gotgeo = 0;
@@ -935 +936 @@
             if (ioctl(fileid, HDIO_GETGEO, &hdgeo) != -1) {
                 if (hdgeo.cylinders && hdgeo.heads && hdgeo.sectors) {
-                    cylindersleft = cylinders = hdgeo.cylinders;
                     cylindersize = hdgeo.heads * hdgeo.sectors / 2;
                     outvalA = cylindersize * cylinders / 1024;
@@ -983 +983 @@
     char *command = NULL;
     char *format_sz = NULL;
+    char *p;
 
     FILE *pin;
@@ -1822 +1823 @@
 
         /* Check for LVM */
-        mr_asprintf(command, "pvdisplay -c %s | grep '%s:' 2> /dev/null", partitions[i], partitions[i]);
+        mr_asprintf(command, "pvdisplay -c %s 2> /dev/null", partitions[i]);
         log_msg(5, "  Running: %s", command);
         tmp = call_program_and_get_last_line_of_output(command,TRUE);
@@ -2638 +2639 @@
     char *p = NULL;
     char *q = NULL;
+    char *tmpro = NULL;
+    char *tmp1 = NULL;
     char *mds = NULL;
     char *sz_size = NULL;
@@ -2873 +2876 @@
             bkpinfo->media_size[i] = bkpinfo->media_size[0];
         }
+        bkpinfo->use_obdr = ask_me_yes_or_no
+            ("Do you want to activate OBDR support for your tapes ?");
+        if (bkpinfo->use_obdr) {
+            log_msg(4, "obdr mode = TRUE");
+        } else {
+            log_msg(4, "obdr mode = FALSE");
+        }
         if (archiving_to_media) {
             if ((compression_type = which_compression_type()) == NULL) {
@@ -2968 +2978 @@
         if (bkpinfo->disaster_recovery) {
             mr_asprintf(command ,"umount %s/isodir 2> /dev/null", bkpinfo->tmpdir);
-            (void)system(command);
+            paranoid_system(command);
             mr_free(command);
 
         }
-        p = popup_and_get_string("Network protocol", "Which Network protocol should I use?", bkpinfo->netfs_proto);
+<<<<<<< .courant
+        p = popup_and_get_string("Network protocol", "Which Network protocol should I use (nfs/sshfs/smbfs) ?", bkpinfo->netfs_proto);
         if (p == NULL) {
             log_to_screen("User has chosen not to backup the PC");
@@ -3016 +3027 @@
 
             if (bkpinfo->restore_data) {
+                /*  mount th FS read-only in restore mode to avoid any erase of whatever */
+                mr_asprintf(tmpro, "-o ro");
+            } else {
+                mr_asprintf(tmpro, "");
+            }
+
+            /*  Build the mount string */
+            if (strstr(bkpinfo->netfs_proto, "smbfs")) {
+                mr_asprintf(tmp, "mount -t cifs %s %s %s",bkpinfo->netfs_mount, bkpinfo->isodir,tmpro);
+                if (bkpinfo->netfs_user) {
+                    mr_strcat(tmp, " -o user=%s", bkpinfo->netfs_user);
+                }
+            else {
                 if (strstr(bkpinfo->netfs_proto, "sshfs")) {
-                    mr_asprintf(tmp, "sshfs -o ro");
+                    mr_asprintf(tmp, "sshfs %s ",tmpro);
                 } else {
-                    mr_asprintf(tmp, "mount -t %s -o nolock,ro", bkpinfo->netfs_proto);
+                    mr_asprintf(tmp, "mount -t %s -o nolock %s ", bkpinfo->netfs_proto,tmpro);
                 }
-            } else {
-                if (strstr(bkpinfo->netfs_proto, "sshfs")) {
-                    mr_asprintf(tmp, "sshfs");
-                } else {
-                    mr_asprintf(tmp, "mount -t %s -o nolock", bkpinfo->netfs_proto);
+                if (bkpinfo->netfs_user) {
+                    mr_strcat(tmp, "%s@", bkpinfo->netfs_user);
                 }
-            }
-            if (bkpinfo->netfs_user) {
-                mr_strcat(tmp, "%s@", bkpinfo->netfs_user);
-            }
-            mr_strcat(tmp, "%s %s", bkpinfo->netfs_mount, bkpinfo->isodir);
+                mr_strcat(tmp, "%s %s", bkpinfo->netfs_mount, bkpinfo->isodir);
+            }
             run_program_and_log_output(tmp, 3);
             mr_free(tmp);
@@ -3037 +3055 @@
             malloc_string(g_selfmounted_isodir);
             strcpy(g_selfmounted_isodir, bkpinfo->isodir);
+            }
         }
         if (!is_this_device_mounted(bkpinfo->netfs_mount)) {
@@ -3193 +3212 @@
         }
 
-
         p = popup_and_get_string("Exclude paths", "Please enter paths which you do NOT want to backup. Separate them with '|'. NB: /tmp and /proc are always excluded. :-) Just hit 'Enter' if you want to do a full system backup.", bkpinfo->exclude_paths);
         if (p == NULL) {

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

@@ -30 +30 @@
 
 extern char *MONDO_LOGFILE;
+
+extern long g_max_biggie_size;
 
 /* Reference to global bkpinfo */
@@ -195 +197 @@
 /*@ long ****************************************/
     long lino = 0;
-    long max_sane_size_for_a_file;
+    // A big file has more than 64 MB of real content
     long curr_set_size;
     long noof_lines;
@@ -221 +223 @@
     assert_string_is_neither_NULL_nor_zerolength(filelist);
     assert(maxsetsizeK > 0);
-
-    max_sane_size_for_a_file = 64L * 1024L;
-// max_sane_size_for_a_file = maxsetsizeK*2;
-//  if (max_sane_size_for_a_file > 32*1024)
-//    { max_sane_size_for_a_file = 32*1024; }
 
     log_it("filelist=%s;", filelist);
@@ -269 +266 @@
             siz = 0;
         } else {
-            siz = (long) (buf.st_size >> 10);
-        }
-        if (siz > max_sane_size_for_a_file) {
-            log_msg(10, "Adding %s to big files\n", incoming);
+            // blocks are 512 bytes long - cf man 2 stat - Pass to the previous unit (MB => kB e.g.)
+            // use blocks instead of size to allow sparse file correct handling as much as possible
+            siz = (long) ((buf.st_blocks*512) >> 10);
+        }
+        if (siz > g_max_biggie_size) {
+            log_msg(10, "Adding %s to big files (size = %ld)\n", incoming, siz);
             fprintf(fbig, "%s\n", incoming);
         } else {
             curr_set_size += siz;
-            log_msg(10, "Adding %s to filelist %d\n", incoming, curr_set_no);
+            log_msg(10, "Adding %s to filelist %d (size = %ld)\n", incoming, curr_set_no, siz);
             fprintf(fout, "%s\n", incoming);
             if (curr_set_size > maxsetsizeK) {
@@ -400 +399 @@
     char *tmp = NULL;
 
+    char *p;
+
     pattr = popen(syscall, "r");
     if (!pattr) {
@@ -431 +432 @@
     char *strtmp = NULL;
     char *tmp = NULL;
+    char *p = NULL;
     int i;
 
@@ -517 +519 @@
     int retval = 0;
     int i;
-    char *p, *q;
+    char *p, *q, *r;
     char *tmp = NULL;
     FILE *pin, *pout, *faclin;
@@ -1323 +1325 @@
     char *skip_these = NULL;
     char *new_with_pipe;
-    char *strtmp;
-    char *token;
+    char *strtmp = NULL;
+    char *token = NULL;
     char *find_excludes = NULL;
     char *name_of_evalcall_form = NULL;
@@ -1374 +1376 @@
 
         log_msg(5, "find command = %s", strtmp);
-        (void)system(strtmp);
+        paranoid_system(strtmp);
         mr_free(strtmp);
 
@@ -1510 +1512 @@
     char *sz_filelist;
     char *exclude_paths = NULL;
-    int i;
     FILE *fout;
     char *command = NULL;
@@ -1597 +1598 @@
             fatal_error("Cannot openout to sz_filelist");
         }
-        i = 0;
         if ((!include_paths) || (strlen(include_paths) == 0)) {
             log_msg(1, "Including only '/' in %s", sz_filelist);
@@ -1697 +1697 @@
 {
     /*@ int ******************************************************** */
-    int noof_chars;
     static int depth = 0;
     static char original_string[MAX_STR_LEN];
@@ -1715 +1714 @@
     assert(startnode != NULL);
     assert(string_to_find != NULL);
-
-    noof_chars = strlen(string_to_find) + 1;    /* we include the '\0' */
 
     log_msg(7, "starting --- str=%s", string_to_find);

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

@@ -51 +51 @@
     /*@ pointers **************************************************** */
     char *p = NULL;
+    char *q;
     FILE *fin;
 
@@ -126 +127 @@
     char *command = NULL;
     char *incoming = NULL;
+    char *q;
 
     /*@ long ******************************************************** */
@@ -204 +206 @@
     char *tmp = NULL;
     char *incoming = NULL;
+    char *q;
 
     /*@ int ********************************************************* */
@@ -471 +474 @@
     char *output = NULL;
     char *command = NULL;
+    char *p = NULL;
 
     /*@ pointers **************************************************** */
@@ -540 +544 @@
     char *curr_cksum = NULL;
     char *tmp = NULL;
+    char *q;
 
     /*@ long [long] ************************************************* */
@@ -679 +684 @@
     /*@ buffers **************************************************** */
     char *incoming = NULL;
+    char *p = NULL;
 
     /*@ end vars *************************************************** */
@@ -743 +749 @@
     char *tmp = NULL;
     char *command = NULL;
+    char *comment;
 
     /*@ long ******************************************************** */
@@ -972 +979 @@
         return (1);
     }
-    fscanf(fin, "%s\n", contents);
+    res = fscanf(fin, "%s\n", contents);
     i = strlen(contents);
     if (i > 0 && contents[i - 1] < 32) {
@@ -978 +985 @@
     }
     paranoid_fclose(fin);
+    res = 0;
     return (res);
 }
@@ -1020 +1028 @@
     if (res) {
         fatal_error("Failed to copy Mondo's stuff to scratchdir");
+    }
+
+    mr_asprintf(command, "cp -f %s/LAST-FILELIST-NUMBER %s", bkpinfo->tmpdir, bkpinfo->scratchdir);
+
+    if (run_program_and_log_output(command, FALSE)) {
+        fatal_error("Failed to copy LAST-FILELIST-NUMBER to scratchdir");
     }
 

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

@@ -42 +42 @@
     char *newcall = NULL;
     char *tmp = NULL;
+    char *p;
 
     /*@ pointers **************************************************** */
@@ -258 +259 @@
     FILE *fin;
     char *p;
+    char *q;
 
     /*@ end vars *************************************************** */
@@ -300 +302 @@
     fin = fopen(tmp1, "r");
     if (fin) {
-        for (fgets(incoming, MAX_STR_LEN, fin); !feof(fin); fgets(incoming, MAX_STR_LEN, fin)) {
+        for (q = fgets(incoming, MAX_STR_LEN, fin); !feof(fin) && (q != NULL); q = fgets(incoming, MAX_STR_LEN, fin)) {
             p = incoming;
             while (p && *p) {
@@ -545 +547 @@
                 log_msg(1, "bytes_read_in = %ld", bytes_read_in);
 
-                fwrite(tmp1, 1, bytes_read_in, ftmp);
-                fread(tmp1, 1, tmpcap, fin);
-                log_msg(0, "tmp1 = '%s'", tmp1);
-                fwrite(tmp1, 1, tmpcap, ftmp);
+                if (fwrite(tmp, 1, bytes_read_in, ftmp)) {
+                    fatal_error("Can't fwrite here");
+                }
+
+                sprintf(tmp, "I am here - %lld", (long long)ftello(fin));
+                if (fread(tmp, 1, tmpcap, fin)) {
+                    fatal_error("Can't fread here");
+                }
+                log_msg(0, "tmp = '%s'", tmp);
+                if (fwrite(tmp, 1, tmpcap, ftmp)) {
+                    fatal_error("Can't fwrite there");
+                }
                 fclose(ftmp);
                 mr_free(tmp1);

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

@@ -50 +50 @@
     int pos = 0, npos = 0;
     int res = 0;
-    int mountpoint_copies = 0;
     int device_copies = 0;
     int i = 0;
@@ -112 +111 @@
             }
             /* does partition /dev/adXsYZ exist more than once in the mountlist? */
-            for (i = 0, mountpoint_copies = 0, device_copies = 0;
+            for (i = 0, device_copies = 0;
                  i < mountlist->entries; i++) {
                 if (!strcmp(device, mountlist->el[i].device)) {
@@ -214 +213 @@
             }
             /* does partition /dev/adXsY exist more than once in the mountlist? */
-            for (i = 0, mountpoint_copies = 0, device_copies = 0;
+            for (i = 0, device_copies = 0;
                  i < mountlist->entries; i++) {
                 if (!strcmp(device, mountlist->el[i].device)) {
@@ -277 +276 @@
                 }
                 /* does partition /dev/adXsYZ exist more than once in the mountlist? */
-                for (i = 0, mountpoint_copies = 0, device_copies = 0;
+                for (i = 0, device_copies = 0;
                      i < mountlist->entries; i++) {
                     if (!strcmp(device, mountlist->el[i].device)) {
@@ -384 +383 @@
     int pos = 0;
     int res = 0;
-    int mountpoint_copies = 0;
     int device_copies = 0;
     int i = 0;
@@ -461 +459 @@
 
         /* does partition /dev/hdNX exist more than once in the mountlist? */
-        for (i = 0, mountpoint_copies = 0, device_copies = 0;
+        for (i = 0, device_copies = 0;
              i < mountlist->entries; i++) {
             if (!strcmp(device, mountlist->el[i].device)) {
@@ -807 +805 @@
     char *tmp = NULL;
     char *p = NULL;
+    char *q = NULL;
 
     int items = 0;
@@ -926 +925 @@
     }
     paranoid_fclose(fout);
+    if (!(fout = fopen(MONDO_MNTLISTCHG, "w"))) {
+        log_OS_error("WMTD - Cannot openout "MONDO_MNTLISTCHG);
+        return (1);
+    }
+    fprintf(fout, "the mountlist was changed by mondorestore\n");
+    paranoid_fclose(fout);
     return (0);
 }

branches/3.1/mondo/src/common/libmondo-raid-EXT.h

@@ -53 +53 @@
 #endif
 
-extern int parse_mdstat(struct raidlist_itself *raidlist, char *device_prefix);
-extern int create_raidtab_from_mdstat(char *raidtab_fname);
+extern int parse_mdstat(char *mdstat_fname, struct raidlist_itself *raidlist, char *device_prefix);
+extern int create_raidtab_from_mdstat(char *mdstat_fname, char *raidtab_fname);

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

@@ -15 +15 @@
 #include "libmondo-tools-EXT.h"
 #include "libmondo-string-EXT.h"
+#include "libmondo-fork-EXT.h"
 #include "lib-common-externs.h"
 #include "libmondo-raid.h"
@@ -429 +430 @@
     char *incoming = NULL;
     char *p;
+    char *q;
 
     assert(fin != NULL);
@@ -604 +606 @@
         return (1);
     }
+    malloc_string(label);
+    malloc_string(value);
     items = 0;
     log_it("Loading raidtab...");
@@ -615 +619 @@
             strcpy(raidlist->el[items].additional_vars.el[v].label, label);
             strcpy(raidlist->el[items].additional_vars.el[v].value, value);
+            log_msg(2,"Found raidtab entry Label: %s Value: %s",raidlist->el[items].additional_vars.el[v].label,raidlist->el[items].additional_vars.el[v].value);
             v++;
             mr_free(label);
@@ -690 +695 @@
             raidrec->raid_level = atoi(value);
         }
+        log_msg(4,"Found raid level %d",raidrec->raid_level);
     } else if (!strcmp(label, "nr-raid-disks")) {   /* ignore it */
     } else if (!strcmp(label, "nr-spare-disks")) {  /* ignore it */
@@ -710 +716 @@
             log_msg(1, "Unknown RAID parity algorithm '%s'\n.", value);
         }
+        log_msg(4,"Found raid parity %d",raidrec->parity);
     } else if (!strcmp(label, "device")) {
         get_next_raidtab_line(fin, &labelB, &valueB);
@@ -735 +742 @@
         strcpy(raidrec->additional_vars.el[v].label, label);
         strcpy(raidrec->additional_vars.el[v].value, value);
-        raidrec->additional_vars.entries = ++v;
+        log_msg(4,"Found additional raid pair #%d: %s / %s",v,raidrec->additional_vars.el[v].label,raidrec->additional_vars.el[v].value);
+        v++;
+        raidrec->additional_vars.entries = v;
     }
 }
@@ -950 +959 @@
 
 
-int parse_mdstat(struct raidlist_itself *raidlist, char *device_prefix) {
-
-  const char delims[] = " ";
-
-  FILE   *fin;
-  int    res = 0, row, i, index_min;
-  int lastpos = 0;
-  size_t len = 0;
-  char   *token;
-  char *string = NULL;
-  char *pos;
-  char type;
-  char *strtmp;
+int parse_mdstat(char *mdstat_fname, struct raidlist_itself *raidlist, char *device_prefix) {
+
+const char delims[] = " ";
+
+FILE *fin = NULL;
+int res = 0, row, i, index_min;
+int v = 0;
+int lastpos = 0;
+size_t len = 0;
+char *token = NULL;
+char *string = NULL;
+char *cmd = NULL;
+char *pos = NULL;
+char type;
+char *strtmp = NULL;
+char *strtmp2 = NULL;
 
   // open file
@@ -1044 +1056 @@
       raidlist->el[raidlist->entries].raid_level = 10;
     } else {
-      log_msg(1, "Unknown RAID level '%s'.\n", token);
-      paranoid_free(string);
-      paranoid_free(token);
-      return 1;
-    }
-    mr_free(token);
+        switch (row) {
+        case 1:  // device information
+            // check whether last line of record and if so skip
+            log_msg(8, "This is the device line\n");
+            pos = strcasestr(string, "unused devices: ");
+            if (pos != NULL) {
+                break;
+            }
+            // tokenise string
+            token = mr_strtok(string, delims, &lastpos);
+            if (token == NULL) {
+                // should not happen !
+                break;
+            }
+            // get RAID device name
+            mr_asprintf(&strtmp,"%s%s", device_prefix, token);
+            strncpy(raidlist->el[raidlist->entries].raid_device, strtmp, 63);
+            raidlist->el[raidlist->entries].raid_device[63] = '\0';
+            mr_free(strtmp);
+            mr_free(token);
+            // store the UUID value in the additional_vars structure
+            v = raidlist->el[raidlist->entries].additional_vars.entries;
+            strcpy(raidlist->el[raidlist->entries].additional_vars.el[v].label, "UUID");
+            mr_asprintf(&cmd,"mdadm --detail %s | grep UUID | cut -d: -f2- | sed 's/^ *//'", raidlist->el[raidlist->entries].raid_device);
+            mr_asprintf(&strtmp, "%s", call_program_and_get_last_line_of_output(cmd));
+            strcpy(raidlist->el[raidlist->entries].additional_vars.el[v].value, strtmp);
+            mr_free(strtmp);
+            v++;
+            // store the Version value in the additional_vars structure
+            strcpy(raidlist->el[raidlist->entries].additional_vars.el[v].label, "Version");
+            mr_asprintf(&cmd,"mdadm --detail %s | grep Version | cut -d: -f2- | sed 's/^ *//'", raidlist->el[raidlist->entries].raid_device);
+            mr_asprintf(&strtmp, "%s", call_program_and_get_last_line_of_output(cmd));
+            strcpy(raidlist->el[raidlist->entries].additional_vars.el[v].value, strtmp);
+            mr_free(strtmp);
+            v++;
+            raidlist->el[raidlist->entries].additional_vars.entries = v;
+            // skip ':' and status
+            token = mr_strtok (string, delims, &lastpos);
+            if (token == NULL) {
+                // should not happen !
+                break;
+            }
+            mr_free(token);
+            token = mr_strtok (string, delims, &lastpos);
+            if (token == NULL) {
+                // should not happen !
+                break;
+            }
+            if (!strcmp(token, "inactive")) {
+                log_msg(1, "RAID device '%s' inactive.\n",
+                raidlist->el[raidlist->entries].raid_device);
+                mr_free(string);
+                mr_free(token);
+                return 1;
+            }
+            mr_free(token);
 
     // get RAID devices (type, index, device)
@@ -1097 +1159 @@
     }
 
+    // get RAID devices (type, index, device)
+    // Note: parity disk for RAID4 is last normal disk, there is no '(P)'
+    raidlist->el[raidlist->entries].data_disks.entries = 0;
+    raidlist->el[raidlist->entries].spare_disks.entries = 0;
+    raidlist->el[raidlist->entries].failed_disks.entries = 0;
+    while((token = mr_strtok (string, delims, &lastpos))) {
+        if ((pos = strstr(token, "("))) {
+                type = *(pos+1);
+        } else {
+                type = ' ';
+        }
+        pos = strstr(token, "[");
+        *pos = '\0';
+        switch(type) {
+        case ' ': // normal data disks
+                raidlist->el[raidlist->entries].data_disks.el[raidlist->el[raidlist->entries].data_disks.entries].index = atoi(pos + 1);
+                mr_asprintf(&strtmp,"%s%s", device_prefix, token);
+                strcpy(raidlist->el[raidlist->entries].data_disks.el[raidlist->el[raidlist->entries].data_disks.entries].device, strtmp);
+                mr_free(strtmp);
+                raidlist->el[raidlist->entries].data_disks.entries++;
+                break;
+        case 'S': // spare disks
+                raidlist->el[raidlist->entries].spare_disks.el[raidlist->el[raidlist->entries].spare_disks.entries].index = atoi(pos + 1);
+                mr_asprintf(&strtmp,"%s%s", device_prefix, token);
+                strcpy(raidlist->el[raidlist->entries].spare_disks.el[raidlist->el[raidlist->entries].spare_disks.entries].device, strtmp);
+                mr_free(strtmp);
+                raidlist->el[raidlist->entries].spare_disks.entries++;
+                break;
+        case 'F': // failed disks
+                raidlist->el[raidlist->entries].failed_disks.el[raidlist->el[raidlist->entries].failed_disks.entries].index = atoi(pos + 1);
+                mr_asprintf(&strtmp,"%s%s", device_prefix, token);
+                strcpy(raidlist->el[raidlist->entries].failed_disks.el[raidlist->el[raidlist->entries].failed_disks.entries].device, strtmp);
+                mr_free(strtmp);
+                raidlist->el[raidlist->entries].failed_disks.entries++;
+                log_it("At least one failed disk found in RAID array.\n");
+                break;
+        default: // error
+                log_msg(1, "Unknown device type '%c'\n", type);
+                mr_free(string);
+                mr_free(token);
+                return 1;
+                break;
+        }
+        mr_free(token);
+    }
+
     // adjust index for each device so that it starts with 0 for every type
     index_min = 99;
     for (i=0; i<raidlist->el[raidlist->entries].data_disks.entries;i++) {
-      if (raidlist->el[raidlist->entries].data_disks.el[i].index < index_min) {
-        index_min = raidlist->el[raidlist->entries].data_disks.el[i].index;
-      }
+        if (raidlist->el[raidlist->entries].data_disks.el[i].index < index_min) {
+            index_min = raidlist->el[raidlist->entries].data_disks.el[i].index;
+        }
     }
     if (index_min > 0) {
-      for (i=0; i<raidlist->el[raidlist->entries].data_disks.entries;i++) {
-        raidlist->el[raidlist->entries].data_disks.el[i].index = raidlist->el[raidlist->entries].data_disks.el[i].index - index_min;    
-      }
+        for (i=0; i<raidlist->el[raidlist->entries].data_disks.entries;i++) {
+                raidlist->el[raidlist->entries].data_disks.el[i].index = raidlist->el[raidlist->entries].data_disks.el[i].index - index_min;    
+        }
     }
     index_min = 99;
     for (i=0; i<raidlist->el[raidlist->entries].spare_disks.entries;i++) {
-      if (raidlist->el[raidlist->entries].spare_disks.el[i].index < index_min) {
-        index_min = raidlist->el[raidlist->entries].spare_disks.el[i].index;
-      }
+        if (raidlist->el[raidlist->entries].spare_disks.el[i].index < index_min) {
+                index_min = raidlist->el[raidlist->entries].spare_disks.el[i].index;
+        }
     }
     if (index_min > 0) {
-      for (i=0; i<raidlist->el[raidlist->entries].spare_disks.entries;i++) {
-        raidlist->el[raidlist->entries].spare_disks.el[i].index = raidlist->el[raidlist->entries].spare_disks.el[i].index - index_min;  
-      }
+        for (i=0; i<raidlist->el[raidlist->entries].spare_disks.entries;i++) {
+                raidlist->el[raidlist->entries].spare_disks.el[i].index = raidlist->el[raidlist->entries].spare_disks.el[i].index - index_min;  
+        }
     }
     index_min = 99;
     for (i=0; i<raidlist->el[raidlist->entries].failed_disks.entries;i++) {
-      if (raidlist->el[raidlist->entries].failed_disks.el[i].index < index_min) {
-        index_min = raidlist->el[raidlist->entries].failed_disks.el[i].index;
-      }
+        if (raidlist->el[raidlist->entries].failed_disks.el[i].index < index_min) {
+                index_min = raidlist->el[raidlist->entries].failed_disks.el[i].index;
+        }
     }
     if (index_min > 0) {
-      for (i=0; i<raidlist->el[raidlist->entries].failed_disks.entries;i++) {
-        raidlist->el[raidlist->entries].failed_disks.el[i].index = raidlist->el[raidlist->entries].failed_disks.el[i].index - index_min;    
-      }
+        for (i=0; i<raidlist->el[raidlist->entries].failed_disks.entries;i++) {
+                raidlist->el[raidlist->entries].failed_disks.el[i].index = raidlist->el[raidlist->entries].failed_disks.el[i].index - index_min;    
+        }
     }
     break;
-      case 2:  // config information
+case 2:  // config information
     // check for persistent super block
     if (strcasestr(string, "super non-persistent")) {
-      raidlist->el[raidlist->entries].persistent_superblock = 0;
-    } else {
-      raidlist->el[raidlist->entries].persistent_superblock = 1;
-    }
-    // extract chunk size
-    if (!(pos = strcasestr(string, "k chunk"))) {
-      raidlist->el[raidlist->entries].chunk_size = -1;
-    } else {
-      while (*pos != ' ') {
-        pos -= 1;
-        if (pos < string) {
-          log_it("String underflow!\n");
-          paranoid_free(string);
-          return 1;
-        }
-      }
-      raidlist->el[raidlist->entries].chunk_size = atoi(pos + 1);
-    }
-    // extract parity if present
-    if ((pos = strcasestr(string, "algorithm"))) {
-      raidlist->el[raidlist->entries].parity = atoi(pos + 9);
-    } else {
-      raidlist->el[raidlist->entries].parity = -1;
-    }
-    break;
-      case 3:  // optional build status information
-    if (!(pos = strchr(string, '\%'))) {
-      if (strcasestr(string, "delayed")) {
-        raidlist->el[raidlist->entries].progress = -1;  // delayed (therefore, stuck at 0%)
-      } else {
-        raidlist->el[raidlist->entries].progress = 999; // not found
-      }
-    } else {
-      while (*pos != ' ') {
-        pos -= 1;
-        if (pos < string) {
-          printf("ERROR: String underflow!\n");
-          paranoid_free(string);
-          return 1;
-        }
-      }
-      raidlist->el[raidlist->entries].progress = atoi(pos);
-    }
-    break;
-      default: // error or IN PROGRESS
-    if (raidlist->el[raidlist->entries].progress != -1 &&
-        raidlist->el[raidlist->entries].progress != 999) {
-        log_msg(1, "Row %d should not occur in record!\n", row);
-    }
-    break;
-      }
-      row++;
-    }
-  }
-  // close file
-  fclose(fin);
-  // free string
-  paranoid_free(string);
-  // return success
-  return 0;
-
-}
-
-
-
-
-int create_raidtab_from_mdstat(char *raidtab_fname)
+                raidlist->el[raidlist->entries].persistent_superblock = 0;
+            } else {
+                raidlist->el[raidlist->entries].persistent_superblock = 1;
+            }
+            // extract chunk size
+            if (!(pos = strcasestr(string, "k chunk"))) {
+                raidlist->el[raidlist->entries].chunk_size = -1;
+            } else {
+                while (*pos != ' ') {
+                    pos -= 1;
+                    if (pos < string) {
+                            log_it("String underflow!\n");
+                            mr_free(string);
+                            return 1;
+                    }
+                }
+                raidlist->el[raidlist->entries].chunk_size = atoi(pos + 1);
+            }
+            // extract parity if present
+            if ((pos = strcasestr(string, "algorithm"))) {
+                raidlist->el[raidlist->entries].parity = atoi(pos + 9);
+            } else {
+                raidlist->el[raidlist->entries].parity = -1;
+            }
+            break;
+        case 3:  // optional build status information
+            if (!(pos = strchr(string, '\%'))) {
+                if (strcasestr(string, "delayed")) {
+                    raidlist->el[raidlist->entries].progress = -1;  // delayed (therefore, stuck at 0%)
+                } else {
+                    raidlist->el[raidlist->entries].progress = 999; // not found
+                }
+            } else {
+                while (*pos != ' ') {
+                    pos -= 1;
+                    if (pos < string) {
+                        printf("ERROR: String underflow!\n");
+                            mr_free(string);
+                            return 1;
+                    }
+                }
+                raidlist->el[raidlist->entries].progress = atoi(pos);
+            }
+            break;
+        default: // error or IN PROGRESS
+            if (raidlist->el[raidlist->entries].progress != -1 &&
+                raidlist->el[raidlist->entries].progress != 999) {
+                log_msg(1, "Row %d should not occur in record!\n", row);
+            }
+            break;
+        }
+        row++;
+    }
+    // free string
+    mr_free(string);
+}
+// close file
+fclose(fin);
+// return success
+return 0;
+
+}
+
+
+
+
+int create_raidtab_from_mdstat(char *mdstat_fname,char *raidtab_fname)
 {
     struct raidlist_itself *raidlist;
@@ -1209 +1317 @@
 
     // FIXME: Prefix '/dev/' should really be dynamic!
-    if (parse_mdstat(raidlist, "/dev/")) {
-        log_to_screen("Sorry, cannot read %s", MDSTAT_FILE);
+    if (parse_mdstat(mdstat_fname,raidlist, "/dev/")) {
+        log_to_screen("Sorry, cannot read %s", mdstat_fname);
         return (1);
     }

branches/3.1/mondo/src/common/libmondo-raid.h

@@ -43 +43 @@
 #endif
 
-int create_raidtab_from_mdstat(char *raidtab_fname);
-int parse_mdstat(struct raidlist_itself *raidlist, char *device_prefix);
+int create_raidtab_from_mdstat(char *mdstat_fname, char *raidtab_fname);
+int parse_mdstat(char *mdstat_fname, struct raidlist_itself *raidlist, char *device_prefix);

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

@@ -116 +116 @@
     char *blk;
     int i;
+    int j;
 
     blk = (char *) malloc(256 * 1024);
@@ -131 +132 @@
     }
     for (i = 0; i < 8 && !feof(g_tape_stream); i++) {
-        (void) fread(blk, 1, 256 * 1024, g_tape_stream);
+        j = fread(blk, 1, 256 * 1024, g_tape_stream);
+        if (j) {
+            // FIXME
+        }
     }
     sleep(1);
@@ -185 +189 @@
     }
     for (i = 0; i < 4 * 8; i++) {
-        (void) fwrite(blk, 1, 256 * 1024, g_tape_stream);
+        if (fwrite(blk, 1, 256 * 1024, g_tape_stream)) {
+            //FIXME
+        }
         if (should_we_write_to_next_tape
             (bkpinfo->media_size[g_current_media_number], (off_t)256 * 1024)) {
@@ -362 +368 @@
 {
     int res = 0;
-    char *fname = (char *)&res;                 /* Should NOT be NULL */
+    char fname_buf[PATH_MAX];
+    char *fname = (char *)fname_buf;        /* Should NOT be NULL */
     char *tmp = NULL;
 
@@ -419 +426 @@
     res = read_header_block_from_stream(ptmp_size, tmp_fname, pctrl_chr);
     log_msg(1, "End of extended attributes, now looking for afioball");
-    return (0);
+    return (res);
 }
 
@@ -521 +528 @@
 {
     long long final_alleged_writeK, final_projected_certain_writeK,
-        final_actually_certain_writeK = 0, cposK, bufsize_K;
+        cposK, bufsize_K;
     int last, curr, i;
-    t_archtype type = other;
     char *command = NULL;
     char *tmpdir = NULL;
@@ -557 +563 @@
         cposK = g_tapecatalog->el[curr].tape_posK;
         if (cposK < final_projected_certain_writeK) {
-            final_actually_certain_writeK = cposK;
             break;
         }
@@ -835 +840 @@
                           g_tape_stream);
             }
-            (void) fwrite(datablock, 1, (size_t) length, fout);
+            if (fwrite(datablock, 1, (size_t) length, fout)) {
+                // FIXME
+            }
             g_tape_posK += length / 1024;
         }
@@ -860 +867 @@
     close_evalcall_form();
     log_it("Saved all.tar.gz to '%s'", outfname);
-    (void) getcwd(old_cwd, MAX_STR_LEN);
-    chdir(bkpinfo->tmpdir);
+    if (getcwd(old_cwd, MAX_STR_LEN)) {
+        // FIXME
+    }
+    if (chdir(bkpinfo->tmpdir)) {
+        // FIXME
+    }
     mr_asprintf(tmp, "tar -zxf %s ."MINDI_CACHE"/mondorestore.cfg 2> /dev/null", outfname);
     paranoid_system(tmp);
@@ -867 +878 @@
 
     paranoid_system("cp -f ."MINDI_CACHE"/mondorestore.cfg . 2> /dev/null");
-    chdir(old_cwd);
+    if (chdir(old_cwd)) {
+        // FIXME
+    }
     unlink(outfname);
     mr_free(outfname);
@@ -1049 +1062 @@
     unsigned int crctt;
 
-    bool had_to_resync = FALSE;
-
     /*@ init  ******************************************************* */
     malloc_string(temp_fname);
@@ -1062 +1073 @@
 
     res = read_header_block_from_stream(&temp_size, temp_fname, &ctrl_chr);
+    if (res) {
+        // FIXME
+    }
     if (orig_size != temp_size && orig_size != -1) {
         log_to_screen("output file's size should be %ld K but is apparently %ld K", (long) size >> 10, (long) temp_size >> 10);
@@ -1100 +1114 @@
             for (size = orig_size; size > where_I_was_before_tape_change;
                  size -= bytes_to_write) {
-                bytes_read =
-                    fread(datablock, 1, bytes_to_read, g_tape_stream);
+                bytes_read = fread(datablock, 1, bytes_to_read, g_tape_stream);
             }
             log_msg(4, "'size' is now %lld (should be %lld)", size,
                     where_I_was_before_tape_change);
             log_to_screen("Successfully re-sync'd tape");
-            had_to_resync = TRUE;
             bytes_read = fread(datablock, 1, bytes_to_read, g_tape_stream);
         }
 
-        (void) fwrite(datablock, 1, (size_t) bytes_to_write, fout); // for blocking reasons, bytes_successfully_read_in isn't necessarily the same as bytes_to_write
+        if (fwrite(datablock, 1, (size_t) bytes_to_write, fout)) {  // for blocking reasons, bytes_successfully_read_in isn't necessarily the same as bytes_to_write
+            // FIXME
+        }
 
 #ifdef EXTRA_TAPE_CHECKSUMS
@@ -1177 +1191 @@
     }
     while (!(*pcontrol_char = tempblock[7000])) {
-        g_tape_posK +=
-            fread(tempblock, 1, (size_t) TAPE_BLOCK_SIZE,
-                  g_tape_stream) / 1024;
+        g_tape_posK += fread(tempblock, 1, (size_t) TAPE_BLOCK_SIZE, g_tape_stream) / 1024;
     }
     memcpy((char *) plen, tempblock + 7001, sizeof(long long));
@@ -1320 +1332 @@
     ctrl_chr = -1;
     while (ctrl_chr != BLK_START_AN_AFIO_OR_SLICE) {
-        res =
-            read_header_block_from_stream(&temp_size, temp_fname, &ctrl_chr);
+        res = read_header_block_from_stream(&temp_size, temp_fname, &ctrl_chr);
         if (ctrl_chr == BLK_START_AN_AFIO_OR_SLICE) {
             break;
@@ -1330 +1341 @@
     }
     while (ctrl_chr != BLK_START_FILE) {
-        res =
-            read_header_block_from_stream(&temp_size, temp_fname, &ctrl_chr);
+        res = read_header_block_from_stream(&temp_size, temp_fname, &ctrl_chr);
         if (ctrl_chr == BLK_START_FILE) {
             break;
@@ -1356 +1366 @@
             bytes_to_write =
                 (size < TAPE_BLOCK_SIZE) ? (long) size : TAPE_BLOCK_SIZE;
-            // FIXME - needs error-checking and -catching
-            fread(datablock, 1, (size_t) TAPE_BLOCK_SIZE, g_tape_stream);
-        }
-        res =
-            read_header_block_from_stream(&temp_size, temp_fname, &ctrl_chr);
+            if (fread(datablock, 1, (size_t) TAPE_BLOCK_SIZE, g_tape_stream)) {
+                // FIXME - needs error-checking and -catching
+            }
+        }
+        res = read_header_block_from_stream(&temp_size, temp_fname, &ctrl_chr);
         if (ctrl_chr != BLK_STOP_FILE) {
             wrong_marker(BLK_STOP_FILE, ctrl_chr);
         }
-        res =
-            read_header_block_from_stream(&temp_size, temp_fname, &ctrl_chr);
+        res = read_header_block_from_stream(&temp_size, temp_fname, &ctrl_chr);
         if (ctrl_chr != BLK_STOP_AN_AFIO_OR_SLICE) {
             wrong_marker(BLK_STOP_AN_AFIO_OR_SLICE, ctrl_chr);
         }
-        res =
-            read_header_block_from_stream(&temp_size, temp_fname, &ctrl_chr);
+        res = read_header_block_from_stream(&temp_size, temp_fname, &ctrl_chr);
         if (ctrl_chr != BLK_START_AN_AFIO_OR_SLICE) {
             wrong_marker(BLK_START_AN_AFIO_OR_SLICE, ctrl_chr);
         }
-        res =
-            read_header_block_from_stream(&temp_size, temp_fname, &ctrl_chr);
+        res = read_header_block_from_stream(&temp_size, temp_fname, &ctrl_chr);
         if (ctrl_chr != BLK_START_FILE) {
             wrong_marker(BLK_START_FILE, ctrl_chr);
@@ -1689 +1696 @@
             bytes_to_read = TAPE_BLOCK_SIZE;
         }
-        (void) fread(datablock, 1, (size_t) bytes_to_read, fin);
+        if (fread(datablock, 1, (size_t) bytes_to_read, fin)) {
+            // FIXME
+        }
         g_tape_posK +=
             fwrite(datablock, 1, /*bytes_to_read */ 

branches/3.1/mondo/src/common/libmondo-string-EXT.h

@@ -23 +23 @@
 extern void strip_spaces(char *in_out);
 extern char *trim_empty_quotes(char *incoming);
-extern char *truncate_to_drive_name(char *partition);
+extern char *truncate_to_drive_name(const char *partition);
 extern char *turn_raid_level_number_to_string(int raid_level);
 

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

@@ -665 +665 @@
  */
 void strip_spaces(char *in_out)
+{
+    /*@ buffers ***************************************************** */
+    char *tmp = NULL;
+
+    /*@ int ******************************************************** */
+    int i;
+
+    /*@ end vars *************************************************** */
+
+    assert(in_out != NULL);
+    malloc_string(tmp);
+    for (i = 0; in_out[i] <= ' ' && i < (int) strlen(in_out) -1; i++);
+    strcpy(tmp, in_out + i);
+    for (i = (int) strlen(tmp) -1; i >= 0 && tmp[i] <= ' '; i--);
+    i++;
+    tmp[i] = '\0';
+
+    // Now tmp contains the stripped string
+    strcpy(in_out,tmp);
+    paranoid_free(tmp);
+}
+
+/**
+ * Remove all characters whose ASCII value is less than or equal to 32
+ * (spaces and control characters) from both sides of @p in_out.
+ * @param in_out The string to strip spaces/control characters from (modified).
+ */
+void strip_spaces2(char *in_out)
 {
     /*@ buffers ***************************************************** */
@@ -752 +780 @@
  * @return @p partition.
  */
-char *truncate_to_drive_name(char *partition)
+char *truncate_to_drive_name(const char *partition)
 {
     int i = strlen(partition) - 1;

branches/3.1/mondo/src/common/libmondo-string.h

@@ -21 +21 @@
 void strip_spaces(char *in_out);
 char *trim_empty_quotes(char *incoming);
-char *truncate_to_drive_name(char *partition);
+char *truncate_to_drive_name(const char *partition);
 char *turn_raid_level_number_to_string(int raid_level);
 void printf_silly_message(void);

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

@@ -304 +304 @@
 {
 #ifdef __FreeBSD__
-    system("kldstat | grep msdosfs || kldload msdosfs 2> /dev/null");
-    system("kldstat | grep ext2fs  || kldload ext2fs 2> /dev/null");
+    paranoid_system("kldstat | grep msdosfs || kldload msdosfs 2> /dev/null");
+    paranoid_system("kldstat | grep ext2fs  || kldload ext2fs 2> /dev/null");
 #else
-    system("modprobe -a msdos vfat loop &> /dev/null");
+    paranoid_system("modprobe -a msdos vfat loop &> /dev/null");
 #endif
 }
@@ -643 +643 @@
                 colon++;
                 hent = gethostbyname(colon);
-                mr_asprintf(bkpinfo->netfs_user,"%s", hostname);
+                mr_asprintf(&(bkpinfo->netfs_user),"%s", hostname);
             } else {
                 hent = gethostbyname(hostname);
@@ -713 +713 @@
 }
 
+/*  From busybox under GPLv2 */
+#ifndef HAVE_MKDTEMP
+/* This is now actually part of POSIX.1, but was only added in 2008 */
+char* mkdtemp(char *template)
+{
+    if (mktemp(template) == NULL || mkdir(template, 0700) != 0)
+        return NULL;
+    return template;
+}
+#endif
+
 void setup_tmpdir(char *path) {
 
@@ -721 +732 @@
         /* purging a potential old tmpdir */
         log_it("Purging old tmpdir %s", bkpinfo->tmpdir);
-        chdir("/tmp");
+        if (chdir("/tmp")) {
+            // FIXME
+        }
         mr_asprintf(tmp,"rm -Rf %s",bkpinfo->tmpdir);
         mr_free(bkpinfo->tmpdir);
-        (void)system(tmp);
+        paranoid_system(tmp);
         mr_free(tmp);
     }
@@ -1032 +1045 @@
     mr_free(tmp);
 
-    if (!run_program_and_log_output("parted2fdisk -l | grep -i raid", 1)
+    if (!run_program_and_log_output("parted2fdisk -l 2>/dev/null | grep -i raid", 1)
         && !does_file_exist("/etc/raidtab")) {
         log_to_screen
             ("You have RAID partitions but no /etc/raidtab - creating one from /proc/mdstat");
-        create_raidtab_from_mdstat("/etc/raidtab");
+        create_raidtab_from_mdstat(MDSTAT_FILE,"/etc/raidtab");
     }
 

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

@@ -412 +412 @@
     char *outlog = NULL;
     char *tmp = NULL;
+    char *p = NULL;
 
     /*@ pointers ******************************************************* */
@@ -477 +478 @@
         bkpinfo->use_star = TRUE;
         if (strstr(tarball_fname, ".bz2"))
-            mr_asprintf(command, "star -diff diffopts=mode,size,data file=%s %s >> %s 2>> %s", tarball_fname, (strstr(tarball_fname, ".bz2")) ? "-bz" : " ", outlog, outlog);
+            mr_asprintf(command, "star -sparse -diff diffopts=mode,size,data file=%s %s >> %s 2>> %s", tarball_fname, (strstr(tarball_fname, ".bz2")) ? "-bz" : " ", outlog, outlog);
     } else {
         bkpinfo->use_star = FALSE;
@@ -681 +682 @@
 
             mr_asprintf(tmp, "echo \"%s\" >> %s/biggies.changed", biggie_fname, bkpinfo->tmpdir);
-            system(tmp);
+            paranoid_system(tmp);
             mr_free(tmp);
         }
@@ -738 +739 @@
         log_it("Grabbing the EXAT files");
         if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) {
-            res =
-                read_EXAT_files_from_tape(&size, fname, &ctrl_chr,
+            res = read_EXAT_files_from_tape(&size, fname, &ctrl_chr,
                                           curr_xattr_list_fname,
                                           curr_acl_list_fname);
@@ -765 +765 @@
         if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) {
             log_it("Reading EXAT files from tape");
-            res =
-                read_EXAT_files_from_tape(&size, fname, &ctrl_chr,
+            res = read_EXAT_files_from_tape(&size, fname, &ctrl_chr,
                                           curr_xattr_list_fname,
                                           curr_acl_list_fname);
@@ -848 +847 @@
         if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) {
             log_it("Grabbing the EXAT biggiefiles");
-            res =
-                read_EXAT_files_from_tape(&size, orig_fname,
+            res = read_EXAT_files_from_tape(&size, orig_fname,
                                           &ctrl_chr, curr_xattr_list_fname,
                                           curr_acl_list_fname);

branches/3.1/mondo/src/common/mondostructures.h

@@ -191 +191 @@
  * A type of file in the catalog of recent archives.
  */
-typedef enum { other,           ///< Some other kind of file.
+typedef enum { 
+    other,                      ///< Some other kind of file.
     fileset,                    ///< An afioball (fileset), optionally compressed.
     biggieslice                 ///< A slice of a biggiefile, optionally compressed.
@@ -201 +202 @@
 typedef enum {
     nuke = 0,                   /// Nuke mode
-    interactive,                /// Interactive mode
+    interactive,                    /// Interactive mode
     compare,                    /// Compare mode
     mbr,                        /// MBR mode

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

@@ -57 +57 @@
  */
     bool g_exiting = FALSE;
+
+// Decide whether we should continue to ask questions or exit (cron use case)
+extern bool g_fail_immediately;
 
 /**
@@ -122 +125 @@
         char *tmp;
 
-         assert_string_is_neither_NULL_nor_zerolength(prompt);
-
+        assert_string_is_neither_NULL_nor_zerolength(prompt);
+
+        if (g_fail_immediately) {
+            // We consider the user aborted by using the -F option
+            log_msg(3, "Exiting at first interaction request due to -F");
+            finish(1);
+        }
         if (g_text_mode) {
             while (1) {
@@ -163 +171 @@
         /*@ buffer *********************************************************** */
         char *tmp = NULL;
+        char *p;
         int i;
 
-        assert_string_is_neither_NULL_nor_zerolength(prompt);
+        if (g_fail_immediately) {
+            // We consider the user aborted by using the -F option
+            log_msg(3, "Exiting at first interaction request due to -F");
+            finish(1);
+        }
 
         if (g_text_mode) {
@@ -318 +331 @@
         sync();
 
-        chdir("/");
+        if (chdir("/")) {
+            // FIXME
+        }
         if (g_selfmounted_isodir) {
             mr_asprintf(command, "umount -d %s", g_selfmounted_isodir);
@@ -369 +384 @@
 
         /*  Before removing dir, make sure we're out of them */
-        chdir("/tmp");
+        if (chdir("/tmp")) {
+            // FIXME
+        }
         run_program_and_log_output("umount -d " MNT_CDROM, FALSE);
         if (g_selfmounted_isodir) {
@@ -385 +402 @@
                 log_msg(8,"erasing tempdir %s",bkpinfo->tmpdir);
                 mr_asprintf(command, "rm -Rf %s", bkpinfo->tmpdir);
-                system(command);
+                paranoid_system(command);
                 mr_free(command);
             }
@@ -394 +411 @@
                 log_msg(8,"erasing scratchdir %s",bkpinfo->scratchdir);
                 mr_asprintf(command, "rm -Rf %s", bkpinfo->scratchdir);
-                system(command);
+                paranoid_system(command);
                 mr_free(command);
             }
@@ -424 +441 @@
         char *command = NULL;
         char *tmp = NULL;
+        char *p = NULL;
 
         /*@ pointers ********************************************************* */
@@ -763 +781 @@
         /*@ buffers *********************************************************** */
         char *prompt = NULL;
+        char *q;
 
         /*@ newt ************************************************************** */
@@ -1130 +1149 @@
         static char *possible_responses[] = { "none", "cdr", "cdrw", "dvd", "tape", "cdstream", "udev", "netfs", "iso", NULL };
         char *outstr = NULL;
+        char *p;
         t_bkptype backup_type;
         int i;
@@ -1286 +1306 @@
         newtPushHelpLine("   Please specify the level of compression that you want.");
         newtCenteredWindow(34, 13, "How much compression?");
-        b1 = newtButton(4, 1, "Maximum");
-        b2 = newtButton(18, 1, "Average");
-        b3 = newtButton(4, 5, "Minimum");
-        b4 = newtButton(18, 5, " None  ");
+        b1 = newtButton(4, 1, "Maximum (9)");
+        b2 = newtButton(18, 1, "Average (4)");
+        b3 = newtButton(4, 5, "Minimum (1)");
+        b4 = newtButton(18, 5, " None (0) ");
         b5 = newtButton(4, 9, "         Exit        ");
         myForm = newtForm(NULL, NULL, 0);
@@ -1327 +1347 @@
         bool done;
         char *tmp = NULL;
+        char *p;
         char *tmp1 = NULL;
         FILE *fin, *fout;
@@ -1563 +1584 @@
 }                               /* extern "C" */
 #endif
-
-
-void wait_until_software_raids_are_prepped(char *mdstat_file, int wait_for_percentage);

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

@@ -313 +313 @@
 #define DONT_KNOW_HOW_TO_EVALUATE_THIS_DEVICE_TYPE  "/dev/md"
 #define RAID_DEVICE_STUB    DONT_KNOW_HOW_TO_EVALUATE_THIS_DEVICE_TYPE
-#define SANE_FORMATS        "swap image vfat ext2 ext3 ext4 xfs vfs jfs reiserfs vmfs dos minix coda fuse.sshfs nfs nfs4 ntfs ntfs-3g hpfs raid lvm cifs ocfs ocfs2"
+#define SANE_FORMATS        "swap image vfat ext2 ext3 ext4 xfs vfs jfs reiserfs vmfs dos minix coda fuse.sshfs nfs nfs4 ntfs ntfs-3g hpfs raid lvm cifs ocfs ocfs2 btrfs"
 #define ALT_TAPE        "/dev/ht0"
 #define MKE2FS_OR_NEWFS "mke2fs"
@@ -331 +331 @@
 #define ACL_BIGGLST_FNAME_RAW_SZ     "%s/acl_list.big.gz"
 
+#define BIGGIEMAXSIZE           64L*1024L
 /**
  * The template for an afioball filename.
@@ -339 +340 @@
 #define ARCH_BUFFER_NUM (ARCH_THREADS*4)    // Number of permissible queued afio files
 #define DO_MBR_PLEASE "/tmp/DO-MBR-PLEASE"
+#define MONDO_MNTLISTCHG "/tmp/mountlist.changed"
 
 

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

@@ -97 +97 @@
 int mr_conf_open(const char *filename) {
     size_t length;              /*length of the buffer/file */
-    size_t res = 0;
 
     /* check if mr_conf is already opened? */
@@ -126 +125 @@
     /*reading file in buffer (skip all 0 characters) */
 
-    res = fread(buffer, sizeof(char), length, CONF);
+    if (fread(buffer, sizeof(char), length, CONF)) {
+        // FIXME
+    }
     buffer[length] = (char) 0;  /*finalize the string */
 

branches/3.1/mondo/src/lib/mr_str.c

@@ -28 +28 @@
     size_t pos1 = 0;
     size_t pos2 = 0;
+
+    if (instr == NULL) {
+        *lastpos = 0;
+        return token;
+    }
+
+    if (delims == NULL) {
+        *lastpos = 0;
+        return token;
+    }
 
     if (strlen(instr) <= *lastpos) {

branches/3.1/mondo/src/mondoarchive/mondoarchive.c

@@ -47 +47 @@
  */
 bool g_ISO_restore_mode = FALSE;
+
+/* Whether we should fail immediately at first error */
+bool g_fail_immediately = FALSE;
 
 /* Do we use extended attributes and acl ?
@@ -159 +162 @@
     int retval = 0;
     char *say_at_end = NULL;
+    FILE *fin = NULL;
 
     printf("Initializing...\n");
@@ -260 +264 @@
         g_loglevel = 10;
         finish(set_acl_list(argv[2], argv[3]));
+    }
+    if (argc >= 2 && !strcmp(argv[1], "mkraidtab")) {
+        g_loglevel = 10;
+        g_text_mode = TRUE;
+        setup_newt_stuff();
+#undef MDSTAT_FILE
+#define MDSTAT_FILE "/tmp/mdstat"
+        if (!(fin = fopen(MDSTAT_FILE, "r"))) {
+            log_msg(1, "Could not open %s.\n", MDSTAT_FILE);
+                finish(1);
+        }
+
+        create_raidtab_from_mdstat(MDSTAT_FILE,"/tmp/raidtab");
+        finish(0);
     }
 
@@ -397 +415 @@
     run_program_and_log_output("mount", 2);
 
-    system("rm -f "MONDO_CACHE"/last-backup.aborted");
+    paranoid_system("rm -f "MONDO_CACHE"/last-backup.aborted");
     if (!retval) {
         printf("Mondoarchive ran OK.\n");
@@ -421 +439 @@
     mr_free(tmp);
 
-    chdir("/tmp");
+    if (chdir("/tmp")) {
+        // FIXME
+    }
 
     if (!g_text_mode) {

branches/3.1/mondo/src/mondoarchive/mondoarchive.h

@@ -9 +9 @@
  */
 char *MONDO_LOGFILE = "/var/log/mondoarchive.log";
-char *MONDO_OPTIONS = "0123456789A:B:C:DE:GHI:J:K:LNOP:QRS:T:UVWYb:c:d:ef:gik:l:mn:op:rs:tuw:x:z";
+char *MONDO_OPTIONS = "0123456789A:B:C:DE:FGHI:J:K:LM:NOP:QRS:T:UVWYb:c:d:ef:gik:l:mn:op:rs:tuw:x:z";
 
 /* No restriction on ps options */

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

@@ -110 +110 @@
             popup_and_OK
                 ("I must now reboot. Please leave the boot media in the drive and repeat your actions - e.g. type 'nuke' - and it should work fine.");
-            system("reboot");
+            paranoid_system("reboot");
         }
     }
@@ -171 +171 @@
 
 int do_my_funky_lvm_stuff(bool just_erase_existing_volumes,
-                          bool vacuum_pack)
+                            bool vacuum_pack)
 {
-    /**  buffers **********************************************/
+    /** buffers **********************************************/
     char *tmp = NULL;
     char *tmp1 = NULL;
@@ -188 +188 @@
     char *p;
     char *q;
+    char *r;
 
     /** int ***************************************************/
@@ -442 +443 @@
     /** pointers *********************************************************/
     char *p;
+    char *q;
 
     /** init *************************************************************/
@@ -503 +505 @@
         } else {
             strcpy(new_mountlist->el[new_mountlist->entries].device,
-                   old_mountlist->el[lino].device);
+                     old_mountlist->el[lino].device);
             strcpy(new_mountlist->el[new_mountlist->entries].mountpoint,
-                   old_mountlist->el[lino].mountpoint);
+                     old_mountlist->el[lino].mountpoint);
             strcpy(new_mountlist->el[new_mountlist->entries].format,
-                   old_mountlist->el[lino].format);
+                     old_mountlist->el[lino].format);
             new_mountlist->el[new_mountlist->entries].size =
                 old_mountlist->el[lino].size;
@@ -527 +529 @@
  * @return 0 for success, nonzero for failure.
  */
-int create_raid_device_via_mdadm(struct raidlist_itself *raidlist, char *device)
-{
-  /** int **************************************************************/
-  int i   = 0;
-  int j   = 0;
-  int res = 0;
-  
-  /** buffers ***********************************************************/
-  char *devices = NULL;
-  char *strtmp  = NULL;
-  char *level   = NULL;
-  char *program = NULL;
-  char *tmp = NULL;
-  char *oldmd = NULL;
-  char *bootdevice;
-  char *name;
+int create_raid_device_via_mdadm(struct raidlist_itself *raidlist, char *device, bool test) {
+    /** int **************************************************************/
+    int i   = 0;
+    int j   = 0;
+    int v   = 0;
+    int res = 0;
+    
+    /** buffers ***********************************************************/
+    char *devices = NULL;
+    char *level   = NULL;
+    char *program = NULL;
 
   malloc_string(bootdevice);
@@ -735 +732 @@
             /* format raid partition */
             mr_asprintf(program, "for plex in `vinum lv -r %s | grep '^P' | tr '\t' ' ' | tr -s ' ' | cut -d' ' -f2`; do echo $plex; done > /tmp/plexes", basename(device));
-            system(program);
+            paranoid_system(program);
             if (g_fprep) {
                 fprintf(g_fprep, "%s\n", program);
@@ -752 +749 @@
 
                 mr_asprintf(tmp, "vinum init %s", line);
-                system(tmp);
+                paranoid_system(tmp);
                 mr_free(tmp);
 
@@ -781 +778 @@
         log_to_screen("Initializing RAID device %s", device);
 
-// Shouldn't be necessary.
+        // Shouldn't be necessary.
         log_to_screen("Stopping %s", device);
         stop_raid_device(device);
@@ -789 +786 @@
         log_msg(1, "Making %s", device);
         // use mkraid if it exists, otherwise use mdadm
-        if (run_program_and_log_output("which mkraid", FALSE)) {
-            res = create_raid_device_via_mdadm(raidlist, device);
-            log_msg(1, "Creating RAID device %s via mdadm returned %d", device, res);
+            if (run_program_and_log_output("which mkraid", FALSE)) {
+                res = create_raid_device_via_mdadm(raidlist, device, TRUE);
+                log_msg(1, "Creating RAID device %s via mdadm returned %d", device, res);
         } else {
             mr_asprintf(program, "mkraid --really-force %s", device);
@@ -884 +881 @@
  */
 int format_everything(struct mountlist_itself *mountlist, bool interactively,
-                          struct raidlist_itself *raidlist)
+                            struct raidlist_itself *raidlist)
 {
     /** int **************************************************************/
@@ -907 +904 @@
     log_it("format_everything (mountlist, interactively = %s", (interactively) ? "true" : "false");
 
-    mvaddstr_and_log_it(g_currentY, 0, "Formatting partitions     ");
+    mvaddstr_and_log_it(g_currentY, 0, "Formatting partitions      ");
     open_progress_form("Formatting partitions",
-                       "I am now formatting your hard disk partitions.",
-                       "This may take up to five minutes.", "",
-                       mountlist->entries + 1);
+                         "I am now formatting your hard disk partitions.",
+                         "This may take up to five minutes.", "",
+                         mountlist->entries + 1);
 
     progress_step =
@@ -949 +946 @@
     sleep(2);
 // This last step is probably necessary
-//  log_to_screen("Re-starting software RAIDs...");
-//  start_all_raid_devices(mountlist);
-//  system("sync"); system("sync"); system("sync"); 
-//  sleep(5);
+//  log_to_screen("Re-starting software RAIDs...");
+//  start_all_raid_devices(mountlist);
+//  paranoid_system("sync"); paranoid_system("sync"); paranoid_system("sync"); 
+//  sleep(5);
 // do LVMs now
     log_msg(1, "Creating LVMs");
@@ -992 +989 @@
             continue;
         } else if (!does_file_exist(me->device)
-                   && strncmp(me->device, "/dev/hd", 7)
-                   && strncmp(me->device, "/dev/sd", 7)) {
+                     && strncmp(me->device, "/dev/hd", 7)
+                     && strncmp(me->device, "/dev/sd", 7)) {
             log_it("Not formatting %s yet - doesn't exist - probably an LVM", me->device);
             continue;
@@ -1049 +1046 @@
     }
     newtSuspend();
-    system("clear");
+    paranoid_system("clear");
     newtResume();
     return (retval);
@@ -1064 +1061 @@
  */
 int make_dummy_partitions(FILE * pout_to_fdisk, char *drivename,
-                          int devno_we_must_allow_for)
+                            int devno_we_must_allow_for)
 {
     /** int **************************************************************/
@@ -1178 +1175 @@
     fprintf(f, "\n\n%u partitions:\n", lp->d_npartitions);
     fprintf(f,
-            "#        size   offset    fstype   [fsize bsize bps/cpg]\n");
+            "#        size   offset    fstype   [fsize bsize bps/cpg]\n");
     pp = lp->d_partitions;
     for (i = 0; i < lp->d_npartitions; i++, pp++) {
         if (pp->p_size) {
-            fprintf(f, "  %c: %8lu %8lu  ", 'a' + i, (u_long) pp->p_size,
+            fprintf(f, "    %c: %8lu %8lu  ", 'a' + i, (u_long) pp->p_size,
                     (u_long) pp->p_offset);
             if (pp->p_fstype < FSMAXTYPES)
@@ -1191 +1188 @@
 
             case FS_UNUSED: /* XXX */
-                fprintf(f, "    %5lu %5lu %5.5s ", (u_long) pp->p_fsize,
+                fprintf(f, "      %5lu %5lu %5.5s ", (u_long) pp->p_fsize,
                         (u_long) (pp->p_fsize * pp->p_frag), "");
                 break;
 
             case FS_BSDFFS:
-                fprintf(f, "    %5lu %5lu %5u ", (u_long) pp->p_fsize,
+                fprintf(f, "      %5lu %5lu %5u ", (u_long) pp->p_fsize,
                         (u_long) (pp->p_fsize * pp->p_frag), pp->p_cpg);
                 break;
 
             case FS_BSDLFS:
-                fprintf(f, "    %5lu %5lu %5d", (u_long) pp->p_fsize,
+                fprintf(f, "      %5lu %5lu %5d", (u_long) pp->p_fsize,
                         (u_long) (pp->p_fsize * pp->p_frag), pp->p_cpg);
                 break;
@@ -1217 +1214 @@
             fprintf(f, "- %lu",
                     (u_long) ((pp->p_offset + pp->p_size +
-                               lp->d_secpercyl - 1) / lp->d_secpercyl -
-                              1));
+                                 lp->d_secpercyl - 1) / lp->d_secpercyl -
+                                1));
             if (pp->p_size % lp->d_secpercyl)
                 putc('*', f);
@@ -1256 +1253 @@
     /*
      * Nobody in these enligthened days uses the CHS geometry for
-     * anything, but nontheless try to get it right.  If we fail
+     * anything, but nontheless try to get it right.    If we fail
      * to get any good ideas from the device, construct something
      * which is IBM-PC friendly.
@@ -1340 +1337 @@
                 lp->d_partitions[c - 'a'].p_cpg = 64;
             } else if (!strcasecmp(mountlist->el[idx].format, "raid")
-                       || !strcasecmp(mountlist->el[idx].format, "vinum")) {
+                         || !strcasecmp(mountlist->el[idx].format, "vinum")) {
                 lp->d_partitions[c - 'a'].p_fstype = FS_VINUM;
             } else if (!strcmp(mountlist->el[idx].format, "swap")) {
@@ -1422 +1419 @@
     char *format = NULL;
     char *tmp = NULL;
+    char *tmp1 = NULL;
     char *tmp1 = NULL;
 
@@ -1511 +1509 @@
 
         /* OK, we've found partition /dev/hdxN in mountlist; let's prep it */
-        /* For FreeBSD, that is      /dev/adXsY */
+        /* For FreeBSD, that is     /dev/adXsY */
 
         log_it("Found partition %s in mountlist", device_str);
@@ -1540 +1538 @@
                 previous_devno =
                     make_dummy_partitions(pout_to_fdisk, drivename,
-                                          current_devno);
+                                            current_devno);
             }
         }
@@ -1595 +1593 @@
         sync();
         paranoid_pclose(pout_to_fdisk);
-        log_msg(0,
-                "------------------- fdisk.log looks like this ------------------");
+        paranoid_system("sync");
+        log_msg(0,"------------------- fdisk.log looks like this ------------------");
         mr_asprintf(tmp, "cat %s >> %s", FDISK_LOG, MONDO_LOGFILE);
         system(tmp);
@@ -1625 +1623 @@
  * Create partition number @p partno on @p drive with @p fdisk.
  * @param drive The drive to create the partition on.
-//  * @param partno The partition number of the new partition (1-4 are primary, >=5 is logical).
+//  * @param partno The partition number of the new partition (1-4 are primary, >=5 is logical).
  * @param prev_partno The partition number of the most recently prepped partition.
  * @param format The filesystem type of this partition (used to set the type).
@@ -1656 +1654 @@
 
     log_it("partition_device('%s', %d, %d, '%s', %lld) --- starting",
-           drive, partno, prev_partno, format, partsize);
+             drive, partno, prev_partno, format, partsize);
 
     if (!strncmp(drive, RAID_DEVICE_STUB, strlen(RAID_DEVICE_STUB))) {
@@ -1743 +1741 @@
             retval =
                 set_partition_type(pout_to_fdisk, drive, partno, format,
-                                   partsize);
+                                     partsize);
             if (retval) {
                 log_msg(1, "Failed. Trying again...");
                 retval =
                     set_partition_type(pout_to_fdisk, drive, partno,
-                                       format, partsize);
+                                         format, partsize);
             }
         }
@@ -1783 +1781 @@
             retval =
                 set_partition_type(pout_to_fdisk, drive, partno, format,
-                                   partsize);
+                                     partsize);
             if (retval) {
                 log_it("Partitioned %s but failed to set its type", partition_name);
@@ -1832 +1830 @@
     /** buffer *********************************************************/
     struct list_of_disks *drivelist;
-    /*  struct mountlist_itself new_mtlist, *mountlist; */
+    /*  struct mountlist_itself new_mtlist, *mountlist; */
 
     /** end ************************************************************/
@@ -1840 +1838 @@
 
     log_it("partition_everything() --- starting");
-    mvaddstr_and_log_it(g_currentY, 0, "Partitioning hard drives      ");
-    /*  mountlist=orig_mtlist; */
+    mvaddstr_and_log_it(g_currentY, 0, "Partitioning hard drives        ");
+    /*  mountlist=orig_mtlist; */
     if (mountlist_contains_raid_devices(mountlist)) {
-        /*      mountlist=&new_mtlist; */
-        /*      extrapolate_mountlist_to_include_raid_partitions(mountlist,orig_mtlist); */
+        /*      mountlist=&new_mtlist; */
+        /*      extrapolate_mountlist_to_include_raid_partitions(mountlist,orig_mtlist); */
         log_msg(0,
                 "Mountlist, including the partitions incorporated in RAID devices:-");
@@ -1865 +1863 @@
 
     open_progress_form("Partitioning devices",
-                       "I am now going to partition all your drives.",
-                       "This should not take more than five minutes.", "",
-                       mountlist->entries);
+                         "I am now going to partition all your drives.",
+                         "This should not take more than five minutes.", "",
+                         mountlist->entries);
 
     make_list_of_drives_in_mountlist(mountlist, drivelist);
@@ -1885 +1883 @@
     }
     newtSuspend();
-    system("clear");
+    paranoid_system("clear");
     newtResume();
     paranoid_free(drivelist);
@@ -1906 +1904 @@
  */
 int set_partition_type(FILE * pout_to_fdisk, const char *drive, int partno,
-                       const char *format, long long partsize)
+                         const char *format, long long partsize)
 {
     /** buffers *********************************************************/
@@ -1939 +1937 @@
         }
     } else if (strcmp(format, "ext2") == 0
-               || strcmp(format, "reiserfs") == 0
-               || strcmp(format, "ext3") == 0 
-               || strcmp(format, "ext4") == 0 
-               || strcmp(format, "xfs") == 0
-               || strcmp(format, "jfs") == 0) {
+                 || strcmp(format, "reiserfs") == 0
+                 || strcmp(format, "ext3") == 0 
+                 || strcmp(format, "ext4") == 0 
+                 || strcmp(format, "xfs") == 0
+                 || strcmp(format, "jfs") == 0
+                     || strcmp(format, "btrfs") == 0) {
         mr_asprintf(partcode, "83");
     } else if (strcmp(format, "minix") == 0) {
@@ -1956 +1955 @@
         mr_asprintf(partcode, "7");
     } else if ((strcmp(format, "ufs") == 0)
-               || (strcmp(format, "ffs") == 0)) {   /* raid autodetect */
+                 || (strcmp(format, "ffs") == 0)) { /* raid autodetect */
         mr_asprintf(partcode, "a5");
     } else if (strcmp(format, "lvm") == 0) {
@@ -2108 +2107 @@
     mr_asprintf(program, "vinum stop -f %s", raid_device);
 #else
-    // use raidstop if it exists, otherwise use mdadm
-    if (run_program_and_log_output("which raidstop", FALSE)) {
+        // use raidstop if it exists, otherwise use mdadm
+        if (run_program_and_log_output("which raidstop", FALSE)) {
         mr_asprintf(program, "mdadm -S %s", raid_device);
     } else {
@@ -2174 +2173 @@
     /** pointers ********************************************************/
     FILE *fin;
+    char *q;
     int i;
 
@@ -2203 +2203 @@
                 for (p = dev; *p > 32; p++);
                 *p = '\0';
-                res = stop_raid_device(dev);
+                retval += stop_raid_device(dev);
                 mr_free(dev);
             }
@@ -2261 +2261 @@
     } else if (strcmp(format, "ext4") == 0) {
         mr_asprintf(program, "mkfs -t ext4 -F -q");
+    } else if (strcmp(format, "btrfs") == 0) {
+              strcpy(program, "mkfs.btrfs");
     } else if (strcmp(format, "minix") == 0) {
         mr_asprintf(program, "mkfs.minix");
@@ -2297 +2299 @@
  * There are a few problems with this function:
  * - It won't work if there was any unallocated space on the user's hard drive
- *   when it was backed up.
+ *   when it was backed up.
  * - It won't work if the user's hard drive lies about its size (more common
- *   than you'd think).
+ *   than you'd think).
  *
  * @param mountlist The mountlist to use for resizing @p drive_name.
@@ -2311 +2313 @@
     /** int *************************************************************/
     int partno, lastpart;
-               /** remove driveno, noof_drives stan benoit apr 2002**/
 
     /** float ***********************************************************/

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

@@ -71 +71 @@
         return (1);
     }
-    fread((void *) &biggiestruct, 1, sizeof(biggiestruct), fin);
+    if (fread((void *) &biggiestruct, 1, sizeof(biggiestruct), fin)) {
+        // FIXME
+    }
     paranoid_fclose(fin);
 
@@ -218 +220 @@
     int retval = 0;
     int res;
-    long noof_lines;
     long archiver_errors;
     bool use_star;
@@ -289 +290 @@
     if (use_star) {
         // doesn't use compressor_exe
-        mr_asprintf(command, "%s -diff H=exustar file=%s >> %s 2>> %s", archiver_exe, tarball_fname, logfile, logfile);
+        mr_asprintf(command, "%s -sparse -diff H=exustar file=%s >> %s 2>> %s", archiver_exe, tarball_fname, logfile, logfile);
     } else {
         mr_asprintf(command, "%s -r -b %ld -M 16m -c %ld %s %s >> %s 2>> %s", archiver_exe, TAPE_BLOCK_SIZE, BUFSIZE, compressor_exe, tarball_fname, logfile, logfile);
@@ -308 +309 @@
     if (length_of_file(logfile) > 5) {
         mr_asprintf(command, "sed s/': \\\"'/\\|/ %s | sed s/'\\\": '/\\|/ | cut -d'|' -f2 | sort -u | grep -vE \"^dev/.*\" >> "MONDO_CACHE"/changed.txt", logfile);
-        system(command);
+        paranoid_system(command);
         mr_free(command);
 
@@ -337 +338 @@
 {
     int retval = 0;
-    int res;
     int current_tarball_number = 0;
 
@@ -409 +409 @@
             log_to_screen(progress_str);
         } else {
-            res = compare_a_tarball(tarball_fname, current_tarball_number);
+            retval += compare_a_tarball(tarball_fname, current_tarball_number);
 
             g_current_progress++;
@@ -459 +459 @@
     assert(bkpinfo != NULL);
 
-    getcwd(cwd, MAX_STR_LEN - 1);
-    chdir(bkpinfo->restore_path);
-    getcwd(new, MAX_STR_LEN - 1);
+    if (getcwd(cwd, MAX_STR_LEN - 1)) {
+        // FIXME
+    }
+    if (chdir(bkpinfo->restore_path)) {
+        //FIXME
+    }
+    if (getcwd(new, MAX_STR_LEN - 1)) {
+        // FIXME
+    }
     insist_on_this_cd_number(g_current_media_number);
     unlink(MONDO_CACHE"/changed.txt");
@@ -467 +473 @@
     resA = compare_all_tarballs();
     resB = compare_all_biggiefiles();
-    chdir(cwd);
+    if (chdir(cwd)) {
+        // FIXME
+    }
     noof_changed_files = count_lines_in_file(MONDO_CACHE"/changed.txt");
     if (noof_changed_files) {
@@ -594 +602 @@
 
             log_msg(2, "calling popup_changelist_from_file()");
-            getcwd(cwd, MAX_STR_LEN - 1);
-            chdir(bkpinfo->restore_path);
-            getcwd(new, MAX_STR_LEN - 1);
+            if (getcwd(cwd, MAX_STR_LEN - 1)) {
+                //FIXME
+            }
+            if (chdir(bkpinfo->restore_path)) {
+                // FIXME
+            }
+            if (getcwd(new, MAX_STR_LEN - 1)) {
+                //FIXME
+            }
             popup_changelist_from_file(MONDO_CACHE"/changed.files");
-            chdir(cwd);
+            if (chdir(cwd)) {
+                // FIXME
+            }
             log_msg(2, "Returning from popup_changelist_from_file()");
         }
@@ -634 +650 @@
     assert(bkpinfo != NULL);
     malloc_string(dir);
-    getcwd(dir, MAX_STR_LEN);
-    chdir(bkpinfo->restore_path);
+    if (getcwd(dir, MAX_STR_LEN)) {
+        // FIXME
+    }
+    if (chdir(bkpinfo->restore_path)) {
+        // FIXME
+    }
 
     mvaddstr_and_log_it(g_currentY,
@@ -647 +667 @@
     }
     res = verify_tape_backups();
-    chdir(dir);
+    if (chdir(dir)) {
+        // FIXME
+    }
     if (length_of_file(MONDO_CACHE"/changed.txt") > 2
         && length_of_file(MONDO_CACHE"/changed.files") > 2) {
@@ -686 +708 @@
     malloc_string(dir);
 
-    getcwd(dir, MAX_STR_LEN);
-    chdir(bkpinfo->restore_path);
+    if (getcwd(dir, MAX_STR_LEN)) {
+        // FIXME
+    }
+    if (chdir(bkpinfo->restore_path)) {
+        // FIXME
+    }
 
     mvaddstr_and_log_it(g_currentY,
                         0, "Verifying archives against filesystem");
     res = verify_tape_backups();
-    chdir(dir);
+    if (chdir(dir)) {
+        // FIXME
+    }
     if (res) {
         mvaddstr_and_log_it(g_currentY++, 74, "Failed.");

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

@@ -137 +137 @@
     /** int **************************************************************/
     int i = 0;
-    int num_to_add = 0;
 
     /** newt *************************************************************/
@@ -233 +232 @@
     mr_asprintf(drive_to_add, "%s", device_str);
     for (i = strlen(drive_to_add); isdigit(drive_to_add[i - 1]); i--);
-    num_to_add = atoi(drive_to_add + i);
     mr_free(drive_to_add);
 
@@ -1943 +1941 @@
         finish(1);
     }
-    newtPushHelpLine
-        ("   Please edit the mountlist to your satisfaction, then click OK or Cancel.");
+    newtPushHelpLine("WARNING: No LVM modification possible here. Edit /tmp/i-want-my-lvm instead");
     i = 4;
     bAdd = newtCompactButton(i, 17, " Add ");
@@ -2423 +2420 @@
     newtComponent b2;
     newtComponent b3;
-    newtComponent b_res;
 
 
@@ -2434 +2430 @@
     myForm = newtForm(NULL, NULL, 0);
     newtFormAddComponents(myForm, b1, b2, b3, NULL);
-    b_res = newtRunForm(myForm);
     newtFormDestroy(myForm);
     newtPopWindow();
@@ -2886 +2881 @@
             mr_getline(tmp, stdin);
             output = tmp[0];
-            free(tmp);
+            mr_free(tmp);
         }
         return (output);

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

@@ -80 +80 @@
 char *incoming = NULL;
 char *question = NULL;
+char *q;
 
 assert_string_is_neither_NULL_nor_zerolength(infname);
@@ -209 +210 @@
 if (is_this_device_mounted(g_isodir_device)) {
     log_to_screen("WARNING - isodir is already mounted");
-    already_mounted = TRUE;
 } else {
     mr_asprintf(mount_isodir_command, "mount %s", g_isodir_device);
@@ -1082 +1082 @@
 char *tmp;
 char *tmp1 = NULL;
+char *q;
 int res = 0;
 pid_t pid;
@@ -1088 +1089 @@
 malloc_string(tmp);
 
-    getcwd(tmp, MAX_STR_LEN);
-    chdir(bkpinfo->tmpdir);
+    if (getcwd(tmp, MAX_STR_LEN) == NULL) {
+        // FIXME
+    }
+    if (chdir(bkpinfo->tmpdir)) {
+        // FIXME
+    }
     log_msg(1, "chdir(%s)", bkpinfo->tmpdir);
     log_to_screen("Extracting filelist and biggielist from media...");
@@ -1116 +1121 @@
         }
     }
-    chdir(tmp);
+    if (chdir(tmp)) {
+        // FIXME
+    }
 
     log_msg(2, "Forking");
@@ -1147 +1154 @@
     unlink(MINDI_CACHE"/filelist.full.gz");
     if (g_text_mode) {
-        printf("Restore which directory? --> ");
-        mr_getline(tmp1, stdin);
-        toggle_path_selection(filelist, tmp1, TRUE);
-        if (strlen(tmp1) == 0) {
+        q = NULL;
+        while (q == NULL) {
+            printf("Restore which directory? --> ");
+            mr_getline(q, stdin);
+        }
+        toggle_path_selection(filelist, q, TRUE);
+        if (strlen(q) == 0) {
             res = 1;
         } else {
             res = 0;
         }
-        mr_free(tmp1);
+        mr_free(q);
     } else {
         res = edit_filelist(filelist);
@@ -1229 +1239 @@
             newtSuspend();
         }
-        (void)system("chroot " MNT_RESTORING);
+        paranoid_system("chroot " MNT_RESTORING);
         if (!g_text_mode) {
             newtResume();
@@ -1271 +1281 @@
     backup_crucial_file(MNT_RESTORING, "/boot/grub/menu.lst");
     backup_crucial_file(MNT_RESTORING, "/boot/grub/grub.cfg");
+    backup_crucial_file(MNT_RESTORING, "/boot/grub2/grub.cfg");
     backup_crucial_file(MNT_RESTORING, "/etc/lilo.conf");
     backup_crucial_file(MNT_RESTORING, "/etc/elilo.conf");
     backup_crucial_file(MNT_RESTORING, "/boot/grub/device.map");
+    backup_crucial_file(MNT_RESTORING, "/boot/grub2/device.map");
     backup_crucial_file(MNT_RESTORING, "/etc/mtab");
     device = read_cfg_var(MINDI_CACHE"/mondorestore.cfg", "bootloader.device");
@@ -1385 +1397 @@
     char *p = NULL;
 
-    int res = 0;
     bool done;
+    int res = 0;        /*  FALSE */
+    bool mntlistchg = FALSE;
+    FILE *fin = NULL;
 
     assert_string_is_neither_NULL_nor_zerolength(bd);
@@ -1397 +1411 @@
                             0,
                             "Modifying fstab, mtab, device.map and menu.lst/grub.cfg, and running GRUB...                             ");
+        /*  Did we changed the mountlist ? If yes, then force editing conf files */
+        if ((fin = fopen(MONDO_MNTLISTCHG, "r")) != NULL) {
+            mntlistchg = TRUE;
+        }
         for (done = FALSE; !done;) {
             p = popup_and_get_string("Boot device", "Please confirm/enter the boot device. If in doubt, try /dev/hda", boot_device);
@@ -1406 +1424 @@
                 continue;
             }
-            mr_asprintf(command, "stabgrub-me %s", p);
-            mr_free(p);
-
-            res = run_program_and_log_output(command, 1);
-            mr_free(command);
-
-            if (res) {
+            /*  Only try to adapt grub here first if the mountlist wasn't changed before */
+            if (! mntlistchg) {
+                mr_asprintf(command, "stabgrub-me %s", p);
+                mr_free(p);
+
+                res = run_program_and_log_output(command, 1);
+                mr_free(command);
+            }
+
+            if ((res) || (mntlistchg)){
                 popup_and_OK
                     ("GRUB installation failed. You will now edit fstab, mtab, device.map and menu.lst/grub.cfg in order to fix grub install");
+                } else {
+                    popup_and_OK("The mountlist was changed. You will now edit fstab, mtab, device.map and menu.lst/grub.cfg in order to fix grub install");
+                }
                 if (!g_text_mode) {
                     newtSuspend();
@@ -1426 +1450 @@
                 } else if (does_file_exist(MNT_RESTORING"/boot/grub/grub.cfg")) {
                     sprintf(tmp, "chroot %s %s /boot/grub/grub.cfg", MNT_RESTORING, editor);
+                } else if (does_file_exist(MNT_RESTORING"/boot/grub2/grub.cfg")) {
+                    sprintf(tmp, "chroot %s %s /boot/grub2/grub.cfg", MNT_RESTORING, editor);
                 }
                 paranoid_system(tmp);
-                sprintf(tmp, "chroot %s %s /boot/grub/device.map", MNT_RESTORING, editor);
+                if (does_file_exist(MNT_RESTORING"/boot/grub/device.map")) {
+                    sprintf(tmp, "chroot %s %s /boot/grub/device.map", MNT_RESTORING, editor);
+                } else if (does_file_exist(MNT_RESTORING"/boot/grub2/device.map")) {
+                    sprintf(tmp, "chroot %s %s /boot/grub2/device.map", MNT_RESTORING, editor);
+                                }
                 paranoid_system(tmp);
                 if (!g_text_mode) {
@@ -1439 +1469 @@
                         ("GRUB installation failed. Please fix the conf files so that a manual install using 'grub-install' or similar command works. You are now chroot()'ed to your restored system. Please type 'exit' when you are done.");
                     newtSuspend();
-                    system("chroot " MNT_RESTORING);
+                    paranoid_system("chroot " MNT_RESTORING);
                     newtResume();
                     popup_and_OK("Thank you.");
@@ -1501 +1531 @@
                 ("Because of bugs in GRUB's own installer, GRUB was not installed properly. Please install the boot loader manually now, using this chroot()'ed shell prompt. Type 'exit' when you have finished.");
             newtSuspend();
-            system("chroot " MNT_RESTORING);
+            paranoid_system("chroot " MNT_RESTORING);
             newtResume();
             popup_and_OK("Thank you.");
@@ -1846 +1876 @@
     FILE *fout;
     char *incoming = NULL;
+    char *q;
 
     assert_string_is_neither_NULL_nor_zerolength(output_file);
@@ -1935 +1966 @@
                        "in preparation for the post-restoration reboot.",
                        "", mountlist->entries);
-    chdir("/");
+    if (chdir("/")) {
+        // FIXME
+    }
     for (i = 0;
          i < 10
@@ -2032 +2065 @@
 /* @} - end restoreUtilityGroup */
 
-void wait_until_software_raids_are_prepped(char *mdstat_file,
-                                           int wait_for_percentage)
+void wait_until_software_raids_are_prepped(char *mdstat_file, int wait_for_percentage)
 {
     struct raidlist_itself *raidlist;
-    int unfinished_mdstat_devices = 9999, i;
+    int unfinished_mdstat_devices = 9999;
+    int i = 0;
     char *screen_message = NULL;
 
@@ -2045 +2078 @@
     while (unfinished_mdstat_devices > 0) {
             // FIXME: Prefix '/dev/' should really be dynamic!
-        if (parse_mdstat(raidlist, "/dev/")) {
+        if (parse_mdstat(MDSTAT_FILE, raidlist, "/dev/")) {
             log_to_screen("Sorry, cannot read %s", MDSTAT_FILE);
             log_msg(1,"Sorry, cannot read %s", MDSTAT_FILE);
             return;
         }
-        for (unfinished_mdstat_devices = i = 0; i <= raidlist->entries; i++) {
+        for (unfinished_mdstat_devices = 0; i <= raidlist->entries; i++) {
             if (raidlist->el[i].progress < wait_for_percentage) {
                 unfinished_mdstat_devices++;
@@ -2067 +2100 @@
                     sleep(2);
                     // FIXME: Prefix '/dev/' should really be dynamic!
-                    if (parse_mdstat(raidlist, "/dev/")) {
+                    if (parse_mdstat(MDSTAT_FILE, raidlist, "/dev/")) {
                         break;
                     }

branches/3.1/mondo/src/mondorestore/mondoprep.h

@@ -82 +82 @@
 
 
-char *truncate_to_drive_name(char *partition);
+char *truncate_to_drive_name(const char *partition);
 void create_mountlist_for_drive(struct mountlist_itself *mountlist,
                                 char *drive_name,

branches/3.1/mondo/src/mondorestore/mondorestore.c

@@ -63 +63 @@
  */
 bool g_ISO_restore_mode = FALSE;    /* are we in Iso Mode? */
+
+/* Whether we should fail immediately at first error */
+bool g_fail_immediately = FALSE;
 
 /**
@@ -618 +621 @@
         ("Label/Identify your ext2/ext3/ext4 partitions if necessary?")) {
         mvaddstr_and_log_it(g_currentY, 0,
-                            "Using tune2fs to identify your ext2,3,4 partitions");
+                            "Using tune2fs/tune4fs to identify your ext2,3,4 partitions");
         if (does_file_exist("/tmp/fstab.new")) {
             mr_asprintf(fstab_fname, "/tmp/fstab.new");
@@ -710 +713 @@
 
 
-/*            MONDO - saving your a$$ since Feb 18th, 2000            */
+/*            MONDO - saving your systems since Feb 18th, 2000            */
 
 
@@ -730 +733 @@
     int retval = 0;
     int res = 0;
-    bool boot_loader_installed = FALSE;
     char *tmp = NULL;
     char *tmp1 = NULL;
@@ -829 +831 @@
         log_msg(1,
                 "Great! Boot loader was installed. No need for msg at end.");
-        boot_loader_installed = TRUE;
     }
     clean_blkid();
@@ -836 +837 @@
     mvaddstr_and_log_it(g_currentY,
                         0,
-                        "Using tune2fs to identify your ext2,3 partitions");
+                        "Using tune2fs/tune4fs to identify your ext2,3,4 partitions");
 
     mr_asprintf(tmp, "label-partitions-as-necessary %s < /tmp/fstab >> %s 2>> %s", MINDI_CACHE"/mountlist.txt", MONDO_LOGFILE, MONDO_LOGFILE);
@@ -1601 +1602 @@
 
         if (use_star) {
-            mr_asprintf(command, "star -x -force-remove -U " STAR_ACL_SZ " errctl= file=%s", tarball_fname);
+            mr_asprintf(command, "star -x -force-remove -sparse -U " STAR_ACL_SZ " file=%s", tarball_fname);
             if (strstr(tarball_fname, ".bz2")) {
                 mr_strcat(command, " -bz");
@@ -1639 +1640 @@
         }
 
-        if (g_getfattr) {
-            log_msg(1, "Setting fattr list %s", xattr_fname);
-            if (length_of_file(xattr_fname) > 0) {
-                res = set_fattr_list(filelist_subset_fname, xattr_fname);
-                if (res) {
-                    log_to_screen("Errors occurred while setting extended attributes");
-                } else {
-                    log_msg(1, "I set xattr OK");
+        if (! use_star) {
+            if (g_getfattr) {
+                log_msg(1, "Setting fattr list %s", xattr_fname);
+                if (length_of_file(xattr_fname) > 0) {
+                    res = set_fattr_list(filelist_subset_fname, xattr_fname);
+                    if (res) {
+                        log_to_screen("Errors occurred while setting extended attributes");
+                    } else {
+                        log_msg(1, "I set xattr OK");
+                    }
+                    retval += res;
                 }
-                retval += res;
-            }
-        }
-        if (g_getfacl) {
-            log_msg(1, "Setting acl list %s", acl_fname);
-            if (length_of_file(acl_fname) > 0) {
-                res = set_acl_list(filelist_subset_fname, acl_fname);
-                if (res) {
-                    log_to_screen
-                        ("Errors occurred while setting access control lists");
-                } else {
-                    log_msg(1, "I set ACL OK");
+            }
+            if (g_getfacl) {
+                log_msg(1, "Setting acl list %s", acl_fname);
+                if (length_of_file(acl_fname) > 0) {
+                    res = set_acl_list(filelist_subset_fname, acl_fname);
+                    if (res) {
+                        log_to_screen("Errors occurred while setting access control lists");
+                    } else {
+                        log_msg(1, "I set ACL OK");
+                    }
+                    retval += res;
                 }
-                retval += res;
-            }
-        }
-        if (retval) {
+            }
+        } else {
+            retval = res;
+        }
+        // Be verbose for star
+        if (retval || use_star) {
             mr_asprintf(command, "cat %s >> %s", temp_log, MONDO_LOGFILE);
-            system(command);
+            paranoid_system(command);
             paranoid_free(command);
 
-            log_msg(2, "Errors occurred while processing fileset #%d",
-                    current_tarball_number);
+            if (retval) {
+                log_msg(2, "Errors occurred while processing fileset #%d", current_tarball_number);
+            }
         } else {
             log_msg(2, "Fileset #%d processed OK", current_tarball_number);
@@ -1782 +1788 @@
         if (strstr(tarball_fname, ".star.")) {
             use_star = TRUE;
-            mr_asprintf(command, "star -t file=%s %s", afio_fname, executable);
+            mr_asprintf(command, "star -sparse -t file=%s %s", afio_fname, executable);
         } else {
             use_star = FALSE;
@@ -1816 +1822 @@
     if (strstr(tarball_fname, ".star.")) {
         // star
-        mr_asprintf(command, "star -x file=%s %s", afio_fname, executable);
+        mr_asprintf(command, "star -sparse -x file=%s %s", afio_fname, executable);
         if (filelist) {
             mr_strcat(command, " list=%s", filelist_subset_fname);
@@ -2216 +2222 @@
     res = read_header_block_from_stream(&biggie_size, biggie_fname, &ctrl_chr);
     if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) {
-        res =
-            read_EXAT_files_from_tape(&biggie_size, biggie_fname, &ctrl_chr, xattr_fname, acl_fname);
+        res = read_EXAT_files_from_tape(&biggie_size, biggie_fname, &ctrl_chr, xattr_fname, acl_fname);
     }
 
@@ -2354 +2359 @@
     mr_free(tmp);
 
-    chdir(bkpinfo->restore_path);   /* I don't know why this is needed _here_ but it seems to be. -HR, 02/04/2002 */
+    if (chdir(bkpinfo->restore_path)) { /* I don't know why this is needed _here_ but it seems to be. -HR, 02/04/2002 */
+        //FIXME
+    }
 
     run_program_and_log_output("pwd", 5);
@@ -2470 +2477 @@
     log_msg(2, "restore_everything() --- starting");
     g_current_media_number = 1;
-    getcwd(cwd, MAX_STR_LEN - 1);
+    if (getcwd(cwd, MAX_STR_LEN - 1)) {
+        // FIXME
+    }
     mr_asprintf(tmp, "mkdir -p %s", bkpinfo->restore_path);
     run_program_and_log_output(tmp, FALSE);
@@ -2476 +2485 @@
 
     log_msg(1, "Changing dir to %s", bkpinfo->restore_path);
-    chdir(bkpinfo->restore_path);
-    getcwd(newpath, MAX_STR_LEN - 1);
+    if (chdir(bkpinfo->restore_path)) {
+        //FIXME
+    }
+    if (getcwd(newpath, MAX_STR_LEN - 1)) {
+        // FIXME
+    }
     log_msg(1, "path is now %s", newpath);
     log_msg(1, "restoring everything");
@@ -2511 +2524 @@
         resB = restore_all_biggiefiles_from_CD(filelist);
     }
-    chdir(cwd);
+    if (chdir(cwd)) {
+        //FIXME
+    }
     if (resA + resB) {
         log_to_screen("Errors occurred while data was being restored.");
@@ -2654 +2669 @@
     if (argc == 2 && strcmp(argv[1], "--edit-mountlist") == 0) {
 #ifdef __FreeBSD__
-        system("mv -f /tmp/raidconf.txt /etc/raidtab");
+        paranoid_system("mv -f /tmp/raidconf.txt /etc/raidtab");
         if (!does_file_exist("/etc/raidtab"))
-            system("vinum printconfig > /etc/raidtab");
+            paranoid_system("vinum printconfig > /etc/raidtab");
 #endif
         load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
         res = let_user_edit_the_mountlist(mountlist, raidlist);
 #ifdef __FreeBSD__
-        system("mv -f /etc/raidtab /tmp/raidconf.txt");
+        paranoid_system("mv -f /etc/raidtab /tmp/raidconf.txt");
 #endif
         paranoid_MR_finish(res);
@@ -2734 +2749 @@
 
     if (argc == 3 && strcmp(argv[1], "--mdconv") == 0) {
-        finish(create_raidtab_from_mdstat(argv[2]));
+        finish(create_raidtab_from_mdstat(MDSTAT_FILE,argv[2]));
     }
 
@@ -2820 +2835 @@
                         mr_asprintf(tmp, "sshfs -o ro %s /tmp/isodir", bkpinfo->netfs_mount);
                     }
-                } else {
-                    if (bkpinfo->netfs_user) {
-                        mr_asprintf(tmp, "mount %s@%s -o nolock,ro /tmp/isodir", bkpinfo->netfs_user,bkpinfo->netfs_mount);
+                } else  {
+                    if (strstr(bkpinfo->netfs_proto, "smbfs")) {
+                        if (bkpinfo->netfs_user) {
+                            mr_asprintf(tmp, "mount -t cifs %s /tmp/isodir -o user=%s,nolock,ro ", bkpinfo->netfs_mount,bkpinfo->netfs_user);
+                        } else {
+                            mr_asprintf(tmp, "mount -t cifs %s /tmp/isodir -o nolock,ro ", bkpinfo->netfs_mount);
+                        }
                     } else {
-                        mr_asprintf(tmp, "mount %s -o nolock,ro /tmp/isodir", bkpinfo->netfs_mount);
+                        if (bkpinfo->netfs_user) {
+                            mr_asprintf(tmp, "mount %s@%s -o nolock,ro /tmp/isodir", bkpinfo->netfs_user,bkpinfo->netfs_mount);
+                        } else {
+                            mr_asprintf(tmp, "mount %s -o nolock,ro /tmp/isodir", bkpinfo->netfs_mount);
+                        }
                     }
                 }
@@ -2956 +2979 @@
     if (strstr(bkpinfo->tmpdir,"mondo.tmp.") != NULL) {
         mr_asprintf(tmp, "rm -Rf %s", bkpinfo->tmpdir);
-        system(tmp);
+        paranoid_system(tmp);
         mr_free(tmp);
     }

branches/3.1/mondo/src/restore-scripts/mondo/grub-MR

@@ -107 +107 @@
 if [ "$MNT_RESTORING" ] ; then
     if [ -x $MNT_RESTORING/usr/sbin/grub-install.unsupported ]; then
-        echo "Now I'll use grub-install.unsupported in chroot" >> $LOGFILE
-        chroot $MNT_RESTORING /usr/sbin/grub-install.unsupported $1 >> $LOGFILE 2>> $LOGFILE
+        echo "Now I'll use OpenSuSE/SLES new grub-install in chroot" >> $LOGFILE
+        chroot $MNT_RESTORING /usr/sbin/grub-install >> $LOGFILE 2>> $LOGFILE
         res=$?
-        echo "grub-install.unsupported in chroot returned $res" >> $LOGFILE
+        echo "grub-install in chroot returned $res" >> $LOGFILE
     fi
 else
     if [ -x /usr/sbin/grub-install.unsupported ]; then
-        echo "Now I'll use grub-install.unsupported locally" >> $LOGFILE
-        /usr/sbin/grub-install.unsupported $1 >> $LOGFILE 2>> $LOGFILE
+        echo "Now I'll use OpenSuSE/SLES new grub-install locally" >> $LOGFILE
+        /usr/sbin/grub-install >> $LOGFILE 2>> $LOGFILE
         res=$?
-        echo "grub-install.unsupported returned $res" >> $LOGFILE
+        echo "grub-install returned $res" >> $LOGFILE
     fi
 fi
@@ -124 +124 @@
 echo "Now I'll use grub-install" >> $LOGFILE
 if [ "$MNT_RESTORING" ] ; then
+    echo "Launching: chroot $MNT_RESTORING grub-install $1" >> $LOGFILE
     chroot $MNT_RESTORING grub-install $1 >> $LOGFILE 2>> $LOGFILE
     res=$?
 else
+    echo "Launching: grub-install $1" >> $LOGFILE
     grub-install $1 >> $LOGFILE 2>> $LOGFILE
     res=$?
 fi
 echo "grub-install returned $res" >> $LOGFILE
+[ "$res" -eq "0" ] && exit 0
+
+
+echo "Now I'll use grub2-install" >> $LOGFILE
+if [ "$MNT_RESTORING" ] ; then
+    chroot $MNT_RESTORING grub2-install $1 >> $LOGFILE 2>> $LOGFILE
+    res=$?
+else
+    grub2-install $1 >> $LOGFILE 2>> $LOGFILE
+    res=$?
+fi
+echo "grub2-install returned $res" >> $LOGFILE
 [ "$res" -eq "0" ] && exit 0
 
@@ -190 +204 @@
 elif [ -f "/mnt/RESTORING/boot/grub/grub.cfg" ]; then
     grep -vE '^#' /boot/grub/grub.cfg > /mnt/RESTORING/tmp/grub.conf
+elif [ -f "/mnt/RESTORING/boot/grub2/grub.cfg" ]; then
+    grep -vE '^#' /boot/grub2/grub.cfg > /mnt/RESTORING/tmp/grub.conf
 else
     echo "Unable to find Grub conf file" | tee -a $LOGFILE

branches/3.1/mondo/src/restore-scripts/mondo/label-partitions-as-necessary

@@ -28 +28 @@
     else
         if [ "$format" = "ext2" ] || [ "$format" = "ext3" ] || [ "$format" = "ext4" ]; then
-            command="tune2fs $opttun $label $mountpt"
+            if [ "$format" = "ext4" ] && [ -x "/sbin/tune4fs" ]; then
+                command="/sbin/tune4fs $opttun $label $mountpt"
+            else
+                command="tune2fs $opttun $label $mountpt"
+            fi
             LogIt "Running $command"
             $command
@@ -38 +42 @@
             if [ "$opttun" = "-U" ]; then
                 LogIt "Creating uuid $label on swap partition $mountpt"
-                echo -n "$label" | perl -ne 's/-//g;chomp;print pack "H*",$_' | dd conv=notrunc "of=$mountpt" obs=1 seek=1036
+                if [ -x "/sbin/swaplabel" ]; then
+                    /sbin/swaplabel $opttun $label $mountpt
+                else
+                    echo -n "$label" | perl -ne 's/-//g;chomp;print pack "H*",$_' | dd conv=notrunc "of=$mountpt" obs=1 seek=1036
+                fi
             else
-                command="mkswap $opttun $label $mountpt"
+                if [ -x "/sbin/swaplabel" ]; then
+                    command="/sbin/swaplabel $opttun $label $mountpt"
+                else
+                    command="mkswap $opttun $label $mountpt"
+                fi
                 LogIt "Running $command"
                 $command
             fi
         else
-            LogIt "I am NOT going to run tune2fs/reiserfstune: the partition is format '$format', which doesn't like tune2fs/reiserfstune anyway"
+            LogIt "I am NOT going to run tune2|4fs/reiserfstune: the partition is format '$format', which doesn't like tune2|4fs/reiserfstune anyway"
         fi
     fi
@@ -53 +65 @@
 # ---------------------------------------------
 
-LogIt "Identifying your drives with tune2fs"
+LogIt "Identifying your drives with FS tune tool"
 if [ "$#" -ne "1" ] ; then
     LogIt "label-partitions-as-necessary $MINDI_CACHE/mountlist.txt < /tmp/fstab.new" 1

branches/3.1/mondo/src/restore-scripts/mondo/make-me-bootable

@@ -2 +2 @@
 
 
-if [ "$#" -ne "1" ] && [ "$#" -ne "2" ] ; then
-    echo "make-me-bootable <fname> (dummy)"
+if [ "$#" -ne "2" ] && [ "$#" -ne "3" ] ; then
+    echo "make-me-bootable <fname> <drive> [noaction]"
     exit 1
 fi
 
-dummy=$2
+drivetouse=$2
 boot_drv=""
 boot_part=""
 root_drv=""
 root_part=""
+if [ ! "$LOGFILE" ]; then
+    LOGFILE="/tmp/mondorestore2.log"
+fi
+dummy="$3"
 
-HAVE_ACTIVE="false"
+activepart=`parted2fdisk -l $drivetouse | tr -s '\t' ' ' | grep "$drivetouse" | grep '*' | cut -d' ' -f1`
+
 for i in `cat $1 | tr -s '\t' ' ' | cut -d' ' -f1 | grep -vE "/dev/fd|none|#"` ; do
-    mountpt=`grep "$i " $1 | tr -s '\t' ' ' | cut -d' ' -f2`
-    format=`grep "$i " $1 | tr -s '\t' ' ' | cut -d' ' -f3`
     # Warning wrong if LVM !
     drive=`echo $i | sed -e 's/[0-9]*$//' -e 's/\([0-9]\)p$/\1/'`
-    partno=`echo $i | sed -e 's/^.*[^0-9]\([0-9]*\)$/\1/'`
+    if [ "$drivetouse" = "$drive" ]; then
+        # We can continue as this is the drive we ned to work on
+        partno=`echo $i | sed -e 's/^.*[^0-9]\([0-9]*\)$/\1/'`
+        mountpt=`grep "$i " $1 | tr -s '\t' ' ' | cut -d' ' -f2`
 
-    if [ "$HAVE_ACTIVE" = "false" ] && [ "`parted2fdisk -l $drive | tr -s '\t' ' ' | grep "$i " | grep -v "*"`" ] ; then
         if [ "$mountpt" = "/" ] ; then
             root_drv=$drive
-        root_part=$partno
+            root_part=$partno
         elif [ "$mountpt" = "/boot" ] ; then
             boot_drv=$drive
@@ -46 +51 @@
 
 if [ "$drive" ] ; then
+    if [ "$partno" = "0" ] || [ ! "$partno" ] ; then
+        partno="1"
+    fi
+    cmd=""
+    for p in "$activepart"; do
+        # First desactivate active partitions (coming from previous usage)
+        cmd="${cmd}a\n$p\n"
+        if [ "$dummy" != "" ] ; then
+            echo "Will desactivate $p on $drive" >> $LOGFILE
+        fi
+    done
+    # Then activate the one which should
     if [ "$dummy" != "" ] ; then
-        if [ "$partno" = "0" ] || [ ! "$partno" ] ; then
-            partno="1"
-        fi
-        echo "$partno"
-    else
-        echo -en "a\n$partno\nw\n" | parted2fdisk $drive >> $LOGFILE 2>> $LOGFILE
-    fi
+        echo "Would activate $partno on $drive" >> $LOGFILE
+    else
+        echo -en "${cmd}a\n$partno\np\nw\n" | parted2fdisk $drive >> $LOGFILE 2>> $LOGFILE
+    fi
 fi
 exit 0

branches/3.1/mondo/src/restore-scripts/mondo/stabgrub-me

@@ -57 +57 @@
 LocateOldGrub() {
     old_grubconf=""
-    if [ -f "/mnt/RESTORING/boot/grub/menu.lst" ] || [ -f "/mnt/RESTORING/boot/grub/grub.cfg" ] ; then
+    if [ -f "/mnt/RESTORING/boot/grub/menu.lst" ] || [ -f "/mnt/RESTORING/boot/grub/grub.cfg" ] || [ -f "/mnt/RESTORING/boot/grub2/grub.cfg" ] ; then
         LogIt "No need for menu.lst/grub.cfg search." 2
         if [ -f "/mnt/RESTORING/boot/grub/menu.lst" ]; then
@@ -63 +63 @@
         elif [ -f "/mnt/RESTORING/boot/grub/grub.cfg" ]; then
             old_grubconf=/mnt/RESTORING/boot/grub/grub.cfg
+        elif [ -f "/mnt/RESTORING/boot/grub2/grub.cfg" ]; then
+            old_grubconf=/mnt/RESTORING/boot/grub2/grub.cfg
         fi
         if [ -L "$old_grubconf" ] ; then
@@ -68 +70 @@
             if [ _"`echo $l | cut -c1`" = _"/" ]; then
                 # If readlink gives an absolute path it's related to the chroot
-                old_grubconf=/mnt/RESTORING/$l
+                        old_grubconf=/mnt/RESTORING/$l
             else
                 # If readlink gives a relative path, it's in the same dir
-                old_grubconf=/mnt/RESTORING/boot/grub/$l
+                    d=`dirname "$old_grubconf"`
+                        old_grubconf=$d/$l
             fi
-        fi  
+        fi
         return 0
     fi
@@ -128 +131 @@
 elif [ -f /mnt/RESTORING/boot/grub/grub.cfg ]; then
     new_grubconf=/mnt/RESTORING/boot/grub/grub.cfg.NEW
+elif [ -f /mnt/RESTORING/boot/grub2/grub.cfg ]; then
+    new_grubconf=/mnt/RESTORING/boot/grub2/grub.cfg.NEW
 fi
 # change back to /tmp if /mnt/RESTORING/etc be problematic

branches/3.1/mondo/test/Makefile.am

@@ -3 +3 @@
 ## The program
 sbin_PROGRAMS         = mrtest_mountlist mrtest_truncname mrtest_conf mrtest_mem mrtest_msg mrtest_string
+mrtestdir                 = $(pkglibdir)/test
+mrtest_PROGRAMS           = mrtest_mountlist mrtest_truncname mrtest_stresc
 mrtest_mountlist_SOURCES  = test-mountlist.c ${top_builddir}/src/mondorestore/mondo-prep.c ${top_builddir}/src/mondorestore/mondo-rstr-newt.c ${top_builddir}/src/mondorestore/mondo-rstr-tools.c
 mrtest_mountlist_LDADD    = ${top_builddir}/src/common/libmondo.a ${top_builddir}/src/lib/libmr.a @MONDORESTORE_STATIC@
@@ -15 +17 @@
 mrtest_string_SOURCES       = test-string.c
 mrtest_string_LDADD         = ${top_builddir}/src/common/libmondo.a ${top_builddir}/src/lib/libmr.a @MONDORESTORE_STATIC@
+mrtest_stresc_SOURCES     = test-mr_stresc.c
+mrtest_stresc_LDADD       = ${top_builddir}/src/lib/libmr.a @MONDORESTORE_STATIC@

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

@@ -3 +3 @@
  *
  * Test program for mountlist management at restore time
- * Cn be used on host system with valgrind easier than with mondorestore
+ * Can be used on host system with valgrind easier than with mondorestore
  */
 #include <stdio.h>
@@ -12 +12 @@
 #include "../mondorestore/mondorestore.h"
 #include "../mondorestore/mr-externs.h"
+
+#define RAIDTAB_TEST "/tmp/raidtab"
+#define MOUNTLIST_TEST "/tmp/mountlist.txt"
 
 extern void twenty_seconds_til_yikes(void);
@@ -23 +26 @@
 extern int g_partition_table_locked_up;
 extern int g_noof_rows;
+
+/* Whether we should fail immediately at first error */
+bool g_fail_immediately = FALSE;
 
 bool g_ISO_restore_mode = FALSE;    /* are we in Iso Mode? */
@@ -64 +70 @@
 
 setup_newt_stuff();
+mr_asprintf(&g_mountlist_fname, MOUNTLIST_TEST);
 log_it("before mountlist");
 load_mountlist(mountlist, MINDI_CACHE"/mountlist.txt");
@@ -69 +76 @@
 resize_mountlist_proportionately_to_suit_new_drives(mountlist);
 log_it("after resize_mountlist_proportionately_to_suit_new_drives");
-load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
+load_raidtab_into_raidlist(raidlist, RAIDTAB_TEST);
 log_it("after load_raidtab_into_raidlist");
 edit_mountlist(MINDI_CACHE"/mountlist.txt", mountlist, raidlist);
@@ -78 +85 @@
 mr_free(flaws_str);
 
+log_it("before check raidlist content");
+log_it("after check raidlist content");
+
+log_it("before create mdadm dev");
+create_raid_device_via_mdadm(raidlist,"/dev/md0",FALSE);
+create_raid_device_via_mdadm(raidlist,"/dev/md1",FALSE);
+log_it("after create mdadm dev");
+
+free(mountlist);
+free(raidlist);
 mr_free(MONDO_LOGFILE);
+mr_free(g_mountlist_fname);
 exit(0);
 }

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

@@ -23 +23 @@
 extern int g_noof_rows;
 
+/* Whether we should fail immediately at first error */
+bool g_fail_immediately = FALSE;
+
 bool g_ISO_restore_mode = FALSE;    /* are we in Iso Mode? */
 bool g_I_have_just_nuked = FALSE;
@@ -37 +40 @@
 
 extern char *MONDO_LOGFILE;
-extern char *truncate_to_drive_name(char *);
+extern char *truncate_to_drive_name(const char *);
 /* We don't have a cleanup function yet */
 void (*mr_cleanup)(int) = NULL;