Changeset 948 in MondoRescue for branches/stable/mondo/src/common/libmondo-verify.c

Timestamp:

Nov 19, 2006, 1:27:46 AM (17 years ago)

Author:

Bruno Cornec

Message:

• mondoarchive does not backup acl+xattr by default anymore
• Add -z option to mondoarchive to support acl+xattr backup
• small mindi fix
• this may break mondo compatibility so tests are required before distributing that version.
• this is still incomplete as that aprameter should be passed for mondorestore to know what to do.

File:

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

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

@@ -124 +124 @@
 int g_last_afioball_number = -1;
 
+extern char *g_getfacl;
+extern char *g_getfattr;
 
 /**
@@ -807 +809 @@
     malloc_string(curr_acl_list_fname);
 
-    sprintf(curr_xattr_list_fname, XATTR_BIGGLST_FNAME_RAW_SZ,
+    if (g_getfattr) {
+        sprintf(curr_xattr_list_fname, XATTR_BIGGLST_FNAME_RAW_SZ,
             bkpinfo->tmpdir);
-    sprintf(curr_acl_list_fname, ACL_BIGGLST_FNAME_RAW_SZ,
+    }
+    if (g_getfacl) {
+        sprintf(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;
@@ -835 +841 @@
          ctrl_chr != BLK_STOP_AFIOBALLS;
          res = read_header_block_from_stream(&size, fname, &ctrl_chr)) {
-        sprintf(curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ,
+        if (g_getfattr) {
+            sprintf(curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ,
                 bkpinfo->tmpdir, current_afioball_number);
-        sprintf(curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ,
+        }
+        if (g_getfacl) {
+            sprintf(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");
@@ -915 +925 @@
     malloc_string(curr_acl_list_fname);
 
-    sprintf(curr_xattr_list_fname, XATTR_BIGGLST_FNAME_RAW_SZ,
+    if (g_getfattr) {
+        sprintf(curr_xattr_list_fname, XATTR_BIGGLST_FNAME_RAW_SZ,
             bkpinfo->tmpdir);
-    sprintf(curr_acl_list_fname, ACL_BIGGLST_FNAME_RAW_SZ,
+    }
+    if (g_getfacl) {
+        sprintf(curr_acl_list_fname, ACL_BIGGLST_FNAME_RAW_SZ,
             bkpinfo->tmpdir);
+    }
     sprintf(comment, "Verifying all bigfiles.");
     log_to_screen(comment);