Changeset 955 in MondoRescue

Timestamp:

Nov 21, 2006, 1:42:17 AM (18 years ago)

Author:

Bruno Cornec

Message:

fix a difference with trunk

File:

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

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

@@ -444 +444 @@
     int res = 0;
     int retval = 0;
+    char *fname = (char *)&res;                 /* Should NOT be NULL */
 
 // xattr
     if (g_getfattr) {
-        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_EXAT_FILE) {
             wrong_marker(BLK_START_EXAT_FILE, *pctrl_chr);
         }
-        if (!strstr(tmp_fname, "xattr")) {
+        if (!strstr(fname, "xattr")) {
             fatal_error("Wrong order, sunshine.");
         }
@@ -463 +464 @@
 // acl
     if (g_getfacl) {
-        res = read_header_block_from_stream(ptmp_size, tmp_fname, pctrl_chr);
-        if (!strstr(tmp_fname, "acl")) {
+        res = read_header_block_from_stream(ptmp_size, fname, pctrl_chr);
+        if (!strstr(fname, "acl")) {
             fatal_error("Wrong order, sunshine.");
         }
@@ -493 +494 @@
     int res = 0;
     if (g_getfattr) {
-// xattr
+    // xattr
         write_header_block_to_stream(length_of_file(xattr_fname), xattr_fname,
                              BLK_START_EXTENDED_ATTRIBUTES);
@@ -502 +503 @@
     }
     if (g_getfacl) {
-// acl
+    // acl
         write_header_block_to_stream(length_of_file(acl_fname), acl_fname,
                              BLK_START_EXAT_FILE);