Changeset 956 in MondoRescue for trunk/mondo/src/common/libmondo-stream.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-stream.c (modified) (5 diffs)

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

@@ -29 +29 @@
 extern int g_tape_buffer_size_MB;
 
+extern char *g_getfacl;
+extern char *g_getfattr;
+
 /**
  * @addtogroup globalGroup
@@ -346 +349 @@
 
 // xattr
-    res = read_header_block_from_stream(ptmp_size, fname, pctrl_chr);
-    if (*pctrl_chr != BLK_START_EXAT_FILE) {
-        wrong_marker(BLK_START_EXAT_FILE, *pctrl_chr);
-    }
-    if (!strstr(fname, "xattr")) {
-        fatal_error("Wrong order, sunshine.");
+    if (g_getfattr) {
+        res = read_header_block_from_stream(ptmp_size, fname, pctrl_chr);
+        if (*pctrl_chr != BLK_START_EXAT_FILE) {
+            wrong_marker(BLK_START_EXAT_FILE, *pctrl_chr);
+        }
+        if (!strstr(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");
     }
     mr_free(fname);
@@ -361 +372 @@
     }
     // acl
-    res = read_header_block_from_stream(ptmp_size, fname, pctrl_chr);
-    if (!strstr(fname, "acl")) {
-        fatal_error("Wrong order, sunshine.");
+    if (g_getfacl) {
+        res = read_header_block_from_stream(ptmp_size, fname, pctrl_chr);
+        if (!strstr(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");
     }
     mr_free(fname);
@@ -380 +406 @@
     }
     // tarball itself
-    res = read_header_block_from_stream(ptmp_size, fname, pctrl_chr);
-    log_msg(1, "Got xattr and acl; now looking for afioball");
-    tmp_fname = fname;
+    res = read_header_block_from_stream(ptmp_size, tmp_fname, pctrl_chr);
+    log_msg(1, "now looking for afioball");
     return (retval);
 }
@@ -391 +416 @@
 {
     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);
-// 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(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);
+    }
     return (res);
 }