Changeset 1235 in MondoRescue

Timestamp:

Mar 11, 2007, 5:21:56 PM (18 years ago)

Author:

Bruno Cornec

Message:

Patch from Scott Cummings (<rsc_at_usfamily.net>):
No compression for iso backup is probably not a commonly used option (-0),
but I wanted to run a backup and a verify as quickly as possible just to try out mondo. In the
process I also tested the case of a verify with a missing big file in
the filesystem (after the backup). That caused a segfault when it tried
to read the non-existent file.
Attached patch changes make "verify_all_slices_on_CD" actually
verify the uncompressed big file slices (instead of just skipping them).

It also has small message enhancements for -0 compression verify.

• really verify uncompressed big file slices
• log 'cat' (0 compression) errors
• detect if no zip_suffix (in case forget -0 on command line)
• avoid segfault in fread if bigfile fails to open on filesystem
• report missing filesystem big file
• generate hundreds of errors about ntfs filesystem not comparing :)

(does it do this for any change in ntfs partition? maybe something

else was going on.)

Yet to do is make afioballs auto detect if they are uncompressed.

File:

• branches/stable/mondo/src/common/libmondo-verify.c (modified) (4 diffs)

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

@@ -264 +264 @@
            does_file_exist(slice_fname
                            (bigfile_num, slice_num, mountpoint, ""))) {
-// handle slices until end of CD
+        // handle slices until end of CD
         if (slice_num == 0) {
             mr_msg(2, "ISO=%d  bigfile=%ld --START--",
@@ -286 +286 @@
             if (!(forig = fopen(tmp2, "r"))) {
                 mr_msg(2, "Failed to open bigfile. Darn.");
+                log_to_screen(_("%s/%s not found on live filesystem"),
+                            bkpinfo->restore_path,
+                            biggiestruct.filename);
+                mr_asprintf(&tmp, "echo \"%s/%s not found\" >> /tmp/biggies.changed",
+                            bkpinfo->restore_path,
+                            biggiestruct.filename);
+                system(tmp);
+                mr_free(tmp);
+
+                bigfile_num++;
+                slice_num = 0;
                 retval++;
+            } else {
+                slice_num++;
             }
             mr_free(tmp2);
-
-            slice_num++;
-        } else if (does_file_exist
-                   (slice_fname(bigfile_num, slice_num, mountpoint, ""))) {
+        } else if (does_file_exist(slice_fname(bigfile_num, slice_num, mountpoint, "")) &&
+                   (length_of_file(slice_fname(bigfile_num, slice_num, mountpoint, "")) == 0)) {
             mr_msg(2, "ISO=%d  bigfile=%ld ---END---",
                     g_current_media_number, bigfile_num);
@@ -299 +310 @@
             slice_num = 0;
         } else {
-            mr_msg(2, "ISO=%d  bigfile=%ld  slice=%ld  \r",
+            mr_msg(2, "ISO=%d  bigfile=%ld  slice=%ld",
                     g_current_media_number, bigfile_num, slice_num);
-            if (bkpinfo->compression_level > 0) {
+            if (!does_file_exist(slice_fname(bigfile_num, slice_num, mountpoint, ""))) {
                 mr_asprintf(&command, "%s -dc %s 2>> %s", sz_exe,
-                        slice_fname(bigfile_num, slice_num, mountpoint,
-                                    bkpinfo->zip_suffix),
+                        slice_fname(bigfile_num, slice_num, mountpoint, bkpinfo->zip_suffix),
                         MONDO_LOGFILE);
             } else {
-                mr_asprintf(&command, "cat %s",
-                        slice_fname(bigfile_num, slice_num, mountpoint,
-                                    bkpinfo->zip_suffix));
+                /* can we set up bkpinfo->compression_level = 0 
+                 * without needing '-0' on command line?
+                 * here and in afio verify */
+                mr_asprintf(&command, "cat %s 2>> %s",
+                        slice_fname(bigfile_num, slice_num, mountpoint, ""), MONDO_LOGFILE);
             }
             if ((pin = popen(command, "r"))) {
@@ -331 +343 @@
                 }
                 paranoid_pclose(pin);
-                if (res && !strncmp(biggiestruct.filename, " /dev/", 5)) {
+                if (res && !strncmp(biggiestruct.filename, "/dev/", 5)) {
                     mr_msg(3,
                             "Ignoring differences between %s and live filesystem because it's a device and therefore the archives are stored via ntfsclone, not dd.",