Changeset 2420 in MondoRescue

Timestamp:

Sep 24, 2009, 11:48:15 AM (15 years ago)

Author:

Bruno Cornec

Message:

• star only supports ACL when used with exustar mode. Fix #356.
• Modify getfattr call to have all extended attributes, including non user ones. (patch from Kevin Ritzenthaler Kevin.Ritzenthaler_at_hp.com) and fix #357

(Backport from 2.2.9)

Location:

branches/2.2.10/mondo/src

Files:

• common/libmondo-archive.c (modified) (1 diff)
• common/libmondo-filelist.c (modified) (1 diff)
• common/libmondo-fork.c (modified) (3 diffs)
• include/my-stuff.h (modified) (1 diff)
• mondorestore/mondo-rstr-compare.c (modified) (1 diff)

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

@@ -213 +213 @@
     paranoid_free(tmp);
 
-    mr_asprintf(command, "star H=star list=%s -c " STAR_ACL_SZ " file=%s", filelist, fname);
+    mr_asprintf(command, "star H=exustar list=%s -c " STAR_ACL_SZ " file=%s", filelist, fname);
     if (bkpinfo->use_lzo) {
         mr_free(command);

branches/2.2.10/mondo/src/common/libmondo-filelist.c

@@ -511 +511 @@
         mr_free(command);
         retval =
-            gen_aux_list(filelist, "getfattr --en=hex -P -d \"%s\"",
+            gen_aux_list(filelist, "getfattr --en=hex -P -m - -d \"%s\"",
                          fattr_fname);
     }

branches/2.2.10/mondo/src/common/libmondo-fork.c

@@ -38 +38 @@
     /*@ buffers ***************************************************** */
     char *result = NULL;
-    char *p = NULL;
+    char *tmpf = NULL;
 
     /*@ pointers **************************************************** */
@@ -47 +47 @@
     assert_string_is_neither_NULL_nor_zerolength(call);
 
+    mr_asprintf(tmpf, "%s/cpgll.out", bkpinfo->scratchdir);
+    mr_strcat(call, " > %s", tmpf);
     log_msg(4, "Calling command: %s", call);
     /* By default return an empty string in any case */
     mr_asprintf(result, "");
 
-    /* popen seems to always return an empty line after the interesting last line result */
-    if ((fin = popen(call, "r"))) {
+    system(call);
+    if ((fin = fopen(ftmp, "r"))) {
         while (!feof(fin)) {
-            mr_getline(p, fin);
-            log_msg(9, "p: %s", p);
-            if ((p != NULL) && (strlen(p) > 1)) {
-                mr_free(result);
-                mr_asprintf(result, "%s", p);
-                log_msg(9, "Result: %s", result);
-            }
-            mr_free(p);
-        }
-        log_msg(4, "Result: %s", result);
+            mr_getline(result, fin);
+            log_msg(9, "Loop result: %s", result);
+        }
+        log_msg(4, "Final Result: %s", result);
         mr_strip_spaces(result);
         paranoid_pclose(fin);
@@ -69 +65 @@
         log_OS_error("Unable to popen call");
     }
+    mr_free(ftmp)
     log_msg(4, "Returns: %s", result);
     return(result);

branches/2.2.10/mondo/src/include/my-stuff.h

@@ -7 +7 @@
 
 // Extra info for ACLs and SELINUX users
-#define STAR_ACL_SZ "-xfflags -acl"
+#define STAR_ACL_SZ "-xattr -acl"
 
 /**

branches/2.2.10/mondo/src/mondorestore/mondo-rstr-compare.c

@@ -291 +291 @@
     if (use_star) {
         // doesn't use compressor_exe
-        mr_asprintf(command, "%s -diff H=star file=%s >> %s 2>> %s", archiver_exe, tarball_fname, logfile, logfile);
+        mr_asprintf(command, "%s -diff H=exustar file=%s >> %s 2>> %s", archiver_exe, tarball_fname, logfile, logfile);
     } else {
         mr_asprintf(command, "%s -r -b %ld -M 16m -c %ld %s %s >> %s 2>> %s", archiver_exe, TAPE_BLOCK_SIZE, BUFSIZE, compressor_exe, tarball_fname, logfile, logfile);