Changeset 3147 in MondoRescue for branches/3.1/mondo/src/common

Timestamp:

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

Author:

Bruno Cornec

Message:

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

Location:

branches/3.1/mondo/src/common

Files:

• libmondo-archive.c (modified) (19 diffs)
• libmondo-cli.c (modified) (11 diffs)
• libmondo-devices.c (modified) (13 diffs)
• libmondo-filelist.c (modified) (13 diffs)
• libmondo-files.c (modified) (10 diffs)
• libmondo-fork.c (modified) (4 diffs)
• libmondo-mountlist.c (modified) (8 diffs)
• libmondo-raid-EXT.h (modified) (1 diff)
• libmondo-raid.c (modified) (11 diffs)
• libmondo-raid.h (modified) (1 diff)
• libmondo-stream.c (modified) (18 diffs)
• libmondo-string-EXT.h (modified) (1 diff)
• libmondo-string.c (modified) (2 diffs)
• libmondo-string.h (modified) (1 diff)
• libmondo-tools.c (modified) (5 diffs)
• libmondo-verify.c (modified) (6 diffs)
• mondostructures.h (modified) (2 diffs)
• newt-specific.c (modified) (13 diffs)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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