Changeset 956 in MondoRescue for trunk/mondo/src/common/libmondo-verify.c

Timestamp:

Nov 21, 2006, 1:42:46 AM (17 years ago)

Author:

Bruno Cornec

Message:

merge -r938:954 $SVN_M/branches/stable

File:

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

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

@@ -32 +32 @@
 int g_last_afioball_number = -1;
 
+extern char *g_getfacl;
+extern char *g_getfattr;
 
 /**
@@ -703 +705 @@
     assert(bkpinfo != NULL);
 
-    mr_asprintf(&curr_xattr_list_fname, XATTR_BIGGLST_FNAME_RAW_SZ,
-             bkpinfo->tmpdir);
-    mr_asprintf(&curr_acl_list_fname, ACL_BIGGLST_FNAME_RAW_SZ,
-             bkpinfo->tmpdir);
+    if (g_getfattr) {
+        mr_asprintf(&curr_xattr_list_fname, XATTR_BIGGLST_FNAME_RAW_SZ,
+            bkpinfo->tmpdir);
+    }
+    if (g_getfacl) {
+        mr_asprintf(&curr_acl_list_fname, ACL_BIGGLST_FNAME_RAW_SZ,
+            bkpinfo->tmpdir);
+    }
     log_to_screen(_("Verifying regular archives on tape"));
     total_afioballs = get_last_filelist_number(bkpinfo) + 1;
@@ -733 +739 @@
          ctrl_chr != BLK_STOP_AFIOBALLS;
          res = read_header_block_from_stream(&size, fname, &ctrl_chr)) {
-        mr_asprintf(&curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ,
-                 bkpinfo->tmpdir, current_afioball_number);
-        mr_asprintf(&curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ,
-                 bkpinfo->tmpdir, current_afioball_number);
+        if (g_getfattr) {
+            mr_asprintf(&curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ,
+                bkpinfo->tmpdir, current_afioball_number);
+        }
+        if (g_getfacl) {
+            mr_asprintf(&curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ,
+                bkpinfo->tmpdir, current_afioball_number);
+        }
         if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) {
             iamhere("Reading EXAT files from tape");
@@ -817 +827 @@
     assert(bkpinfo != NULL);
 
-    mr_asprintf(&curr_xattr_list_fname, XATTR_BIGGLST_FNAME_RAW_SZ,
-             bkpinfo->tmpdir);
-    mr_asprintf(&curr_acl_list_fname, ACL_BIGGLST_FNAME_RAW_SZ,
-             bkpinfo->tmpdir);
+    if (g_getfattr) {
+        mr_asprintf(&curr_xattr_list_fname, XATTR_BIGGLST_FNAME_RAW_SZ,
+            bkpinfo->tmpdir);
+    }
+    if (g_getfacl) {
+        mr_asprintf(&curr_acl_list_fname, ACL_BIGGLST_FNAME_RAW_SZ,
+            bkpinfo->tmpdir);
+    }
     mr_asprintf(&comment, "Verifying all bigfiles.");
     log_to_screen(comment);