Changeset 1645 in MondoRescue for branches/2.2.5/mondo/src/common/libmondo-verify.c

Timestamp:

Sep 24, 2007, 3:04:43 AM (17 years ago)

Author:

Bruno Cornec

Message:

Render bkpinfo global (potential issue on thread, but should not be a problem as that structure is indeed static during archive)
Should solve the tmpdir issue from previous rev.
May still not compile

File:

• branches/2.2.5/mondo/src/common/libmondo-verify.c (modified) (28 diffs)

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

@@ -128 +128 @@
 extern char *MONDO_LOGFILE;
 
+/* Reference to global bkpinfo */
+extern struct s_bkpinfo *bkpinfo;
+
 /**
  * Generate a list of the files that have changed, based on @c afio @c -r
@@ -210 +213 @@
  * @return The number of sets containing differences (0 for success).
  */
-int verify_afioballs_on_CD(struct s_bkpinfo *bkpinfo, char *mountpoint)
+int verify_afioballs_on_CD(char *mountpoint)
 {
 
@@ -229 +232 @@
          set_number < 9999
          &&
-         !does_file_exist(vfy_tball_fname
-                          (bkpinfo, mountpoint, set_number));
+         !does_file_exist(vfy_tball_fname(mountpoint, set_number));
          set_number++);
-    if (!does_file_exist(vfy_tball_fname(bkpinfo, mountpoint, set_number))) {
+    if (!does_file_exist(vfy_tball_fname(mountpoint, set_number))) {
         return (0);
     }
@@ -253 +255 @@
 
     for (total_sets = set_number;
-         does_file_exist(vfy_tball_fname(bkpinfo, mountpoint, total_sets));
+         does_file_exist(vfy_tball_fname(mountpoint, total_sets));
          total_sets++) {
         log_msg(1, "total_sets = %d", total_sets);
     }
     for (;
-         does_file_exist(vfy_tball_fname(bkpinfo, mountpoint, set_number));
+         does_file_exist(vfy_tball_fname(mountpoint, set_number));
          set_number++) {
         percentage =
@@ -266 +268 @@
         log_msg(1, "set = %d", set_number);
         retval +=
-            verify_an_afioball_from_CD(bkpinfo,
-                                       vfy_tball_fname(bkpinfo, mountpoint,
-                                                       set_number));
+            verify_an_afioball_from_CD(vfy_tball_fname(mountpoint, set_number));
     }
     g_last_afioball_number = set_number - 1;
@@ -287 +287 @@
  * @return The number of differences (0 for perfect biggiefiles).
  */
-int verify_all_slices_on_CD(struct s_bkpinfo *bkpinfo, char *mtpt)
+int verify_all_slices_on_CD(char *mtpt)
 {
 
@@ -501 +501 @@
  * @return 0, always.
  */
-int verify_a_tarball(struct s_bkpinfo *bkpinfo, char *tarball_fname)
+int verify_a_tarball(char *tarball_fname)
 {
     /*@ buffers ********************************************************* */
@@ -631 +631 @@
  */
 int
-verify_an_afioball_from_CD(struct s_bkpinfo *bkpinfo, char *tarball_fname)
+verify_an_afioball_from_CD(char *tarball_fname)
 {
 
@@ -637 +637 @@
     int res = 0;
 
-    assert(bkpinfo != NULL);
     assert_string_is_neither_NULL_nor_zerolength(tarball_fname);
 
@@ -644 +643 @@
         fatal_error("Cannot verify nonexistent afioball");
     }
-    res = verify_a_tarball(bkpinfo, tarball_fname);
+    res = verify_a_tarball(tarball_fname);
     return (res);
 }
@@ -659 +658 @@
  */
 int
-verify_an_afioball_from_stream(struct s_bkpinfo *bkpinfo, char *orig_fname,
-                               long long size)
+verify_an_afioball_from_stream(char *orig_fname, long long size)
 {
 
@@ -691 +689 @@
             tarball_fname);
 /*  log_it(tmp); */
-    read_file_from_stream_to_file(bkpinfo, tarball_fname, size);
-    res = verify_a_tarball(bkpinfo, tarball_fname);
+    read_file_from_stream_to_file(tarball_fname, size);
+    res = verify_a_tarball(tarball_fname);
     if (res) {
         sprintf(tmp,
@@ -714 +712 @@
  */
 int
-verify_a_biggiefile_from_stream(struct s_bkpinfo *bkpinfo,
-                                char *biggie_fname, long long size)
+verify_a_biggiefile_from_stream(char *biggie_fname, long long size)
 {
 
@@ -765 +762 @@
             wrong_marker(BLK_START_AN_AFIO_OR_SLICE, ctrl_chr);
         }
-        res = read_file_from_stream_to_file(bkpinfo, test_file, slice_siz);
+        res = read_file_from_stream_to_file(test_file, slice_siz);
         unlink(test_file);
         res =
@@ -809 +806 @@
  * @return 0 for success (even if there are differences); nonzero for a tape error.
  */
-int verify_afioballs_from_stream(struct s_bkpinfo *bkpinfo)
+int verify_afioballs_from_stream()
 {
     /*@ int ********************************************************** */
@@ -842 +839 @@
     }
     log_to_screen("Verifying regular archives on tape");
-    total_afioballs = get_last_filelist_number(bkpinfo) + 1;
+    total_afioballs = get_last_filelist_number() + 1;
     open_progress_form("Verifying filesystem",
                        "I am verifying archives against your live filesystem now.",
@@ -853 +850 @@
         if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) {
             res =
-                read_EXAT_files_from_tape(bkpinfo, &size, fname, &ctrl_chr,
+                read_EXAT_files_from_tape(&size, fname, &ctrl_chr,
                                           curr_xattr_list_fname,
                                           curr_acl_list_fname);
@@ -876 +873 @@
             iamhere("Reading EXAT files from tape");
             res =
-                read_EXAT_files_from_tape(bkpinfo, &size, fname, &ctrl_chr,
+                read_EXAT_files_from_tape(&size, fname, &ctrl_chr,
                                           curr_xattr_list_fname,
                                           curr_acl_list_fname);
@@ -886 +883 @@
         /*log_it(tmp); */
         update_progress_form(tmp);
-        res = verify_an_afioball_from_stream(bkpinfo, fname, size);
+        res = verify_an_afioball_from_stream(fname, size);
         if (res) {
             sprintf(tmp, "Afioball %ld differs from live filesystem",
@@ -917 +914 @@
  * @return 0 for success (even if there are differences); nonzero for a tape error.
  */
-int verify_biggiefiles_from_stream(struct s_bkpinfo *bkpinfo)
+int verify_biggiefiles_from_stream()
 {
 
@@ -966 +963 @@
             iamhere("Grabbing the EXAT biggiefiles");
             res =
-                read_EXAT_files_from_tape(bkpinfo, &size, orig_fname,
+                read_EXAT_files_from_tape(&size, orig_fname,
                                           &ctrl_chr, curr_xattr_list_fname,
                                           curr_acl_list_fname);
@@ -998 +995 @@
         sprintf(logical_fname, "%s/%s", bkpinfo->restore_path, orig_fname);
         res =
-            verify_a_biggiefile_from_stream(bkpinfo, logical_fname, size);
+            verify_a_biggiefile_from_stream(logical_fname, size);
         retval += res;
         current_biggiefile_number++;
@@ -1030 +1027 @@
  * @ingroup verifyGroup
  */
-int verify_cd_image(struct s_bkpinfo *bkpinfo)
+int verify_cd_image()
 {
 
@@ -1071 +1068 @@
             popup_and_OK("Please push CD tray closed.");
         }
-        if (find_and_mount_actual_cd(bkpinfo, mountpoint)) {
+        if (find_and_mount_actual_cd(mountpoint)) {
             log_to_screen("failed to mount actual CD");
             return (1);
@@ -1112 +1109 @@
 */
     }
-    verify_afioballs_on_CD(bkpinfo, mountpoint);
+    verify_afioballs_on_CD(mountpoint);
     iamhere("before verify_all_slices");
-    verify_all_slices_on_CD(bkpinfo, mountpoint);
+    verify_all_slices_on_CD(mountpoint);
 
 #ifdef __FreeBSD__
@@ -1155 +1152 @@
  * @ingroup verifyGroup
  */
-int verify_tape_backups(struct s_bkpinfo *bkpinfo)
+int verify_tape_backups()
 {
 
@@ -1172 +1169 @@
     log_msg(3, "verify_tape_backups --- starting");
     log_to_screen("Verifying backups");
-    openin_tape(bkpinfo);
+    openin_tape();
 /* verify archives themselves */
-    retval += verify_afioballs_from_stream(bkpinfo);
-    retval += verify_biggiefiles_from_stream(bkpinfo);
+    retval += verify_afioballs_from_stream();
+    retval += verify_biggiefiles_from_stream();
 /* find the final blocks */
     paranoid_system("sync");
     sleep(2);
-    closein_tape(bkpinfo);
+    closein_tape();
 /* close tape; exit */
 //  fclose(g_tape_stream); <-- not needed; is handled by closein_tape()
@@ -1231 +1228 @@
  * @ingroup stringGroup
  */
-char *vfy_tball_fname(struct s_bkpinfo *bkpinfo, char *mountpoint,
-                      int setno)
+char *vfy_tball_fname(char *mountpoint, int setno)
 {
     /*@ buffers ******************************************************* */