Changeset 1933 in MondoRescue

Timestamp:

May 7, 2008, 2:54:22 PM (17 years ago)

Author:

Bruno Cornec

Message:

Attempt to fix #249 (adding START and STOP headers systematically for xattr and acl + more precise error messages

Location:

branches/2.2.6/mondo/src/common

Files:

• libmondo-archive.c (modified) (3 diffs)
• libmondo-stream.c (modified) (5 diffs)

branches/2.2.6/mondo/src/common/libmondo-archive.c

@@ -1355 +1355 @@
     int i;
     char *curr_xattr_list_fname = NULL;
-    char *curr_acl_list_fname;
+    char *curr_acl_list_fname = NULL;
     int misc_counter_that_is_not_important = 0;
 
@@ -1469 +1469 @@
                     write_EXAT_files_to_tape(curr_xattr_list_fname,
                                              curr_acl_list_fname);
-// archives themselves
+                // archives themselves
                 res +=
                     move_files_to_stream(storing_afioball_fname,
@@ -2260 +2260 @@
                 write_EXAT_files_to_tape(curr_xattr_list_fname,
                                          curr_acl_list_fname);
-// archives themselves
+            // archives themselves
             res = move_files_to_stream(curr_afioball_fname, NULL);
         } else {

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

@@ -446 +446 @@
 {
     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);
@@ -456 +455 @@
         }
         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);
@@ -464 +463 @@
         }
         log_msg(1, "Got xattr");
-    }
-// acl
+        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
     if (g_getfacl) {
         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) {
@@ -485 +497 @@
         log_msg(1, "Got acl");
     }
-// tarball itself
+    // tarball itself
     res = read_header_block_from_stream(ptmp_size, tmp_fname, pctrl_chr);
-    log_msg(1, "now looking for afioball");
-    return (retval);
+    log_msg(1, "End of extended attributes, now looking for afioball");
+    return (0);
 }
 
@@ -504 +516 @@
         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);
     }