Changeset 956 in MondoRescue for trunk/mondo/src/common/libmondo-filelist.c

Timestamp:

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

Author:

Bruno Cornec

Message:

merge -r938:954 $SVN_M/branches/stable

File:

• trunk/mondo/src/common/libmondo-filelist.c (modified) (5 diffs)

trunk/mondo/src/common/libmondo-filelist.c

@@ -62 +62 @@
 extern int g_noof_rows;
 
+extern char *g_getfacl;
+extern char *g_getfattr;
 
 /**
@@ -95 +97 @@
     log_to_screen(_("Dividing filelist into sets. Please wait."));
     i = 0;
-/*
-  if (find_home_of_exe("getfattr")) 
-    { i++; log_to_screen ("NEW! Recording extended attributes."); }
-  if (find_home_of_exe("getfacl"))
-    { i++; log_to_screen ("NEW! Recording ACL information."); }
-  if (i)
-    { i=0; log_to_screen ("This will take more time. Please be patient."); }
-*/
     mr_asprintf(&filelist, "%s/archives/filelist.full", bkpinfo->scratchdir);
     if (!does_file_exist(filelist)) {
@@ -475 +469 @@
     int retval = 0;
 
-    mr_asprintf(&command, "touch %s", facl_fname);
-    run_program_and_log_output(command, 8);
-    mr_free(command);
-
-    tmp = find_home_of_exe("getfacl");
-    if (tmp) {
-//      sort_file(filelist); // FIXME - filelist chopper sorts, so this isn't necessary
+    if (g_getfacl != NULL) {
+        mr_asprintf(&command, "touch %s", facl_fname);
+        run_program_and_log_output(command, 8);
+        mr_free(command);
+
         mr_asprintf(&command,
                  "getfacl --all-effective -P %s 2>> %s | gzip -c1 > %s 2>> %s",
@@ -489 +481 @@
         mr_free(command);
     }
-    mr_free(tmp);
     return (retval);
 }
@@ -500 +491 @@
     int retval = 0;
 
-    mr_asprintf(&command, "touch %s", fattr_fname);
-    run_program_and_log_output(command, 8);
-    mr_free(command);
-
-    tmp = find_home_of_exe("getfattr");
-    if (tmp) {
-//      sort_file(filelist); // FIXME - filelist chopper sorts, so this isn't necessary
+    if (g_getfattr != NULL) {
+        mr_asprintf(&command, "touch %s", fattr_fname);
+        run_program_and_log_output(command, 8);
+        mr_free(command);
+
         retval =
             gen_aux_list(filelist, "getfattr --en=hex -P -d \"%s\"",
                          fattr_fname);
     }
-    mr_free(tmp);
     return (retval);
 }