Changeset 948 in MondoRescue for branches/stable/mondo/src/common/libmondo-stream.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-stream.c (modified) (3 diffs)

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

@@ -115 +115 @@
 extern bool g_sigpipe;
 extern int g_tape_buffer_size_MB;
+
+extern char *g_getfacl;
+extern char *g_getfattr;
 
 /**
@@ -443 +446 @@
 
 // xattr
-    res = read_header_block_from_stream(ptmp_size, tmp_fname, pctrl_chr);
-    if (*pctrl_chr != BLK_START_EXAT_FILE) {
-        wrong_marker(BLK_START_EXAT_FILE, *pctrl_chr);
-    }
-    if (!strstr(tmp_fname, "xattr")) {
-        fatal_error("Wrong order, sunshine.");
-    }
-    read_file_from_stream_to_file(bkpinfo, xattr_fname, *ptmp_size);
-    res = read_header_block_from_stream(ptmp_size, tmp_fname, pctrl_chr);
-    if (*pctrl_chr != BLK_STOP_EXAT_FILE) {
-        wrong_marker(BLK_STOP_EXAT_FILE, *pctrl_chr);
+    if (g_getfattr) {
+        res = read_header_block_from_stream(ptmp_size, tmp_fname, pctrl_chr);
+        if (*pctrl_chr != BLK_START_EXAT_FILE) {
+            wrong_marker(BLK_START_EXAT_FILE, *pctrl_chr);
+        }
+        if (!strstr(tmp_fname, "xattr")) {
+            fatal_error("Wrong order, sunshine.");
+        }
+        read_file_from_stream_to_file(bkpinfo, xattr_fname, *ptmp_size);
+        res = read_header_block_from_stream(ptmp_size, tmp_fname, pctrl_chr);
+        if (*pctrl_chr != BLK_STOP_EXAT_FILE) {
+            wrong_marker(BLK_STOP_EXAT_FILE, *pctrl_chr);
+        }
+        log_msg(1, "Got xattr");
     }
 // acl
-    res = read_header_block_from_stream(ptmp_size, tmp_fname, pctrl_chr);
-    if (!strstr(tmp_fname, "acl")) {
-        fatal_error("Wrong order, sunshine.");
-    }
-    if (*pctrl_chr != BLK_START_EXAT_FILE) {
-        wrong_marker(BLK_START_EXAT_FILE, *pctrl_chr);
-    }
-    read_file_from_stream_to_file(bkpinfo, acl_fname, *ptmp_size);
-    res = read_header_block_from_stream(ptmp_size, tmp_fname, pctrl_chr);
-    if (*pctrl_chr != BLK_STOP_EXAT_FILE) {
-        wrong_marker(BLK_STOP_EXAT_FILE, *pctrl_chr);
-    }
-    res = read_header_block_from_stream(ptmp_size, tmp_fname, pctrl_chr);
-    if (*pctrl_chr != BLK_STOP_EXTENDED_ATTRIBUTES) {
-        wrong_marker(BLK_STOP_EXTENDED_ATTRIBUTES, *pctrl_chr);
+    if (g_getfacl) {
+        res = read_header_block_from_stream(ptmp_size, tmp_fname, pctrl_chr);
+        if (!strstr(tmp_fname, "acl")) {
+            fatal_error("Wrong order, sunshine.");
+        }
+        if (*pctrl_chr != BLK_START_EXAT_FILE) {
+            wrong_marker(BLK_START_EXAT_FILE, *pctrl_chr);
+        }
+        read_file_from_stream_to_file(bkpinfo, acl_fname, *ptmp_size);
+        res = read_header_block_from_stream(ptmp_size, tmp_fname, pctrl_chr);
+        if (*pctrl_chr != BLK_STOP_EXAT_FILE) {
+            wrong_marker(BLK_STOP_EXAT_FILE, *pctrl_chr);
+        }
+        res = read_header_block_from_stream(ptmp_size, tmp_fname, pctrl_chr);
+        if (*pctrl_chr != BLK_STOP_EXTENDED_ATTRIBUTES) {
+            wrong_marker(BLK_STOP_EXTENDED_ATTRIBUTES, *pctrl_chr);
+        }
+        log_msg(1, "Got acl");
     }
 // tarball itself
     res = read_header_block_from_stream(ptmp_size, tmp_fname, pctrl_chr);
-    log_msg(1, "Got xattr and acl; now looking for afioball");
+    log_msg(1, "now looking for afioball");
     return (retval);
 }
@@ -483 +492 @@
 {
     int res = 0;
-// EXATs
-    write_header_block_to_stream(length_of_file(xattr_fname), xattr_fname,
-                                 BLK_START_EXTENDED_ATTRIBUTES);
+    if (g_getfattr) {
 // xattr
-    write_header_block_to_stream(length_of_file(xattr_fname), xattr_fname,
-                                 BLK_START_EXAT_FILE);
-    write_file_to_stream_from_file(bkpinfo, xattr_fname);
-    write_header_block_to_stream((off_t)-1, xattr_fname, BLK_STOP_EXAT_FILE);
+        write_header_block_to_stream(length_of_file(xattr_fname), xattr_fname,
+                             BLK_START_EXTENDED_ATTRIBUTES);
+        write_header_block_to_stream(length_of_file(xattr_fname), xattr_fname,
+                             BLK_START_EXAT_FILE);
+        write_file_to_stream_from_file(bkpinfo, xattr_fname);
+        write_header_block_to_stream((off_t)-1, xattr_fname, BLK_STOP_EXAT_FILE);
+    }
+    if (g_getfacl) {
 // acl
-    write_header_block_to_stream(length_of_file(acl_fname), acl_fname,
-                                 BLK_START_EXAT_FILE);
-    write_file_to_stream_from_file(bkpinfo, acl_fname);
-    write_header_block_to_stream((off_t)-1, acl_fname, BLK_STOP_EXAT_FILE);
-    write_header_block_to_stream(length_of_file(xattr_fname), xattr_fname,
-                                 BLK_STOP_EXTENDED_ATTRIBUTES);
+        write_header_block_to_stream(length_of_file(acl_fname), acl_fname,
+                             BLK_START_EXAT_FILE);
+        write_file_to_stream_from_file(bkpinfo, acl_fname);
+        write_header_block_to_stream((off_t)-1, acl_fname, BLK_STOP_EXAT_FILE);
+        write_header_block_to_stream(length_of_file(xattr_fname), xattr_fname,
+                             BLK_STOP_EXTENDED_ATTRIBUTES);
+    }
     return (res);
 }