Changeset 1939 in MondoRescue for branches/stable/mondo/src/common/libmondo-stream.c

Timestamp:

May 17, 2008, 1:29:54 AM (16 years ago)

Author:

Bruno Cornec

Message:

svn merge -r 1923:1938 $SVN_M/branches/2.2.6

File:

• branches/stable/mondo/src/common/libmondo-stream.c (modified) (9 diffs)

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

@@ -30 +30 @@
 
 #define EXTRA_TAPE_CHECKSUMS
+#define STR_HEADER  "Mondolicious, baby"
 
 /*@unused@*/
@@ -362 +363 @@
 {
     int res = 0;
-    int retval = 0;
     char *fname = (char *)&res;                 /* Should NOT be NULL */
 
-// xattr
+    // xattr
     if (g_getfattr) {
         res = read_header_block_from_stream(ptmp_size, fname, pctrl_chr);
@@ -372 +372 @@
         }
         if (!strstr(fname, "xattr")) {
-            fatal_error("Wrong order, sunshine.");
+            fatal_error("Wrong order for xattr, sunshine.");
         }
         read_file_from_stream_to_file(xattr_fname, *ptmp_size);
@@ -380 +380 @@
         }
         mr_msg(1, "Got xattr");
+        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);
+        }
+        res = read_header_block_from_stream(ptmp_size, tmp_fname, pctrl_chr);
+        if (pctrl_chr == BLK_START_AN_AFIO_OR_SLICE) {
+            log_msg(1, "No acl attributes found, skipping to afio files");
+            return(0);
+        } else {
+            if (pctrl_chr != BLK_START_EXTENDED_ATTRIBUTES) {
+                wrong_marker(BLK_START_EXTENDED_ATTRIBUTES, *pctrl_chr);
+            }
+        }
     }
     // acl
@@ -385 +398 @@
         res = read_header_block_from_stream(ptmp_size, fname, pctrl_chr);
         if (!strstr(fname, "acl")) {
-            fatal_error("Wrong order, sunshine.");
+            fatal_error("Wrong order for acl, sunshine.");
         }
         if (*pctrl_chr != BLK_START_EXAT_FILE) {
@@ -403 +416 @@
     // tarball itself
     res = read_header_block_from_stream(ptmp_size, tmp_fname, pctrl_chr);
-    mr_msg(1, "now looking for afioball");
-    return (retval);
+    mr_msg(1, "End of extended attributes, now looking for afioball");
+    return (0);
 }
 
@@ -420 +433 @@
         write_file_to_stream_from_file(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_STOP_EXTENDED_ATTRIBUTES);
     }
     if (g_getfacl) {
     // acl
+        write_header_block_to_stream(length_of_file(acl_fname), acl_fname,
+                             BLK_START_EXTENDED_ATTRIBUTES);
         write_header_block_to_stream(length_of_file(acl_fname), acl_fname,
                              BLK_START_EXAT_FILE);
         write_file_to_stream_from_file(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,
+        write_header_block_to_stream(length_of_file(acl_fname), acl_fname,
                              BLK_STOP_EXTENDED_ATTRIBUTES);
     }
@@ -1008 +1025 @@
     }
     memcpy((char *) plen, tempblock + 7001, sizeof(long long));
-    if (strcmp(tempblock + 6000 + *pcontrol_char, "Mondolicious, baby")) {
+    if (strcmp(tempblock + 6000 + *pcontrol_char, STR_HEADER)) {
         log_it("Bad header block at %ld K", (long) g_tape_posK);
     }
@@ -1594 +1611 @@
         tempblock[i] = 0;
     }
-    sprintf(tempblock + 6000 + control_char, "Mondolicious, baby");
+    sprintf(tempblock + 6000 + control_char, STR_HEADER);
     tempblock[7000] = control_char;
     memcpy(tempblock + 7001, (char *) &olen, sizeof(off_t));