Changeset 1869 in MondoRescue for branches/2.2.5

Timestamp:

Jan 17, 2008, 6:41:21 PM (16 years ago)

Author:

Bruno Cornec

Message:

Solve an issue on Bigfiles:
When one bigfile (such as mondo's ISO image) is deleted during the archiving,
it creates a hole in the suite of Bigfiles (in my case bigfile 0 was missing)
So at restore time, it was aborting the rest of the restoration of big files as this one was failing, which is worng
Now mondorestore loops until it reaches the number of bigfiles, so will restore the others.

File:

• branches/2.2.5/mondo/src/mondorestore/mondo-restore.c (modified) (3 diffs)

branches/2.2.5/mondo/src/mondorestore/mondo-restore.c

@@ -2072 +2072 @@
                        "Please wait. This may take some time.",
                        "", total_slices);
-    for (bigfileno = 0, finished = FALSE; !finished;) {
+    for (bigfileno = 0, finished = FALSE ; !finished && (bigfileno < noof_biggiefiles);) {
         log_msg(2, "Thinking about restoring bigfile %ld", bigfileno + 1);
         if (!does_file_exist(slice_fname(bigfileno, 0, ARCHIVES_PATH, ""))) {
@@ -2082 +2082 @@
                     g_current_media_number);
             log_msg(3, "Slicename would have been %s",
-                    slice_fname(bigfileno + 1, 0, ARCHIVES_PATH, ""));
+                    slice_fname(bigfileno, 0, ARCHIVES_PATH, ""));
             // I'm not positive 'just_changed_cds' is even necessary...
             if (just_changed_cds) {
@@ -2096 +2096 @@
                 just_changed_cds = TRUE;
             } else {
+                /* That big file doesn't exist, but the followings may */
+                /* So we need to continue looping */
                 log_msg(2, "There was no bigfile #%ld. That's OK.",
-                        bigfileno + 1);
+                    bigfileno + 1);
                 log_msg(2, "I'm going to stop restoring bigfiles now.");
-                finished = TRUE;
+                retval++;
+                bigfileno++;
+                }
             }
         } else {