Changeset 1940 in MondoRescue

Timestamp:

May 17, 2008, 2:34:23 AM (17 years ago)

Author:

Bruno Cornec

Message:

Improve log when errors on ext. attr.

File:

• branches/2.2.6/mondo/src/common/libmondo-stream.c (modified) (3 diffs)

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

@@ -448 +448 @@
     int res = 0;
     char *fname = (char *)&res;                 /* Should NOT be NULL */
+    char *tmp = NULL;
 
     // xattr
@@ -455 +456 @@
             wrong_marker(BLK_START_EXAT_FILE, *pctrl_chr);
         }
-        if (!strstr(fname, "xattr")) {
-            fatal_error("Wrong order for xattr, sunshine.");
+        if (strstr(fname, "xattr") == NULL) {
+            asprintf(&tmp,"Wrong order expected xattr, got %s, sunshine.", fname);
+            fatal_error(tmp);
         }
         read_file_from_stream_to_file(xattr_fname, *ptmp_size);
-        res = read_header_block_from_stream(ptmp_size, tmp_fname, pctrl_chr);
+        res = read_header_block_from_stream(ptmp_size, fname, pctrl_chr);
         if (*pctrl_chr != BLK_STOP_EXAT_FILE) {
             wrong_marker(BLK_STOP_EXAT_FILE, *pctrl_chr);
         }
         log_msg(1, "Got xattr");
-        res = read_header_block_from_stream(ptmp_size, tmp_fname, pctrl_chr);
+        res = read_header_block_from_stream(ptmp_size, 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);
+        res = read_header_block_from_stream(ptmp_size, fname, pctrl_chr);
         if (pctrl_chr == BLK_START_AN_AFIO_OR_SLICE) {
             log_msg(1, "No acl attributes found, skipping to afio files");
@@ -481 +483 @@
     if (g_getfacl) {
         res = read_header_block_from_stream(ptmp_size, fname, pctrl_chr);
-        if (!strstr(fname, "acl")) {
-            fatal_error("Wrong order for acl, sunshine.");
-        }
         if (*pctrl_chr != BLK_START_EXAT_FILE) {
             wrong_marker(BLK_START_EXAT_FILE, *pctrl_chr);
         }
+        if (strstr(fname, "acl") == NULL) {
+            asprintf(&tmp,"Wrong order expected acl, got %s, sunshine.", fname);
+            fatal_error(tmp);
+        }
         read_file_from_stream_to_file(acl_fname, *ptmp_size);
-        res = read_header_block_from_stream(ptmp_size, tmp_fname, pctrl_chr);
+        res = read_header_block_from_stream(ptmp_size, 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);
+        res = read_header_block_from_stream(ptmp_size, fname, pctrl_chr);
         if (*pctrl_chr != BLK_STOP_EXTENDED_ATTRIBUTES) {
             wrong_marker(BLK_STOP_EXTENDED_ATTRIBUTES, *pctrl_chr);