Changeset 127 in MondoRescue

Timestamp:

Nov 19, 2005, 2:27:31 AM (18 years ago)

Author:

bcornec

Message:

merge -r 125:126 $SVN_M/branches/2.05

Location:

trunk

Files:

• mindi/Mindi/DiskSize/lib/DiskSize.c (modified) (1 diff)
• mindi/Mindi/DiskSize/lib/DiskSize.h (modified) (1 diff)
• mondo/mondo/common/libmondo-archive.c (modified) (10 diffs)
• mondo/mondo/common/libmondo-devices.c (modified) (2 diffs)
• mondo/mondo/common/libmondo-filelist.c (modified) (25 diffs)
• mondo/mondo/common/libmondo-files.c (modified) (2 diffs)
• mondo/mondo/common/libmondo-stream.c (modified) (22 diffs)
• mondo/mondo/common/libmondo-tools.c (modified) (19 diffs)
• mondo/mondo/common/libmondo-verify.c (modified) (13 diffs)
• mondo/mondo/common/my-stuff.h (modified) (1 diff)
• mondo/mondo/common/newt-specific.c (modified) (2 diffs)
• mondo/mondo/mondorestore/mondo-prep.c (modified) (1 diff)
• mondo/mondo/mondorestore/mondo-rstr-newt.c (modified) (2 diffs)
• mondo/mondo/mondorestore/mondo-rstr-tools.c (modified) (2 diffs)
• mondo/mondo/mondorestore/mr-externs.h (modified) (1 diff)
• mondo/mondo/xmondo/xmondo.h (modified) (1 diff)
• mondo/mondo/xmondo/xmondobackup.h (modified) (1 diff)
• mondo/mondo/xmondo/xmondorestore.h (modified) (1 diff)

trunk/mindi/Mindi/DiskSize/lib/DiskSize.c

@@ -4 +4 @@
 #include "DiskSize.h"
 
-long
-get_size_of_disk(disk)
-    const char *    disk;
+long get_size_of_disk(disk)
+const char *disk;
 {
-    int       fd;
-    unsigned long ul;
-    if ((fd = open (disk, O_RDONLY)) == -1) {
-    return 0; /* couldn't open */
-    }
-    if (ioctl (fd, BLKGETSIZE, &ul) == -1) {
-    return 0; /* couldn't ioctl */
-    }
-    close (fd);
-    return ul / 2;
+    int fd;
+    unsigned long ul;
+    if ((fd = open(disk, O_RDONLY)) == -1) {
+        return 0;               /* couldn't open */
+    }
+    if (ioctl(fd, BLKGETSIZE, &ul) == -1) {
+        return 0;               /* couldn't ioctl */
+    }
+    close(fd);
+    return ul / 2;
 }

trunk/mindi/Mindi/DiskSize/lib/DiskSize.h

@@ -1 @@
-extern long get_size_of_disk (const char *disk);
+extern long get_size_of_disk(const char *disk);

trunk/mondo/mondo/common/libmondo-archive.c

@@ -358 +358 @@
     paranoid_free(command);
 
-    asprintf(&command, "cat %s | afio -o -b %ld -M 16m %s %s 2>> %s",
-             filelist, TAPE_BLOCK_SIZE, zipparams, fname, MONDO_LOGFILE);
+    asprintf(&command, "afio -o -b %ld -M 16m %s %s < %s 2>> %s",
+             TAPE_BLOCK_SIZE, zipparams, fname, filelist, MONDO_LOGFILE);
     paranoid_free(zipparams);
 
@@ -556 +556 @@
 
     asprintf(&tmp,
-             "echo \"%s\" | tr -s ' ' '\n' | grep -x \"/dev/.*\" | tr -s '\n' ' ' | awk '{print $0\"\\n\";}'",
+             "echo '%s' | tr -s ' ' '\n' | grep -x '/dev/.*' | tr -s '\n' ' ' | awk '{print $0\"\\n\";}'",
              bkpinfo->exclude_paths);
     asprintf(&devs_to_exclude,
@@ -832 +832 @@
 6=\"%s\" 7=%ld 8=\"%s\" 9=\"%s\" 10=\"%s\" \
 11=\"%s\" 12=%s 13=%ld 14=\"%s\" 15=\"%s\" 16=\"%s\" 17=\"%s\" 18=%ld 19=%d",*/
-             "mindi --custom %s %s/images \"%s\" \"%s\" \
-\"%s\" %ld \"%s\" \"%s\" \"%s\" \
-\"%s\" %s %ld \"%s\" \"%s\" \"%s\" \"%s\" %ld %d %s", bkpinfo->tmpdir,  // parameter #2
+             "mindi --custom %s %s/images '%s' '%s' \
+'%s' %ld '%s' '%s' '%s' \
+'%s' %s %ld '%s' '%s' '%s' '%s' %ld %d %s", bkpinfo->tmpdir,    // parameter #2
              bkpinfo->scratchdir,   // parameter #3
              bkpinfo->kernel_path,  // parameter #4
@@ -917 +917 @@
     } else {
         log_to_screen("Mindi failed to create your boot+data disks.");
-        asprintf(&command, "cat %s | grep \"Fatal error\"",
-                 "/var/log/mindi.log");
+        asprintf(&command, "grep 'Fatal error' /var/log/mindi.log");
         asprintf(&tmp, call_program_and_get_last_line_of_output(command));
         paranoid_free(command);
@@ -1715 +1714 @@
                 log_to_screen("%s...OK", message_to_screen);
                 if (!run_program_and_log_output
-                    ("tail -n10 /var/log/mondo-archive.log | fgrep \":-(\"",
+                    ("tail -n10 /var/log/mondo-archive.log | fgrep ':-('",
                      1)) {
                     log_to_screen
@@ -1724 +1723 @@
 #ifdef DVDRWFORMAT
             asprintf(&tmp,
-                     "cat %s | tail -n8 | grep \"blank=full.*dvd-compat.*DAO\"",
+                     "tail -n8 %s | grep 'blank=full.*dvd-compat.*DAO'",
                      MONDO_LOGFILE);
             if (g_backup_media_type == dvd
@@ -3105 +3104 @@
     } else {
         file_to_openin = biggie_filename;
-        asprintf(&command, "md5sum \"%s\"", biggie_filename);
+        asprintf(&command, "md5sum '%s'", biggie_filename);
         if (!(fin = popen(command, "r"))) {
             log_OS_error("Unable to popen-in command");
@@ -3508 +3507 @@
         if (bkpinfo->verify_data && !res) {
             log_to_screen
-                ("Please reboot from the 1st CD in Compare Mode, as a precaution.");
+                ("Please reboot from the 1st %s in Compare Mode, as a precaution.",
+                 media_descriptor_string(g_backup_media_type));
             chdir("/");
             iamhere("Before calling verify_cd_image()");
@@ -3640 +3640 @@
 */
         asprintf(&tmp,
-                 "cat %s | grep \"afio: \" | sed 's/afio: //' | grep -vx \"/dev/.*\" >> /tmp/changed.files",
+                 "sed -n -e 's/afio: //p' %s | grep -vx '/dev/.*' >> /tmp/changed.files",
                  MONDO_LOGFILE);
         system(tmp);
@@ -3646 +3646 @@
 
         asprintf(&tmp,
-                 "cat %s | grep \"star: \" | sed 's/star: //' | grep -vx \"/dev/.*\" >> /tmp/changed.files",
+                 "sed -n -e 's/star: //p' %s | grep -vx '/dev/.*' >> /tmp/changed.files",
                  MONDO_LOGFILE);
         system(tmp);

trunk/mondo/mondo/common/libmondo-devices.c

@@ -1 +1 @@
 /* libmondo-devices.c                 Subroutines for handling devices
    $Id$
-.
-
-
-01/07/2005
-- sensibly_set_tmpdir_and_scratchdir() --- exclude smb and smbfs and (new) cifs
-
-10/23
-- if root mounted at '/dev/rd/' then say FALSE, not mounted on ramdisk
-  just to please Fred Beondo :-p
-
-07/25
-- updated get_phys_size_of_drive() to support newer, larger drives
-
-07/18
-- better support of users who boot from LVM CD and nuke-restore non-LVM backups
-
-07/08
-- BLKGETSIZE64 instead of BLKGETIO..whatever (Joshua)
-- amended to use BLKGETSIZE if BLKGETSIZE64 missing (Hugo)
-- resort to HDIO_GETGEO if BLKGETSIZE and BLKGETSIZE63 fail
-
-
-06/25
-- added Mandrake 9.2 support to which_boot_loader()
-- cleaned up find_cdrom_device()
-
-06/23
-- rewrote resolve_softlinks_to_get_to_actual_device_file() in C
-
-06/17
-- don't use star automatically if SELINUX detected; let user do that
-
-05/07
-- usage of parted2fdisk instead of fdisk alone (ia32/ia64 compatibility)
-  BCO
-
-04/17
-- replaced INTERNAL_TAPE_BLK_SIZE with bkpinfo->internal_tape_block_size
-
-04/13
-- if kernel >= 2.6 then ask for /dev entry, not SCSI node
-
-04/12
-- in mount_CDROM_...whatever, don't use bkpinfo_DONTUSETHIS to see if
-  mounting a real CD device; look for /dev/ at start of $device instead
-
-04/04
-- when testing for tape drive, use INTERNAL_TAPE_BLK_SIZE, not TAPE_BLOCK_SIZE
-
-04/03
-- don't eject/retract drive if ISO
-
-02/23/2004
-- changed strstr() to strncmp() in a few places
-
-12/11/2003
-- if we can't find the DVD using dvdrecord then try it w/cdrecord
-
-11/15
-- changed a few []s to char*s
-- better support of multiple CD-ROM drives
-
-11/14
-- better find_cdrom_device(), to cope w/ multiple CD writers
-
-10/26
-- call 'mt -f %s offline' to eject tape drive in eject_device()
-
-10/25
-- ask user to confirm which NFS share to mount
-- improved which_boot_loader()
-
-10/22
-- tweaked find_cdrom_device() and find_cdrw_device()
-- created find_dvd_device()
-
-10/21
-- changed "/mnt/cdrom" to MNT_CDROM
-
-09/28
-- interactive gui no longer asks dvd's speed
-
-09/26
-- interactive gui now supports dvd
-
-09/23
-- malloc/free global strings in new subroutines - malloc_libmondo_global_strings()
-  and free_libmondo_global_strings() - which are in libmondo-tools.c
-
-09/21
-- ask for CD size when backing up interactively
-- offer to exclude NFS shares if they're present
-
-09/20
-- exclude /dev/shm from sensibly_*()
-
-09/18
-- less verbose logging when insisting on CD #n
-
-09/09
-- added resolve_softlinks_to_get_to_actual_device_file()
-
-09/05
-- rewrote inisist_on_this_cd_number() and what_number_cd_is_this()
-
-09/02
-- is_this_a_valid_disk_format() -- treat ntfs (a.k.a. type 7) as recognized format
-  just in case user's backup includes a partimagehack-imaged drive
-
-08/01 - 08/31
-- better boot-time tape detection
-- remove backup-time, erroneous, "remove floppy" msg
-- working on am_I_in_disaster_recovery_mode()
-- interactively_obtain_...() - pause & ask user to remove CD/floppy
-
-06/01 - 07/31
-- in which_boot_loader(), also search /dev/cciss for boot loader
-- fixed calls to popup_and_get_string()
-- fixed bug in get_phys_size_of_drive()
-- fixed bug in where_is_root_mounted()
-- commented out a spurious assert()
-
-05/01 - 05/31
-- superior get_phys_size_of_drive() (Joshua Oreman)
-- fixed call to inject_device() --- Andree L.
-- find_cdrom_device() now may, if asked to, mount drive if possible,
-  to test that it has a CD in it; it then unmounts
-- mount_CDROM_here() now calls retract_cd_and_defeat_autorun() as well
-- fixed support for subdir-within-NFS-mount
-- cleaned up some FreeBSD-specific stuff
-- added Joshua Oreman's FreeBSD patches
-- mount_CDROM_here() --- mkdir -p mountpt
-- add older drive support to get_phys_size_of_drive()
-
-04/01 - 04/30
-- made which_boot_loader() more friendly towards Red Hat 9
-- find_and_mount_actual_cd() retracts all CD trays
-- added lots of log_OS_error()'s and assert()'s
-- fix ISO support in interactively_restore_...()
-- made find_cdrom_device() skip dmesg if second-stage string is empty
-- in find_cdrw_device(), find cdrecord before dvdrecord
-- fixed am_i_in_disaster_recovery_mode()
-- fixed insist_on_this_cd_number()
-
-03/01 - 03/31
-- more work on find_cdrom_device()
-- find_cdrom_device() --- if nonexistent/not found then
-  make sure to return '' as dev str and 1 as res
-- cleaner find_cdrom_device(), to find DVD instead of CD-ROM
-  as last resort
-- fix insist_on_this_cd_number()
-- add user the speed of CD writer, if writing
-- if root is /dev/root then assume not a ramdisk
-
-01/07 - 02/28
-- fixed find_cdrom_device (Stan Benoit)
-- if root is at /dev/root/root then LVM (not ramdisk)
-- fix am_I_in_disaster_recovery_mode() to recognize that /dev/rd/cp*
-  entries are not ramdisks but RAID disks
-- find_cdrw_device() no longer complains to stderr if no cdrecord
-
-01/02/2003
-- sensibly_set_tmpdir_and_scratchdir() --- exclude smb and smbfs
-
-12/01/2002
-- don't ask for isodir path if in disaster recovery mode
-
-11/01 - 11/30
-- added g_restoring_live_from_cd;
-- handle_incoming_parameters() will sensibly set tmpdir and scratchdir
-- properly wipe spurious scratchdir and tmpdir
-- modified sensibly_...() to use tmp.mondo.* and mondo.scratch.*
-  instead of mondo.tmpdir.* and mondo.scratchdir.*
-- line 861,912: set media_size[0] to 1999 as well as 1 thru N
-- chmod 700, not 770, in make_fifo()
-- sensibly_set_tmpdir_and_scratchdir() will now prefix a '/' to the
-  strings if it is missing
-
-10/01 - 10/31
-- changed find_cdrom_device() to ignore DVD drives in the hd[a-d] search;
-  consequently, the subroutine will try scd0, sr0, etc. afterwards
-- commented code
-- fixed obscure bug in find_and_mount_actual_cd()
-- code which sensibly configures tmpdir,scratchdir is now sep. sub.
-- changed sort -s to sort -n <-- sensibly...()
-
-09/01 - 09/30
-- added list_of_NFS_devices_and_mounts()
-- try /dev/st0 if no tape specified at all
-- change '64k' to TAPE_BLOCK_SIZE
-- improved find_cdrom_device()
-- if cdrecord not found then find_cdrom_device() returns 1
-- if disaster recovery mode then don't ask for CD-ROM's /dev entry;
-  assume /dev/cdrom
-- if restoring data then ask for CD-ROM's /dev entry (not its SCSI node)
-- run_program_and_log_output() now takes boolean operator to specify
-  whether it will log its activities in the event of _success_
-- changed sort -n +4 to sort -s +4 (Troff)
-- ask if user's kernel is sane; if 'no' then use FAILSAFE
-- ask user to confirm the tape/CD device name
-- if restoring (not archiving) then don't try to find CD-ROM's SCSI
-  node; try to find its /dev entry instead
-- better detection of biggest partition
-
-08/01 - 08/31
-- fixed verify bug --- CD#1 was being verified again & again & ...
-- detect boot loader + device; if not detectible then _ask_
-- if run interactively, assume tape size is irrelevant & don't ask
-  for it; Mondo should handle end-of-tape gracefully now
-- worked on handling unknowng media size
-- added interactively_obtain_media_parameters_from_user()
-- when trying to mount CD-ROM, find_and_mount_actual_cd() will
-  now call find_cdrom_device() to try to find the /dev entry first
-- fixed serious bug in zero_out_a_device()
-- cleaned up some log_it() calls
-- fixed minor bug in find_cdrom_device()
-- better at distinguishing between live filesystem and ramdisk
-
-07/24/2002
-- created
 */
 
@@ -2189 +1969 @@
                 if (!popup_and_get_string
                     ("ISO size.",
-                     "Please enter how big you want each ISO image to be (in megabytes). This should be less than or equal to the size of the CD-R[W]'s you plan to backup to.",
+                     "Please enter how big you want each ISO image to be (in megabytes). This should be less than or equal to the size of the CD-R[W]'s or DVD's you plan to backup to.",
                      sz_size, 16)) {
                     log_to_screen("User has chosen not to backup the PC");

trunk/mondo/mondo/common/libmondo-filelist.c

@@ -158 +158 @@
     log_msg(1, "Sorting file %s", orig_fname);
     asprintf(&tmp_fname, "/tmp/sort.%d.%d.%d", (int) (random() % 32768),
-            (int) (random() % 32768), (int) (random() % 32768));
+             (int) (random() % 32768), (int) (random() % 32768));
 
     if (!does_file_exist(orig_fname)) {
@@ -165 +165 @@
 
     asprintf(&command, "sort %s > %s 2>> %s", orig_fname, tmp_fname,
-            MONDO_LOGFILE);
+             MONDO_LOGFILE);
     retval = system(command);
     paranoid_free(command);
@@ -254 +254 @@
     if (!(fbig = fopen(biggie_fname, "w"))) {
         log_OS_error("Cannot openout biggie_fname");
-        return(0);
+        return (0);
     }
     if (!(fout = fopen(outfname, "w"))) {
         log_OS_error("Cannot openout outfname");
-        return(0);
+        return (0);
     }
     (void) fgets(&incoming, &n, fin);
@@ -268 +268 @@
         }
         /* BERLIOS: Useless with getline
-        if (i > MAX_STR_LEN - 1) {
-            incoming[MAX_STR_LEN - 30] = '\0';
-            log_msg(1, "Warning - truncating file %s's name", incoming);
-            err++;
-        }
-        */
+           if (i > MAX_STR_LEN - 1) {
+           incoming[MAX_STR_LEN - 30] = '\0';
+           log_msg(1, "Warning - truncating file %s's name", incoming);
+           err++;
+           }
+         */
         if (incoming[i] < 32) {
             incoming[i] = '\0';
@@ -298 +298 @@
                 curr_set_no++;
                 curr_set_size = 0;
-                asprintf(&outfname, "%s/filelist.%ld", outdir, curr_set_no);
+                asprintf(&outfname, "%s/filelist.%ld", outdir,
+                         curr_set_no);
                 if (!(fout = fopen(outfname, "w"))) {
                     log_OS_error("Unable to openout outfname");
-                    return(0);
+                    return (0);
                 }
                 update_evalcall_form((int) (lino * 100 / noof_lines));
@@ -327 +328 @@
         log_OS_error
             ("Unable to echo write one-liner to LAST-FILELIST-NUMBER");
-        return(0);
+        return (0);
     }
     paranoid_free(outfname);
@@ -423 +424 @@
         return (2);
     }
-    for (getline(&tmp, &n, pattr); !feof(pattr);
-         getline(&tmp, &n, pattr)) {
+    for (getline(&tmp, &n, pattr); !feof(pattr); getline(&tmp, &n, pattr)) {
         fputs(tmp, pout);
     }
@@ -490 +490 @@
 //      sort_file(filelist); // FIXME - filelist chopper sorts, so this isn't necessary
         asprintf(&command,
-                "cat %s | getfacl --all-effective -P - 2>> %s | gzip -c1 > %s 2>> %s",
-                filelist, MONDO_LOGFILE, facl_fname, MONDO_LOGFILE);
+                 "cat %s | getfacl --all-effective -P - 2>> %s | gzip -c1 > %s 2>> %s",
+                 filelist, MONDO_LOGFILE, facl_fname, MONDO_LOGFILE);
         iamhere(command);
         retval = system(command);
@@ -544 +544 @@
 {
     const int my_depth = 8;
-    char *command, *syscall_pin, *syscall_pout; 
+    char *command, *syscall_pin, *syscall_pout;
     char *incoming = NULL;
-    char *current_subset_file = NULL; 
+    char *current_subset_file = NULL;
     char *current_master_file, *masklist;
     int retval = 0;
@@ -561 +561 @@
                 "No masklist provided. I shall therefore set ALL attributes.");
         asprintf(&command, "cat %s | gzip -dc | %s --restore - 2>> %s",
-                original_exat_fname, executable, MONDO_LOGFILE);
+                 original_exat_fname, executable, MONDO_LOGFILE);
         log_msg(1, "command = %s", command);
         retval = system(command);
@@ -575 +575 @@
     }
     asprintf(&masklist, "/tmp/%d.%d.mask", (int) (random() % 32768),
-            (int) (random() % 32768));
+             (int) (random() % 32768));
     asprintf(&command, "cp -f %s %s", orig_msklist, masklist);
     run_program_and_log_output(command, 1);
@@ -583 +583 @@
     asprintf(&syscall_pin, "cat %s | gzip -dc", original_exat_fname);
     asprintf(&syscall_pout, "%s --restore - 2>> %s", executable,
-            MONDO_LOGFILE);
+             MONDO_LOGFILE);
 
     log_msg(1, "syscall_pin = %s", syscall_pin);
@@ -774 +774 @@
         return (add_string_at_node(node->right, string_to_add));
     }
-
     // walk down tree if appropriate
     if (node->down != NULL && node->ch == char_to_add) {
@@ -788 +787 @@
         return (1);
     }
-
     // add here
     if (!(newnode = (struct s_node *) malloc(sizeof(struct s_node)))) {
@@ -904 +902 @@
 
     open_evalcall_form("Loading filelist from disk");
-    for (getline(&fname, &n, pin); !feof(pin);
-         getline(&fname, &n, pin)) {
+    for (getline(&fname, &n, pin); !feof(pin); getline(&fname, &n, pin)) {
         if ((fname[strlen(fname) - 1] == 13
              || fname[strlen(fname) - 1] == 10) && strlen(fname) > 0) {
@@ -1326 +1323 @@
  */
 int open_and_list_dir(char *dir, char *sth, FILE * fout,
-                      time_t time_of_last_full_backup, char *skeleton_filelist) 
+                      time_t time_of_last_full_backup,
+                      char *skeleton_filelist)
 {
     DIR *dip;
@@ -1359 +1357 @@
         // 2.6 has /sys as a proc-type thing -- must be excluded
         asprintf(&tmp,
-                "find %s -maxdepth %d -path /proc -prune -o -path /tmp -prune -o -path /sys -prune -o -path /dev/shm -prune -o -path /media/floppy -prune -o -type d -a -print > %s 2> /dev/null",
-                dir, MAX_SKEL_DEPTH, skeleton_filelist);
+                 "find %s -maxdepth %d -path /proc -prune -o -path /tmp -prune -o -path /sys -prune -o -path /dev/shm -prune -o -path /media/floppy -prune -o -type d -a -print > %s 2> /dev/null",
+                 dir, MAX_SKEL_DEPTH, skeleton_filelist);
 #else
         // On BSD, for example, /sys is the kernel sources -- don't exclude
         asprintf(&tmp,
-                "find %s -maxdepth %d -path /proc -prune -o -path /tmp -prune -o -type d -a -print > %s 2> /dev/null",
-                dir, MAX_SKEL_DEPTH, skeleton_filelist);
+                 "find %s -maxdepth %d -path /proc -prune -o -path /tmp -prune -o -type d -a -print > %s 2> /dev/null",
+                 dir, MAX_SKEL_DEPTH, skeleton_filelist);
 #endif
         system(tmp);
@@ -1436 +1434 @@
             asprintf(&new_with_spaces, " %s ", new);
             /* BERLIOS: Old code
-            new_with_spaces[0] = ' ';
-            strcpy(new_with_spaces + 1, new);
-            strcat(new_with_spaces, " ");
-            */
+               new_with_spaces[0] = ' ';
+               strcpy(new_with_spaces + 1, new);
+               strcat(new_with_spaces, " ");
+             */
             if (strstr(skip_these, new_with_spaces)) {
                 fprintf(fout, "%s\n", new);
@@ -1447 +1445 @@
                         && S_ISDIR(statbuf.st_mode)) {
                         open_and_list_dir(new, skip_these, fout,
-                                          time_of_last_full_backup, skeleton_filelist);
+                                          time_of_last_full_backup,
+                                          skeleton_filelist);
                     } else {
                         if (time_of_last_full_backup == 0
@@ -1457 +1456 @@
                                 uberctr++;
                                 asprintf(&tmp, " %c ",
-                                        special_dot_char(uberctr));
+                                         special_dot_char(uberctr));
 #ifndef _XWIN
                                 if (!g_text_mode) {
@@ -1547 +1546 @@
     time_t time_of_last_full_backup = 0;
     struct stat statbuf;
-    char *skeleton_filelist; 
-    // The pathname to the skeleton filelist, used to give better progress reporting for mondo_makefilelist().
+    char *skeleton_filelist;
+    // The pathname to the skeleton filelist, used to give better progress reporting for mondo_makefilelist().
 
     asprintf(&sz_datefile, sz_datefile_wildcard, 0);
@@ -1565 +1564 @@
     if (differential == 0) {
         // restore last good datefile if it exists
-        asprintf(&command, "cp -f %s.aborted %s", sz_datefile, sz_datefile);
+        asprintf(&command, "cp -f %s.aborted %s", sz_datefile,
+                 sz_datefile);
         run_program_and_log_output(command, 3);
         paranoid_free(command);
@@ -1572 +1572 @@
         if (does_file_exist(sz_datefile)) {
             asprintf(&command, "mv -f %s %s.aborted", sz_datefile,
-                    sz_datefile);
+                     sz_datefile);
             paranoid_system(command);
             paranoid_free(command);
@@ -1630 +1630 @@
                 log_msg(1, "Including %s in filelist %s", q, sz_filelist);
                 open_and_list_dir(q, exclude_paths, fout,
-                                  time_of_last_full_backup, skeleton_filelist);
+                                  time_of_last_full_backup,
+                                  skeleton_filelist);
                 p += strlen(q);
                 while (*p == ' ') {
@@ -1819 +1820 @@
         return (1);
     }
-    for (getline(&tmp, &n, fin); !feof(fin);
-         getline(&tmp, &n, fin)) {
+    for (getline(&tmp, &n, fin); !feof(fin); getline(&tmp, &n, fin)) {
         if (!tmp[0]) {
             continue;

trunk/mondo/mondo/common/libmondo-files.c

@@ -569 +569 @@
         return (output);
     }
-    sprintf(command, "cat %s | tail -n1", filename);
+    sprintf(command, "tail -n1 %s", filename);
     fin = popen(command, "r");
     (void) fgets(output, MAX_STR_LEN, fin);
@@ -1313 +1313 @@
     if (scratchLL <= 1) {
         sprintf(tmp,
-                "Your backup will probably occupy a single CD/tape/ISO. Maybe two.");
+                "Your backup will probably occupy a single %s. Maybe two.",
+                media_descriptor_string(bkpinfo->backup_media_type));
     } else {
         sprintf(tmp, "Your backup will occupy approximately %s media.",

trunk/mondo/mondo/common/libmondo-stream.c

@@ -227 +227 @@
     }
     asprintf(&command, "%s -scanbus 2> /dev/null | grep -i tape | wc -l",
-            cdr_exe);
+             cdr_exe);
     asprintf(&tmp, call_program_and_get_last_line_of_output(command));
     paranoid_free(command);
@@ -240 +240 @@
 
     asprintf(&command,
-            "%s -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep -i TAPE | cut -d' ' -f2 | head -n1",
-            cdr_exe);
+             "%s -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep -i TAPE | cut -d' ' -f2 | head -n1",
+             cdr_exe);
     asprintf(&tmp, call_program_and_get_last_line_of_output(command));
     paranoid_free(command);
@@ -251 +251 @@
 
     asprintf(&command,
-            "%s -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep -i TAPE | cut -d' ' -f3 | cut -d')' -f1 | head -n1",
-            cdr_exe);
+             "%s -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep -i TAPE | cut -d' ' -f3 | cut -d')' -f1 | head -n1",
+             cdr_exe);
     paranoid_free(cdr_exe);
 
@@ -292 +292 @@
         log_it("Turning %s", dev);
         paranoid_free(tmp);
-        asprintf(&tmp, (strrchr(dev, '/') != NULL) ? strrchr(dev, '/') : dev);
+        asprintf(&tmp,
+                 (strrchr(dev, '/') != NULL) ? strrchr(dev, '/') : dev);
         sprintf(dev, "/dev/os%s", tmp);
         log_it("...into %s", dev);
@@ -327 +328 @@
     int res = 0;
     int retval = 0;
-    char *fname = &res;     /* Should NOT be NULL */
+    char *fname = &res;         /* Should NOT be NULL */
 
 // xattr
@@ -411 +412 @@
         //      log_it("g_current_media_number = %d", g_current_media_number);
         asprintf(&tmp,
-                "When the tape drive goes quiet, please insert volume %d in this series.",
-                tapeno);
+                 "When the tape drive goes quiet, please insert volume %d in this series.",
+                 tapeno);
         popup_and_OK(tmp);
         paranoid_free(tmp);
@@ -467 +468 @@
     char *p;
     /* BERLIOS: useless
-    char suffix[16];
-    */
+       char suffix[16];
+     */
 
     bufsize_K = (long long) (1024LL * (1 + g_tape_buffer_size_MB));
     asprintf(&tmpdir, "%s/tmpfs/backcatalog", td);
     /* BERLIOS: useless
-    if ((p = strrchr(latest_fname, '.'))) {
-        strcpy(suffix, ++p);
-    } else {
-        suffix[0] = '\0';
-    }
-    */
+       if ((p = strrchr(latest_fname, '.'))) {
+       strcpy(suffix, ++p);
+       } else {
+       suffix[0] = '\0';
+       }
+     */
     if (strstr(latest_fname, ".afio.") || strstr(latest_fname, ".star.")) {
         type = fileset;
@@ -556 +557 @@
         return (0);
     }
-    asprintf(&tmp, "mt -f %s setblk %ld", tapedev, internal_tape_block_size);
+    asprintf(&tmp, "mt -f %s setblk %ld", tapedev,
+             internal_tape_block_size);
     res = run_program_and_log_output(tmp, 3);
     paranoid_free(tmp);
@@ -669 +671 @@
     chdir(bkpinfo->tmpdir);
     asprintf(&tmp, "tar -zxf %s tmp/mondo-restore.cfg 2> /dev/null",
-            outfname);
+             outfname);
     paranoid_system(tmp);
     paranoid_free(tmp);
@@ -696 +698 @@
     /*  add 'dummy' if testing */
     asprintf(&command,
-            "cdrecord -eject dev=%s speed=%d fs=24m -waiti - >> %s 2>> %s",
-            cddev, speed, MONDO_LOGFILE, MONDO_LOGFILE);
+             "cdrecord -eject dev=%s speed=%d fs=24m -waiti - >> %s 2>> %s",
+             cddev, speed, MONDO_LOGFILE, MONDO_LOGFILE);
     /*  initialise the catalog */
     g_current_media_number = 1;
@@ -817 +819 @@
     char *tmp;
     char *datablock;
-    char *temp_fname = bkpinfo;     /* Should NOT be NULL */
-    char *temp_cksum = bkpinfo;     /* Should NOT be NULL */
+    char *temp_fname = bkpinfo; /* Should NOT be NULL */
+    char *temp_cksum = bkpinfo; /* Should NOT be NULL */
     char *actual_cksum;
 
@@ -857 +859 @@
     if (orig_size != temp_size && orig_size != -1) {
         asprintf(&tmp,
-                "output file's size should be %ld K but is apparently %ld K",
-                (long) size >> 10, (long) temp_size >> 10);
+                 "output file's size should be %ld K but is apparently %ld K",
+                 (long) size >> 10, (long) temp_size >> 10);
         log_to_screen(tmp);
         paranoid_free(tmp);
@@ -867 +869 @@
     }
     asprintf(&tmp, "Reading file from tape; writing to '%s'; %ld KB",
-            outfname, (long) size >> 10);
+             outfname, (long) size >> 10);
     log_to_screen(tmp);
     paranoid_free(tmp);
@@ -937 +939 @@
     if (strcmp(temp_cksum, actual_cksum)) {
         asprintf(&tmp, "actual cksum=%s; recorded cksum=%s", actual_cksum,
-                temp_cksum);
+                 temp_cksum);
         log_to_screen(tmp);
         paranoid_free(tmp);
 
         asprintf(&tmp, "%s (%ld K) is corrupt on tape", temp_fname,
-                (long) orig_size >> 10);
+                 (long) orig_size >> 10);
         log_to_screen(tmp);
         paranoid_free(tmp);
@@ -1110 +1112 @@
     int res;
     int ctrl_chr;
-    char *temp_fname = &res;        /* should NOT be NULL */
+    char *temp_fname = &res;    /* should NOT be NULL */
     char *datablock;
     long long temp_size, size;
@@ -1175 +1177 @@
             fread(datablock, 1, (size_t) TAPE_BLOCK_SIZE, g_tape_stream);
         }
-        
+
         paranoid_free(temp_fname);
         temp_fname = &res;
-        res =
-            read_header_block_from_stream(&temp_size, NULL,
-                                          &ctrl_chr);
+        res = read_header_block_from_stream(&temp_size, NULL, &ctrl_chr);
         if (ctrl_chr != BLK_STOP_FILE) {
             wrong_marker(BLK_STOP_FILE, ctrl_chr);
         }
-        res =
-            read_header_block_from_stream(&temp_size, NULL,
-                                          &ctrl_chr);
+        res = read_header_block_from_stream(&temp_size, NULL, &ctrl_chr);
         if (ctrl_chr != BLK_STOP_AN_AFIO_OR_SLICE) {
             wrong_marker(BLK_STOP_AN_AFIO_OR_SLICE, ctrl_chr);
         }
-        res =
-            read_header_block_from_stream(&temp_size, NULL,
-                                          &ctrl_chr);
+        res = read_header_block_from_stream(&temp_size, NULL, &ctrl_chr);
         if (ctrl_chr != BLK_START_AN_AFIO_OR_SLICE) {
             wrong_marker(BLK_START_AN_AFIO_OR_SLICE, ctrl_chr);
@@ -1209 +1205 @@
         }
         /* BERLIOS: useless ?
-        pB = strrchr(the_file_I_was_reading, '/');
-        if (pB) {
-            pB++;
-        } else {
-            pB = the_file_I_was_reading;
-        }
-        */
+           pB = strrchr(the_file_I_was_reading, '/');
+           if (pB) {
+           pB++;
+           } else {
+           pB = the_file_I_was_reading;
+           }
+         */
     }
     log_msg(2, "Reading %s (it matches %s)", temp_fname,
@@ -1291 +1287 @@
     if (bkpinfo->backup_media_type == cdstream) {
         asprintf(&command,
-                "cdrecord -eject dev=%s speed=%d fs=24m -waiti - >> %s 2>> %s",
-                bkpinfo->media_device, bkpinfo->cdrw_speed, MONDO_LOGFILE,
-                MONDO_LOGFILE);
+                 "cdrecord -eject dev=%s speed=%d fs=24m -waiti - >> %s 2>> %s",
+                 bkpinfo->media_device, bkpinfo->cdrw_speed, MONDO_LOGFILE,
+                 MONDO_LOGFILE);
         log_it("Opening OUT to next CD with the command");
         log_it(command);
@@ -1343 +1339 @@
     for (i = 0; i <= last; i++) {
         asprintf(&fname, "%s/tmpfs/backcatalog/%s", bkpinfo->tmpdir,
-                g_tapecatalog->el[i].fname);
+                 g_tapecatalog->el[i].fname);
         if (!does_file_exist(fname)) {
             log_msg(6, "Can't write %s - it doesn't exist.", fname);
@@ -1491 +1487 @@
     }
     asprintf(&tmp, "Writing file '%s' to tape (%ld KB)", p,
-            (long) filesize >> 10);
+             (long) filesize >> 10);
     log_it(tmp);
     paranoid_free(tmp);
@@ -1594 +1590 @@
                g_tape_stream) / 1024;
     asprintf(&tmp, "%s (fname=%s, size=%ld K)",
-            marker_to_string(control_char), p,
-            (long) length_of_incoming_file >> 10);
+             marker_to_string(control_char), p,
+             (long) length_of_incoming_file >> 10);
     log_msg(6, tmp);
     paranoid_free(tmp);
@@ -1615 +1611 @@
     /*@ end vars *************************************************** */
     asprintf(&tmp, "Wrong marker! (Should be %s, is actually %s)",
-            marker_to_string(should_be), marker_to_string(it_is));
+             marker_to_string(should_be), marker_to_string(it_is));
     log_to_screen(tmp);
     paranoid_free(tmp);

trunk/mondo/mondo/common/libmondo-tools.c

@@ -168 +168 @@
 
     asprintf(&tmp,
-           "for i in `find /root /home -type d -name Desktop -maxdepth 2`; do \
+             "for i in `find /root /home -type d -name Desktop -maxdepth 2`; do \
 file=$i/.directory; if [ -f \"$file\" ] ; then mv -f $file $file.old ; \
 cat $file.old | awk '{if (index($0, \"rootimagesmindi\")) { while (length($0)>2) { getline;} ; } \
@@ -189 +189 @@
 
     asprintf(&home_sz,
-           call_program_and_get_last_line_of_output
-           ("find /usr/lib/ /usr/local/ /usr/share/ /usr/local/share/ /opt/ /ramdisk/usr/share/ -type d -maxdepth 2 -name include -prune -o -type d -maxdepth 2 -path '*/mondo/restore-scripts' -printf '%h\n' 2> /dev/null"));
+             call_program_and_get_last_line_of_output
+             ("find /usr/lib/ /usr/local/ /usr/share/ /usr/local/share/ /opt/ /ramdisk/usr/share/ -type d -maxdepth 2 -name include -prune -o -type d -maxdepth 2 -path '*/mondo/restore-scripts' -printf '%h\n' 2> /dev/null"));
 
     if (home_sz[0] == '\0') {
         paranoid_free(home_sz);
         asprintf(&home_sz,
-               call_program_and_get_last_line_of_output
-               ("find /usr -type d -path '*/mondo/restore-scripts' -follow -maxdepth 3 -printf '%h\n' 2> /dev/null"));
+                 call_program_and_get_last_line_of_output
+                 ("find /usr -type d -path '*/mondo/restore-scripts' -follow -maxdepth 3 -printf '%h\n' 2> /dev/null"));
     }
     if (home_sz[0] == '\0') {
@@ -402 +402 @@
 #ifdef __FreeBSD__
     asprintf(&tmp,
-           call_program_and_get_last_line_of_output
-           ("vmstat | tail -1 | tr -s ' ' | cut -d' ' -f6"));
+             call_program_and_get_last_line_of_output
+             ("vmstat | tail -1 | tr -s ' ' | cut -d' ' -f6"));
     avm += atol(tmp);
     paranoid_free(tmp);
     asprintf(&tmp,
-           call_program_and_get_last_line_of_output
-           ("swapinfo | grep -v Device | tr -s ' ' | cut -d' ' -f4 | tr '\n' '+' | sed 's/+$//' | bc"));
+             call_program_and_get_last_line_of_output
+             ("swapinfo | grep -v Device | tr -s ' ' | cut -d' ' -f4 | tr '\n' '+' | sed 's/+$//' | bc"));
     avm += atol(tmp);
     paranoid_free(tmp);
     asprintf(&command, "mdmfs -s %d%c md9 %s", rdsiz_MB, 'm',
-            g_tmpfs_mountpt);
+             g_tmpfs_mountpt);
 #else
     asprintf(&tmp,
-           call_program_and_get_last_line_of_output
-           ("free | grep \":\" | tr -s ' ' '\t' | cut -f2 | head -n1"));
+             call_program_and_get_last_line_of_output
+             ("free | grep \":\" | tr -s ' ' '\t' | cut -f2 | head -n1"));
     avm += atol(tmp);
     paranoid_free(tmp);
     asprintf(&command, "mount /dev/shm -t tmpfs %s -o size=%d%c",
-            g_tmpfs_mountpt, rdsiz_MB, 'm');
+             g_tmpfs_mountpt, rdsiz_MB, 'm');
     run_program_and_log_output("cat /proc/cpuinfo", 5);
     /* BERLIOS: rpm is not necessarily there ! */
@@ -453 +453 @@
 
     if (bkpinfo->backup_media_type == dvd) {
-        if (! (find_home_of_exe("growisofs"))) {
+        if (!(find_home_of_exe("growisofs"))) {
             fatal_error("Please install growisofs.");
         }
@@ -483 +483 @@
             sprintf(bkpinfo->call_make_iso,
                     "%s %s -Z %s . 2>> _ERR_",
-                    mondo_mkisofs_sz,
-                    "", bkpinfo->media_device);
+                    mondo_mkisofs_sz, "", bkpinfo->media_device);
         }
         paranoid_free(mondo_mkisofs_sz);
@@ -572 +571 @@
         log_it("isodir = %s", bkpinfo->isodir);
         asprintf(&command, "df %s | tail -n1 | cut -d' ' -f1",
-                bkpinfo->isodir);
+                 bkpinfo->isodir);
         log_it("command = %s", command);
         asprintf(&tmp, call_program_and_get_last_line_of_output(command));
@@ -582 +581 @@
 
         asprintf(&command, "mount | grep -w %s | tail -n1 | cut -d' ' -f3",
-                tmp);
+                 tmp);
         paranoid_free(tmp);
         log_it("command = %s", command);
@@ -595 +594 @@
         log_it("isomnt: %s, %d", tmp, strlen(tmp));
         if (strlen(bkpinfo->isodir) < strlen(tmp)) {
-            asprintf(&iso_path,"");
+            asprintf(&iso_path, "");
         } else {
             asprintf(&iso_path, "%s", bkpinfo->isodir + strlen(tmp));
@@ -627 +626 @@
             } else {
                 asprintf(&ip_address, "%s%s", inet_ntoa((struct in_addr)
-                                             *((struct in_addr *) hent->
-                                               h_addr)), strchr(bkpinfo->nfs_mount, ':'));
+                                                        *((struct in_addr
+                                                           *) hent->
+                                                          h_addr)),
+                         strchr(bkpinfo->nfs_mount, ':'));
                 strcpy(bkpinfo->nfs_mount, ip_address);
                 paranoid_free(ip_address);
@@ -789 +790 @@
 
     asprintf(&command, "df -m %s | tail -n1 | tr -s ' ' '\t' | cut -f4",
-            partition);
+             partition);
     asprintf(&out_sz, call_program_and_get_last_line_of_output(command));
     paranoid_free(command);
@@ -836 +837 @@
     }
     asprintf(&tmp,
-           call_program_and_get_last_line_of_output
-           ("free | grep Mem | head -n1 | tr -s ' ' '\t' | cut -f2"));
+             call_program_and_get_last_line_of_output
+             ("free | grep Mem | head -n1 | tr -s ' ' '\t' | cut -f2"));
     if (atol(tmp) < 35000) {
         retval++;
@@ -926 +927 @@
         ("umount `mount | grep cdr | cut -d' ' -f3 | tr '\n' ' '`", 5);
     asprintf(&tmp,
-           call_program_and_get_last_line_of_output
-           ("mount | grep -E \"cdr(om|w)\""));
+             call_program_and_get_last_line_of_output
+             ("mount | grep -E \"cdr(om|w)\""));
     if (strcmp("", tmp)) {
         if (strstr(tmp, "autofs")) {
@@ -1027 +1028 @@
     if (!does_file_exist(config_file)) {
         asprintf(&tmp, "(read_cfg_var) Cannot find %s config file",
-                config_file);
+                 config_file);
         log_to_screen(tmp);
         paranoid_free(tmp);
@@ -1039 +1040 @@
     } else {
         asprintf(&command, "cat %s | grep \"%s .*\" | cut -d' ' -f2,3,4,5",
-                config_file, label);
+                 config_file, label);
         strcpy(value, call_program_and_get_last_line_of_output(command));
         paranoid_free(command);
@@ -1150 +1151 @@
         log_it("Started autofs OK");
     }
-        paranoid_free(tmp);
+    paranoid_free(tmp);
 }
 
@@ -1168 +1169 @@
     log_msg(4, "Done. Great. Seeting command to something");
     asprintf(&command,
-           "cat /etc/fstab | grep -v \":\" | grep -vx \"#.*\" | grep -w \"/boot\" | tr -s ' ' '\t' | cut -f1 | head -n1");
+             "cat /etc/fstab | grep -v \":\" | grep -vx \"#.*\" | grep -w \"/boot\" | tr -s ' ' '\t' | cut -f1 | head -n1");
     log_msg(4, "Cool. Command = '%s'", command);
     asprintf(&tmp, call_program_and_get_last_line_of_output(command));
@@ -1191 +1192 @@
                 asprintf(&g_boot_mountpt, tmp);
                 asprintf(&tmp1,
-                        "%s (your /boot partition) is not mounted. I'll mount it before backing up",
-                        g_boot_mountpt);
+                         "%s (your /boot partition) is not mounted. I'll mount it before backing up",
+                         g_boot_mountpt);
                 log_it(tmp1);
                 paranoid_free(tmp1);
@@ -1263 +1264 @@
     if (!does_file_exist(config_file)) {
         asprintf(&tmp, "(write_cfg_file) Cannot find %s config file",
-                config_file);
+                 config_file);
         log_to_screen(tmp);
         paranoid_free(tmp);
@@ -1269 +1270 @@
     }
     asprintf(&tempfile,
-           call_program_and_get_last_line_of_output
-           ("mktemp -q /tmp/mojo-jojo.blah.XXXXXX"));
+             call_program_and_get_last_line_of_output
+             ("mktemp -q /tmp/mojo-jojo.blah.XXXXXX"));
     if (does_file_exist(config_file)) {
         asprintf(&command, "cat %s | grep -vx \"%s .*\" > %s", config_file,
-                label, tempfile);
+                 label, tempfile);
         paranoid_system(command);
         paranoid_free(command);

trunk/mondo/mondo/common/libmondo-verify.c

@@ -608 +608 @@
     char *orig_cksum;
     char *tmp;
-    char *slice_fnam = (char *)&res;
+    char *slice_fnam = (char *) &res;
 
     /*@ pointers ******************************************************** */
@@ -627 +627 @@
     asprintf(&test_file, "%s/temporary-%s", bkpinfo->tmpdir, p);
     asprintf(&tmp,
-    "Temporarily copying biggiefile %s's slices from tape to '%s'",
-    p, test_file);
-    log_it(tmp); 
+             "Temporarily copying biggiefile %s's slices from tape to '%s'",
+             p, test_file);
+    log_it(tmp);
     paranoid_free(tmp);
     for (res =
@@ -643 +643 @@
         unlink(test_file);
         paranoid_free(slice_fnam);
-        slice_fnam = (char *)&res;
+        slice_fnam = (char *) &res;
         res =
             read_header_block_from_stream(&slice_siz, slice_fnam,
@@ -654 +654 @@
         retval += res;
         paranoid_free(slice_fnam);
-        slice_fnam = (char *)&res;
+        slice_fnam = (char *) &res;
     }
     paranoid_free(test_file);
@@ -706 +706 @@
     /*@ buffers ***************************************************** */
     char *tmp;
-    char *fname = (char *)&res;             /* Should NOT be NULL */
+    char *fname = (char *) &res;    /* Should NOT be NULL */
     char *curr_xattr_list_fname;
     char *curr_acl_list_fname;
@@ -744 +744 @@
     for (res = read_header_block_from_stream(&size, fname, &ctrl_chr);
          ctrl_chr != BLK_STOP_AFIOBALLS;
-         res = 
-         read_header_block_from_stream(&size, fname, &ctrl_chr)) {
+         res = read_header_block_from_stream(&size, fname, &ctrl_chr)) {
         asprintf(&curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ,
                  bkpinfo->tmpdir, current_afioball_number);
@@ -753 +752 @@
             iamhere("Reading EXAT files from tape");
             paranoid_free(fname);
-            fname = (char *)&res;
+            fname = (char *) &res;
             res =
                 read_EXAT_files_from_tape(bkpinfo, &size, fname, &ctrl_chr,
@@ -781 +780 @@
         g_current_progress++;
         paranoid_free(fname);
-        fname = (char *)&res;
+        fname = (char *) &res;
         res = read_header_block_from_stream(&size, fname, &ctrl_chr);
         if (ctrl_chr != BLK_STOP_AN_AFIO_OR_SLICE) {
@@ -787 +786 @@
         }
         paranoid_free(fname);
-        fname = (char *)&res;
+        fname = (char *) &res;
     }
     log_msg(1, "All done with afioballs");
@@ -817 +816 @@
 
     /*@ buffers ******************************************************** */
-    char *orig_fname = (char *)&ctrl_chr;   /* Should NOT be NULL */
+    char *orig_fname = (char *) &ctrl_chr;  /* Should NOT be NULL */
     char *logical_fname;
     char *comment;
@@ -841 +840 @@
             iamhere("Grabbing the EXAT biggiefiles");
             paranoid_free(orig_fname);
-            orig_fname = (char *)&ctrl_chr;
+            orig_fname = (char *) &ctrl_chr;
             res =
                 read_EXAT_files_from_tape(bkpinfo, &size, orig_fname,
@@ -851 +850 @@
     paranoid_free(curr_acl_list_fname);
     paranoid_free(orig_fname);
-    orig_fname = (char *)&ctrl_chr;
+    orig_fname = (char *) &ctrl_chr;
 
     if (ctrl_chr != BLK_START_BIGGIEFILES) {
@@ -891 +890 @@
         g_current_progress++;
         paranoid_free(orig_fname);
-        orig_fname = (char *)&ctrl_chr;
+        orig_fname = (char *) &ctrl_chr;
     }
     close_progress_form();

trunk/mondo/mondo/common/my-stuff.h

@@ -210 +210 @@
  * @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"
+#define MONDO_GROWISOFS_REGULAR_SYSLINUX "growisofs -speed=1 -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.
-         */// -b images/mindi-boot.2880.img
-#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"
+                 */// -b images/mindi-boot.2880.img
+#define MONDO_GROWISOFS_REGULAR_ELILO     "growisofs -speed=1 -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.
-         */// -b images/mindi-boot.2880.img
-#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"
+                 */// -b images/mindi-boot.2880.img
+#define MONDO_GROWISOFS_REGULAR_LILO     "growisofs -speed=1 -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"
+#define MONDO_GROWISOFS_NONBOOT          "growisofs -speed=1 -use-the-force-luke -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ -v"
 
 /**

trunk/mondo/mondo/common/newt-specific.c

@@ -313 +313 @@
 
         system
-            ("cat /var/log/mondo-archive.log | gzip -9 > /tmp/MA.log.gz 2> /dev/null");
+            ("gzip -9c /var/log/mondo-archive.log > /tmp/MA.log.gz 2> /dev/null");
         if (!strstr(g_version, "cvs") && !strstr(g_version, "svn")) {
             printf("Please try the latest SVN version ");
@@ -427 +427 @@
         }
         if (grep_for_me[0] != '\0') {
-            asprintf(&command, "cat %s | grep \"%s\" | tail -n%d",
-                     filename, grep_for_me, g_noof_log_lines);
-        } else {
-            asprintf(&command, "cat %s | tail -n%d", filename,
-                     g_noof_log_lines);
+            asprintf(&command, "grep '%s' %s | tail -n%d",
+                     grep_for_me, filename, g_noof_log_lines);
+        } else {
+            asprintf(&command, "tail -n%d %s", g_noof_log_lines, filename);
         }
         fin = popen(command, "r");

trunk/mondo/mondo/mondorestore/mondo-prep.c

@@ -488 +488 @@
             if (lvmversion == 2) {
                 strcpy(tmp, call_program_and_get_last_line_of_output
-                       ("cat /var/log/mondo-archive.log | tail -n5 | grep Insufficient | tail -n1"));
+                       ("tail -n5 /var/log/mondo-archive.log | grep Insufficient | tail -n1"));
             } else {
                 strcpy(tmp, call_program_and_get_last_line_of_output
-                       ("cat /var/log/mondo-archive.log | tail -n5 | grep lvcreate | tail -n1"));
+                       ("tail -n5 /var/log/mondo-archive.log | grep lvcreate | tail -n1"));
             }
             for (p = tmp; *p != '\0' && !isdigit(*p); p++);

trunk/mondo/mondo/mondorestore/mondo-rstr-newt.c

@@ -2312 +2312 @@
 #else
 
-    for (i = 0;
-         strcmp(raidlist->el[i].raid_device, device)
+    for (i = 0; strcmp(raidlist->el[i].raid_device, device)
          && i < raidlist->entries; i++);
 #endif
@@ -2625 +2624 @@
  * @ingroup restoreUtilityGroup
  */
-int
-read_variableINT_and_remove_from_raidvars(struct
-                                          OSSWAP (raid_device_record,
-                                                  vinum_volume) * raidrec,
-                                          char *label)
+int read_variableINT_and_remove_from_raidvars(struct
+                                              OSSWAP (raid_device_record,
+                                                      vinum_volume) *
+                                              raidrec, char *label)
 {
     /** int ***************************************************************/

trunk/mondo/mondo/mondorestore/mondo-rstr-tools.c

@@ -745 +745 @@
 #endif
 
-    } else
-     if (bkpinfo->backup_media_type == iso) {
+    } else if (bkpinfo->backup_media_type == iso) {
 #ifdef __FreeBSD__
         sprintf(mount_cmd, "%s/%d.iso", bkpinfo->isodir,
@@ -1965 +1964 @@
     int signals[] =
         { SIGKILL, SIGPIPE, SIGTERM, SIGHUP, SIGTRAP, SIGABRT, SIGINT,
-SIGSTOP, 0 };
+        SIGSTOP, 0
+    };
     int i;
     for (i = 0; signals[i]; i++) {

trunk/mondo/mondo/mondorestore/mr-externs.h

@@ -85 +85 @@
 extern void resize_drive_proportionately_to_suit_new_drives(struct
                                                             mountlist_itself
-                                                            *mountlist,
-                                                            char
+                                                            *mountlist, char
                                                             *drive_name);
 extern void resize_mountlist_proportionately_to_suit_new_drives(struct

trunk/mondo/mondo/xmondo/xmondo.h

@@ -56 +56 @@
   Q_OBJECT public:
     /** construtor */
-    XMondo(QWidget * parent = 0, const char *name = 0);
+     XMondo(QWidget * parent = 0, const char *name = 0);
     /** destructor */
      virtual ~ XMondo();

trunk/mondo/mondo/xmondo/xmondobackup.h

@@ -30 +30 @@
 class XMondoBackup:public QObject {
   Q_OBJECT public:
-    XMondoBackup();
+     XMondoBackup();
     ~XMondoBackup();
     int run(struct s_bkpinfo *bkpinfo);

trunk/mondo/mondo/xmondo/xmondorestore.h

@@ -44 +44 @@
     bool good() {
         return ok;
-    } bool isSetupDone() {
+    }
+    bool isSetupDone() {
         return doneSetup;
     }