Changeset 1939 in MondoRescue

Timestamp:

May 17, 2008, 1:29:54 AM (17 years ago)

Author:

Bruno Cornec

Message:

svn merge -r 1923:1938 $SVN_M/branches/2.2.6

Location:

branches/stable

Files:

• mindi/README.pxe (modified) (1 diff)
• mindi/deplist.txt (modified) (1 diff)
• mindi/distributions/conf/mindi.conf.dist (modified) (1 diff)
• mindi/mindi (modified) (16 diffs)
• mindi/rootfs/sbin/init (modified) (1 diff)
• mindi/rootfs/sbin/start-nfs (modified) (1 diff)
• mondo-doc/distributions (deleted)
• mondo/src/common/Makefile.am (modified) (1 diff)
• mondo/src/common/libmondo-archive.c (modified) (4 diffs)
• mondo/src/common/libmondo-cli.c (modified) (1 diff)
• mondo/src/common/libmondo-devices.c (modified) (3 diffs)
• mondo/src/common/libmondo-stream.c (modified) (9 diffs)
• mondo/src/include/my-stuff.h (modified) (2 diffs, 1 prop)
• mondo/src/mondoarchive/Makefile.am (modified) (1 diff)
• mondo/src/mondoarchive/mondoarchive.c (modified) (1 diff)
• mondo/src/mondorestore/Makefile.am (modified) (1 diff)
• mondo/src/mondorestore/mondo-restore-EXT.h (modified) (1 diff)
• mondo/src/mondorestore/mondo-rstr-tools.c (modified) (3 diffs)
• mondo/src/mondorestore/mondorestore.c (modified) (1 diff)
• tools/DISTROS (deleted)
• tools/build2qemu (deleted)
• tools/common-env (deleted)
• tools/distro-env (deleted)
• tools/file2ftp (deleted)
• tools/ftp-env (deleted)
• tools/mg (deleted)
• tools/mkqemu (deleted)
• tools/mvi (deleted)
• tools/pkg2ftp (deleted)
• tools/setupqemu (deleted)
• tools/svn-env (deleted)
• tools/updateqemu (deleted)
• website/support.shtml (modified) (1 diff)

branches/stable/mindi/README.pxe

@@ -21 +21 @@
 server is the ip addr of the NFS server
 mountpoint is the mount point on the NFS server to use (should be in /etc/exports of the NFS server)
+The [] mean this parameter is optional
+The () mean that you have a choice with the '|' meaning 'or'
 
 The initrd and kernel file come from the first bootable media 

branches/stable/mindi/deplist.txt

@@ -30 +30 @@
 fdisk hdparm parted uname
 loadkeys
-mount
-devfsd burnBX burnK6 burnK7 burnMMX burnP5 burnP6 lucifer tiobench tiotest bonnie++ mprime ide-smart
+# These lines require absolute paths now !
+/bin/mount
+/sbin/mount.nfs /sbin/mount.nfs4 
+/sbin/mount.fuse
+/sbin/mount.cifs /sbin/mount.cifs3
+/sbin/mount.smb /sbin/mount.smb3
+/sbin/mount.smbfs /sbin/mount.smbfs3
 # helps for debugging
 /usr/bin/ldd
 /usr/bin/strace
+
+#
+devfsd burnBX burnK6 burnK7 burnMMX burnP5 burnP6 lucifer tiobench tiotest bonnie++ mprime ide-smart
 
 # For udev

branches/stable/mindi/distributions/conf/mindi.conf.dist

@@ -93 +93 @@
 #
 mindi_scsi_mods="3w-xxxx 3w_xxxx 3w-9xxx 3w_9xxx 53c7,8xx a100u2w a320raid aacraid adpahci advansys aha152x aha1542 aha1740 aic79xx aic79xx_mod aic7xxx aic7xxx_mod aic7xxx_old AM53C974 atp870u BusLogic cciss cpqfc dmx3191d dpt_i2o dtc eata eata_dma eata_pio fdomain gdth g_NCR5380 i2o_block i2o_core ide-scsi ieee1394 imm in2000 initio ips iscsi isp megaraid megaraid_mm megaraid_mbox megaraid_sas mptbase mptscsih mptsas mptspi mptfc mptscsi mptctl NCR53c406a ncr53c8xx nsp32 pas16 pci2000 pci2220i pcmcia ppa psi240i qla1280 qla2200 qla2300 qla2xxx qla2xxx_conf qlogicfas qlogicfc qlogicisp raw1394 scsi_debug scsi_mod scsi_transport_sas scsi_transport_spi sd_mod seagate sg sim710 sr_mod sym53c416 sym53c8xx sym53c8xx_2 t128 tmscsim u14-34f ultrastor wd7000 vmhgfs"
-mindi_ide_mods="ide ide-generic ide-detect ide-mod ide-disk ide-cd ide_cd ide-cs ide-core ide_core edd paride ata_generic ata_piix libata via82cxxx generic nvidia ahci sata_nv cmd64x pata_amd pata_marvell pata_serverworks"
-mindi_usb_mods="usb-storage usb-ohci usb-uhci usbcore usb_storage input hid uhci_hcd ehci_hcd uhci-hcd ehci-hcd ohci-hcd ohci_hcd usbkbd usbhid keybdev mousedev libusual"
+mindi_ide_mods="ide ide-generic ide-detect ide-mod ide-disk ide_disk ide-cd ide_cd ide-cs ide-core ide_core edd paride ata_generic ata_piix libata via82cxxx generic nvidia ahci sata_nv cmd64x pata_amd pata_marvell pata_serverworks"
+# Replace with that line for HP OCMP e.g.
+#DENY_MODS="MPS_Driver_Mapper mps octtldrv tscttl streams kqemu"
+mindi_usb_mods="usb-storage usb-ohci usb-uhci usbcore usb_storage input hid uhci_hcd ehci_hcd uhci-hcd ehci-hcd ohci-hcd ohci_hcd usbkbd usbhid keybdev mousedev libusual scsi_mod"
 mindi_pcmcia_mods="pcmcia_core ds yenta_socket"
-mindi_cdrom_mods="cdrom isocd isofs inflate_fs nls_iso8859-1 nls_cp437 nls_utf8 sg sr_mod zlib_inflate"
+mindi_cdrom_mods="cdrom isocd isofs inflate_fs nls_iso8859-1 nls_base nls_cp437 nls_utf8 sg sr_mod zlib_inflate iso9660"
 mindi_tape_mods="ht st osst ide-tape ide_tape"
 mindi_net_mods="sunrpc nfs nfs_acl lockd fscache loop mii 3c59x e100 bcm5700 bnx2 e1000 eepro100 ne2k-pci tg3 pcnet32 8139cp 8139too 8390 forcedeth vmxnet vmnet"

branches/stable/mindi/mindi

@@ -108 +108 @@
 
 BOOT_MEDIA_MESSAGE="$mindi_boot_msg"
-
 FDISK=$MINDI_SBIN/parted2fdisk
 
@@ -172 +171 @@
 
     mkdir -p $bigdir/etc
-    #cp --parents -pRdf $mappath $bigdir 2>> $LOGFILE || LogIt "AKMF -- Could not copy $mappath to $bigdir"
     tar cf - $mappath 2>> /dev/null | (cd $bigdir ; tar xf -) || LogIt "AKMF -- Could not copy $mappath to $bigdir"
     if [ "`echo $mappath | grep -F ".gz"`" ] ; then
@@ -282 +280 @@
                 BIGNO=$(($BIGNO+1))
             else
-                #cp --parents -Rdf $incoming $outdir 2> /dev/null || Die "Cannot copy $incoming to $outdir - did you run out of disk space?"
                 tar cf - $incoming 2> /dev/null | (cd $outdir ; tar xf -) || Die "Cannot copy $incoming to $outdir - did you run out of disk space?"
     
@@ -299 +296 @@
         incoming=`ReadLine`
     done
-}
-
-
-CopyImageToDisk() {
-    local image dev procno res comment
-    image=$1
-    dev=$2
-    comment=$3
-    [ ! -f "$image" ] && [ ! -b "$image" ] && Die "Image $image does not exist. Did you run out of disk space?"
-    Prompt "About to write $comment. Please press ENTER."
-    echo -en "Formatting disk..."
-    if which fdformat > /dev/null ; then
-        fdformat -n $dev > /dev/null 2> /dev/null || Die "Cannot format $dev - is your Linux distro broken?"
-    elif which superformat > /dev/null ; then
-        superformat $dev > /dev/null 2> /dev/null || Die "Cannot format $dev - is your Linux distro broken?"
-    else
-        Die "Please install either fdformat or superformat."
-    fi
-    echo -en "\nWriting $comment"
-    if echo $image | grep "mindi-[r|b]oot\.1440" &> /dev/null ; then
-        cat $image > $dev &
-    else
-        dd if=$image of=$dev &> /dev/null &
-    fi
-    procno=$!
-    ps $procno > /dev/null 2> /dev/null
-    while [ "$?" -eq "0" ] ; do
-        sleep 3
-        echo -en "."
-        ps $procno > /dev/null 2> /dev/null
-    done
-    echo -e "$DONE"
-    LogIt "$comment has been written."
 }
 
@@ -1439 +1403 @@
     MakeSyslinuxMessageFile $MINDI_TMP/iso/isolinux/message.txt
     cp $kernelpath $MINDI_TMP/iso/isolinux/vmlinuz 2>> $LOGFILE || Die "Cannot copy vmlinuz ($kernelpath) to mindi tmp ($MINDI_TMP/iso/isolinux/vmlinuz). Did you run out of disk space?"
-    cp $MINDI_TMP/mindi.rdz $MINDI_TMP/iso/isolinux/initrd.img 2>> $LOGFILE
+    cp $MINDI_TMP/mindi.rdz $MINDI_TMP/iso/isolinux/initrd.img 2>> $LOGFILE || Die "Cannot copy mindi.rdz ($MINDI_TMP/mindi.rdz) to $MINDI_TMP/iso/isolinux/initrd.img. Did you run out of disk space?"
     if [ _"$MONDO_SHARE" != _"" ]; then 
-        cp $kernelpath $MONDO_ROOT/vmlinuz 2>> $LOGFILE || Die "Cannot copy vmlinuz ($kernelpath) to mondo root ($MONDO_ROOT/vmlinuz). Did you run out of disk space?"/dev/null 
-        cp $MINDI_TMP/mindi.rdz $MONDO_ROOT/initrd.img 2>> $LOGFILE || Die "Cannot copy mindi.rdz ($MINDI_TMP/mindi.rdz) to mondo root ($MONDO_ROOT/vmlinuz). Did you run out of disk space?"
-
+        cp $kernelpath $MONDO_ROOT/vmlinuz 2>> $LOGFILE || Die "Cannot copy vmlinuz ($kernelpath) to mondo root ($MONDO_ROOT/vmlinuz). Did you run out of disk space?"
+        cp $MINDI_TMP/mindi.rdz $MONDO_ROOT/initrd.img 2>> $LOGFILE || Die "Cannot copy mindi.rdz ($MINDI_TMP/mindi.rdz) to $MONDO_ROOT/initrd.img. Did you run out of disk space?"
     fi
     [ -e "$iso_cfg_file" ] || Die "FIXME - unable to find $iso_cfg_file - this should never occur"
@@ -1960 +1923 @@
         cd $MINDI_TMP
         for i in `ListKernelModulePaths | HackPathsToFailsafe` ; do
-            #cp --parents -pRdf ./$i $bigdir 2>> $LOGFILE || Die "PDDI can't cp $i->$bigdir"
             tar cf - ./$i 2>> $LOGFILE | (cd $bigdir ; tar xf -) || Die "PDDI can't copy $i->$bigdir"
             if [ "`du -sk $i | cut -f1`" -lt "$(($CHOPSIZE*2))" ] ; then
-                #cp --parents -pRdf $i $bigdir 2>> $LOGFILE
                 tar cf - $i 2>> $LOGFILE | (cd $bigdir ; tar xf -)
             else
@@ -1975 +1936 @@
             for k in $j ; do
                 if [ "`du -sk $k | cut -f1`" -lt "$CHOPSIZE" ] ; then
-                    #cp --parents -pRdf $k $bigdir 2>> $LOGFILE
                     tar cf - $k 2>> $LOGFILE | (cd $bigdir ; tar xf -)
                 else
@@ -2352 +2312 @@
         s=`which $w 2> /dev/null`
         if [ -e "$s" ] ; then
-            #cp --parents -af $s . 2>> $LOGFILE
             tar cf - $s 2> /dev/null | tar xf -
         fi
@@ -2362 +2321 @@
     file $MINDI_LIB/rootfs/bin/busybox 2>&1 | grep -q "dynamically" 
     if [ $? -eq 0 ]; then
-        # We want to use the real mount
-        rm -f bin/mount
-        LocateDeps $MINDI_LIB/rootfs/bin/busybox /bin/mount > $MINDI_TMP/busy.lis
-        #cp --parents -Rdf `sort -u $MINDI_TMP/busy.lis` .
-        tar cf - /bin/mount `sort -u $MINDI_TMP/busy.lis` 2> /dev/null | tar xf -
+        # We want to use the real mount and all the supported variants (nfs, cifs, ...)
+        rm -f bin/mount $MINDI_TMP/busy.lis
+        mountlis=`grep mount $DEPLIST_FILE`
+        for f in $MINDI_LIB/rootfs/bin/busybox $mountlis ; do
+            if [ -f $f ]; then
+                LocateDeps $f >> $MINDI_TMP/busy.lis
+            fi
+        done
+        tar cf - $mountlis `sort -u $MINDI_TMP/busy.lis` 2> /dev/null | tar xf -
         rm -f $MINDI_TMP/busy.lis
     fi
@@ -2376 +2339 @@
         echo "udev device manager found" > $mountpoint/tmp/USE-UDEV
         LogIt "udev device manager found"
-        #cp --parents -Rdf /etc/udev . 2> /dev/null
         tar cf - /etc/udev 2> /dev/null | tar xf -
         # This avoids NIC remapping if on another machine at restore time on Debian at least
         rm -f ./etc/udev/rules.d/z25_persistent-net.rules
-        #cp --parents -Rdf /lib/udev /lib64/udev . 2> /dev/null
         tar cf - /lib*/udev 2> /dev/null | tar xf -
         if [ -x /sbin/udevd ]; then
@@ -2407 +2368 @@
                 fi
             done
-            #cp --parents -Rdf $lis `sort -u $MINDI_TMP/udev.lis` .
             tar cf - $lis `sort -u $MINDI_TMP/udev.lis` 2> /dev/null | tar xf -
             rm -f $MINDI_TMP/udev.lis
@@ -2426 +2386 @@
             lis=`grep -Ev '^#' $MINDI_CACHE/tools.files` 
             LocateDeps $lis > $MINDI_TMP/tools.lis
-            #cp --parents -Rdf $lis `sort -u $MINDI_TMP/tools.lis` .
             tar cf - $lis `sort -u $MINDI_TMP/tools.lis` 2> /dev/null | tar xf -
         fi
@@ -2446 +2405 @@
     fi
 
-    #cp --parents -Rdf /dev/fd0*[1,2][4,7,8]* . 2> /dev/null
     tar cf - /dev/fd0*[1,2][4,7,8]* 2> /dev/null | tar xf -
 
@@ -2489 +2447 @@
         [ "$YOUR_KERNEL_SUCKS" ] && i=$MINDI_TMP/$i
         echo "Adding $i ($s KB) to the rootfs" >> $LOGFILE
-        #cp --parents -Rpdf $i $mountpoint 2>/dev/null || LogIt "Unable to copy $i to $mountpoint"
         tar cf - $i 2>/dev/null | (cd $mountpoint ; tar xf -) || LogIt "Unable to copy $i to $mountpoint"
         # Uncompress modules if not using udev and native modprobe
@@ -2501 +2458 @@
 
     # Also copy modules.dep in case of udev so that normal modprobe works
-    #cp --parents -Rpdf /$needed_modules_path/modules.dep $mountpoint 2>/dev/null || LogIt "Unable to copy modules.dep to $mountpoint"
     tar cf - /$needed_modules_path/modules.dep 2>/dev/null | (cd $mountpoint ; tar xf -) || LogIt "Unable to copy modules.dep to $mountpoint"
 
@@ -2550 +2506 @@
         ln -sf sbin/init init
         # create cpio image file and unmount loop filesystem
-        find . -print | cpio -o -H newc | gzip -9 > $old_pwd/$rdz_fname 2> /dev/null
+        find . -print | cpio -o -H newc | gzip -9 > $rdz_fname 2> /dev/null
         cd $old_pwd
         umount $mountpoint || Die "Cannot unmount $tempfile"

branches/stable/mindi/rootfs/sbin/init

@@ -531 +531 @@
 
     for m in `find /lib/modules -name '*\.ko*' -o -name '*\.o*'`; do
-        j=`basename $m | sed 's/\.ko.*$//'`
-        j=`basename $m | sed 's/\.o.*$//'`
+        k=`basename $m | sed 's/\.ko.*$//'`
+        j=`basename $k | sed 's/\.o.*$//'`
         echo "$DENY_MODS" | grep -q "$j "
         if [ $? -eq 0 ]; then

branches/stable/mindi/rootfs/sbin/start-nfs

@@ -68 +68 @@
     # Finally mounts the NFS share
     LogIt "Mounting NFS share ($nfsmount) on /tmp/isodir..."
+    touch /etc/mtab
     mount -t nfs -o nolock $nfsmount /tmp/isodir
     
     LogIt "Mounting NFS image ${imgname}-1.iso in $dirimg on /mnt/cdrom in loopback"
-    mount -o ro -t iso9660 /tmp/isodir/$dirimg/${imgname}-1.iso /mnt/cdrom
+    mount -o ro,loop -t iso9660 /tmp/isodir/$dirimg/${imgname}-1.iso /mnt/cdrom
 fi

branches/stable/mondo/src/common/Makefile.am

@@ -4 +4 @@
 ## Process this file with Automake to generate `Makefile.in'
 ##
-AM_CPPFLAGS = -DMONDO_SHARE=\"$(pkgdatadir)\" -DMONDO_CONF_DIR=\"$(sysconfdir)\" -I${top_builddir}/src/include
+AM_CPPFLAGS = -DMONDO_SHARE=\"$(pkgdatadir)\" -DMONDO_CONF_DIR=\"$(sysconfdir)/mondo\" -I${top_builddir}/src/include -I${top_builddir}/src/common
 
 ## libmondo

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

@@ -951 +951 @@
             mr_free(command);
         } else {
-            mr_asprintf(&command, "cp -f %s/mindi-*oot*.img %s/images",
-                bkpinfo->tmpdir, bkpinfo->scratchdir);
-            if (system(command)) {
-                mr_msg(2, "Unable to copy mindi images");
-            }
-            mr_free(command);
-
             mr_asprintf(&tmp, "cp -f %s/images/all.tar.gz %s",
                  bkpinfo->scratchdir, bkpinfo->tmpdir);
@@ -1368 +1361 @@
     int i;
     char *curr_xattr_list_fname = NULL;
-    char *curr_acl_list_fname;
+    char *curr_acl_list_fname = NULL;
     int misc_counter_that_is_not_important = 0;
 
@@ -1476 +1469 @@
                 res += write_EXAT_files_to_tape(curr_xattr_list_fname,
                                                 curr_acl_list_fname);
+                // archives themselves
+                res +=
+                    write_EXAT_files_to_tape(curr_xattr_list_fname,
+                                             curr_acl_list_fname);
                 // archives themselves
                 res +=
@@ -2152 +2149 @@
                                                    curr_afioball_fname);
             iamhere("Writing EXAT files");
-            res += write_EXAT_files_to_tape(curr_xattr_list_fname,
-                                            curr_acl_list_fname);
+            res +=
+                write_EXAT_files_to_tape(curr_xattr_list_fname,
+                                         curr_acl_list_fname);
             // archives themselves
             res = move_files_to_stream(curr_afioball_fname, NULL);

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

@@ -170 +170 @@
 extern bool g_text_mode;
 extern char g_startdir[MAX_STR_LEN];    ///< ????? @bug ?????
-extern bool g_sigpipe;
 extern char *MONDO_OPTIONS;
 

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

@@ -1567 +1567 @@
     bkpinfo->nonbootable_backup = FALSE;
 
-// Tape, CD, NFS, ...?
+    // Tape, CD, NFS, ...?
     srandom(getpid());
     bkpinfo->backup_media_type =
@@ -1576 +1576 @@
         finish(1);
     }
+    /* Why asking to remove the media with tape ?
     if (bkpinfo->backup_media_type == tape && bkpinfo->restore_data) {
         popup_and_OK(_("Please remove media from drive"));
     }
+    */
     mr_msg(3, "media type = %s",
             bkptype_to_string(bkpinfo->backup_media_type));
@@ -1588 +1590 @@
     mvaddstr_and_log_it(2, 0, " ");
 
-// Find device's /dev (or SCSI) entry
+    // Find device's /dev (or SCSI) entry
     switch (bkpinfo->backup_media_type) {
     case cdr:

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

@@ -30 +30 @@
 
 #define EXTRA_TAPE_CHECKSUMS
+#define STR_HEADER  "Mondolicious, baby"
 
 /*@unused@*/
@@ -362 +363 @@
 {
     int res = 0;
-    int retval = 0;
     char *fname = (char *)&res;                 /* Should NOT be NULL */
 
-// xattr
+    // xattr
     if (g_getfattr) {
         res = read_header_block_from_stream(ptmp_size, fname, pctrl_chr);
@@ -372 +372 @@
         }
         if (!strstr(fname, "xattr")) {
-            fatal_error("Wrong order, sunshine.");
+            fatal_error("Wrong order for xattr, sunshine.");
         }
         read_file_from_stream_to_file(xattr_fname, *ptmp_size);
@@ -380 +380 @@
         }
         mr_msg(1, "Got xattr");
+        res = read_header_block_from_stream(ptmp_size, tmp_fname, pctrl_chr);
+        if (*pctrl_chr != BLK_STOP_EXTENDED_ATTRIBUTES) {
+            wrong_marker(BLK_STOP_EXTENDED_ATTRIBUTES, *pctrl_chr);
+        }
+        res = read_header_block_from_stream(ptmp_size, tmp_fname, pctrl_chr);
+        if (pctrl_chr == BLK_START_AN_AFIO_OR_SLICE) {
+            log_msg(1, "No acl attributes found, skipping to afio files");
+            return(0);
+        } else {
+            if (pctrl_chr != BLK_START_EXTENDED_ATTRIBUTES) {
+                wrong_marker(BLK_START_EXTENDED_ATTRIBUTES, *pctrl_chr);
+            }
+        }
     }
     // acl
@@ -385 +398 @@
         res = read_header_block_from_stream(ptmp_size, fname, pctrl_chr);
         if (!strstr(fname, "acl")) {
-            fatal_error("Wrong order, sunshine.");
+            fatal_error("Wrong order for acl, sunshine.");
         }
         if (*pctrl_chr != BLK_START_EXAT_FILE) {
@@ -403 +416 @@
     // tarball itself
     res = read_header_block_from_stream(ptmp_size, tmp_fname, pctrl_chr);
-    mr_msg(1, "now looking for afioball");
-    return (retval);
+    mr_msg(1, "End of extended attributes, now looking for afioball");
+    return (0);
 }
 
@@ -420 +433 @@
         write_file_to_stream_from_file(xattr_fname);
         write_header_block_to_stream((off_t)-1, xattr_fname, BLK_STOP_EXAT_FILE);
+        write_header_block_to_stream(length_of_file(xattr_fname), xattr_fname,
+                             BLK_STOP_EXTENDED_ATTRIBUTES);
     }
     if (g_getfacl) {
     // acl
+        write_header_block_to_stream(length_of_file(acl_fname), acl_fname,
+                             BLK_START_EXTENDED_ATTRIBUTES);
         write_header_block_to_stream(length_of_file(acl_fname), acl_fname,
                              BLK_START_EXAT_FILE);
         write_file_to_stream_from_file(acl_fname);
         write_header_block_to_stream((off_t)-1, acl_fname, BLK_STOP_EXAT_FILE);
-        write_header_block_to_stream(length_of_file(xattr_fname), xattr_fname,
+        write_header_block_to_stream(length_of_file(acl_fname), acl_fname,
                              BLK_STOP_EXTENDED_ATTRIBUTES);
     }
@@ -1008 +1025 @@
     }
     memcpy((char *) plen, tempblock + 7001, sizeof(long long));
-    if (strcmp(tempblock + 6000 + *pcontrol_char, "Mondolicious, baby")) {
+    if (strcmp(tempblock + 6000 + *pcontrol_char, STR_HEADER)) {
         log_it("Bad header block at %ld K", (long) g_tape_posK);
     }
@@ -1594 +1611 @@
         tempblock[i] = 0;
     }
-    sprintf(tempblock + 6000 + control_char, "Mondolicious, baby");
+    sprintf(tempblock + 6000 + control_char, STR_HEADER);
     tempblock[7000] = control_char;
     memcpy(tempblock + 7001, (char *) &olen, sizeof(off_t));

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

@@ -2 +2 @@
  * Common defines across the project
  *
- *  $Id: my-stuff.h 973 2006-11-23 18:05:21Z bruno $
+ *  $Id$
  */
 
@@ -286 +286 @@
 
 #endif                          /* _MY_STUFF_H_ */
+=======
+/* my-stuff.h
+   $Id$
+*/
+
+#define HAVE_MALLOC 1
+
+
+// Extra info for ACLs and SELINUX users
+#define STAR_ACL_SZ "-xfflags -acl"
+//#define STAR_ACL_SZ "-xfflags"
+//#define STAR_ACL_SZ ""
+// Enable the first line and disable the second if you are a Fedora Core 2 user
+
+/**
+ * @file
+ * The main header file for Mondo.
+ */
+
+#if !defined(bool) && !defined(__cplusplus)
+/**
+ * Create the illusion of a Boolean type.
+ */
+#define bool int
+#define TRUE 1
+#define FALSE 0
+#endif
+
+#ifndef _MY_STUFF_H_
+#define _MY_STUFF_H_
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#ifndef __FreeBSD__
+#include <getopt.h>
+#endif
+#include <sys/types.h>
+#include <sys/shm.h>
+#include <sys/ipc.h>
+#include <sys/ioctl.h>
+#include <sys/sem.h>
+#include <sys/param.h>
+#include <stdio.h>
+#include <stdlib.h>
+#ifndef  __USE_FILE_OFFSET64
+#define  __USE_FILE_OFFSET64
+#endif
+#ifndef  __USE_LARGEFILE64
+#define  __USE_LARGEFILE64
+#endif
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <stddef.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <time.h>
+#include <unistd.h>
+#include <signal.h>
+//#include <curses.h>
+#include <newt.h>
+#include <ctype.h>
+#include <string.h>
+#include <pthread.h>
+#include <assert.h>
+
+#if defined(DEBUG) && !__cplusplus
+int count;
+char trace_log[255];            /*buffer for logging */
+char *trace_log_ptr;
+#endif                          /* DEBUG */
+
+#define IA64_BOOT_SIZE "16384"  /* Should be coherent with mindi */
+#define STD_PREFIX "mondorescue"    /* Should be coherent with mindi */
+
+/**
+ * The biggielist stub (appended to the directory where all.tar.gz was unpacked).
+ */
+#define BIGGIELIST_TXT_STUB "./tmp/biggielist.txt"
+
+/**
+ * The filelist stub (appended to the directory where all.tar.gz was unpacked).
+ */
+#define FILELIST_FULL_STUB "./tmp/filelist.full.gz"
+
+/**
+ * The mountlist stub (appended to the directory where all.tar.gz was unpacked).
+ */
+#define MOUNTLIST_FNAME_STUB "./tmp/mountlist.txt"
+
+/**
+ * The mondo-restore.cfg stub (appended to the directory where all.tar.gz was unpacked).
+ */
+#define MONDO_CFG_FILE_STUB "./tmp/mondo-restore.cfg"
+/**
+ * The location where mindi media images are stored.
+ */
+#define MINDI_CACHE "/var/cache/mindi"
+
+/**
+ * The location where mondo changed info are stored.
+ */
+#define MONDO_CACHE "/var/cache/mondo"
+
+/**
+ * The RAID kernel proc file
+ */
+#define MDSTAT_FILE "/proc/mdstat"
+
+/**
+ * @bug Apparently unused.
+ */
+#define MONDO_TRACEFILE "/var/log/mondo-tracefile.log"
+
+#undef assert
+
+extern void _mondo_assert_fail(const char *file, const char *function,
+                               int line, const char *exp);
+
+/**
+ * An assert macro that calls _mondo_assert_fail() when it fails.
+ */
+#ifdef NDEBUG
+#define assert(exp) ((void)0)
+#else
+#define assert(exp) ((exp)?((void)0):_mondo_assert_fail(__FILE__, __FUNCTION__, __LINE__, #exp))
+#endif
+
+#define CRC_M16 0xA001          ///< Mask for crc16.
+#define CRC_MTT 0x1021          ///< Mask for crc-ccitt.
+
+#define FALSE 0                 ///< The ubiquitous FALSE macro.
+#define TRUE 1                  ///< The even more ubiquitous TRUE macro.
+
+#define SCREEN_LENGTH 25        ///< The default size of the screen.
+#define NOOF_ERR_LINES 6        ///< The number of lines of log output to keep at the bottom of the screen.
+#define ARBITRARY_MAXIMUM 2000  ///< The maximum number of items showing at once in the mountlist or filelist editor.
+#define MAX_TAPECATALOG_ENTRIES 8192    ///< The maximum number of entries in the tape catalog.
+#define MAX_STR_LEN 384         ///< The maximum length of almost all @p char buffers in Mondo.
+                                        ///  Note: Make this divisible by eight to avoid aligment issues
+                                        ///        on 64bit platforms like ia64.
+#define MAXIMUM_RAID_DEVS 32    ///< The maximum number of RAID devices in the raidlist.
+#define MAXIMUM_ADDITIONAL_RAID_VARS 32 ///< The maximum number of additional RAID variables per RAID device in the raidlist.
+#define MAXIMUM_DISKS_PER_RAID_DEV 32   ///< The maximum number of disks per RAID device in the raidtab.
+
+#define RAIDTAB_FNAME "/etc/raidtab"    ///< The filename of the raidtab file, at least on Linux.
+
+#define BLK_START_OF_BACKUP     1   ///< Marker block: start a backup.
+#define BLK_START_OF_TAPE       2   ///< Marker block: start a tape.
+#define BLK_START_AFIOBALLS 10  ///< Marker block: start the afioball section.
+#define BLK_STOP_AFIOBALLS  19  ///< Marker block: stop the afioball section.
+#define BLK_START_AN_AFIO_OR_SLICE      20  ///< Marker block: start an afioball or a slice.
+#define BLK_STOP_AN_AFIO_OR_SLICE   29  ///< Marker block: stop an afioball or a slice.
+#define BLK_START_BIGGIEFILES   30  ///< Marker block: start the biggiefile section.
+#define BLK_STOP_BIGGIEFILES    39  ///< Marker block: stop the biggiefile section.
+#define BLK_START_A_NORMBIGGIE  40  ///< Marker block: start a normal biggiefile.
+#define BLK_START_A_PIHBIGGIE   41  ///< Marker block: start a ntfsprog'd biggiefile
+#define BLK_START_EXTENDED_ATTRIBUTES 45    ///< Marker block: start xattr/acl info
+#define BLK_STOP_EXTENDED_ATTRIBUTES 46 ///< Marker block: stop xattr/acl info
+#define BLK_START_EXAT_FILE     47
+#define BLK_STOP_EXAT_FILE      48
+#define BLK_STOP_A_BIGGIE   59  ///< Marker block: stop a biggiefile.
+#define BLK_START_FILE          80  ///< Marker block: start a file (non-afio or slice).
+#define BLK_STOP_FILE           89  ///< Marker block: stop a file (non-afio or slice).
+#define BLK_END_OF_TAPE         100 ///< Marker block: end of tape.
+#define BLK_END_OF_BACKUP       101 ///< Marker block: end of backup.
+#define BLK_ABORTED_BACKUP      102 ///< Marker block: backup was aborted.
+
+/// The external tape blocksize.
+#ifdef EXTTAPE
+#define TAPE_BLOCK_SIZE (long)EXTTAPE
+#else
+#define TAPE_BLOCK_SIZE 131072L /* was 8192; 06/2002-->65536; 11/2002-->131072 */
+#endif
+
+#define DEFAULT_INTERNAL_TAPE_BLOCK_SIZE 32768  // Nov 2003?
+
+
+
+
+#define SLICE_SIZE 4096         ///< The size of a slice of a biggiefile.
+
+
+
+
+
+
+/**
+ * Determine whether @p x (t_bkptype) is a streaming backup.
+ */
+#define IS_THIS_A_STREAMING_BACKUP(x) (x == tape || x == udev || x == cdstream)
+
+
+/**
+ * @c mkisofs command to generate a nonbootable CD, except for -o option and the directory to image.
+ */
+#define MONDO_MKISOFS_NONBOOT   "mkisofs -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL_Version -V _CD#_"
+
+/**
+ * @c mkisofs command to generate a bootable CD using isolinux, except for -o option and the directory to image.
+ */
+#define MONDO_MKISOFS_REGULAR_SYSLINUX  "mkisofs -J -boot-info-table -no-emul-boot -b isolinux.bin -c boot.cat -boot-load-size 4 -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL_Version -V _CD#_"
+
+/**
+ * @c mkisofs command to generate a bootable CD using LILO, except for -o option and the directory to image.
+ */
+#define MONDO_MKISOFS_REGULAR_LILO      "mkisofs -boot-info-table -no-emul-boot -b isolinux.bin -c boot.cat -boot-load-size 4 -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_"
+
+/**
+ * @c mkisofs command to generate a bootable CD using ELILO, except for -o option and the directory to image.
+ */
+// Should replace 8192 by IA64_BOOT_SIZE
+#define MONDO_MKISOFS_REGULAR_ELILO      "mkisofs -no-emul-boot -b images/mindi-bootroot.8192.img -c boot.cat -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_"
+
+/**
+ * The stub name of the temporary ISO image to create, burn, and remove.
+ */
+#define MONDO_TMPISOS "temporary.iso"
+
+/**
+ * @c growisofs command to generate a bootable DVD using isolinux, except for the directory to image.
+ */
+#define MONDO_GROWISOFS_REGULAR_SYSLINUX "growisofs -use-the-force-luke -J -no-emul-boot -boot-load-size 4 -b isolinux.bin --boot-info-table -c boot.cat -boot-load-size 4 -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL_Version -V _CD#_ -v"
+
+/**
+ * @c growisofs command to generate a bootable DVD using LILO, except for the directory to image.
+     */
+#define MONDO_GROWISOFS_REGULAR_ELILO     "growisofs -use-the-force-luke -no-emul-boot -b images/mindi-boot.2880.img -c boot.cat -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ -v"
+
+/**
+ * @c growisofs command to generate a bootable DVD using LILO, except for the directory to image.
+     */
+#define MONDO_GROWISOFS_REGULAR_LILO     "growisofs -no-emul-boot -b isolinux.bin -c boot.cat -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ -v"
+
+/**
+ * @c growisofs command to generate a nonbootable DVD, except for the directory to image.
+ */
+#define MONDO_GROWISOFS_NONBOOT          "growisofs -use-the-force-luke -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ -v"
+
+/**
+ * Welcome string displayed at the top of the newt interface.
+ */
+#define WELCOME_STRING "W E L C O M E   T O   M O N D O   R E S C U E"
+
+/**
+ * The maximum length of a filename in the tape catalog.
+ */
+#define MAX_TAPECAT_FNAME_LEN 32
+
+//#define strcpy(y,x) strncpy(y, x, sizeof(y)-1)
+
+
+/**
+ * Assert that (@p x != NULL) and (@p x[0] != '\\0').
+ */
+#define assert_string_is_neither_NULL_nor_zerolength(x) {assert(x!=NULL);assert(x[0]!='\0');}
+
+/**
+ * Log the file, line, Mondo error message, and OS error message (errno).
+ */
+#define log_OS_error(x) {log_msg(0, "%s (%s)", x, strerror(errno));}
+
+/**
+ * Assert that (@p x != NULL).
+ */
+#define assert_pointer_is_not_NULL(x) {assert(x!=NULL);}
+
+/**
+ * close() @p x and log a message if it fails.
+ */
+#define paranoid_close(x) {if(close(x)) {log_msg(5, "close err");} x=-999; }
+
+/**
+ * fclose() @p x and log a message if it fails.
+ */
+#define paranoid_fclose(x) {if(fclose(x)) {log_msg(5, "fclose err");} x=NULL; }
+
+/**
+ * pclose() @p x and log a message if it fails.
+ */
+#define paranoid_pclose(x) {if(pclose(x)) {log_msg(5, "pclose err");} x=NULL; }
+
+/**
+ * Run the command @p x and log it if it fails.
+ */
+#define paranoid_system(x) {if(system(x)) log_msg(4, x); }
+
+/**
+ * Free @p x and set it to NULL.
+ */
+#define paranoid_free(x) {if (x != NULL) free(x); x=NULL;}
+
+/**
+ * Free variables and call finish(@p x).
+ */
+#define paranoid_MR_finish(x) {free_MR_global_filenames (); finish(x); }
+
+/**
+ * Log file, function, line, and @p x.
+ */
+#define iamhere(x) {log_it("%s, %s, %ld: %s", __FILE__, __FUNCTION__, __LINE__, x);}
+
+/**
+ * Yes, we want malloc() to help us fix bugs.
+ */
+#define MALLOC_CHECK_ 1
+
+/**
+ * Malloc @p x to be MAX_STR_LEN bytes and call fatal_error() if we're out of memory.
+ */
+#define malloc_string(x) { x = (char *)malloc(MAX_STR_LEN); if (!x) { fatal_error("Unable to malloc"); } x[0] = x[1] = '\0'; }
+
+/**
+ * Path to the location the hard drive is mounted on during a restore.
+ */
+#define MNT_RESTORING "/mnt/RESTORING"
+
+/** @def VANILLA_SCSI_CDROM The first SCSI CD-ROM in the system (most likely to be the one to write to). */
+/** @def VANILLA_SCSI_TAPE  The first SCSI tape in the system (most likely to be the one towrite to. */
+/** @def DONT_KNOW_HOW_TO_EVALUATE_THIS_DEVICE_TYPE A string whose presence in a device name indicates the
+ * inability to check this device for errors in the mountlist. */
+/** @def RAID_DEVICE_STUB The stub of a RAID device (set up RAID if we find it). */
+/** @def SANE_FORMATS Sane formats for this OS, separated by spaces. */
+/** @def ALT_TAPE The first IDE tape in the system. */
+/** @def MKE2FS_OR_NEWFS @c mke2fs or @c newfs, depending on the OS. */
+/** @def CP_BIN The GNU @c cp binary to use. */
+#ifdef __FreeBSD__
+#define VANILLA_SCSI_CDROM  "/dev/cd0"
+#define VANILLA_SCSI_TAPE   "/dev/sa0"
+#define VANILLA_USB_DEVICE  "tobegivenbybsdguru"
+#define DONT_KNOW_HOW_TO_EVALUATE_THIS_DEVICE_TYPE  "/dev/vinum/"
+#define RAID_DEVICE_STUB    DONT_KNOW_HOW_TO_EVALUATE_THIS_DEVICE_TYPE
+#define SANE_FORMATS        "swap image msdosfs nfs ntfs raid lvm ffs ufs ext2fs"
+#define ALT_TAPE        "/dev/ast0"
+#define MKE2FS_OR_NEWFS "newfs"
+#define CP_BIN      "gcp"
+#else
+#define VANILLA_SCSI_CDROM  "/dev/scd0"
+#define VANILLA_SCSI_TAPE   "/dev/st0"
+#define VANILLA_USB_DEVICE  "/dev/hda"
+#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 xfs vfs jfs reiserfs vmfs dos minix coda nfs ntfs hpfs raid lvm cifs"
+#define ALT_TAPE        "/dev/ht0"
+#define MKE2FS_OR_NEWFS "mke2fs"
+#define CP_BIN      "cp"
+#endif
+
+
+/**
+ * The template for a filelist filename.
+ * The first argument (%s) is the tempdir and the second (%d) is the filelist number.
+ */
+#define FILELIST_FNAME_RAW_SZ "%s/filelist.%ld"
+
+#define XATTR_LIST_FNAME_RAW_SZ      "%s/xattr_list.%ld.gz"
+#define XATTR_BIGGLST_FNAME_RAW_SZ   "%s/xattr_list.big.gz"
+#define ACL_LIST_FNAME_RAW_SZ        "%s/acl_list.%ld.gz"
+#define ACL_BIGGLST_FNAME_RAW_SZ     "%s/acl_list.big.gz"
+
+/**
+ * The template for an afioball filename.
+ * The first argument (%s) is the tempdir and the second (%d) is the filelist number.
+ */
+#define AFIOBALL_FNAME_RAW_SZ (bkpinfo->use_star)?"%s/tmpfs/%ld.star.%s":"%s/tmpfs/%ld.afio.%s"
+#define ARCH_THREADS 2          ///< The number of simultaneous threads running afio in the background.
+#define ARCH_BUFFER_NUM (ARCH_THREADS*4)    // Number of permissible queued afio files
+#define FORTY_SPACES "                                         "    ///< 40 spaces.
+#define PPCFG_RAMDISK_SIZE 350  ///< Size of the tmpfs, in megabytes, to attempt to mount (to speed up Mondo).
+
+#define DO_MBR_PLEASE "/tmp/DO-MBR-PLEASE"
+
+
+/**
+ * Compatibility define to change log_it() calls to log_debug_msg() calls.
+ */
+#define log_it(format, args...) log_debug_msg(2, __FILE__, __FUNCTION__, __LINE__, format, ## args)
+
+/**
+ * Macro to log a message along with file, line, and function information.
+ */
+#define log_msg(level, format, args...) log_debug_msg(level, __FILE__, __FUNCTION__, __LINE__, format, ## args)
+
+#define DEFAULT_DVD_DISK_SIZE 4480  ///< The default size (in MB) of a DVD disk, unless the user says otherwise.
+
+#define DEFAULT_DEBUG_LEVEL 4   ///< By default, don't log messages with a loglevel higher than this.
+
+#define SZ_NTFSPROG_VOLSIZE "1048576"   // was 4096
+#define NTFSPROG_PARAMS "-z0 -V" SZ_NTFSPROG_VOLSIZE " -o -b -d -g1"
+
+#define MNT_CDROM "/mnt/cdrom"
+#define MNT_FLOPPY "/mnt/floppy"
+
+#define DEFAULT_MR_LOGLEVEL 4
+
+#endif                          /* _MY_STUFF_H_ */

branches/stable/mondo/src/mondoarchive/Makefile.am

@@ -5 +5 @@
 ##
 AM_CPPFLAGS = -DMONDO_CONF_DIR=\"$(sysconfdir)/mondo\" -I${top_builddir}/src/include -I${top_builddir}/src/common -I${top_builddir}/src/mondoarchive
+
+AM_CPPFLAGS = -DMONDO_CONF_DIR=\"$(sysconfdir)/mondo\" -I${top_builddir}/src/include -I${top_builddir}/src/common
 
 ## Headers

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

@@ -743 +743 @@
     return EXIT_SUCCESS;
 }
+=======
+/***************************************************************************
+                          main.c  -  description
+                             -------------------
+    begin                : Fri Apr 19 16:40:35 EDT 2002
+    copyright            : (C) 2002 by Stan Benoit
+    email                : troff@nakedsoul.org
+    cvsid                : $Id$
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+/**
+ * @file
+ * The main file for mondoarchive.
+ */
+
+/************************* #include statements *************************/
+#include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include "my-stuff.h"
+#include "../common/mondostructures.h"
+#include "../common/libmondo.h"
+#include "../common/libmondo-cli-EXT.h"
+#include "../common/libmondo-tools-EXT.h"
+#include "mondoarchive.h"
+
+// for CVS
+//static char cvsid[] = "$Id$";
+
+/************************* external variables *************************/
+extern void set_signals(int);
+extern int g_current_media_number;
+extern void register_pid(pid_t, char *);
+extern int g_currentY;
+extern bool g_text_mode;
+extern char *g_boot_mountpt;
+extern bool g_remount_floppy_at_end;
+extern char *g_cdrw_drive_is_here;
+static char *g_cdrom_drive_is_here = NULL;
+static char *g_dvd_drive_is_here = NULL;
+extern double g_kernel_version;
+
+/***************** global vars, used only by main.c ******************/
+long diffs;
+
+extern t_bkptype g_backup_media_type;
+extern int g_loglevel;
+
+/**
+ * Whether we're restoring from ISOs. Obviously not, since this is the
+ * backup program.
+ * @note You @b MUST declare this variable somewhere in your program if
+ * you use libmondo. Otherwise the link will fail.
+ * @ingroup globalGroup
+ */
+bool g_ISO_restore_mode = FALSE;
+
+/* Do we use extended attributes and acl ?
+ *  * By default no, use --acl & --attr options to force their usage */
+char *g_getfacl = NULL;
+char *g_getfattr = NULL;
+
+/* Reference to global bkpinfo */
+struct s_bkpinfo *bkpinfo;
+
+/****************** subroutines used only by main.c ******************/
+
+
+/**
+ * Print a "don't panic" message to the log and a message about the logfile to the screen.
+ */
+void welcome_to_mondoarchive(void)
+{
+    char *tmp = NULL;
+
+    log_msg(0, "Mondo Archive v%s --- http://www.mondorescue.org",
+            PACKAGE_VERSION);
+    log_msg(0, "running %s binaries", get_architecture());
+    tmp = get_uname_m();
+    log_msg(0, "running on %s architecture", tmp);
+    free(tmp);
+    log_msg(0,
+            "-----------------------------------------------------------");
+    log_msg(0,
+            "NB: Mondo logs almost everything, so don't panic if you see");
+    log_msg(0,
+            "some error messages.  Please read them carefully before you");
+    log_msg(0,
+            "decide to break out in a cold sweat.    Despite (or perhaps");
+    log_msg(0,
+            "because of) the wealth of messages. some users are inclined");
+    log_msg(0,
+            "to stop reading this log. If Mondo stopped for some reason,");
+    log_msg(0,
+            "chances are it's detailed here.  More than likely there's a");
+    log_msg(0,
+            "message at the very end of this log that will tell you what");
+    log_msg(0,
+            "is wrong. Please read it!                          -Devteam");
+    log_msg(0,
+            "-----------------------------------------------------------");
+
+    log_msg(0, "Zero...");
+    log_msg(1, "One...");
+    log_msg(2, "Two...");
+    log_msg(3, "Three...");
+    log_msg(4, "Four...");
+    log_msg(5, "Five...");
+    log_msg(6, "Six...");
+    log_msg(7, "Seven...");
+    log_msg(8, "Eight...");
+    printf("See %s for details of backup run.\n", MONDO_LOGFILE);
+}
+
+
+extern char *g_magicdev_command;
+
+/**
+ * Do whatever is necessary to insure a successful backup on the Linux distribution
+ * of the day.
+ */
+void distro_specific_kludges_at_start_of_mondoarchive(void)
+{
+    log_msg(2, "Unmounting old ramdisks if necessary");
+    stop_magicdev_if_necessary();   // for RH+Gnome users
+    run_program_and_log_output
+        ("umount `mount | grep shm | grep mondo | cut -d' ' -f3`", 2);
+    unmount_supermounts_if_necessary(); // for Mandrake users whose CD-ROMs are supermounted
+    //  stop_autofs_if_necessary(); // for Xandros users
+    mount_boot_if_necessary();  // for Gentoo users with non-mounted /boot partitions
+    clean_up_KDE_desktop_if_necessary();    // delete various misc ~/.* files that get in the way
+}
+
+
+
+/**
+ * Undo whatever was done by distro_specific_kludges_at_start_of_mondoarchive().
+ */
+void distro_specific_kludges_at_end_of_mondoarchive(void)
+{
+//  char tmp[500];
+    log_msg(2, "Restarting magicdev if necessary");
+    sync();
+    restart_magicdev_if_necessary();    // for RH+Gnome users
+
+    log_msg(2, "Restarting autofs if necessary");
+    sync();
+    //  restart_autofs_if_necessary(); // for Xandros users
+
+    log_msg(2, "Restarting supermounts if necessary");
+    sync();
+    remount_supermounts_if_necessary(); // for Mandrake users
+
+    log_msg(2, "Unmounting /boot if necessary");
+    sync();
+    unmount_boot_if_necessary();    // for Gentoo users
+
+//  log_msg( 2, "Cleaning up KDE desktop");
+//  clean_up_KDE_desktop_if_necessary();
+}
+
+
+/**
+ * Backup/verify the user's data.
+ * What did you think it did, anyway? :-)
+ */
+int main(int argc, char *argv[])
+{
+    char *tmp;
+    int res, retval;
+    char *say_at_end;
+
+/* Make sure I'm root; abort if not */
+    if (getuid() != 0) {
+        fprintf(stderr, "Please run as root.\r\n");
+        exit(127);
+    }
+
+/* If -V, -v or --version then echo version no. and quit */
+    if (argc == 2
+        && (!strcmp(argv[argc - 1], "-v") || !strcmp(argv[argc - 1], "-V")
+            || !strcmp(argv[argc - 1], "--version"))) {
+        printf("mondoarchive v%s\nSee man page for help\n", PACKAGE_VERSION);
+        exit(0);
+    }
+
+/* Initialize variables */
+
+    printf("Initializing...\n");
+    if (!(bkpinfo = malloc(sizeof(struct s_bkpinfo)))) {
+        fatal_error("Cannot malloc bkpinfo");
+    }
+    reset_bkpinfo();
+
+    res = 0;
+    retval = 0;
+    diffs = 0;
+    malloc_string(tmp);
+    malloc_string(say_at_end);
+    say_at_end[0] = '\0';
+    malloc_libmondo_global_strings();
+
+    /* initialize log file with time stamp */
+    unlink(MONDO_LOGFILE);
+    log_msg(0, "Time started: %s", mr_date());
+
+    /* make sure PATH environmental variable allows access to mkfs, fdisk, etc. */
+    strncpy(tmp, getenv("PATH"), MAX_STR_LEN - 1);
+    tmp[MAX_STR_LEN - 1] = '\0';
+    if (strlen(tmp) >= MAX_STR_LEN - 33) {
+        fatal_error
+            ("Your PATH environmental variable is too long. Please shorten it.");
+    }
+    strcat(tmp, ":/sbin:/usr/sbin:/usr/local/sbin");
+    setenv("PATH", tmp, 1);
+
+    /* Add the ARCH environment variable for ia64 purposes */
+    strncpy(tmp, get_architecture(), MAX_STR_LEN - 1);
+    tmp[MAX_STR_LEN - 1] = '\0';
+    setenv("ARCH", tmp, 1);
+
+    /* Add MONDO_SHARE environment variable for mindi */
+    setenv_mondo_share();
+
+    /* Configure the bkpinfo structure, global file paths, etc. */
+    g_main_pid = getpid();
+    log_msg(9, "This");
+
+    register_pid(g_main_pid, "mondo");
+    set_signals(TRUE);          // catch SIGTERM, etc.
+    run_program_and_log_output("dmesg -n1", TRUE);
+
+    log_msg(9, "Next");
+    make_hole_for_dir(MONDO_CACHE);
+
+    welcome_to_mondoarchive();
+    distro_specific_kludges_at_start_of_mondoarchive();
+    g_kernel_version = get_kernel_version();
+
+    if (argc == 4 && !strcmp(argv[1], "getfattr")) {
+        g_loglevel = 10;
+        g_text_mode = TRUE;
+        setup_newt_stuff();
+        if (!strstr(argv[2], "filelist")) {
+            printf("Sorry - filelist goes first\n");
+            finish(1);
+        } else {
+            finish(get_fattr_list(argv[2], argv[3]));
+        }
+        finish(0);
+    }
+    if (argc == 4 && !strcmp(argv[1], "setfattr")) {
+        g_loglevel = 10;
+//      chdir("/tmp");
+        g_text_mode = TRUE;
+        setup_newt_stuff();
+        finish(set_fattr_list(argv[2], argv[3]));
+    }
+
+    if (argc == 3 && !strcmp(argv[1], "wildcards")) {
+        g_loglevel = 10;
+        g_text_mode = TRUE;
+        setup_newt_stuff();
+        turn_wildcard_chars_into_literal_chars(tmp, argv[2]);
+        printf("in=%s; out=%s\n", argv[2], tmp);
+        finish(1);
+    }
+
+    if (argc == 4 && !strcmp(argv[1], "getfacl")) {
+        g_loglevel = 10;
+        g_text_mode = TRUE;
+        setup_newt_stuff();
+        if (!strstr(argv[2], "filelist")) {
+            printf("Sorry - filelist goes first\n");
+            finish(1);
+        } else {
+            finish(get_acl_list(argv[2], argv[3]));
+        }
+        finish(0);
+    }
+    if (argc == 4 && !strcmp(argv[1], "setfacl")) {
+        g_loglevel = 10;
+//      chdir("/tmp");
+        g_text_mode = TRUE;
+        setup_newt_stuff();
+        finish(set_acl_list(argv[2], argv[3]));
+    }
+
+    if (argc > 2 && !strcmp(argv[1], "find-cd")) {
+        g_loglevel = 10;
+        g_text_mode = TRUE;
+        setup_newt_stuff();
+        if (find_cdrw_device(tmp)) {
+            printf("Failed to find CDR-RW drive\n");
+        } else {
+            printf("CD-RW is at %s\n", tmp);
+        }
+        tmp[0] = '\0';
+        if (find_cdrom_device(tmp, atoi(argv[2]))) {
+            printf("Failed to find CD-ROM drive\n");
+        } else {
+            printf("CD-ROM is at %s\n", tmp);
+        }
+        finish(0);
+    }
+
+    if (argc > 2 && !strcmp(argv[1], "find-dvd")) {
+        g_loglevel = 10;
+        g_text_mode = TRUE;
+        setup_newt_stuff();
+        if (find_dvd_device(tmp, atoi(argv[2]))) {
+            printf("Failed to find DVD drive\n");
+        } else {
+            printf("DVD is at %s\n", tmp);
+        }
+        finish(0);
+    }
+
+    if (argc > 2 && !strcmp(argv[1], "disksize")) {
+        printf("%s --> %ld\n", argv[2], get_phys_size_of_drive(argv[2]));
+        finish(0);
+    }
+    if (argc > 2 && !strcmp(argv[1], "test-dev")) {
+        if (is_dev_an_NTFS_dev(argv[2])) {
+            printf("%s is indeed an NTFS dev\n", argv[2]);
+        } else {
+            printf("%s is _not_ an NTFS dev\n", argv[2]);
+        }
+        finish(0);
+    }
+
+    if (pre_param_configuration()) {
+        fatal_error
+            ("Pre-param initialization phase failed. Please review the error messages above, make the specified changes, then try again. Exiting...");
+    }
+
+/* Process command line, if there is one. If not, ask user for info. */
+    if (argc == 1) {
+        g_text_mode = FALSE;
+        setup_newt_stuff();
+        res = interactively_obtain_media_parameters_from_user(TRUE);    /* yes, archiving */
+        if (res) {
+            fatal_error
+                ("Syntax error. Please review the parameters you have supplied and try again.");
+        }
+    } else {
+        res = handle_incoming_parameters(argc, argv);
+        if (res) {
+            printf
+                ("Errors were detected in the command line you supplied.\n");
+            printf("Please review the log file - %s\n", MONDO_LOGFILE );
+            log_msg(1, "Mondoarchive will now exit.");
+            finish(1);
+        }
+        setup_newt_stuff();
+    }
+
+/* Finish configuring global structures */
+    if (post_param_configuration()) {
+        fatal_error
+            ("Post-param initialization phase failed. Perhaps bad parameters were supplied to mondoarchive? Please review the documentation, error messages and logs. Exiting...");
+    }
+
+    log_to_screen
+        ("BusyBox's sources are available from http://www.busybox.net");
+
+    /* If we're meant to backup then backup */
+    if (bkpinfo->backup_data) {
+        res = backup_data();
+        retval += res;
+        if (res) {
+            strcat(say_at_end,
+                   "Data archived. Please check the logs, just as a precaution. ");
+        } else {
+            strcat(say_at_end, "Data archived OK. ");
+        }
+    }
+
+/* If we're meant to verify then verify */
+    if (bkpinfo->verify_data) {
+        res = verify_data();
+        if (res < 0) {
+            sprintf(tmp, "%d difference%c found.", -res,
+                    (-res != 1) ? 's' : ' ');
+            strcat(say_at_end, tmp);
+            log_to_screen(tmp);
+            res = 0;
+        }
+        retval += res;
+    }
+
+/* Report result of entire operation (success? errors?) */
+    if (!retval) {
+        mvaddstr_and_log_it(g_currentY++, 0,
+                            "Backup and/or verify ran to completion. Everything appears to be fine.");
+    } else {
+        mvaddstr_and_log_it(g_currentY++, 0,
+                            "Backup and/or verify ran to completion. However, errors did occur.");
+    }
+
+    if (does_file_exist(MINDI_CACHE"/mondorescue.iso")) {
+        log_to_screen
+            (MINDI_CACHE"/mondorescue.iso, a boot/utility CD, is available if you want it.");
+    }
+
+    if (length_of_file(MONDO_CACHE"/changed.files") > 2) {
+        if (g_text_mode) {
+            log_to_screen("Type 'less "MONDO_CACHE"/changed.files' to see which files don't match the archives");
+        } else {
+            log_msg(1, "Type 'less "MONDO_CACHE"/changed.files' to see which files don't match the archives");
+            log_msg(2, "Calling popup_changelist_from_file()");
+            popup_changelist_from_file(MONDO_CACHE"/changed.files");
+            log_msg(2, "Returned from popup_changelist_from_file()");
+        }
+    } else {
+        unlink(MONDO_CACHE"/changed.files");
+    }
+    log_to_screen(say_at_end);
+    sprintf(tmp, "umount %s/tmpfs", bkpinfo->tmpdir);
+    run_program_and_log_output(tmp, TRUE);
+    if (bkpinfo->backup_media_type == usb) {
+        log_msg(1, "Unmounting USB device.");
+        sprintf(tmp, "umount %s1", bkpinfo->media_device);
+        run_program_and_log_output(tmp, TRUE);
+    }
+
+    run_program_and_log_output("mount", 2);
+
+    system("rm -f "MONDO_CACHE"/last-backup.aborted");
+    if (!retval) {
+        printf("Mondoarchive ran OK.\n");
+    } else {
+        printf("Errors occurred during backup. Please check logfile.\n");
+    }
+    distro_specific_kludges_at_end_of_mondoarchive();
+    register_pid(0, "mondo");
+    set_signals(FALSE);
+
+    free_libmondo_global_strings();
+    paranoid_free(say_at_end);
+    
+
+    if (!g_cdrom_drive_is_here) {
+        log_msg(10, "FYI, g_cdrom_drive_is_here was never used");
+    }
+    if (!g_dvd_drive_is_here) {
+        log_msg(10, "FYI, g_dvd_drive_is_here was never used");
+    }
+
+    /* finalize log file with time stamp */
+    log_msg(0, "Time finished: %s", mr_date());
+
+    chdir("/tmp");
+
+    if (!g_text_mode) {
+        popup_and_OK
+            ("Mondo Archive has finished its run. Please press ENTER to return to the shell prompt.");
+        log_to_screen("See %s for details of backup run.", MONDO_LOGFILE);
+    } else {
+        printf("See %s for details of backup run.\n", MONDO_LOGFILE);
+    }
+    finish(retval);
+
+    return EXIT_SUCCESS;
+}

branches/stable/mondo/src/mondorestore/Makefile.am

@@ -4 +4 @@
 ## Process with Automake to generate Makefile.in
 ##
+AM_CPPFLAGS = -DMONDO_CONF_DIR=\"$(sysconfdir)/mondo\" -I${top_builddir}/src/include -I${top_builddir}/src/common
+
 AM_CPPFLAGS = -DMONDO_CONF_DIR=\"$(sysconfdir)/mondo\" -I${top_builddir}/src/include -I${top_builddir}/src/common
 

branches/stable/mondo/src/mondorestore/mondo-restore-EXT.h

@@ -5 +5 @@
 #endif
 
-extern bool g_sigpipe_caught;
 extern bool g_ISO_restore_mode; /* are we in Iso Mode? */
 extern bool g_I_have_just_nuked;

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

@@ -21 +21 @@
 extern char *bkptype_to_string(t_bkptype bt);
 
-extern bool g_sigpipe_caught;
 extern bool g_ISO_restore_mode; /* are we in Iso Mode? */
 extern bool g_I_have_just_nuked;
@@ -414 +413 @@
     }
     mr_msg(1, "Mounting device %s   ", device);
-    if (writeable) {
-        mr_asprintf(&additional_parameters, "-o rw");
-    } else {
-        mr_asprintf(&additional_parameters, "-o ro");
-    }
-    if (find_home_of_exe("setfattr")) {
-        mr_strcat(additional_parameters, ",user_xattr");
-    }
-    if (find_home_of_exe("setfacl")) {
-        mr_strcat(additional_parameters, ",acl");
+    /* Deal with additional params only if not /proc or /sys */
+    if (strcmp(format, "proc") && strcmp(format, "sys")) {
+        if (writeable) {
+            mr_asprintf(&additional_parameters, "-o rw");
+        } else {
+            mr_asprintf(&additional_parameters, "-o ro");
+        }
+        if (find_home_of_exe("setfattr")) {
+            mr_strcat(additional_parameters, ",user_xattr");
+        }
+        if (find_home_of_exe("setfacl")) {
+            mr_strcat(additional_parameters, ",acl");
+        }
     }
 
@@ -586 +588 @@
         mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     }
+    /* Also mounting under MNT_RESTORING  special FS */
+    (void)mount_device("/proc","/proc","proc",TRUE);
+    (void)mount_device("/sys","/sys","sysfs",TRUE);
     run_program_and_log_output("df -m", 3);
     mr_free(mountlist);

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

@@ -3275 +3275 @@
  *END_MONDO-RESTORE.C                                                     *
  **************************************************************************/
+=======
+/***************************************************************************
+$Id$
+restores mondoarchive data
+***************************************************************************/
+
+/**
+ * @file
+ * The main file for mondorestore.
+ */
+
+/**************************************************************************
+ * #include statements                                                    *
+ **************************************************************************/
+#include <pthread.h>
+#include "my-stuff.h"
+#include "../common/mondostructures.h"
+#include "../common/libmondo.h"
+#include "mr-externs.h"
+#include "mondo-restore.h"
+#include "mondorestore.h"
+#include "mondo-rstr-compare-EXT.h"
+#include "mondo-rstr-tools-EXT.h"
+
+extern void twenty_seconds_til_yikes(void);
+
+/* Reference to global bkpinfo */
+struct s_bkpinfo *bkpinfo;
+
+
+/* For use in other programs (ex. XMondo) */
+#ifdef MONDORESTORE_MODULE
+#define main __mondorestore_main
+#define g_ISO_restore_mode __mondorestore_g_ISO_restore_mode
+#endif
+
+//static char cvsid[] = "$Id$";
+
+/**************************************************************************
+ * Globals                                                                *
+ **************************************************************************/
+extern char *g_tmpfs_mountpt;   // declared in libmondo-tools.c
+extern bool g_text_mode;
+extern FILE *g_fprep;
+extern double g_kernel_version;
+extern int g_partition_table_locked_up;
+extern int g_noof_rows;
+
+extern int partition_everything(struct mountlist_itself *mountlist);
+
+
+/**
+ * @name Restore-Time Globals
+ * @ingroup globalGroup
+ * @{
+ */
+
+/**
+ * If TRUE, then we're restoring from ISOs or an NFS server.
+ * If FALSE, then we're restoring from some kind of real media (tape, CD, etc.)
+ */
+bool g_ISO_restore_mode = FALSE;    /* are we in Iso Mode? */
+
+/**
+ * If TRUE, then we have had a successful "nuke" restore.
+ */
+bool g_I_have_just_nuked = FALSE;
+
+/**
+ * The device to mount to get at the ISO images. Ignored unless @p g_ISO_restore_mode.
+ */
+char *g_isodir_device;
+
+/**
+ * The format of @p g_isodir_device. Ignored unless @p g_ISO_restore_mode.
+ */
+char *g_isodir_format;
+
+/**
+ * The location of 'biggielist.txt', containing the biggiefiles on the current archive set.
+ */
+char *g_biggielist_txt;
+
+/**
+ * The location of 'filelist.full', containing all files (<em>including biggiefiles</em>) on
+ * the current archive set.
+ */
+char *g_filelist_full;
+
+/**
+ * The location of a file containing a list of the devices that were archived
+ * as images, not as individual files.
+ */
+char *g_filelist_imagedevs;
+
+/**
+ * The location of a file containing a list of imagedevs to actually restore.
+ * @see g_filelist_imagedevs
+ */
+char *g_imagedevs_restthese;
+
+/**
+ * The location of 'mondo-restore.cfg', containing the metadata
+ * information for this backup.
+ */
+char *g_mondo_cfg_file;
+
+/**
+ * The location of 'mountlist.txt', containing the information on the
+ * user's partitions and hard drives.
+ */
+char *g_mountlist_fname;
+
+/**
+ * Mondo's home directory during backup. Unused in mondorestore; included
+ * to avoid link errors.
+ */
+char *g_mondo_home;
+
+extern char *g_getfacl;
+extern char *g_getfattr;
+
+/* @} - end of "Restore-Time Globals" in globalGroup */
+
+
+
+extern int copy_from_src_to_dest(FILE * f_orig, FILE * f_archived,
+                                 char direction);
+
+
+
+/**************************************************************************
+ * COMPAQ PROLIANT Stuff:  needs some special help                        *
+**************************************************************************/
+
+/**
+ * The message to display if we detect that the user is using a Compaq Proliant.
+ */
+#define COMPAQ_PROLIANTS_SUCK "Partition and format your disk using Compaq's disaster recovery CD. After you've done that, please reboot with your Mondo media in Interactive Mode."
+
+
+
+
+/**
+ * Allow the user to modify the mountlist before we partition & format their drives.
+ * @param bkpinfo The backup information structure. @c disaster_recovery is the only field used.
+ * @param mountlist The mountlist to let the user modify.
+ * @param raidlist The raidlist that goes with @p mountlist.
+ * @return 0 for success, nonzero for failure.
+ * @ingroup restoreGuiGroup
+ */
+int let_user_edit_the_mountlist(struct mountlist_itself *mountlist,
+                                struct raidlist_itself *raidlist)
+{
+    int retval = 0, res = 0;
+
+    log_msg(2, "let_user_edit_the_mountlist() --- starting");
+
+    assert(bkpinfo != NULL);
+    assert(mountlist != NULL);
+    assert(raidlist != NULL);
+    if (!bkpinfo->disaster_recovery) {
+        strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
+        log_msg(2, "I guess you're testing edit_mountlist()");
+    }
+    if (!does_file_exist(g_mountlist_fname)) {
+        log_to_screen(g_mountlist_fname);
+        log_to_screen("does not exist");
+        return (1);
+    }
+
+    retval = load_mountlist(mountlist, g_mountlist_fname);
+    load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
+    if (retval) {
+        log_to_screen
+            ("Warning - load_raidtab_into_raidlist returned an error");
+    }
+    res = edit_mountlist(g_mountlist_fname, mountlist, raidlist);
+    if (res) {
+        return (1);
+    }
+
+    save_mountlist_to_disk(mountlist, g_mountlist_fname);
+    save_raidlist_to_raidtab(raidlist, RAIDTAB_FNAME);
+
+    log_to_screen("I have finished editing the mountlist for you.");
+
+    return (retval);
+}
+
+
+
+
+
+/**
+ * Determine whether @p mountlist contains a Compaq diagnostic partition.
+ * @param mountlist The mountlist to examine.
+ * @return TRUE if there's a Compaq diagnostic partition; FALSE if not.
+ * @ingroup restoreUtilityGroup
+ */
+bool
+partition_table_contains_Compaq_diagnostic_partition(struct
+                                                     mountlist_itself *
+                                                     mountlist)
+{
+    int i;
+
+    assert(mountlist != NULL);
+
+    for (i = 0; i < mountlist->entries; i++) {
+        if (strstr(mountlist->el[i].format, "ompaq")) {
+            log_msg(2, "mountlist[%d] (%s) is %s (Compaq alert!)",
+                    i, mountlist->el[i].device, mountlist->el[i].format);
+
+            return (TRUE);
+        }
+    }
+    return (FALSE);
+}
+
+/**************************************************************************
+ *END_PARTITION_TABLE_CONTAINS_COMPAQ_DIAGNOSTIC_PARTITION                *
+ **************************************************************************/
+
+
+/**
+ * Allow the user to abort the backup if we find that there is a Compaq diagnostic partition.
+ * @note This function does not actually check for the presence of a Compaq partition.
+ * @ingroup restoreUtilityGroup
+ */
+void offer_to_abort_because_Compaq_Proliants_suck(void)
+{
+    popup_and_OK(COMPAQ_PROLIANTS_SUCK);
+    if (ask_me_yes_or_no
+        ("Would you like to reboot and use your Compaq CD to prep your hard drive?"))
+    {
+        fatal_error
+            ("Aborting. Please reboot and prep your hard drive with your Compaq CD.");
+    }
+}
+
+/**************************************************************************
+ *END_OFFER_TO_ABORT_BECAUSE_COMPAQ_PROLIANTS_SUCK                        *
+ **************************************************************************/
+
+
+
+/**
+ * Call interactive_mode(), nuke_mode(), or compare_mode() depending on the user's choice.
+ * @param bkpinfo The backup information structure. Most fields are used.
+ * @param mountlist The mountlist containing information about the user's partitions.
+ * @param raidlist The raidlist to go with @p mountlist.
+ * @return The return code from the mode function called.
+ * @ingroup restoreGroup
+ */
+int
+catchall_mode(struct mountlist_itself *mountlist,
+              struct raidlist_itself *raidlist)
+{
+    char c, *tmp;
+    int retval = 0;
+
+    iamhere("inside catchall");
+    assert(bkpinfo != NULL);
+    assert(mountlist != NULL);
+    assert(raidlist != NULL);
+    malloc_string(tmp);
+    iamhere("pre wrm");
+    c = which_restore_mode();
+    iamhere("post wrm");
+    if (c == 'I' || c == 'N' || c == 'C') {
+        interactively_obtain_media_parameters_from_user(FALSE);
+    } else {
+        popup_and_OK("No restoring or comparing will take place today.");
+        if (is_this_device_mounted("/mnt/cdrom")) {
+            run_program_and_log_output("umount /mnt/cdrom", FALSE);
+        }
+        if (g_ISO_restore_mode) {
+            sprintf(tmp, "umount %s", bkpinfo->isodir);
+            run_program_and_log_output(tmp, FALSE);
+        }
+        paranoid_MR_finish(0);
+    }
+
+    iamhere("post int");
+
+    if (bkpinfo->backup_media_type == iso) {
+        if (iso_fiddly_bits((c == 'N') ? TRUE : FALSE)) {
+            log_msg(2,
+                    "catchall_mode --- iso_fiddly_bits returned w/ error");
+            return (1);
+        } else {
+            log_msg(2, "catchall_mode --- iso_fiddly_bits ok");
+        }
+    }
+
+    if (c == 'I') {
+        log_msg(2, "IM selected");
+        retval += interactive_mode(mountlist, raidlist);
+    } else if (c == 'N') {
+        log_msg(2, "NM selected");
+        retval += nuke_mode(mountlist, raidlist);
+    } else if (c == 'C') {
+        log_msg(2, "CM selected");
+        retval += compare_mode(mountlist, raidlist);
+    }
+    paranoid_free(tmp);
+    return (retval);
+}
+
+/**************************************************************************
+ *END_CATCHALL_MODE                                                      *
+ **************************************************************************/
+
+/**************************************************************************
+ *END_  EXTRACT_CONFIG_FILE_FROM_RAMDISK                                  *
+ **************************************************************************/
+
+
+/**
+ * Locate an executable in the directory structure rooted at @p restg.
+ * @param out_path Where to put the executable.
+ * @param fname The basename of the executable.
+ * @param restg The directory structure to look in.
+ * @note If it could not be found in @p restg then @p fname is put in @p out_path.
+ * @ingroup restoreUtilityGroup
+ */
+void
+find_pathname_of_executable_preferably_in_RESTORING(char *out_path,
+                                                    char *fname,
+                                                    char *restg)
+{
+    assert(out_path != NULL);
+    assert_string_is_neither_NULL_nor_zerolength(fname);
+
+    sprintf(out_path, "%s/sbin/%s", restg, fname);
+    if (does_file_exist(out_path)) {
+        sprintf(out_path, "%s/usr/sbin/%s", restg, fname);
+        if (does_file_exist(out_path)) {
+            sprintf(out_path, "%s/bin/%s", restg, fname);
+            if (does_file_exist(out_path)) {
+                sprintf(out_path, "%s/usr/bin/%s", restg, fname);
+                if (does_file_exist(out_path)) {
+                    strcpy(out_path, fname);
+                }
+            }
+        }
+    }
+}
+
+/**************************************************************************
+ *END_FIND_PATHNAME_OF_EXECUTABLE_PREFERABLY_IN_RESTORING                 *
+ **************************************************************************/
+
+static void clean_blkid() {
+
+    char *tmp1 = NULL;
+
+    /* Clean up blkid cache file if they exist */
+    asprintf(&tmp1,"%s/etc/blkid.tab",bkpinfo->restore_path);
+    (void)unlink(tmp1);
+    paranoid_free(tmp1);
+    asprintf(&tmp1,"%s/etc/blkid.tab.old",bkpinfo->restore_path);
+    (void)unlink(tmp1);
+    paranoid_free(tmp1);
+}
+
+
+
+
+/**
+ * @addtogroup restoreGroup
+ * @{
+ */
+/**
+ * Restore the user's data, in a disaster recovery situation, prompting the
+ * user about whether or not to do every step.
+ * The user can edit the mountlist, choose files to restore, etc.
+ * @param bkpinfo The backup information structure. Most fields are used.
+ * @param mountlist The mountlist containing information about the user's partitions.
+ * @param raidlist The raidlist to go with @p mountlist.
+ * @return 0 for success, or the number of errors encountered.
+ */
+int
+interactive_mode(struct mountlist_itself *mountlist,
+                 struct raidlist_itself *raidlist)
+{
+    int retval = 0;
+    int res;
+    int ptn_errs = 0;
+    int fmt_errs = 0;
+
+    bool done;
+    bool restore_all;
+
+  /** needs malloc **********/
+    char *tmp;
+    char *fstab_fname;
+    char *old_restpath;
+
+    struct s_node *filelist;
+
+    /* try to partition and format */
+
+    log_msg(2, "interactive_mode --- starting (great, assertions OK)");
+
+    malloc_string(tmp);
+    malloc_string(fstab_fname);
+    malloc_string(old_restpath);
+    assert(bkpinfo != NULL);
+    assert(mountlist != NULL);
+    assert(raidlist != NULL);
+
+    log_msg(2, "interactive_mode --- assertions OK");
+
+    if (g_text_mode) {
+        if (!ask_me_yes_or_no
+            ("Interactive Mode + textonly = experimental! Proceed anyway?"))
+        {
+            fatal_error("Wise move.");
+        }
+    }
+
+    iamhere("About to load config file");
+    get_cfg_file_from_archive_or_bust();
+    read_cfg_file_into_bkpinfo(g_mondo_cfg_file);
+    iamhere("Done loading config file; resizing ML");
+    if (bkpinfo->backup_media_type == nfs) {
+        strcpy(tmp, bkpinfo->prefix);
+        if (popup_and_get_string
+            ("Prefix", "Prefix of your ISO images ?", tmp, MAX_STR_LEN / 4)) {
+            strcpy(bkpinfo->prefix, tmp);
+            log_msg(1, "Prefix set to %s",bkpinfo->prefix);
+        }
+    }
+    
+#ifdef __FreeBSD__
+    if (strstr
+        (call_program_and_get_last_line_of_output("cat /tmp/cmdline"),
+         "noresize"))
+#else
+    if (strstr
+        (call_program_and_get_last_line_of_output("cat /proc/cmdline"),
+         "noresize"))
+#endif
+    {
+        log_msg(1, "Not resizing mountlist.");
+    } else {
+        resize_mountlist_proportionately_to_suit_new_drives(mountlist);
+    }
+    for (done = FALSE; !done;) {
+        iamhere("About to edit mountlist");
+        if (g_text_mode) {
+            save_mountlist_to_disk(mountlist, g_mountlist_fname);
+            sprintf(tmp, "%s %s", find_my_editor(), g_mountlist_fname);
+            res = system(tmp);
+            load_mountlist(mountlist, g_mountlist_fname);
+        } else {
+            res = edit_mountlist(g_mountlist_fname, mountlist, raidlist);
+        }
+        iamhere("Finished editing mountlist");
+        if (res) {
+            paranoid_MR_finish(1);
+        }
+        log_msg(2, "Proceeding...");
+        save_mountlist_to_disk(mountlist, g_mountlist_fname);
+        save_raidlist_to_raidtab(raidlist, RAIDTAB_FNAME);
+        mvaddstr_and_log_it(1, 30, "Restoring Interactively");
+        if (bkpinfo->differential) {
+            log_to_screen("Because this is a differential backup, disk");
+            log_to_screen
+                (" partitioning and formatting will not take place.");
+            done = TRUE;
+        } else {
+            if (ask_me_yes_or_no
+                ("Do you want to erase and partition your hard drives?")) {
+                if (partition_table_contains_Compaq_diagnostic_partition
+                    (mountlist)) {
+                    offer_to_abort_because_Compaq_Proliants_suck();
+                    done = TRUE;
+                } else {
+                    twenty_seconds_til_yikes();
+                    g_fprep = fopen("/tmp/prep.sh", "w");
+                    ptn_errs = partition_everything(mountlist);
+                    if (ptn_errs) {
+                        log_to_screen
+                            ("Warning. Errors occurred during disk partitioning.");
+                    }
+
+                    fmt_errs = format_everything(mountlist, FALSE, raidlist);
+                    if (!fmt_errs) {
+                        log_to_screen
+                            ("Errors during disk partitioning were handled OK.");
+                        log_to_screen
+                            ("Partitions were formatted OK despite those errors.");
+                        ptn_errs = 0;
+                    }
+                    if (!ptn_errs && !fmt_errs) {
+                        done = TRUE;
+                    }
+                }
+                paranoid_fclose(g_fprep);
+            } else {
+                mvaddstr_and_log_it(g_currentY++, 0,
+                                    "User opted not to partition the devices");
+                if (ask_me_yes_or_no
+                    ("Do you want to format your hard drives?")) {
+                    fmt_errs = format_everything(mountlist, TRUE, raidlist);
+                    if (!fmt_errs) {
+                        done = TRUE;
+                    }
+                } else {
+                    ptn_errs = fmt_errs = 0;
+                    done = TRUE;
+                }
+            }
+            if (fmt_errs) {
+                mvaddstr_and_log_it(g_currentY++,
+                                    0,
+                                    "Errors occurred. Please repartition and format drives manually.");
+                done = FALSE;
+            }
+            if (ptn_errs & !fmt_errs) {
+                mvaddstr_and_log_it(g_currentY++,
+                                    0,
+                                    "Errors occurred during partitioning. Formatting, however, went OK.");
+                done = TRUE;
+            }
+            if (!done) {
+                if (!ask_me_yes_or_no("Re-edit the mountlist?")) {
+                    retval++;
+                    goto end_of_func;
+                }
+            }
+        }
+    }
+
+    /* mount */
+    if (mount_all_devices(mountlist, TRUE)) {
+        unmount_all_devices(mountlist);
+        retval++;
+        goto end_of_func;
+    }
+    /* restore */
+    if ((restore_all =
+         ask_me_yes_or_no("Do you want me to restore all of your data?")))
+    {
+        log_msg(1, "Restoring all data");
+        retval += restore_everything(NULL);
+    } else
+        if ((restore_all =
+             ask_me_yes_or_no
+             ("Do you want me to restore _some_ of your data?"))) {
+        strcpy(old_restpath, bkpinfo->restore_path);
+        for (done = FALSE; !done;) {
+            unlink("/tmp/filelist.full");
+            filelist = process_filelist_and_biggielist();
+            /* Now you have /tmp/tmpfs/filelist.restore-these and /tmp/tmpfs/biggielist.restore-these;
+               the former is a list of regular files; the latter, biggiefiles and imagedevs.
+             */
+            if (filelist) {
+              gotos_suck:
+                strcpy(tmp, old_restpath);
+// (NB: %s is where your filesystem is mounted now, by default)", MNT_RESTORING);
+                if (popup_and_get_string
+                    ("Restore path", "Restore files to where?", tmp,
+                     MAX_STR_LEN / 4)) {
+                    if (!strcmp(tmp, "/")) {
+                        if (!ask_me_yes_or_no("Are you sure?")) {
+                            goto gotos_suck;
+                        }
+                        tmp[0] = '\0';  // so we restore to [blank]/file/name :)
+                    }
+                    strcpy(bkpinfo->restore_path, tmp);
+                    log_msg(1, "Restoring subset");
+                    retval += restore_everything(filelist);
+                    free_filelist(filelist);
+                } else {
+                    strcpy(bkpinfo->restore_path, old_restpath);
+                    free_filelist(filelist);
+                }
+                if (!ask_me_yes_or_no
+                    ("Restore another subset of your backup?")) {
+                    done = TRUE;
+                }
+            } else {
+                done = TRUE;
+            }
+        }
+        strcpy(old_restpath, bkpinfo->restore_path);
+    } else {
+        mvaddstr_and_log_it(g_currentY++,
+                            0,
+                            "User opted not to restore any data.                                  ");
+    }
+    if (retval) {
+        mvaddstr_and_log_it(g_currentY++,
+                            0,
+                            "Errors occurred during the restore phase.            ");
+    }
+
+    if (ask_me_yes_or_no("Initialize the boot loader?")) {
+        run_boot_loader(TRUE);
+    } else {
+        mvaddstr_and_log_it(g_currentY++,
+                            0,
+                            "User opted not to initialize the boot loader.");
+    }
+
+    clean_blkid();
+    protect_against_braindead_sysadmins();
+    retval += unmount_all_devices(mountlist);
+    /*  if (restore_some || restore_all || */
+    if (ask_me_yes_or_no
+        ("Label/Identify your ext2 and ext3 partitions if necessary?")) {
+        mvaddstr_and_log_it(g_currentY, 0,
+                            "Using tune2fs to identify your ext2,3 partitions");
+        if (does_file_exist("/tmp/fstab.new")) {
+            strcpy(fstab_fname, "/tmp/fstab.new");
+        } else {
+            strcpy(fstab_fname, "/tmp/fstab");
+        }
+        sprintf(tmp,
+                "label-partitions-as-necessary %s < %s >> %s 2>> %s",
+                g_mountlist_fname, fstab_fname, MONDO_LOGFILE,
+                MONDO_LOGFILE);
+        res = system(tmp);
+        if (res) {
+            log_to_screen
+                ("label-partitions-as-necessary returned an error");
+            mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
+        } else {
+            mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+        }
+        retval += res;
+    }
+
+    iamhere("About to leave interactive_mode()");
+    if (retval) {
+        mvaddstr_and_log_it(g_currentY++,
+                            0,
+                            "Warning - errors occurred during the restore phase.");
+    }
+  end_of_func:
+    paranoid_free(tmp);
+    paranoid_free(fstab_fname);
+    paranoid_free(old_restpath);
+    iamhere("Leaving interactive_mode()");
+    return (retval);
+}
+
+/**************************************************************************
+ *END_INTERACTIVE_MODE                                                    *
+ **************************************************************************/
+
+
+
+/**
+ * Run an arbitrary restore mode (prompt the user), but from ISO images
+ * instead of real media.
+ * @param mountlist The mountlist containing information about the user's partitions.
+ * @param raidlist The raidlist that goes with @p mountlist.
+ * @param nuke_me_please If TRUE, we plan to run Nuke Mode.
+ * @return 0 for success, or the number of errors encountered.
+ */
+int
+iso_mode(struct mountlist_itself *mountlist,
+         struct raidlist_itself *raidlist, bool nuke_me_please)
+{
+    char c;
+    int retval = 0;
+
+    assert(mountlist != NULL);
+    assert(raidlist != NULL);
+    if (iso_fiddly_bits(nuke_me_please)) {
+        log_msg(1, "iso_mode --- returning w/ error");
+        return (1);
+    } else {
+        c = which_restore_mode();
+        if (c == 'I' || c == 'N' || c == 'C') {
+            interactively_obtain_media_parameters_from_user(FALSE);
+        }
+        if (c == 'I') {
+            retval += interactive_mode(mountlist, raidlist);
+        } else if (c == 'N') {
+            retval += nuke_mode(mountlist, raidlist);
+        } else if (c == 'C') {
+            retval += compare_mode(mountlist, raidlist);
+        } else {
+            log_to_screen("OK, I shan't restore/compare any files.");
+        }
+    }
+    if (is_this_device_mounted(MNT_CDROM)) {
+        paranoid_system("umount " MNT_CDROM);
+    }
+//  if (! already_mounted)
+//    {
+    if (system("umount /tmp/isodir 2> /dev/null")) {
+        log_to_screen
+            ("WARNING - unable to unmount device where the ISO files are stored.");
+    }
+//    }
+    return (retval);
+}
+
+/**************************************************************************
+ *END_ISO_MODE                                                            *
+ **************************************************************************/
+
+
+/*            MONDO - saving your a$$ since Feb 18th, 2000            */
+
+
+
+
+/**
+ * Restore the user's data automatically (no prompts), after a twenty-second
+ * warning period.
+ * @param bkpinfo The backup information structure. Most fields are used.
+ * @param mountlist The mountlist containing information about the user's partitions.
+ * @param raidlist The raidlist that goes with @p mountlist.
+ * @return 0 for success, or the number of errors encountered.
+ * @warning <b><i>THIS WILL ERASE ALL EXISTING DATA!</i></b>
+ */
+int
+nuke_mode(struct mountlist_itself *mountlist,
+          struct raidlist_itself *raidlist)
+{
+    int retval = 0;
+    int res = 0;
+    bool boot_loader_installed = FALSE;
+  /** malloc **/
+    char tmp[MAX_STR_LEN], tmpA[MAX_STR_LEN], tmpB[MAX_STR_LEN],
+        tmpC[MAX_STR_LEN];
+
+    assert(bkpinfo != NULL);
+    assert(mountlist != NULL);
+    assert(raidlist != NULL);
+
+    log_msg(2, "nuke_mode --- starting");
+
+    get_cfg_file_from_archive_or_bust();
+    load_mountlist(mountlist, g_mountlist_fname);   // in case read_cfg_file_into_bkpinfo updated the mountlist
+#ifdef __FreeBSD__
+    if (strstr
+        (call_program_and_get_last_line_of_output("cat /tmp/cmdline"),
+         "noresize"))
+#else
+    if (strstr
+        (call_program_and_get_last_line_of_output("cat /proc/cmdline"),
+         "noresize"))
+#endif
+    {
+        log_msg(2, "Not resizing mountlist.");
+    } else {
+        resize_mountlist_proportionately_to_suit_new_drives(mountlist);
+    }
+    if (!evaluate_mountlist(mountlist, tmpA, tmpB, tmpC)) {
+        sprintf(tmp,
+                "Mountlist analyzed. Result: \"%s %s %s\" Switch to Interactive Mode?",
+                tmpA, tmpB, tmpC);
+        if (ask_me_yes_or_no(tmp)) {
+            retval = interactive_mode(mountlist, raidlist);
+            goto after_the_nuke;
+        } else {
+            fatal_error("Nuke Mode aborted. ");
+        }
+    }
+    save_mountlist_to_disk(mountlist, g_mountlist_fname);
+    mvaddstr_and_log_it(1, 30, "Restoring Automatically");
+    if (bkpinfo->differential) {
+        log_to_screen("Because this is a differential backup, disk");
+        log_to_screen("partitioning and formatting will not take place.");
+        res = 0;
+    } else {
+        if (partition_table_contains_Compaq_diagnostic_partition
+            (mountlist)) {
+            offer_to_abort_because_Compaq_Proliants_suck();
+        } else {
+            twenty_seconds_til_yikes();
+            g_fprep = fopen("/tmp/prep.sh", "w");
+#ifdef __FreeBSD__
+            if (strstr
+                (call_program_and_get_last_line_of_output
+                 ("cat /tmp/cmdline"), "nopart"))
+#else
+            if (strstr
+                (call_program_and_get_last_line_of_output
+                 ("cat /proc/cmdline"), "nopart"))
+#endif
+            {
+                log_msg(2,
+                        "Not partitioning drives due to 'nopart' option.");
+                res = 0;
+            } else {
+                res = partition_everything(mountlist);
+                if (res) {
+                    log_to_screen
+                        ("Warning. Errors occurred during partitioning.");
+                    res = 0;
+                }
+            }
+            retval += res;
+            if (!res) {
+                log_to_screen("Preparing to format your disk(s)");
+                sleep(1);
+                system("sync");
+                log_to_screen("Please wait. This may take a few minutes.");
+                res += format_everything(mountlist, FALSE, raidlist);
+            }
+            paranoid_fclose(g_fprep);
+        }
+    }
+    retval += res;
+    if (res) {
+        mvaddstr_and_log_it(g_currentY++,
+                            0,
+                            "Failed to partition and/or format your hard drives.");
+
+        if (ask_me_yes_or_no("Try in interactive mode instead?")) {
+            retval = interactive_mode(mountlist, raidlist);
+            goto after_the_nuke;
+        } else
+            if (!ask_me_yes_or_no
+                ("Would you like to try to proceed anyway?")) {
+            return (retval);
+        }
+    }
+    retval = mount_all_devices(mountlist, TRUE);
+    if (retval) {
+        unmount_all_devices(mountlist);
+        log_to_screen
+            ("Unable to mount all partitions. Sorry, I cannot proceed.");
+        return (retval);
+    }
+    iamhere("Restoring everything");
+    retval += restore_everything(NULL);
+    if (!run_boot_loader(FALSE)) {
+        log_msg(1,
+                "Great! Boot loader was installed. No need for msg at end.");
+        boot_loader_installed = TRUE;
+    }
+    clean_blkid();
+    protect_against_braindead_sysadmins();
+    retval += unmount_all_devices(mountlist);
+    mvaddstr_and_log_it(g_currentY,
+                        0,
+                        "Using tune2fs to identify your ext2,3 partitions");
+
+    sprintf(tmp, "label-partitions-as-necessary %s < /tmp/fstab",
+            g_mountlist_fname);
+    res = run_program_and_log_output(tmp, TRUE);
+    if (res) {
+        log_to_screen("label-partitions-as-necessary returned an error");
+        mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
+    } else {
+        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+    }
+    retval += res;
+
+  after_the_nuke:
+    if (retval) {
+        log_to_screen("Errors occurred during the nuke phase.");
+    } else if (strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "RESTORE")) {
+        log_to_screen
+            ("PC was restored successfully. Thank you for using Mondo Rescue.");
+        log_to_screen
+            ("Please visit our website at http://www.mondorescue.org for more information.");
+    } else {
+        strcpy(tmp,"Mondo has restored your system.\n\nPlease wait for the command prompt. Then remove the backup media and reboot.\n\nPlease visit our website at http://www.mondorescue.org for more information.");
+            popup_and_OK(tmp);
+        log_to_screen
+          ("Mondo has restored your system. Please wait for the command prompt.");
+        log_to_screen
+            ("Then remove the backup media and reboot.");
+        log_to_screen
+            ("Please visit our website at http://www.mondorescue.org for more information.");
+    }
+    g_I_have_just_nuked = TRUE;
+/*
+  if (!boot_loader_installed && !does_file_exist(DO_MBR_PLEASE))
+    {
+      log_to_screen("PLEASE RUN 'mondorestore --mbr' NOW TO INITIALIZE YOUR BOOT SECTOR");
+      write_one_liner_data_file(DO_MBR_PLEASE, "mondorestore --mbr");
+    }
+*/
+    return (retval);
+}
+
+/**************************************************************************
+ *END_NUKE_MODE                                                           *
+ **************************************************************************/
+
+
+
+/**
+ * Restore the user's data (or a subset of it) to the live filesystem.
+ * This should not be called if we're booted from CD!
+ * @param bkpinfo The backup information structure. Most fields are used.
+ * @return 0 for success, or the number of errors encountered.
+ */
+int restore_to_live_filesystem()
+{
+    int retval = 0;
+
+  /** malloc **/
+    char *old_restpath;
+
+    struct mountlist_itself *mountlist;
+//  static
+    struct raidlist_itself *raidlist;
+    struct s_node *filelist;
+
+    log_msg(1, "restore_to_live_filesystem() - starting");
+    assert(bkpinfo != NULL);
+    malloc_string(old_restpath);
+    mountlist = malloc(sizeof(struct mountlist_itself));
+    raidlist = malloc(sizeof(struct raidlist_itself));
+    if (!mountlist || !raidlist) {
+        fatal_error("Cannot malloc() mountlist and/or raidlist");
+    }
+
+    strcpy(bkpinfo->restore_path, "/");
+    if (!g_restoring_live_from_cd && !g_restoring_live_from_nfs) {
+        popup_and_OK
+            ("Please insert tape/CD/USB Key, then hit 'OK' to continue.");
+        sleep(1);
+    }
+    if (!g_restoring_live_from_nfs) {
+        interactively_obtain_media_parameters_from_user(FALSE);
+    }
+    log_msg(2, "bkpinfo->media_device = %s", bkpinfo->media_device);
+    if (!bkpinfo->media_device[0]) {
+        log_msg(2, "Warning - failed to find media dev");
+    }
+
+
+    log_msg(2, "bkpinfo->isodir = %s", bkpinfo->isodir);
+
+    open_evalcall_form("Thinking...");
+
+    get_cfg_file_from_archive_or_bust();
+    read_cfg_file_into_bkpinfo(g_mondo_cfg_file);
+    load_mountlist(mountlist, g_mountlist_fname);   // in case read_cfg_file_into_bkpinfo 
+
+    close_evalcall_form();
+    retval = load_mountlist(mountlist, g_mountlist_fname);
+    load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
+
+    if (!g_restoring_live_from_nfs && (filelist = process_filelist_and_biggielist())) {
+        save_filelist(filelist, "/tmp/selected-files.txt");
+        strcpy(old_restpath, bkpinfo->restore_path);
+        if (popup_and_get_string("Restore path",
+                                 "Restore files to where? )",
+                                 bkpinfo->restore_path, MAX_STR_LEN / 4)) {
+            iamhere("Restoring everything");
+            retval += restore_everything(filelist);
+            free_filelist(filelist);
+            strcpy(bkpinfo->restore_path, old_restpath);
+        } else {
+            free_filelist(filelist);
+        }
+        strcpy(bkpinfo->restore_path, old_restpath);
+    } else {
+        retval += restore_everything(NULL);
+    }
+    if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
+        log_msg(2,
+                "Tape : I don't need to unmount or eject the CD-ROM.");
+    } else {
+        run_program_and_log_output("umount " MNT_CDROM, FALSE);
+        if (!bkpinfo->please_dont_eject) {
+            eject_device(bkpinfo->media_device);
+        }
+    }
+    run_program_and_log_output("umount " MNT_CDROM, FALSE);
+    if (!bkpinfo->please_dont_eject) {
+        eject_device(bkpinfo->media_device);
+    }
+    paranoid_free(old_restpath);
+    free(mountlist);
+    free(raidlist);
+    return (retval);
+}
+
+/**************************************************************************
+ *END_RESTORE_TO_LIVE_FILESYSTEM                                          *
+ **************************************************************************/
+
+/* @} - end of restoreGroup */
+
+
+#include <utime.h>
+/**
+ * @addtogroup LLrestoreGroup
+ * @{
+ */
+/**
+ * Restore biggiefile @p bigfileno from the currently mounted CD.
+ * @param bkpinfo The backup information structure. Fields used:
+ * - @c bkpinfo->backup_media_type
+ * - @c bkpinfo->restore_path
+ * @param bigfileno The biggiefile number (starting from 0) to restore.
+ * @param filelist The node structure containing the list of files to restore.
+ * If the biggiefile is not in this list, it will be skipped (return value will
+ * still indicate success).
+ * @return 0 for success (or skip), nonzero for failure.
+ */
+int
+restore_a_biggiefile_from_CD(long bigfileno,
+                             struct s_node *filelist,
+                             char *pathname_of_last_file_restored)
+{
+    FILE *fin;
+    FILE *fout;
+    FILE *fbzip2;
+
+  /** malloc ***/
+    char *checksum, *outfile_fname, *tmp, *bzip2_command,
+        *ntfsprog_command, *suffix, *sz_devfile;
+    char *bigblk;
+    char *p;
+    int retval = 0;
+    int finished = FALSE;
+    long sliceno;
+    long siz;
+    char ntfsprog_fifo[MAX_STR_LEN];
+    char *file_to_openout = NULL;
+    struct s_filename_and_lstat_info biggiestruct;
+    struct utimbuf the_utime_buf, *ubuf;
+    bool use_ntfsprog_hack = FALSE;
+    pid_t pid;
+    int res = 0;
+    int old_loglevel;
+    char sz_msg[MAX_STR_LEN];
+    struct s_node *node;
+
+    old_loglevel = g_loglevel;
+    ubuf = &the_utime_buf;
+    assert(bkpinfo != NULL);
+
+    malloc_string(checksum);
+    malloc_string(outfile_fname);
+    malloc_string(tmp);
+    malloc_string(bzip2_command);
+    malloc_string(ntfsprog_command);
+    malloc_string(suffix);
+    malloc_string(sz_devfile);
+
+    pathname_of_last_file_restored[0] = '\0';
+    if (!(bigblk = malloc(TAPE_BLOCK_SIZE))) {
+        fatal_error("Cannot malloc bigblk");
+    }
+
+    if (!(fin = fopen(slice_fname(bigfileno, 0, ARCHIVES_PATH, ""), "r"))) {
+        log_to_screen("Cannot even open bigfile's info file");
+        return (1);
+    }
+
+    memset((void *) &biggiestruct, 0, sizeof(biggiestruct));
+    if (fread((void *) &biggiestruct, 1, sizeof(biggiestruct), fin) <
+        sizeof(biggiestruct)) {
+        log_msg(2, "Warning - unable to get biggiestruct of bigfile #%d",
+                bigfileno + 1);
+    }
+    paranoid_fclose(fin);
+
+    strcpy(checksum, biggiestruct.checksum);
+
+    if (!checksum[0]) {
+        sprintf(tmp, "Warning - bigfile %ld does not have a checksum",
+                bigfileno + 1);
+        log_msg(3, tmp);
+        p = checksum;
+    }
+
+    if (!strncmp(biggiestruct.filename, "/dev/", 5))    // Whether NTFS or not :)
+    {
+        strcpy(outfile_fname, biggiestruct.filename);
+    } else {
+        sprintf(outfile_fname, "%s/%s", bkpinfo->restore_path,
+                biggiestruct.filename);
+    }
+
+    /* skip file if we have a selective restore subset & it doesn't match */
+    if (filelist != NULL) {
+        node = find_string_at_node(filelist, biggiestruct.filename);
+        if (!node) {
+            log_msg(0, "Skipping %s (name isn't in filelist)",
+                    biggiestruct.filename);
+            pathname_of_last_file_restored[0] = '\0';
+            return (0);
+        } else if (!(node->selected)) {
+            log_msg(1, "Skipping %s (name isn't in biggielist subset)",
+                    biggiestruct.filename);
+            pathname_of_last_file_restored[0] = '\0';
+            return (0);
+        }
+    }
+    /* otherwise, continue */
+
+    log_msg(1, "DEFINITELY restoring %s", biggiestruct.filename);
+    if (biggiestruct.use_ntfsprog) {
+        if (strncmp(biggiestruct.filename, "/dev/", 5)) {
+            log_msg(1,
+                    "I was in error when I set biggiestruct.use_ntfsprog to TRUE.");
+            log_msg(1, "%s isn't even in /dev", biggiestruct.filename);
+            biggiestruct.use_ntfsprog = FALSE;
+        }
+    }
+
+    if (biggiestruct.use_ntfsprog)  // if it's an NTFS device
+//  if (!strncmp ( biggiestruct.filename, "/dev/", 5))
+    {
+        g_loglevel = 4;
+        use_ntfsprog_hack = TRUE;
+        log_msg(2,
+                "Calling ntfsclone in background because %s is an NTFS /dev entry",
+                outfile_fname);
+        sprintf(sz_devfile, "/tmp/%d.%d.000", (int) (random() % 32768),
+                (int) (random() % 32768));
+        mkfifo(sz_devfile, 0x770);
+        strcpy(ntfsprog_fifo, sz_devfile);
+        file_to_openout = ntfsprog_fifo;
+        switch (pid = fork()) {
+        case -1:
+            fatal_error("Fork failure");
+        case 0:
+            log_msg(3,
+                    "CHILD - fip - calling feed_outfrom_ntfsprog(%s, %s)",
+                    biggiestruct.filename, ntfsprog_fifo);
+            res =
+                feed_outfrom_ntfsprog(biggiestruct.filename,
+                                       ntfsprog_fifo);
+//          log_msg(3, "CHILD - fip - exiting");
+            exit(res);
+            break;
+        default:
+            log_msg(3,
+                    "feed_into_ntfsprog() called in background --- pid=%ld",
+                    (long int) (pid));
+        }
+    } else {
+        use_ntfsprog_hack = FALSE;
+        ntfsprog_fifo[0] = '\0';
+        file_to_openout = outfile_fname;
+        if (!does_file_exist(outfile_fname))    // yes, it looks weird with the '!' but it's correct that way
+        {
+            make_hole_for_file(outfile_fname);
+        }
+    }
+
+    sprintf(tmp, "Reassembling big file %ld (%s)", bigfileno + 1,
+            outfile_fname);
+    log_msg(2, tmp);
+
+    /*
+       last slice is zero-length and uncompressed; when we find it, we stop.
+       We DON'T wait until there are no more slices; if we did that,
+       We might stop at end of CD, not at last slice (which is 0-len and uncompd)
+     */
+
+    strncpy(pathname_of_last_file_restored, biggiestruct.filename,
+            MAX_STR_LEN - 1);
+    pathname_of_last_file_restored[MAX_STR_LEN - 1] = '\0';
+
+    log_msg(3, "file_to_openout = %s", file_to_openout);
+    if (!(fout = fopen(file_to_openout, "w"))) {
+        log_to_screen("Cannot openout outfile_fname - hard disk full?");
+        return (1);
+    }
+    log_msg(3, "Opened out to %s", outfile_fname);  // CD/DVD --> mondorestore --> ntfsclone --> hard disk itself
+
+    for (sliceno = 1, finished = FALSE; !finished;) {
+        if (!does_file_exist
+            (slice_fname(bigfileno, sliceno, ARCHIVES_PATH, ""))
+            &&
+            !does_file_exist(slice_fname
+                             (bigfileno, sliceno, ARCHIVES_PATH, "lzo"))
+            &&
+            !does_file_exist(slice_fname
+                             (bigfileno, sliceno, ARCHIVES_PATH, "gz"))
+            &&
+            !does_file_exist(slice_fname
+                             (bigfileno, sliceno, ARCHIVES_PATH, "bz2"))) {
+            log_msg(3,
+                    "Cannot find a data slice or terminator slice on CD %d",
+                    g_current_media_number);
+            g_current_media_number++;
+            sprintf(tmp,
+                    "Asking for %s #%d so that I may read slice #%ld\n",
+                    media_descriptor_string(bkpinfo->backup_media_type),
+                    g_current_media_number, sliceno);
+            log_msg(2, tmp);
+            sprintf(tmp, "Restoring from %s #%d",
+                    media_descriptor_string(bkpinfo->backup_media_type),
+                    g_current_media_number);
+            log_to_screen(tmp);
+            insist_on_this_cd_number(g_current_media_number);
+            log_to_screen("Continuing to restore.");
+        } else {
+            strcpy(tmp,
+                   slice_fname(bigfileno, sliceno, ARCHIVES_PATH, ""));
+            if (does_file_exist(tmp) && length_of_file(tmp) == 0) {
+                log_msg(2,
+                        "End of bigfile # %ld (slice %ld is the terminator)",
+                        bigfileno + 1, sliceno);
+                finished = TRUE;
+                continue;
+            } else {
+                if (does_file_exist
+                    (slice_fname
+                     (bigfileno, sliceno, ARCHIVES_PATH, "lzo"))) {
+                    strcpy(bzip2_command, "lzop");
+                    strcpy(suffix, "lzo");
+                } else
+                    if (does_file_exist
+                        (slice_fname
+                         (bigfileno, sliceno, ARCHIVES_PATH, "gz"))) {
+                    strcpy(bzip2_command, "gzip");
+                    strcpy(suffix, "gz");
+                } else
+                    if (does_file_exist
+                        (slice_fname
+                         (bigfileno, sliceno, ARCHIVES_PATH, "bz2"))) {
+                    strcpy(bzip2_command, "bzip2");
+                    strcpy(suffix, "bz2");
+                } else
+                    if (does_file_exist
+                        (slice_fname
+                         (bigfileno, sliceno, ARCHIVES_PATH, ""))) {
+                    strcpy(bzip2_command, "");
+                    strcpy(suffix, "");
+                } else {
+                    log_to_screen("OK, that's pretty fsck0red...");
+                    return (1);
+                }
+            }
+            if (bzip2_command[0] != '\0') {
+                sprintf(bzip2_command + strlen(bzip2_command),
+                        " -dc %s 2>> %s",
+                        slice_fname(bigfileno, sliceno, ARCHIVES_PATH,
+                                    suffix), MONDO_LOGFILE);
+            } else {
+                sprintf(bzip2_command, "cat %s 2>> %s",
+                        slice_fname(bigfileno, sliceno, ARCHIVES_PATH,
+                                    suffix), MONDO_LOGFILE);
+            }
+            sprintf(tmp, "Working on %s #%d, file #%ld, slice #%ld    ",
+                    media_descriptor_string(bkpinfo->backup_media_type),
+                    g_current_media_number, bigfileno + 1, sliceno);
+            log_msg(2, tmp);
+
+            if (!g_text_mode) {
+                newtDrawRootText(0, g_noof_rows - 2, tmp);
+                newtRefresh();
+                strip_spaces(tmp);
+                update_progress_form(tmp);
+            }
+            if (!(fbzip2 = popen(bzip2_command, "r"))) {
+                fatal_error("Can't run popen command");
+            }
+            while (!feof(fbzip2)) {
+                siz = fread(bigblk, 1, TAPE_BLOCK_SIZE, fbzip2);
+                if (siz > 0) {
+                    sprintf(sz_msg, "Read %ld from fbzip2", siz);
+                    siz = fwrite(bigblk, 1, siz, fout);
+                    sprintf(sz_msg + strlen(sz_msg),
+                            "; written %ld to fout", siz);
+//        log_msg(2. sz_msg);
+                }
+            }
+            paranoid_pclose(fbzip2);
+
+
+            sliceno++;
+            g_current_progress++;
+        }
+    }
+/*
+  memset(bigblk, TAPE_BLOCK_SIZE, 1); // This all looks very fishy...
+  fwrite( bigblk, 1, TAPE_BLOCK_SIZE, fout);
+  fwrite( bigblk, 1, TAPE_BLOCK_SIZE, fout);
+  fwrite( bigblk, 1, TAPE_BLOCK_SIZE, fout);
+  fwrite( bigblk, 1, TAPE_BLOCK_SIZE, fout);
+*/
+    paranoid_fclose(fout);
+    g_loglevel = old_loglevel;
+
+    if (use_ntfsprog_hack) {
+        log_msg(3, "Waiting for ntfsclone to finish");
+        sprintf(tmp,
+                " ps | grep \" ntfsclone \" | grep -v grep > /dev/null 2> /dev/null");
+        while (system(tmp) == 0) {
+            sleep(1);
+        }
+        log_it("OK, ntfsclone has really finished");
+    }
+
+    if (strcmp(outfile_fname, "/dev/null")) {
+        chown(outfile_fname, biggiestruct.properties.st_uid,
+              biggiestruct.properties.st_gid);
+        chmod(outfile_fname, biggiestruct.properties.st_mode);
+        ubuf->actime = biggiestruct.properties.st_atime;
+        ubuf->modtime = biggiestruct.properties.st_mtime;
+        utime(outfile_fname, ubuf);
+    }
+    paranoid_free(bigblk);
+    paranoid_free(checksum);
+    paranoid_free(outfile_fname);
+    paranoid_free(tmp);
+    paranoid_free(bzip2_command);
+    paranoid_free(ntfsprog_command);
+    paranoid_free(suffix);
+    paranoid_free(sz_devfile);
+
+    return (retval);
+}
+
+/**************************************************************************
+ *END_ RESTORE_A_BIGGIEFILE_FROM_CD                                       *
+ **************************************************************************/
+
+
+
+/**
+ * Restore a biggiefile from the currently opened stream.
+ * @param bkpinfo The backup information structure. Fields used:
+ * - @c bkpinfo->restore_path
+ * - @c bkpinfo->zip_exe
+ * @param orig_bf_fname The original filename of the biggiefile.
+ * @param biggiefile_number The number of the biggiefile (starting from 0).
+ * @param orig_checksum Unused.
+ * @param biggiefile_size Unused.
+ * @param filelist The node structure containing the list of files to be restored.
+ * If @p orig_bf_fname is not in the list, it will be ignored.
+ * @return 0 for success (or skip), nonzero for failure.
+ * @bug orig_checksum and biggiefile_size are unused (except to check that they are non-NULL).
+ */
+int restore_a_biggiefile_from_stream(char *orig_bf_fname, long biggiefile_number, char *orig_checksum,  //UNUSED
+                                     long long biggiefile_size, //UNUSED
+                                     struct s_node *filelist,
+                                     int use_ntfsprog,
+                                     char *pathname_of_last_file_restored)
+{
+    FILE *pout;
+    FILE *fin;
+
+  /** mallocs ********/
+    char *tmp;
+    char *command;
+    char *outfile_fname;
+    char *ntfsprog_command;
+    char *sz_devfile;
+    char *ntfsprog_fifo;
+    char *file_to_openout = NULL;
+
+    struct s_node *node;
+
+    int old_loglevel;
+    long current_slice_number = 0;
+    int retval = 0;
+    int res = 0;
+    int ctrl_chr = '\0';
+    long long slice_siz;
+    bool dummy_restore = FALSE;
+    bool use_ntfsprog_hack = FALSE;
+    pid_t pid;
+    struct s_filename_and_lstat_info biggiestruct;
+    struct utimbuf the_utime_buf, *ubuf;
+    ubuf = &the_utime_buf;
+
+    malloc_string(tmp);
+    malloc_string(ntfsprog_fifo);
+    malloc_string(outfile_fname);
+    malloc_string(command);
+    malloc_string(sz_devfile);
+    malloc_string(ntfsprog_command);
+    old_loglevel = g_loglevel;
+    assert(bkpinfo != NULL);
+    assert(orig_bf_fname != NULL);
+    assert(orig_checksum != NULL);
+
+    pathname_of_last_file_restored[0] = '\0';
+    if (use_ntfsprog == BLK_START_A_PIHBIGGIE) {
+        use_ntfsprog = 1;
+        log_msg(1, "%s --- pih=YES", orig_bf_fname);
+    } else if (use_ntfsprog == BLK_START_A_NORMBIGGIE) {
+        use_ntfsprog = 0;
+        log_msg(1, "%s --- pih=NO", orig_bf_fname);
+    } else {
+        use_ntfsprog = 0;
+        log_msg(1, "%s --- pih=NO (weird marker though)", orig_bf_fname);
+    }
+
+    strncpy(pathname_of_last_file_restored, orig_bf_fname,
+            MAX_STR_LEN - 1);
+    pathname_of_last_file_restored[MAX_STR_LEN - 1] = '\0';
+
+    /* open out to biggiefile to be restored (or /dev/null if biggiefile is not to be restored) */
+
+    if (filelist != NULL) {
+        node = find_string_at_node(filelist, orig_bf_fname);
+        if (!node) {
+            dummy_restore = TRUE;
+            log_msg(1,
+                    "Skipping big file %ld (%s) - not in biggielist subset",
+                    biggiefile_number + 1, orig_bf_fname);
+            pathname_of_last_file_restored[0] = '\0';
+        } else if (!(node->selected)) {
+            dummy_restore = TRUE;
+            log_msg(1, "Skipping %s (name isn't in biggielist subset)",
+                    orig_bf_fname);
+            pathname_of_last_file_restored[0] = '\0';
+        }
+    }
+
+    if (use_ntfsprog) {
+        if (strncmp(orig_bf_fname, "/dev/", 5)) {
+            log_msg(1,
+                    "I was in error when I set use_ntfsprog to TRUE.");
+            log_msg(1, "%s isn't even in /dev", orig_bf_fname);
+            use_ntfsprog = FALSE;
+        }
+    }
+
+    if (use_ntfsprog) {
+        g_loglevel = 4;
+        strcpy(outfile_fname, orig_bf_fname);
+        use_ntfsprog_hack = TRUE;
+        log_msg(2,
+                "Calling ntfsclone in background because %s is a /dev entry",
+                outfile_fname);
+        sprintf(sz_devfile, "%s/%d.%d.000", 
+                bkpinfo->tmpdir,
+                (int) (random() % 32768),
+                (int) (random() % 32768));
+        mkfifo(sz_devfile, 0x770);
+        strcpy(ntfsprog_fifo, sz_devfile);
+        file_to_openout = ntfsprog_fifo;
+        switch (pid = fork()) {
+        case -1:
+            fatal_error("Fork failure");
+        case 0:
+            log_msg(3,
+                    "CHILD - fip - calling feed_outfrom_ntfsprog(%s, %s)",
+                    outfile_fname, ntfsprog_fifo);
+            res =
+                feed_outfrom_ntfsprog(outfile_fname, ntfsprog_fifo);
+//          log_msg(3, "CHILD - fip - exiting");
+            exit(res);
+            break;
+        default:
+            log_msg(3,
+                    "feed_into_ntfsprog() called in background --- pid=%ld",
+                    (long int) (pid));
+        }
+    } else {
+        if (!strncmp(orig_bf_fname, "/dev/", 5))    // non-NTFS partition
+        {
+            strcpy(outfile_fname, orig_bf_fname);
+        } else                  // biggiefile
+        {
+            sprintf(outfile_fname, "%s/%s", bkpinfo->restore_path,
+                    orig_bf_fname);
+        }
+        use_ntfsprog_hack = FALSE;
+        ntfsprog_fifo[0] = '\0';
+        file_to_openout = outfile_fname;
+        if (!does_file_exist(outfile_fname))    // yes, it looks weird with the '!' but it's correct that way
+        {
+            make_hole_for_file(outfile_fname);
+        }
+        sprintf(tmp, "Reassembling big file %ld (%s)",
+                biggiefile_number + 1, orig_bf_fname);
+        log_msg(2, tmp);
+    }
+
+    if (dummy_restore) {
+        sprintf(outfile_fname, "/dev/null");
+    }
+
+    if (!bkpinfo->zip_exe[0]) {
+        sprintf(command, "cat > \"%s\"", file_to_openout);
+    } else {
+        sprintf(command, "%s -dc > \"%s\" 2>> %s", bkpinfo->zip_exe,
+                file_to_openout, MONDO_LOGFILE);
+        if (strcmp(bkpinfo->zip_exe, "gzip") == 0) {
+            /* Ignore SIGPIPE for gzip as it causes errors on big files
+             * Cf: http://trac.mondorescue.org/ticket/244
+             */
+            signal(SIGPIPE,SIG_IGN);
+        }
+    }
+    sprintf(tmp, "Pipe command = '%s'", command);
+    log_msg(3, tmp);
+
+    /* restore biggiefile, one slice at a time */
+    if (!(pout = popen(command, "w"))) {
+        fatal_error("Cannot pipe out");
+    }
+    for (res = read_header_block_from_stream(&slice_siz, tmp, &ctrl_chr);
+         ctrl_chr != BLK_STOP_A_BIGGIE;
+         res = read_header_block_from_stream(&slice_siz, tmp, &ctrl_chr)) {
+        if (ctrl_chr != BLK_START_AN_AFIO_OR_SLICE) {
+            wrong_marker(BLK_START_AN_AFIO_OR_SLICE, ctrl_chr);
+        }
+        sprintf(tmp, "Working on file #%ld, slice #%ld    ",
+                biggiefile_number + 1, current_slice_number);
+        log_msg(2, tmp);
+        if (!g_text_mode) {
+            newtDrawRootText(0, g_noof_rows - 2, tmp);
+            newtRefresh();
+        }
+        strip_spaces(tmp);
+        update_progress_form(tmp);
+        if (current_slice_number == 0) {
+            res =
+                read_file_from_stream_to_file("/tmp/biggie-blah.txt",
+                                              slice_siz);
+            if (!(fin = fopen("/tmp/biggie-blah.txt", "r"))) {
+                log_OS_error("blah blah");
+            } else {
+                if (fread
+                    ((void *) &biggiestruct, 1, sizeof(biggiestruct),
+                     fin) < sizeof(biggiestruct)) {
+                    log_msg(2,
+                            "Warning - unable to get biggiestruct of bigfile #%d",
+                            biggiefile_number + 1);
+                }
+                paranoid_fclose(fin);
+            }
+        } else {
+            res =
+                read_file_from_stream_to_stream(pout, slice_siz);
+        }
+        retval += res;
+        res = read_header_block_from_stream(&slice_siz, tmp, &ctrl_chr);
+        if (ctrl_chr != BLK_STOP_AN_AFIO_OR_SLICE) {
+            wrong_marker(BLK_STOP_AN_AFIO_OR_SLICE, ctrl_chr);
+        }
+        current_slice_number++;
+        g_current_progress++;
+    }
+    paranoid_pclose(pout);
+
+    if (bkpinfo->zip_exe[0]) {
+        if (strcmp(bkpinfo->zip_exe, "gzip") == 0) {
+            /* Re-enable SIGPIPE for gzip
+             */
+            signal(SIGPIPE, terminate_daemon);
+        }
+    }
+
+    log_msg(1, "pathname_of_last_file_restored is now %s",
+            pathname_of_last_file_restored);
+
+    if (use_ntfsprog_hack) {
+        log_msg(3, "Waiting for ntfsclone to finish");
+        sprintf(tmp,
+                " ps | grep \" ntfsclone \" | grep -v grep > /dev/null 2> /dev/null");
+        while (system(tmp) == 0) {
+            sleep(1);
+        }
+        log_msg(3, "OK, ntfsclone has really finished");
+    }
+
+    log_msg(3, "biggiestruct.filename = %s", biggiestruct.filename);
+    log_msg(3, "biggiestruct.checksum = %s", biggiestruct.checksum);
+    if (strcmp(outfile_fname, "/dev/null")) {
+        chmod(outfile_fname, biggiestruct.properties.st_mode);
+        chown(outfile_fname, biggiestruct.properties.st_uid,
+              biggiestruct.properties.st_gid);
+        ubuf->actime = biggiestruct.properties.st_atime;
+        ubuf->modtime = biggiestruct.properties.st_mtime;
+        utime(outfile_fname, ubuf);
+    }
+
+    paranoid_free(tmp);
+    paranoid_free(outfile_fname);
+    paranoid_free(command);
+    paranoid_free(ntfsprog_command);
+    paranoid_free(sz_devfile);
+    paranoid_free(ntfsprog_fifo);
+    g_loglevel = old_loglevel;
+    return (retval);
+}
+
+/**************************************************************************
+ *END_RESTORE_A_BIGGIEFILE_FROM_STREAM                                    *
+ **************************************************************************/
+
+
+
+/**
+ * Restore @p tarball_fname from CD.
+ * @param tarball_fname The filename of the tarball to restore (in /mnt/cdrom).
+ * This will be used unmodified.
+ * @param current_tarball_number The number (starting from 0) of the fileset
+ * we're restoring now.
+ * @param filelist The node structure containing the list of files to be
+ * restored. If no file in the afioball is in this list, afio will still be
+ * called, but nothing will be written.
+ * @return 0 for success, nonzero for failure.
+ */
+int
+restore_a_tarball_from_CD(char *tarball_fname,
+                          long current_tarball_number,
+                          struct s_node *filelist)
+{
+    int retval = 0;
+    int res;
+    char *p;
+
+  /** malloc **/
+    char *command;
+    char *tmp;
+    char *filelist_name;
+    char *filelist_subset_fname;
+    char *executable;
+    char *temp_log;
+    char screen_message[100];
+    long matches = 0;
+    bool use_star;
+    char *xattr_fname;
+    char *acl_fname;
+//  char files_to_restore_this_time_fname[MAX_STR_LEN];
+
+    assert_string_is_neither_NULL_nor_zerolength(tarball_fname);
+    malloc_string(command);
+    malloc_string(tmp);
+    malloc_string(filelist_name);
+    malloc_string(filelist_subset_fname);
+    malloc_string(executable);
+    malloc_string(temp_log);
+    malloc_string(xattr_fname);
+    malloc_string(acl_fname);
+
+    log_msg(5, "Entering");
+    filelist_subset_fname[0] = '\0';
+    use_star = (strstr(tarball_fname, ".star")) ? TRUE : FALSE;
+//  sprintf(files_to_restore_this_time_fname, "/tmp/ftrttf.%d.%d", (int)getpid(), (int)random());
+    sprintf(command, "mkdir -p %s/tmp", MNT_RESTORING);
+    run_program_and_log_output(command, 9);
+    sprintf(temp_log, "/tmp/%d.%d", (int) (random() % 32768),
+            (int) (random() % 32768));
+
+    sprintf(filelist_name, MNT_CDROM "/archives/filelist.%ld",
+            current_tarball_number);
+    if (length_of_file(filelist_name) <= 2) {
+        log_msg(2, "There are _zero_ files in filelist '%s'",
+                filelist_name);
+        log_msg(2,
+                "This is a bit silly (ask dev-team to fix mondo_makefilelist, please)");
+        log_msg(2,
+                "but it's non-critical. It's cosmetic. Don't worry about it.");
+        retval = 0;
+        goto leave_sub;
+    }
+    if (count_lines_in_file(filelist_name) <= 0
+        || length_of_file(tarball_fname) <= 0) {
+        log_msg(3, "length_of_file(%s) = %llu", tarball_fname,
+                length_of_file(tarball_fname));
+        sprintf(tmp, "Unable to restore fileset #%ld (CD I/O error)",
+                current_tarball_number);
+        log_to_screen(tmp);
+        retval = 1;
+        goto leave_sub;
+    }
+
+    if (filelist) {
+        sprintf(filelist_subset_fname, "/tmp/filelist-subset-%ld.tmp",
+                current_tarball_number);
+        if ((matches =
+             save_filelist_entries_in_common(filelist_name, filelist,
+                                             filelist_subset_fname,
+                                             use_star))
+            <= 0) {
+            sprintf(tmp, "Skipping fileset %ld", current_tarball_number);
+            log_msg(1, tmp);
+        } else {
+            log_msg(3, "Saved fileset %ld's subset to %s",
+                    current_tarball_number, filelist_subset_fname);
+        }
+        sprintf(screen_message, "Tarball #%ld --- %ld matches",
+                current_tarball_number, matches);
+        log_to_screen(screen_message);
+    } else {
+        filelist_subset_fname[0] = '\0';
+    }
+
+    if (filelist == NULL || matches > 0) {
+        if (g_getfattr) {
+            sprintf(xattr_fname, XATTR_LIST_FNAME_RAW_SZ,
+                MNT_CDROM "/archives", current_tarball_number);
+        }
+        if (g_getfacl) {
+            sprintf(acl_fname, ACL_LIST_FNAME_RAW_SZ, MNT_CDROM "/archives",
+                current_tarball_number);
+        }
+        if (strstr(tarball_fname, ".bz2")) {
+            strcpy(executable, "bzip2");
+        } else if (strstr(tarball_fname, ".gz")) {
+            strcpy(executable, "gzip");
+        } else if (strstr(tarball_fname, ".lzo")) {
+            strcpy(executable, "lzop");
+        } else {
+            executable[0] = '\0';
+        }
+        if (executable[0]) {
+            sprintf(tmp, "which %s > /dev/null 2> /dev/null", executable);
+            if (run_program_and_log_output(tmp, FALSE)) {
+                log_to_screen
+                    ("(compare_a_tarball) Compression program not found - oh no!");
+                paranoid_MR_finish(1);
+            }
+            strcpy(tmp, executable);
+            sprintf(executable, "-P %s -Z", tmp);
+        }
+#ifdef __FreeBSD__
+#define BUFSIZE 512
+#else
+#define BUFSIZE (1024L*1024L)/TAPE_BLOCK_SIZE
+#endif
+
+//      if (strstr(tarball_fname, ".star."))
+        if (use_star) {
+            sprintf(command,
+                    "star -x -force-remove -U " STAR_ACL_SZ
+                    " errctl= file=%s", tarball_fname);
+            if (strstr(tarball_fname, ".bz2")) {
+                strcat(command, " -bz");
+            }
+        } else {
+            if (filelist_subset_fname[0] != '\0') {
+                sprintf(command,
+                        "afio -i -M 8m -b %ld -c %ld %s -w '%s' %s",
+                        TAPE_BLOCK_SIZE,
+                        BUFSIZE, executable, filelist_subset_fname,
+//             files_to_restore_this_time_fname,
+                        tarball_fname);
+            } else {
+                sprintf(command,
+                        "afio -i -b %ld -c %ld -M 8m %s %s",
+                        TAPE_BLOCK_SIZE,
+                        BUFSIZE, executable, tarball_fname);
+            }
+        }
+#undef BUFSIZE
+        sprintf(command + strlen(command), " 2>> %s >> %s", temp_log,
+                temp_log);
+        log_msg(1, "command = '%s'", command);
+        unlink(temp_log);
+        res = system(command);
+        if (res) {
+            p = strstr(command, "-acl ");
+            if (p) {
+                p[0] = p[1] = p[2] = p[3] = ' ';
+                log_msg(1, "new command = '%s'", command);
+                res = system(command);
+            }
+        }
+        if (res && length_of_file(temp_log) < 5) {
+            res = 0;
+        }
+
+        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;
+            }
+        }
+        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;
+            }
+        }
+        if (retval) {
+            sprintf(command, "cat %s >> %s", temp_log, MONDO_LOGFILE);
+            system(command);
+            log_msg(2, "Errors occurred while processing fileset #%d",
+                    current_tarball_number);
+        } else {
+            log_msg(2, "Fileset #%d processed OK", current_tarball_number);
+        }
+    }
+    if (does_file_exist("/PAUSE")) {
+        popup_and_OK
+            ("Press ENTER to go on. Delete /PAUSE to stop these pauses.");
+    }
+    unlink(filelist_subset_fname);
+    unlink(xattr_fname);
+    unlink(acl_fname);
+    unlink(temp_log);
+
+  leave_sub:
+    paranoid_free(command);
+    paranoid_free(tmp);
+    paranoid_free(filelist_name);
+    paranoid_free(filelist_subset_fname);
+    paranoid_free(executable);
+    paranoid_free(temp_log);
+    paranoid_free(xattr_fname);
+    paranoid_free(acl_fname);
+    log_msg(5, "Leaving");
+    return (retval);
+}
+
+/**************************************************************************
+ *END_RESTORE_A_TARBALL_FROM_CD                                           *
+ **************************************************************************/
+
+
+/**
+ * Restore a tarball from the currently opened stream.
+ * @param bkpinfo The backup information structure. Fields used:
+ * - @c bkpinfo->backup_media_type
+ * - @c bkpinfo->media_device
+ * - @c bkpinfo->zip_exe
+ * @param tarball_fname The filename of the afioball to restore.
+ * @param current_tarball_number The number (starting from 0) of the fileset
+ * we're restoring now.
+ * @param filelist The node structure containing the list of files to be
+ * restored. If no file in the afioball is in this list, afio will still be
+ * called, but nothing will be written.
+ * @param size The size (in @b bytes) of the afioball.
+ * @return 0 for success, nonzero for failure.
+ */
+int
+restore_a_tarball_from_stream(char *tarball_fname,
+                              long current_tarball_number,
+                              struct s_node *filelist,
+                              long long size, char *xattr_fname,
+                              char *acl_fname)
+{
+    int retval = 0;
+    int res = 0;
+
+  /** malloc add ***/
+    char *tmp;
+    char *command;
+    char *afio_fname;
+    char *filelist_fname;
+    char *filelist_subset_fname;
+    char *executable;
+    long matches = 0;
+    bool restore_this_fileset = FALSE;
+    bool use_star;
+
+    assert(bkpinfo != NULL);
+    assert_string_is_neither_NULL_nor_zerolength(tarball_fname);
+    malloc_string(filelist_subset_fname);
+    malloc_string(filelist_fname);
+    malloc_string(afio_fname);
+    malloc_string(executable);
+    malloc_string(command);
+    malloc_string(tmp);
+    filelist_subset_fname[0] = '\0';
+    /* to do it with a file... */
+    use_star = (strstr(tarball_fname, ".star")) ? TRUE : FALSE;
+    sprintf(tmp,
+            "Restoring from fileset #%ld (%ld KB) on %s #%d",
+            current_tarball_number, (long) size >> 10,
+            media_descriptor_string(bkpinfo->backup_media_type),
+            g_current_media_number);
+    log_msg(2, tmp);
+    run_program_and_log_output("mkdir -p " MNT_RESTORING "/tmp", FALSE);
+
+  /****************************************************************************
+   * Use RAMDISK's /tmp; saves time; oh wait, it's too small                  *
+   * Well, pipe from tape to afio, then; oh wait, can't do that either: bug   *
+   * in afio or someting; oh darn.. OK, use tmpfs :-)                         *
+   ****************************************************************************/
+    filelist_fname[0] = filelist_subset_fname[0] = '\0';
+    sprintf(afio_fname, "/tmp/tmpfs/archive.tmp.%ld",
+            current_tarball_number);
+    sprintf(filelist_fname, "%s/filelist.%ld", bkpinfo->tmpdir,
+            current_tarball_number);
+    sprintf(filelist_subset_fname, "%s/filelist-subset-%ld.tmp",
+            bkpinfo->tmpdir, current_tarball_number);
+//  sprintf(filelist_fname, "/tmp/tmpfs/temp-filelist.%ld", current_tarball_number);
+    res = read_file_from_stream_to_file(afio_fname, size);
+    if (strstr(tarball_fname, ".star")) {
+        bkpinfo->use_star = TRUE;
+    }
+    if (res) {
+        log_msg(1, "Warning - error reading afioball from tape");
+    }
+    if (bkpinfo->compression_level == 0) {
+        executable[0] = '\0';
+    } else {
+        if (bkpinfo->use_star) {
+            strcpy(executable, " -bz");
+        } else {
+            sprintf(executable, "-P %s -Z", bkpinfo->zip_exe);
+        }
+    }
+
+    if (!filelist)              // if unconditional restore then restore entire fileset
+    {
+        restore_this_fileset = TRUE;
+    } else                      // If restoring selectively then get TOC from tarball
+    {
+        if (strstr(tarball_fname, ".star.")) {
+            use_star = TRUE;
+            sprintf(command, "star -t file=%s %s", afio_fname, executable);
+        } else {
+            use_star = FALSE;
+            sprintf(command, "afio -t -M 8m -b %ld %s %s", TAPE_BLOCK_SIZE,
+                    executable, afio_fname);
+        }
+        sprintf(command + strlen(command), " > %s 2>> %s", filelist_fname,
+                MONDO_LOGFILE);
+        log_msg(1, "command = %s", command);
+        if (system(command)) {
+            log_msg(4, "Warning - error occurred while retrieving TOC");
+        }
+        if ((matches =
+             save_filelist_entries_in_common(filelist_fname, filelist,
+                                             filelist_subset_fname,
+                                             use_star))
+            <= 0 || length_of_file(filelist_subset_fname) < 2) {
+            if (length_of_file(filelist_subset_fname) < 2) {
+                log_msg(1, "No matches found in fileset %ld",
+                        current_tarball_number);
+            }
+            sprintf(tmp, "Skipping fileset %ld", current_tarball_number);
+            log_msg(2, tmp);
+            restore_this_fileset = FALSE;
+        } else {
+            log_msg(5, "%ld matches. Saved fileset %ld's subset to %s",
+                    matches, current_tarball_number,
+                    filelist_subset_fname);
+            restore_this_fileset = TRUE;
+        }
+    }
+
+// Concoct the call to star/afio to restore files
+    if (strstr(tarball_fname, ".star."))    // star
+    {
+        sprintf(command, "star -x file=%s %s", afio_fname, executable);
+        if (filelist) {
+            sprintf(command + strlen(command), " list=%s",
+                    filelist_subset_fname);
+        }
+    } else                      // afio
+    {
+        sprintf(command, "afio -i -M 8m -b %ld %s", TAPE_BLOCK_SIZE,
+                executable);
+        if (filelist) {
+            sprintf(command + strlen(command), " -w %s",
+                    filelist_subset_fname);
+        }
+        sprintf(command + strlen(command), " %s", afio_fname);
+    }
+    sprintf(command + strlen(command), " 2>> %s", MONDO_LOGFILE);
+
+// Call if IF there are files to restore (selectively/unconditionally)
+    if (restore_this_fileset) {
+        log_msg(1, "Calling command='%s'", command);
+        paranoid_system(command);
+
+        if (g_getfattr) {
+            iamhere("Restoring xattr stuff");
+            res = set_fattr_list(filelist_subset_fname, xattr_fname);
+            if (res) {
+                log_msg(1, "Errors occurred while setting xattr");
+            } else {
+                log_msg(1, "I set xattr OK");
+            }
+            retval += res;
+        }
+
+        if (g_getfacl) {
+            iamhere("Restoring acl stuff");
+            res = set_acl_list(filelist_subset_fname, acl_fname);
+            if (res) {
+                log_msg(1, "Errors occurred while setting ACL");
+            } else {
+                log_msg(1, "I set ACL OK");
+            }
+            retval += res;
+        }
+
+    } else {
+        log_msg(1, "NOT CALLING '%s'", command);
+    }
+
+    if (does_file_exist("/PAUSE") && current_tarball_number >= 50) {
+        log_to_screen("Paused after set %ld", current_tarball_number);
+        popup_and_OK("Pausing. Press ENTER to continue.");
+    }
+
+    unlink(filelist_subset_fname);
+    unlink(filelist_fname);
+    unlink(afio_fname);
+
+    paranoid_free(filelist_subset_fname);
+    paranoid_free(filelist_fname);
+    paranoid_free(afio_fname);
+    paranoid_free(command);
+    paranoid_free(tmp);
+    return (retval);
+}
+
+/**************************************************************************
+ *END_RESTORE_A_TARBALL_FROM_STREAM                                       *
+ **************************************************************************/
+
+
+
+
+/**
+ * Restore all biggiefiles from all media in this CD backup.
+ * The CD with the last afioball should be currently mounted.
+ * @param bkpinfo The backup information structure. @c backup_media_type is the
+ * only field used in this function.
+ * @param filelist The node structure containing the list of files to be
+ * restored. If a prospective biggiefile is not in this list, it will be ignored.
+ * @return 0 for success, nonzero for failure.
+ */
+int
+restore_all_biggiefiles_from_CD(struct s_node *filelist)
+{
+    int retval = 0;
+    int res = 0;
+    long noof_biggiefiles, bigfileno = 0, total_slices;
+  /** malloc **/
+    char *tmp;
+    bool just_changed_cds = FALSE;
+    char *xattr_fname;
+    char *acl_fname;
+    char *biggies_whose_EXATs_we_should_set;    // EXtended ATtributes
+    char *pathname_of_last_biggie_restored;
+    FILE *fbw = NULL;
+
+    malloc_string(xattr_fname);
+    malloc_string(acl_fname);
+    malloc_string(tmp);
+    malloc_string(biggies_whose_EXATs_we_should_set);
+    malloc_string(pathname_of_last_biggie_restored);
+    assert(bkpinfo != NULL);
+
+    sprintf(biggies_whose_EXATs_we_should_set,
+            "%s/biggies-whose-EXATs-we-should-set", bkpinfo->tmpdir);
+    if (!(fbw = fopen(biggies_whose_EXATs_we_should_set, "w"))) {
+        log_msg(1, "Warning - cannot openout %s",
+                biggies_whose_EXATs_we_should_set);
+    }
+
+    read_cfg_var(g_mondo_cfg_file, "total-slices", tmp);
+    total_slices = atol(tmp);
+    sprintf(tmp, "Reassembling large files      ");
+    mvaddstr_and_log_it(g_currentY, 0, tmp);
+    if (length_of_file(BIGGIELIST) < 6) {
+        log_msg(1, "OK, no biggielist; not restoring biggiefiles");
+        return (0);
+    }
+    noof_biggiefiles = count_lines_in_file(BIGGIELIST);
+    if (noof_biggiefiles <= 0) {
+        log_msg(2,
+                "OK, no biggiefiles in biggielist; not restoring biggiefiles");
+        return (0);
+    }
+    sprintf(tmp, "OK, there are %ld biggiefiles in the archives",
+            noof_biggiefiles);
+    log_msg(2, tmp);
+
+    open_progress_form("Reassembling large files",
+                       "I am now reassembling all the large files.",
+                       "Please wait. This may take some time.",
+                       "", total_slices);
+    for (bigfileno = 0 ; bigfileno < noof_biggiefiles ;) {
+        log_msg(2, "Thinking about restoring bigfile %ld", bigfileno + 1);
+        if (!does_file_exist(slice_fname(bigfileno, 0, ARCHIVES_PATH, ""))) {
+            log_msg(3,
+                    "...but its first slice isn't on this CD. Perhaps this was a selective restore?");
+            log_msg(3, "Cannot find bigfile #%ld 's first slice on %s #%d",
+                    bigfileno + 1,
+                    media_descriptor_string(bkpinfo->backup_media_type),
+                    g_current_media_number);
+            log_msg(3, "Slicename would have been %s",
+                    slice_fname(bigfileno, 0, ARCHIVES_PATH, ""));
+            // I'm not positive 'just_changed_cds' is even necessary...
+            if (just_changed_cds) {
+                just_changed_cds = FALSE;
+                log_msg(3,
+                        "I'll continue to scan this CD for bigfiles to be restored.");
+            } else if (does_file_exist(MNT_CDROM "/archives/NOT-THE-LAST")) {
+                insist_on_this_cd_number(++g_current_media_number);
+                sprintf(tmp, "Restoring from %s #%d",
+                        media_descriptor_string(bkpinfo->backup_media_type),
+                        g_current_media_number);
+                log_to_screen(tmp);
+                just_changed_cds = TRUE;
+            } else {
+                /* That big file doesn't exist, but the followings may */
+                /* So we need to continue looping */
+                log_msg(2, "There was no bigfile #%ld. That's OK.",
+                    bigfileno + 1);
+                log_msg(2, "I'm going to stop restoring bigfiles now.");
+                retval++;
+                bigfileno++;
+            }
+        } else {
+            just_changed_cds = FALSE;
+            sprintf(tmp, "Restoring big file %ld", bigfileno + 1);
+            update_progress_form(tmp);
+            res =
+                restore_a_biggiefile_from_CD(bigfileno, filelist, pathname_of_last_biggie_restored);
+            iamhere(pathname_of_last_biggie_restored);
+            if (fbw && pathname_of_last_biggie_restored[0]) {
+                fprintf(fbw, "%s\n", pathname_of_last_biggie_restored);
+            }
+            retval += res;
+            bigfileno++;
+
+        }
+    }
+
+    if (fbw) {
+        fclose(fbw);
+        if (g_getfattr) {
+            sprintf(xattr_fname, XATTR_BIGGLST_FNAME_RAW_SZ, ARCHIVES_PATH);
+            if (length_of_file(xattr_fname) > 0) {
+                set_fattr_list(biggies_whose_EXATs_we_should_set, xattr_fname);
+            }
+        }
+        if (g_getfacl) {
+            sprintf(acl_fname, ACL_BIGGLST_FNAME_RAW_SZ, ARCHIVES_PATH);
+            if (length_of_file(acl_fname) > 0) {
+                set_acl_list(biggies_whose_EXATs_we_should_set, acl_fname);
+            }
+        }
+    }
+    if (does_file_exist("/PAUSE")) {
+        popup_and_OK
+            ("Press ENTER to go on. Delete /PAUSE to stop these pauses.");
+    }
+    close_progress_form();
+    if (retval) {
+        mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
+    } else {
+        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+    }
+    paranoid_free(xattr_fname);
+    paranoid_free(acl_fname);
+    paranoid_free(tmp);
+    paranoid_free(biggies_whose_EXATs_we_should_set);
+    paranoid_free(pathname_of_last_biggie_restored);
+    return (retval);
+}
+
+/**************************************************************************
+ *END_RESTORE_ALL_BIGGIFILES_FROM_CD                                      *
+ **************************************************************************/
+
+
+
+/**
+ * Restore all afioballs from all CDs in the backup.
+ * The first CD should be inserted (if not, it will be asked for).
+ * @param bkpinfo The backup information structure. @c backup_media_type is the
+ * only field used in @e this function.
+ * @param filelist The node structure containing the list of files to be
+ * restored. If no file in some particular afioball is in this list, afio will
+ * still be called for that fileset, but nothing will be written.
+ * @return 0 for success, or the number of filesets that failed.
+ */
+int
+restore_all_tarballs_from_CD(struct s_node *filelist)
+{
+    int retval = 0;
+    int res;
+    int attempts;
+    long current_tarball_number = 0;
+    long max_val;
+  /**malloc ***/
+    char *tmp;
+    char *tarball_fname;
+    char *progress_str;
+    char *comment;
+
+    malloc_string(tmp);
+    malloc_string(tarball_fname);
+    malloc_string(progress_str);
+    malloc_string(comment);
+
+    assert(bkpinfo != NULL);
+
+    mvaddstr_and_log_it(g_currentY, 0, "Restoring from archives");
+    log_msg(2,
+            "Insisting on 1st CD, so that I can have a look at LAST-FILELIST-NUMBER");
+    if (g_current_media_number != 1) {
+        log_msg(3, "OK, that's jacked up.");
+        g_current_media_number = 1;
+    }
+    insist_on_this_cd_number(g_current_media_number);
+    read_cfg_var(g_mondo_cfg_file, "last-filelist-number", tmp);
+    max_val = atol(tmp) + 1;
+    sprintf(progress_str, "Restoring from %s #%d",
+            media_descriptor_string(bkpinfo->backup_media_type),
+            g_current_media_number);
+    log_to_screen(progress_str);
+    open_progress_form("Restoring from archives",
+                       "Restoring data from the archives.",
+                       "Please wait. This may take some time.",
+                       progress_str, max_val);
+    for (;;) {
+        insist_on_this_cd_number(g_current_media_number);
+        update_progress_form(progress_str);
+        sprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.bz2",
+                current_tarball_number);
+        if (!does_file_exist(tarball_fname)) {
+            sprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.gz",
+                current_tarball_number);
+        }
+        if (!does_file_exist(tarball_fname)) {
+            sprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.lzo",
+                    current_tarball_number);
+        }
+        if (!does_file_exist(tarball_fname)) {
+            sprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.",
+                    current_tarball_number);
+        }
+        if (!does_file_exist(tarball_fname)) {
+            sprintf(tarball_fname, MNT_CDROM "/archives/%ld.star.bz2",
+                    current_tarball_number);
+        }
+        if (!does_file_exist(tarball_fname)) {
+            sprintf(tarball_fname, MNT_CDROM "/archives/%ld.star.",
+                    current_tarball_number);
+        }
+        if (!does_file_exist(tarball_fname)) {
+            if (current_tarball_number == 0) {
+                log_to_screen
+                    ("No tarballs. Strange. Maybe you only backed up freakin' big files?");
+                return (0);
+            }
+            if (!does_file_exist(MNT_CDROM "/archives/NOT-THE-LAST")
+                || system("find " MNT_CDROM
+                          "/archives/slice* > /dev/null 2> /dev/null") ==
+                0) {
+                break;
+            }
+            g_current_media_number++;
+            sprintf(progress_str, "Restoring from %s #%d",
+                    media_descriptor_string(bkpinfo->backup_media_type),
+                    g_current_media_number);
+            log_to_screen(progress_str);
+        } else {
+            sprintf(progress_str, "Restoring from fileset #%ld on %s #%d",
+                    current_tarball_number,
+                    media_descriptor_string(bkpinfo->backup_media_type),
+                    g_current_media_number);
+//    log_msg(3, "progress_str = %s", progress_str);
+            for (res = 999, attempts = 0; attempts < 3 && res != 0;
+                 attempts++) {
+                res =
+                    restore_a_tarball_from_CD(tarball_fname,
+                                              current_tarball_number,
+                                              filelist);
+            }
+            sprintf(tmp, "%s #%d, fileset #%ld - restore ",
+                    media_descriptor_string(bkpinfo->backup_media_type),
+                    g_current_media_number, current_tarball_number);
+            if (res) {
+                strcat(tmp, "reported errors");
+            } else if (attempts > 1) {
+                strcat(tmp, "succeeded");
+            } else {
+                strcat(tmp, "succeeded");
+            }
+            if (attempts > 1) {
+                sprintf(tmp + strlen(tmp), " (%d attempts) - review logs",
+                        attempts);
+            }
+            strcpy(comment, tmp);
+            if (attempts > 1) {
+                log_to_screen(comment);
+            }
+
+            retval += res;
+            current_tarball_number++;
+            g_current_progress++;
+        }
+    }
+    close_progress_form();
+    if (retval) {
+        mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
+    } else {
+        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+    }
+    paranoid_free(tmp);
+    paranoid_free(tarball_fname);
+    paranoid_free(progress_str);
+    paranoid_free(comment);
+
+    return (retval);
+}
+
+/**************************************************************************
+ *END_RESTORE_ALL_TARBALLS_FROM_CD                                        *
+ **************************************************************************/
+
+
+
+/**
+ * Restore all biggiefiles from the currently opened stream.
+ * @param bkpinfo The backup information structure. Passed to other functions.
+ * @param filelist The node structure containing the list of files to be
+ * restored. If a prospective biggiefile is not in the list, it will be ignored.
+ * @return 0 for success, or the number of biggiefiles that failed.
+ */
+int
+restore_all_biggiefiles_from_stream(struct s_node *filelist)
+{
+    long noof_biggiefiles;
+    long current_bigfile_number = 0;
+    long total_slices;
+
+    int retval = 0;
+    int res = 0;
+    int ctrl_chr;
+
+  /** malloc add ****/
+    char *tmp;
+    char *biggie_fname;
+    char *biggie_cksum;
+    char *xattr_fname;
+    char *acl_fname;
+    char *p;
+    char *pathname_of_last_biggie_restored;
+    char *biggies_whose_EXATs_we_should_set;    // EXtended ATtributes
+    long long biggie_size;
+    FILE *fbw = NULL;
+
+    malloc_string(tmp);
+    malloc_string(biggie_fname);
+    malloc_string(biggie_cksum);
+    malloc_string(xattr_fname);
+    malloc_string(acl_fname);
+    malloc_string(biggies_whose_EXATs_we_should_set);
+    malloc_string(pathname_of_last_biggie_restored);
+    assert(bkpinfo != NULL);
+
+    read_cfg_var(g_mondo_cfg_file, "total-slices", tmp);
+
+    total_slices = atol(tmp);
+    sprintf(tmp, "Reassembling large files      ");
+    if (g_getfattr) {
+        sprintf(xattr_fname, XATTR_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
+    }
+    if (g_getfacl) {
+        sprintf(acl_fname, ACL_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
+    }
+    mvaddstr_and_log_it(g_currentY, 0, tmp);
+    sprintf(biggies_whose_EXATs_we_should_set,
+            "%s/biggies-whose-EXATs-we-should-set", bkpinfo->tmpdir);
+    if (!(fbw = fopen(biggies_whose_EXATs_we_should_set, "w"))) {
+        log_msg(1, "Warning - cannot openout %s",
+                biggies_whose_EXATs_we_should_set);
+    }
+// get xattr and acl files if they're there
+    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);
+    }
+
+    noof_biggiefiles = atol(biggie_fname);
+    sprintf(tmp, "OK, there are %ld biggiefiles in the archives",
+            noof_biggiefiles);
+    log_msg(2, tmp);
+    open_progress_form("Reassembling large files",
+                       "I am now reassembling all the large files.",
+                       "Please wait. This may take some time.",
+                       "", total_slices);
+
+    for (res =
+         read_header_block_from_stream(&biggie_size, biggie_fname,
+                                       &ctrl_chr);
+         ctrl_chr != BLK_STOP_BIGGIEFILES;
+         res =
+         read_header_block_from_stream(&biggie_size, biggie_fname,
+                                       &ctrl_chr)) {
+        if (ctrl_chr != BLK_START_A_NORMBIGGIE
+            && ctrl_chr != BLK_START_A_PIHBIGGIE) {
+            wrong_marker(BLK_START_A_NORMBIGGIE, ctrl_chr);
+        }
+        p = strrchr(biggie_fname, '/');
+        if (!p) {
+            p = biggie_fname;
+        } else {
+            p++;
+        }
+        sprintf(tmp, "Restoring big file %ld (%lld K)",
+                current_bigfile_number + 1, biggie_size / 1024);
+        update_progress_form(tmp);
+        res = restore_a_biggiefile_from_stream(biggie_fname,
+                                               current_bigfile_number,
+                                               biggie_cksum,
+                                               biggie_size,
+                                               filelist, ctrl_chr,
+                                               pathname_of_last_biggie_restored);
+        log_msg(1, "I believe I have restored %s",
+                pathname_of_last_biggie_restored);
+        if (fbw && pathname_of_last_biggie_restored[0]) {
+            fprintf(fbw, "%s\n", pathname_of_last_biggie_restored);
+        }
+        retval += res;
+        current_bigfile_number++;
+
+    }
+    if (current_bigfile_number != noof_biggiefiles
+        && noof_biggiefiles != 0) {
+        sprintf(tmp, "Warning - bigfileno=%ld but noof_biggiefiles=%ld\n",
+                current_bigfile_number, noof_biggiefiles);
+    } else {
+        sprintf(tmp,
+                "%ld biggiefiles in biggielist.txt; %ld biggiefiles processed today.",
+                noof_biggiefiles, current_bigfile_number);
+    }
+    log_msg(1, tmp);
+
+    if (fbw) {
+        fclose(fbw);
+        if (length_of_file(biggies_whose_EXATs_we_should_set) > 2) {
+            iamhere("Setting biggie-EXATs");
+            if (g_getfattr) {
+                if (length_of_file(xattr_fname) > 0) {
+                    log_msg(1, "set_fattr_List(%s,%s)",
+                        biggies_whose_EXATs_we_should_set, xattr_fname);
+                    set_fattr_list(biggies_whose_EXATs_we_should_set,
+                               xattr_fname);
+                }
+            }
+            if (g_getfacl) {
+                if (length_of_file(acl_fname) > 0) {
+                    log_msg(1, "set_acl_list(%s,%s)",
+                            biggies_whose_EXATs_we_should_set, acl_fname);
+                    set_acl_list(biggies_whose_EXATs_we_should_set, acl_fname);
+                }
+            }
+        } else {
+            iamhere
+                ("No biggiefiles selected. So, no biggie-EXATs to set.");
+        }
+    }
+    if (does_file_exist("/PAUSE")) {
+        popup_and_OK
+            ("Press ENTER to go on. Delete /PAUSE to stop these pauses.");
+    }
+
+    close_progress_form();
+    if (retval) {
+        mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
+    } else {
+        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+    }
+    paranoid_free(biggies_whose_EXATs_we_should_set);
+    paranoid_free(pathname_of_last_biggie_restored);
+    paranoid_free(biggie_fname);
+    paranoid_free(biggie_cksum);
+    paranoid_free(xattr_fname);
+    paranoid_free(acl_fname);
+    paranoid_free(tmp);
+    return (retval);
+}
+
+/**************************************************************************
+ *END_RESTORE_ALL_BIGGIEFILES_FROM_STREAM                                 *
+ **************************************************************************/
+
+
+
+
+
+
+/**
+ * Restore all afioballs from the currently opened tape stream.
+ * @param bkpinfo The backup information structure. Fields used:
+ * - @c bkpinfo->backup_media_type
+ * - @c bkpinfo->restore_path
+ * @param filelist The node structure containing the list of files to be
+ * restored. If no file in an afioball is in this list, afio will still be
+ * called for that fileset, but nothing will be written.
+ * @return 0 for success, or the number of filesets that failed.
+ */
+int
+restore_all_tarballs_from_stream(struct s_node *filelist)
+{
+    int retval = 0;
+    int res;
+    long current_afioball_number = 0;
+    int ctrl_chr;
+    long max_val /*, total_noof_files */ ;
+
+  /** malloc **/
+    char *tmp;
+    char *progress_str;
+    char *tmp_fname;
+    char *xattr_fname;
+    char *acl_fname;
+
+    long long tmp_size;
+
+    malloc_string(tmp);
+    malloc_string(progress_str);
+    malloc_string(tmp_fname);
+    assert(bkpinfo != NULL);
+    malloc_string(xattr_fname);
+    malloc_string(acl_fname);
+    mvaddstr_and_log_it(g_currentY, 0, "Restoring from archives");
+    read_cfg_var(g_mondo_cfg_file, "last-filelist-number", tmp);
+    max_val = atol(tmp) + 1;
+
+    chdir(bkpinfo->restore_path);   /* I don't know why this is needed _here_ but it seems to be. -HR, 02/04/2002 */
+
+    run_program_and_log_output("pwd", 5);
+
+    sprintf(progress_str, "Restoring from media #%d",
+            g_current_media_number);
+    log_to_screen(progress_str);
+    open_progress_form("Restoring from archives",
+                       "Restoring data from the archives.",
+                       "Please wait. This may take some time.",
+                       progress_str, max_val);
+
+    log_msg(3, "hey");
+
+    res = read_header_block_from_stream(&tmp_size, tmp_fname, &ctrl_chr);
+    if (res) {
+        log_msg(2, "Warning - error reading afioball from tape");
+    }
+    retval += res;
+    if (ctrl_chr != BLK_START_AFIOBALLS) {
+        wrong_marker(BLK_START_AFIOBALLS, ctrl_chr);
+    }
+    log_msg(2, "ho");
+    res = read_header_block_from_stream(&tmp_size, tmp_fname, &ctrl_chr);
+    while (ctrl_chr != BLK_STOP_AFIOBALLS) {
+        update_progress_form(progress_str);
+        if (g_getfattr) {
+            sprintf(xattr_fname, "%s/xattr-subset-%ld.tmp", bkpinfo->tmpdir,
+                current_afioball_number);
+            unlink(xattr_fname);
+        }
+        if (g_getfacl) {
+            sprintf(acl_fname, "%s/acl-subset-%ld.tmp", bkpinfo->tmpdir,
+                current_afioball_number);
+            unlink(acl_fname);
+        }
+        if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) {
+            iamhere("Reading EXAT files from tape");
+            res =
+                read_EXAT_files_from_tape(&tmp_size, tmp_fname,
+                                          &ctrl_chr, xattr_fname,
+                                          acl_fname);
+        }
+        if (ctrl_chr != BLK_START_AN_AFIO_OR_SLICE) {
+            wrong_marker(BLK_START_AN_AFIO_OR_SLICE, ctrl_chr);
+        }
+        sprintf(tmp,
+                "Restoring from fileset #%ld (name=%s, size=%ld K)",
+                current_afioball_number, tmp_fname, (long) tmp_size >> 10);
+        res =
+            restore_a_tarball_from_stream(tmp_fname,
+                                          current_afioball_number,
+                                          filelist, tmp_size, xattr_fname,
+                                          acl_fname);
+        retval += res;
+        if (res) {
+            sprintf(tmp, "Fileset %ld - errors occurred",
+                    current_afioball_number);
+            log_to_screen(tmp);
+        }
+        res =
+            read_header_block_from_stream(&tmp_size, tmp_fname, &ctrl_chr);
+        if (ctrl_chr != BLK_STOP_AN_AFIO_OR_SLICE) {
+            wrong_marker(BLK_STOP_AN_AFIO_OR_SLICE, ctrl_chr);
+        }
+
+        current_afioball_number++;
+        g_current_progress++;
+        sprintf(progress_str, "Restoring from fileset #%ld on %s #%d",
+                current_afioball_number,
+                media_descriptor_string(bkpinfo->backup_media_type),
+                g_current_media_number);
+        res =
+            read_header_block_from_stream(&tmp_size, tmp_fname, &ctrl_chr);
+        if (g_getfattr) {
+            unlink(xattr_fname);
+        }
+        if (g_getfacl) {
+            unlink(acl_fname);
+        }
+    }                           // next
+    log_msg(1, "All done with afioballs");
+    close_progress_form();
+    if (retval) {
+        mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
+    } else {
+        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+    }
+    paranoid_free(tmp);
+    paranoid_free(progress_str);
+    paranoid_free(tmp_fname);
+    paranoid_free(xattr_fname);
+    paranoid_free(acl_fname);
+    return (retval);
+}
+
+/**************************************************************************
+ *END_ RESTORE_ALL_TARBALLS_FROM_STREAM                                   *
+ **************************************************************************/
+
+/* @} - end of LLrestoreGroup */
+
+
+/**
+ * Restore all files in @p filelist.
+ * @param bkpinfo The backup information structure. Most fields are used.
+ * @param filelist The node structure containing the list of files to be
+ * restored.
+ * @return 0 for success, or the number of afioballs and biggiefiles that failed.
+ * @ingroup restoreGroup
+ */
+int restore_everything(struct s_node *filelist)
+{
+    int resA;
+    int resB;
+
+  /** mallco ***/
+    char *cwd;
+    char *newpath;
+    char *tmp;
+    assert(bkpinfo != NULL);
+
+    malloc_string(cwd);
+    malloc_string(newpath);
+    malloc_string(tmp);
+    log_msg(2, "restore_everything() --- starting");
+    g_current_media_number = 1;
+    getcwd(cwd, MAX_STR_LEN - 1);
+    sprintf(tmp, "mkdir -p %s", bkpinfo->restore_path);
+    run_program_and_log_output(tmp, FALSE);
+    log_msg(1, "Changing dir to %s", bkpinfo->restore_path);
+    chdir(bkpinfo->restore_path);
+    getcwd(newpath, MAX_STR_LEN - 1);
+    log_msg(1, "path is now %s", newpath);
+    log_msg(1, "restoring everything");
+    if (!find_home_of_exe("petris") && !g_text_mode) {
+        newtDrawRootText(0, g_noof_rows - 2,
+                         "Press ALT-<left cursor> twice to play Petris :-) ");
+        newtRefresh();
+    }
+    mvaddstr_and_log_it(g_currentY, 0, "Preparing to read your archives");
+    if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
+        mount_media();
+        mvaddstr_and_log_it(g_currentY++, 0,
+                            "Restoring OS and data from streaming media");
+        if (bkpinfo->backup_media_type == cdstream) {
+            openin_cdstream();
+        } else {
+            assert_string_is_neither_NULL_nor_zerolength(bkpinfo->media_device);
+            openin_tape();
+        }
+        resA = restore_all_tarballs_from_stream(filelist);
+        resB = restore_all_biggiefiles_from_stream(filelist);
+        if (bkpinfo->backup_media_type == cdstream) {
+            closein_cdstream();
+        } else {
+            closein_tape();
+        }
+    } else {
+        mvaddstr_and_log_it(g_currentY++, 0,
+                            "Restoring OS and data from CD/USB   ");
+        mount_media();
+        resA = restore_all_tarballs_from_CD(filelist);
+        resB = restore_all_biggiefiles_from_CD(filelist);
+    }
+    chdir(cwd);
+    if (resA + resB) {
+        log_to_screen("Errors occurred while data was being restored.");
+    }
+    if (length_of_file("/etc/raidtab") > 0) {
+        log_msg(2, "Copying local raidtab to restored filesystem");
+        run_program_and_log_output("cp -f /etc/raidtab " MNT_RESTORING
+                                   "/etc/raidtab", FALSE);
+    }
+    kill_petris();
+    log_msg(2, "restore_everything() --- leaving");
+    paranoid_free(cwd);
+    paranoid_free(newpath);
+    paranoid_free(tmp);
+    return (resA + resB);
+}
+
+/**************************************************************************
+ *END_RESTORE_EVERYTHING                                                  *
+ **************************************************************************/
+
+
+
+/**
+ * @brief Haha. You wish! (This function is not implemented :-)
+ */
+int
+restore_live_from_monitas_server(char *monitas_device,
+                                 char *restore_this_directory,
+                                 char *restore_here)
+     /* NB: bkpinfo hasn't been populated yet, except for ->tmp which is "/tmp" */
+{
+    FILE *fout;
+    int retval = 0;
+    int i;
+    int j;
+    struct mountlist_itself the_mountlist;
+    static struct raidlist_itself the_raidlist;
+  /** malloc **/
+    char tmp[MAX_STR_LEN + 1];
+    char command[MAX_STR_LEN + 1];
+    char datablock[256 * 1024];
+    char datadisks_fname[MAX_STR_LEN + 1];
+    long k;
+    long length;
+    long long llt;
+    struct s_node *filelist = NULL;
+    assert(bkpinfo != NULL);
+    assert_string_is_neither_NULL_nor_zerolength(monitas_device);
+    assert(restore_this_directory != NULL);
+    assert(restore_here != NULL);
+
+    sprintf(tmp, "restore_here = '%s'", restore_here);
+
+    log_msg(2, tmp);
+
+    log_msg(2, "restore_live_from_monitas_server() - starting");
+    unlink("/tmp/mountlist.txt");
+    unlink("/tmp/filelist.full");
+    unlink("/tmp/biggielist.txt");
+    if (restore_here[0] == '\0') {
+        strcpy(bkpinfo->restore_path, MNT_RESTORING);
+    } else {
+        strcpy(bkpinfo->restore_path, restore_here);
+    }
+    log_msg(3, "FYI FYI FYI FYI FYI FYI FYI FYI FYI FYI FYI");
+    sprintf(tmp, "FYI - data will be restored to %s",
+            bkpinfo->restore_path);
+    log_msg(3, tmp);
+    log_msg(3, "FYI FYI FYI FYI FYI FYI FYI FYI FYI FYI FYI");
+    sprintf(datadisks_fname, "/tmp/mondorestore.datadisks.%d",
+            (int) (random() % 32768));
+    chdir(bkpinfo->tmpdir);
+
+    sprintf(command, "cat %s", monitas_device);
+    g_tape_stream = popen(command, "r");    // for compatibility with openin_tape()
+    if (!(fout = fopen(datadisks_fname, "w"))) {
+        log_OS_error(datadisks_fname);
+        return (1);
+    }
+    for (i = 0; i < 32; i++) {
+        for (j = 0; j < 4; j++) {
+            for (length = k = 0; length < 256 * 1024; length += k) {
+                k = fread(datablock + length, 1, 256 * 1024 - length,
+                          g_tape_stream);
+            }
+            fwrite(datablock, 1, length, fout);
+            g_tape_posK += length;
+        }
+    }
+    paranoid_fclose(fout);
+    sprintf(command,
+            "tar -zxvf %s ./tmp/mondo-restore.cfg ./tmp/mountlist.txt ./tmp/filelist.full ./tmp/biggielist.txt",
+            datadisks_fname);
+    run_program_and_log_output(command, 4);
+    read_header_block_from_stream(&llt, tmp, &i);
+    read_header_block_from_stream(&llt, tmp, &i);
+
+    unlink(datadisks_fname);
+    read_cfg_file_into_bkpinfo(g_mondo_cfg_file);
+    retval = load_mountlist(&the_mountlist, g_mountlist_fname); // in case read_cfg_file_into_bkpinfo   strcpy(bkpinfo->media_device, monitas_device);
+
+
+    load_raidtab_into_raidlist(&the_raidlist, RAIDTAB_FNAME);
+    iamhere("FIXME");
+    fatal_error("This will fail");
+    sprintf(command,
+            "grep -E '^%s.*$' %s > %s",
+            restore_this_directory, g_filelist_full, g_filelist_full);
+    if (system(command)) {
+        retval++;
+        log_to_screen
+            ("Error(s) occurred while processing filelist and wildcard");
+    }
+    iamhere("FIXME");
+    fatal_error("This will fail");
+    sprintf(command,
+            "grep -E '^%s.*$' %s > %s",
+            restore_this_directory, g_biggielist_txt, g_biggielist_txt);
+    if (system(command)) {
+        log_msg(1,
+                "Error(s) occurred while processing biggielist and wildcard");
+    }
+    sprintf(command, "touch %s", g_biggielist_txt);
+    run_program_and_log_output(command, FALSE);
+//  filelist = load_filelist(g_filelist_restthese);  // FIXME --- this probably doesn't work because it doesn't include the biggiefiles
+    retval += restore_everything(filelist);
+    free_filelist(filelist);
+    log_msg(2, "--------End of restore_live_from_monitas_server--------");
+    return (retval);
+}
+
+/**************************************************************************
+ *END_RESTORE_LIVE_FROM_MONITAS_SERVER                                    *
+ **************************************************************************/
+
+
+
+
+extern void wait_until_software_raids_are_prepped(char *, int);
+
+
+char which_restore_mode(void);
+
+
+/**
+ * Log a "don't panic" message to the logfile.
+ */
+void welcome_to_mondorestore()
+{
+    log_msg(0, "-------------- Mondo Restore v%s -------------", PACKAGE_VERSION);
+    log_msg(0,
+            "DON'T PANIC! Mondorestore logs almost everything, so please ");
+    log_msg(0,
+            "don't break out in a cold sweat just because you see a few  ");
+    log_msg(0,
+            "error messages in the log. Read them; analyze them; see if  ");
+    log_msg(0,
+            "they are significant; above all, verify your backups! Please");
+    log_msg(0,
+            "attach a compressed copy of this log to any e-mail you send ");
+    log_msg(0,
+            "to the Mondo mailing list when you are seeking technical    ");
+    log_msg(0,
+            "support. Without it, we can't help you.            - DevTeam");
+    log_msg(0,
+            "------------------------------------------------------------");
+    log_msg(0,
+            "BTW, despite (or perhaps because of) the wealth of messages,");
+    log_msg(0,
+            "some users are inclined to stop reading this log.  If Mondo ");
+    log_msg(0,
+            "stopped for some reason, chances are it's detailed here.    ");
+    log_msg(0,
+            "More than likely there's a message at the very end of this  ");
+    log_msg(0,
+            "log that will tell you what is wrong.  Please read it!      ");
+    log_msg(0,
+            "------------------------------------------------------------");
+}
+
+
+
+/**
+ * Restore the user's data.
+ * What did you think it did, anyway? :-)
+ */
+int main(int argc, char *argv[])
+{
+    FILE *fin;
+    FILE *fout;
+    int retval = 0;
+    int res;
+//  int c;
+    char *tmp;
+
+    struct mountlist_itself *mountlist;
+    struct raidlist_itself *raidlist;
+    struct s_node *filelist;
+    char *a, *b;
+    bool run_postnuke = FALSE;
+
+  /**************************************************************************
+   * hugo-                                                                  *
+   * busy stuff here - it needs some comments -stan                           *
+   *                                                                        *
+   **************************************************************************/
+    if (getuid() != 0) {
+        fprintf(stderr, "Please run as root.\r\n");
+        exit(127);
+    }
+    if (!
+        (bkpinfo = malloc(sizeof(struct s_bkpinfo)))) {
+        fatal_error("Cannot malloc bkpinfo");
+    }
+    reset_bkpinfo();
+
+    g_loglevel = DEFAULT_MR_LOGLEVEL;
+    malloc_string(tmp);
+
+/* Configure global variables */
+#ifdef __FreeBSD__
+    if (strstr
+        (call_program_and_get_last_line_of_output("cat /tmp/cmdline"),
+         "textonly"))
+#else
+    if (strstr
+        (call_program_and_get_last_line_of_output("cat /proc/cmdline"),
+         "textonly"))
+#endif
+    {
+        g_text_mode = TRUE;
+        log_msg(1, "TEXTONLY MODE");
+    } else {
+        g_text_mode = FALSE;
+    }                           // newt :-)
+    if (!(mountlist = malloc(sizeof(struct mountlist_itself)))) {
+        fatal_error("Cannot malloc mountlist");
+    }
+    if (!(raidlist = malloc(sizeof(struct raidlist_itself)))) {
+        fatal_error("Cannot malloc raidlist");
+    }
+
+    malloc_libmondo_global_strings();
+
+    strcpy(g_mondo_home,
+           call_program_and_get_last_line_of_output("which mondorestore"));
+    sprintf(g_tmpfs_mountpt, "/tmp/tmpfs");
+    make_hole_for_dir(g_tmpfs_mountpt);
+    g_current_media_number = 1; // precaution
+
+    run_program_and_log_output("mkdir -p " MNT_CDROM, FALSE);
+
+    malloc_string(tmp);
+    malloc_string(a);
+    malloc_string(b);
+    setup_MR_global_filenames();    // malloc() and set globals, using bkpinfo->tmpdir etc.
+    bkpinfo->backup_media_type = none;  // in case boot disk was made for one backup type but user wants to restore from another backup type
+    bkpinfo->restore_data = TRUE;   // Well, yeah :-)
+    if (am_I_in_disaster_recovery_mode()) {
+        run_program_and_log_output("mount / -o remount,rw", 2);
+    }                           // for b0rken distros
+    g_main_pid = getpid();
+    srandom((int) (time(NULL)));
+    register_pid(getpid(), "mondo");
+    set_signals(TRUE);
+    g_kernel_version = get_kernel_version();
+
+    log_msg(1, "FYI - g_mountlist_fname = %s", g_mountlist_fname);
+    if (strlen(g_mountlist_fname) < 3) {
+        fatal_error
+            ("Serious error in malloc()'ing. Could be a bug in your glibc.");
+    }
+    mkdir(MNT_CDROM, 0x770);
+    make_hole_for_dir(MONDO_CACHE);
+
+    /* Backup original mountlist.txt */
+    sprintf(tmp, "%s.orig", g_mountlist_fname);
+    if (!does_file_exist(g_mountlist_fname)) {
+        log_msg(2,
+                "%ld: Warning - g_mountlist_fname (%s) does not exist yet",
+                __LINE__, g_mountlist_fname);
+    } else if (!does_file_exist(tmp)) {
+        sprintf(tmp, "cp -f %s %s.orig", g_mountlist_fname,
+                g_mountlist_fname);
+        run_program_and_log_output(tmp, FALSE);
+    }
+
+    /* Init directories */
+    make_hole_for_dir("/var/log");
+    make_hole_for_dir("/tmp/tmpfs");    /* just in case... */
+    run_program_and_log_output("umount " MNT_CDROM, FALSE);
+    /*
+    run_program_and_log_output("ln -sf /var/log/mondo-archive.log /tmp/mondorestore.log",
+         FALSE);
+         */
+
+    run_program_and_log_output("rm -Rf /tmp/tmpfs/mondo.tmp.*", FALSE);
+
+    /* Init GUI */
+    malloc_libmondo_global_strings();
+    setup_newt_stuff();         /* call newtInit and setup screen log */
+    welcome_to_mondorestore();
+    if (bkpinfo->disaster_recovery) {
+        log_msg(1, "I am in disaster recovery mode");
+    } else {
+        log_msg(1, "I am in normal, live mode");
+    }
+
+    iamhere("what time is it");
+
+    /* Process command-line parameters */
+    if (argc == 2 && strcmp(argv[1], "--edit-mountlist") == 0) {
+#ifdef __FreeBSD__
+        system("mv -f /tmp/raidconf.txt /etc/raidtab");
+        if (!does_file_exist("/etc/raidtab"))
+            system("vinum printconfig > /etc/raidtab");
+#endif
+        load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
+        if (!does_file_exist(g_mountlist_fname)) {
+            strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
+        }
+        res = let_user_edit_the_mountlist(mountlist, raidlist);
+#ifdef __FreeBSD__
+        system("mv -f /etc/raidtab /tmp/raidconf.txt");
+#endif
+        paranoid_MR_finish(res);
+    }
+
+    g_loglevel = DEFAULT_MR_LOGLEVEL;
+    if (argc == 3 && strcmp(argv[1], "--echo-to-screen") == 0) {
+        fout = fopen("/tmp/out.txt", "w");
+        fput_string_one_char_at_a_time(stderr, argv[2]);
+        finish(0);
+    }
+
+    if (argc == 3 && strcmp(argv[1], "--gendf") == 0) {
+        make_grub_install_scriptlet(argv[2]);
+        finish(0);
+    }
+
+    if (argc >= 2 && strcmp(argv[1], "--pih") == 0) {
+        if (system("mount | grep cdrom 2> /dev/null > /dev/null")) {
+            system("mount " MNT_CDROM);
+        }
+        bkpinfo->compression_level = 1;
+        g_current_media_number = 2;
+        strcpy(bkpinfo->restore_path, "/tmp/TESTING");
+        bkpinfo->backup_media_type = dvd;
+        open_progress_form("Reassembling /dev/hda1",
+                           "Shark is a bit of a silly person.",
+                           "Please wait. This may take some time.",
+                           "", 1999);
+        system("rm -Rf /tmp/*pih*");
+
+        restore_a_biggiefile_from_CD(42, NULL, tmp);
+    }
+
+    if (argc == 5 && strcmp(argv[1], "--common") == 0) {
+        g_loglevel = 6;
+        filelist = load_filelist(argv[2]);
+        if (!filelist) {
+            fatal_error("Failed to load filelist");
+        }
+        toggle_node_selection(filelist, FALSE);
+        toggle_all_root_dirs_on(filelist);
+        // BERLIOS: /usr/lib ???
+        toggle_path_selection(filelist, "/usr/share", TRUE);
+//      show_filelist(filelist);
+        save_filelist(filelist, "/tmp/out.txt");
+//      finish(0);
+//      toggle_path_selection (filelist, "/root/stuff", TRUE);
+        strcpy(a, argv[3]);
+        strcpy(b, argv[4]);
+
+        res = save_filelist_entries_in_common(a, filelist, b, FALSE);
+        free_filelist(filelist);
+        printf("res = %d", res);
+        finish(0);
+    }
+
+    if (argc == 3 && strcmp(argv[1], "--popuplist") == 0) {
+        popup_changelist_from_file(argv[2]);
+        paranoid_MR_finish(0);
+    }
+
+    if (argc == 5 && strcmp(argv[1], "--copy") == 0) {
+        log_msg(1, "SCORE");
+        g_loglevel = 10;
+        if (strstr(argv[2], "save")) {
+            log_msg(1, "Saving from %s to %s", argv[3], argv[4]);
+            fin = fopen(argv[3], "r");
+            fout = fopen(argv[4], "w");
+            copy_from_src_to_dest(fin, fout, 'w');
+            fclose(fin);
+            fin = fopen(argv[3], "r");
+            copy_from_src_to_dest(fin, fout, 'w');
+            fclose(fout);
+            fclose(fin);
+        } else if (strstr(argv[2], "restore")) {
+            fout = fopen(argv[3], "w");
+            fin = fopen(argv[4], "r");
+            copy_from_src_to_dest(fout, fin, 'r');
+            fclose(fin);
+            fin = fopen(argv[4], "r");
+            copy_from_src_to_dest(fout, fin, 'r');
+            fclose(fout);
+            fclose(fin);
+        } else {
+            fatal_error("Unknown additional param");
+        }
+        finish(0);
+    }
+
+    if (argc == 3 && strcmp(argv[1], "--mdstat") == 0) {
+        wait_until_software_raids_are_prepped(argv[2], 100);
+        finish(0);
+    }
+
+    if (argc == 3 && strcmp(argv[1], "--mdconv") == 0) {
+        finish(create_raidtab_from_mdstat(argv[2]));
+    }
+
+    if (argc == 3 && strcmp(argv[1], "-p") == 0) {
+        strcpy(bkpinfo->prefix,argv[2]);
+        log_msg(1,"Prefix forced to %s",bkpinfo->prefix);
+    }
+
+    if (argc == 3 && strcmp(argv[1], "-K") == 0) {
+        g_loglevel = atoi(argv[2]);
+        log_msg(1,"Loglevel forced to %s",g_loglevel);
+    }
+
+    if (argc == 2 && strcmp(argv[1], "--live-grub") == 0) {
+        retval = run_grub(FALSE, "/dev/hda");
+        if (retval) {
+            log_to_screen("Failed to write Master Boot Record");
+        }
+        paranoid_MR_finish(0);
+    }
+    if (argc == 3 && strcmp(argv[1], "--paa") == 0) {
+        g_current_media_number = atoi(argv[2]);
+        pause_and_ask_for_cdr(5, NULL);
+        paranoid_MR_finish(0);
+    } else if (!bkpinfo->disaster_recovery) {   // live!
+        if (argc != 1) {
+            popup_and_OK
+                ("Live mode doesn't support command-line parameters yet.");
+            paranoid_MR_finish(1);
+//    return(1);
+        }
+        log_msg(1, "I am in normal, live mode.");
+        log_msg(2, "FYI, MOUNTLIST_FNAME = %s", g_mountlist_fname);
+        mount_boot_if_necessary();  /* for Gentoo users */
+        log_msg(2, "Still here.");
+        if (argc > 1 && strcmp(argv[argc - 1], "--live-from-cd") == 0) {
+            g_restoring_live_from_cd = TRUE;
+        }
+        if (bkpinfo->backup_media_type == nfs) {
+            g_restoring_live_from_nfs = TRUE;
+        }
+        if (argc == 5 && strcmp(argv[1], "--monitas-live") == 0) {
+            retval =
+                restore_live_from_monitas_server(argv[2],
+                                                 argv[3], argv[4]);
+        } else {
+            log_msg(2, "Calling restore_to_live_filesystem()");
+            retval = restore_to_live_filesystem();
+        }
+        log_msg(2, "Still here. Yay.");
+        if (strlen(bkpinfo->tmpdir) > 0) {
+            sprintf(tmp, "rm -Rf %s/*", bkpinfo->tmpdir);
+            run_program_and_log_output(tmp, FALSE);
+        }
+        unmount_boot_if_necessary();    /* for Gentoo users */
+        paranoid_MR_finish(retval);
+    } else {
+        /* Disaster recovery mode (must be) */
+        log_msg(1, "I must be in disaster recovery mode.");
+        log_msg(2, "FYI, MOUNTLIST_FNAME = %s ", g_mountlist_fname);
+        if (argc == 3 && strcmp(argv[1], "--monitas-memorex") == 0) {
+            log_to_screen("Uh, that hasn't been implemented yet.");
+            paranoid_MR_finish(1);
+        }
+
+        iamhere("About to call load_mountlist and load_raidtab");
+        strcpy(bkpinfo->restore_path, MNT_RESTORING);
+        read_cfg_file_into_bkpinfo(g_mondo_cfg_file);
+        retval = load_mountlist(mountlist, g_mountlist_fname);
+        retval += load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
+        iamhere
+            ("Returned from calling load_mountlist and load_raidtab successfully");
+
+        if (argc > 1
+            && (strcmp(argv[1], "--compare") == 0
+                || strcmp(argv[1], "--nuke") == 0)) {
+            if (bkpinfo->backup_media_type == nfs
+                && !is_this_device_mounted(bkpinfo->nfs_mount)) {
+                log_msg(1, "Mounting nfs dir");
+                sprintf(bkpinfo->isodir, "/tmp/isodir");
+                run_program_and_log_output("mkdir -p /tmp/isodir", 5);
+                sprintf(tmp, "mount %s -t nfs -o nolock /tmp/isodir",
+                        bkpinfo->nfs_mount);
+                run_program_and_log_output(tmp, 1);
+            }
+        }
+
+
+        if (retval) {
+            log_to_screen
+                ("Warning - load_raidtab_into_raidlist returned an error");
+        }
+
+
+        log_msg(1, "Send in the clowns.");
+
+        if (argc == 2 && strcmp(argv[1], "--partition-only") == 0) {
+            log_msg(0, "Partitioning only.");
+            load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
+            strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
+            load_mountlist(mountlist, g_mountlist_fname);
+            res = partition_everything(mountlist);
+            finish(res);
+        }
+
+        if (argc == 2 && strcmp(argv[1], "--format-only") == 0) {
+            log_msg(0, "Formatting only.");
+            load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
+            strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
+            load_mountlist(mountlist, g_mountlist_fname);
+            res = format_everything(mountlist, FALSE, raidlist);
+            finish(res);
+        }
+
+        if (argc == 2 && strcmp(argv[1], "--stop-lvm-and-raid") == 0) {
+            log_msg(0, "Stopping LVM and RAID");
+            load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
+            strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
+            load_mountlist(mountlist, g_mountlist_fname);
+            res = do_my_funky_lvm_stuff(TRUE, FALSE);
+            res += stop_all_raid_devices(mountlist);
+            finish(res);
+        }
+
+        if (argc == 2 && strcmp(argv[1], "--nuke") == 0) {
+            iamhere("nuking");
+            retval += nuke_mode(mountlist, raidlist);
+        } else if (argc == 2 && strcmp(argv[1], "--interactive") == 0) {
+            iamhere("catchall");
+            retval += catchall_mode(mountlist, raidlist);
+        } else if (argc == 2 && strcmp(argv[1], "--compare") == 0) {
+            iamhere("compare");
+            retval += compare_mode(mountlist, raidlist);
+        } else if (argc == 2 && strcmp(argv[1], "--iso") == 0) {
+            iamhere("iso");
+            retval = iso_mode(mountlist, raidlist, FALSE);
+        } else if (argc == 2 && strcmp(argv[1], "--mbr") == 0) {
+            iamhere("mbr");
+            retval = mount_all_devices(mountlist, TRUE);
+            if (!retval) {
+                retval += run_boot_loader(FALSE);
+                retval += unmount_all_devices(mountlist);
+            }
+            if (retval) {
+                log_to_screen("Failed to write Master Boot Record");
+            }
+        } else if (argc == 2 && strcmp(argv[1], "--isonuke") == 0) {
+            iamhere("isonuke");
+            retval = iso_mode(mountlist, raidlist, TRUE);
+        } else if (argc != 1) {
+            log_to_screen("Invalid paremeters");
+            paranoid_MR_finish(1);
+        } else {
+            iamhere("catchall (no mode specified in command-line call");
+            retval += catchall_mode(mountlist, raidlist);
+        }
+    }
+
+    /* clean up at the end */
+    if (retval) {
+        if (does_file_exist(MONDO_CACHE"/changed.files")) {
+            log_to_screen
+                ("See "MONDO_CACHE"/changed.files for list of files that have changed.");
+        }
+        mvaddstr_and_log_it(g_currentY++,
+                            0,
+                            "Run complete. Errors were reported. Please review the logfile.");
+    } else {
+        if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
+            mvaddstr_and_log_it(g_currentY++,
+                                0,
+                                "Run complete. Please remove media and reboot.");
+        } else {
+            run_program_and_log_output("sync", FALSE);
+            if (is_this_device_mounted(MNT_CDROM)) {
+                res =
+                    run_program_and_log_output("umount " MNT_CDROM, FALSE);
+            } else {
+                res = 0;
+            }
+
+            if (!bkpinfo->please_dont_eject) {
+                res = eject_device("/dev/cdrom");
+/*
+              if (res) 
+        {
+          log_to_screen( "WARNING - failed to eject CD-ROM disk" ); 
+        }
+*/
+            }
+            mvaddstr_and_log_it(g_currentY++,
+                                0,
+                                "Run complete. Please remove media and reboot.");
+        }
+    }
+
+// g_I_have_just_nuked is set true by nuke_mode() just before it returns
+    if (!system("which post-nuke > /dev/null 2> /dev/null")) {
+      log_msg(1, "post-nuke found; find out whether we should run it...");
+      if (g_I_have_just_nuked || does_file_exist("/POST-NUKE-ANYWAY")) {
+        run_postnuke = TRUE;
+        log_msg(1, "Yes, will run post-nuke because in nuke mode or file /POST-NUKE-ANYWAY exists.");
+      } else if (ask_me_yes_or_no("post-nuke script found. Do you want to run it?")) {
+        run_postnuke = TRUE;
+        log_msg(1, "Yes, will run post-nuke because user interactively asked for it.");
+      } else {
+        run_postnuke = FALSE;
+        log_msg(1, "No, will not run post-nuke.");
+      }
+    } else {
+      log_msg(1, "No post-nuke found.");
+    }
+    if (run_postnuke) {
+      log_to_screen("Running post-nuke...");
+      if (mount_all_devices(mountlist, TRUE)) {
+        log_to_screen
+          ("Unable to re-mount partitions for post-nuke stuff");
+      } else {
+        log_msg(1, "Re-mounted partitions for post-nuke stuff");
+        sprintf(tmp, "post-nuke %s %d", bkpinfo->restore_path,
+            retval);
+        log_msg(2, "Calling '%s'", tmp);
+        if ((res = run_program_and_log_output(tmp, 0))) {
+          log_OS_error(tmp);
+        }
+        log_msg(1, "post-nuke returned w/ res=%d", res);
+      }
+      unmount_all_devices(mountlist);
+      log_to_screen("I've finished post-nuking.");
+    }
+
+/*  
+  log_to_screen("If you are REALLY in a hurry, hit Ctrl-Alt-Del now.");
+  log_to_screen("Otherwise, please wait until the RAID disks are done.");
+  wait_until_software_raids_are_prepped("/proc/mdstat", 100);
+  log_to_screen("Thank you.");
+*/
+    unlink("/tmp/mondo-run-prog.tmp");
+    set_signals(FALSE);
+    log_to_screen("Restore log (%s) copied to /var/log on your hard disk", MONDO_LOGFILE);
+    sprintf(tmp,
+            "Mondo-restore is exiting (retval=%d)                                      ",
+            retval);
+    log_to_screen(tmp);
+    sprintf(tmp, "umount %s", bkpinfo->isodir);
+    run_program_and_log_output(tmp, 5);
+    paranoid_free(mountlist);
+    paranoid_free(raidlist);
+    if (am_I_in_disaster_recovery_mode()) {
+        run_program_and_log_output("mount / -o remount,rw", 2);
+    }                           // for b0rken distros
+    sprintf(tmp, "rm -Rf %s", bkpinfo->tmpdir);
+    system(tmp);
+    paranoid_MR_finish(retval); // frees global stuff plus bkpinfo
+    free_libmondo_global_strings(); // it's fine to have this here :) really :)
+    paranoid_free(a);
+    paranoid_free(b);
+    paranoid_free(tmp);
+
+    unlink("/tmp/filelist.full");
+    unlink("/tmp/filelist.full.gz");
+
+    exit(retval);
+}
+
+/**************************************************************************
+ *END_MAIN                                                                *
+ **************************************************************************/
+
+
+
+
+
+/**************************************************************************
+ *END_MONDO-RESTORE.C                                                     *
+ **************************************************************************/

branches/stable/website/support.shtml

@@ -18 +18 @@
             <li><tt>/var/log/mondorestore.log</tt></li>
     </ul></p>
+    <p>Feel free to compress them if their size is greater than 400kB - limit of the mailing list attachements size. And the preferred way is to provide them as multiple files compressed, rather than a compressed tar file if possible :-)</p>
     <p>Second look at the <a href="/docs.shtml">Mondo Rescue documentation</a> and the extensive FAQ section of the Mondo Rescue HOWTO, as a lot of good tip and tricks are provided there.</p>
     <p>Third look at the <a href="http://trac.mondorescue.org/">Mondo Rescue wiki</a> which may contain additional comments,and feel free to contribute by adding your remarks.</p>
-    <p>Fourth look at the <a href="http://sourceforge.net/mailarchive/forum.php?forum_name=mondo-devel">Mondo Rescue Mailing List Archives</a> as you're probably not the first with this problem.</p>
+    <p>Fourth look at the <a href="http://sourceforge.net/mailarchive/forum.php?forum_name=mondo-devel">Mondo Rescue Mailing List Archives</a> as you're probably not the first with this problem. Or look at existing <a href="http://trac.mondorescue.org/newticket">bug reports</a>.</p>
+    <p>Fifth, if you're willing to help debugging the future Mondo Rescue versions, try the latest beta available under the <a href="ftp://ftp.mondorescue.org/test">test directory</a> of our ftp server.</p>
     <p>Finally post on the <a href="mailto:mondo-devel_at_lists.sourceforge.net">Mondo Rescue Mailing List</a> if you did not find what you were looking for, as there are more than 400 users there who could help you, including dev team members. <b>But</b>, they can only help you if your provide at least the above mentioned <b>2 first log files</b>.</p>
     <p>If your think you found a bug in Mondo Rescue, please <a href="http://trac.mondorescue.org/newticket">fill a bug report</a> and also include the log files.</p>