Changeset 956 in MondoRescue for trunk/mondo/src/mondoarchive

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/mondoarchive/mondo-cli.c (modified) (4 diffs)

trunk/mondo/src/mondoarchive/mondo-cli.c

@@ -32 +32 @@
 bool g_ISO_restore_mode = FALSE;
 
+extern double g_kernel_version;
+extern int g_current_media_number;
+extern pid_t g_main_pid;
+extern char *resolve_softlinks_to_get_to_actual_device_file(char *);
+
+/* Do we use extended attributes and acl ? 
+ * By default no, use --acl & --attr options to force their usage */
+char *g_getfacl = NULL;
+char *g_getfattr = NULL;
 
 /**
@@ -194 +203 @@
     char *q = NULL;
 
-    long itbs;
+    long itbs = 0L;
 
     struct stat buf;
@@ -496 +505 @@
     if (flag_set['w']) {
         bkpinfo->backup_media_type = cdrw;
+    }
+    if (flag_set['z']) {
+        if (find_home_of_exe("getfattr")) {
+            asprintf(&g_getfattr,"getfattr");
+        }
+        if (find_home_of_exe("getfacl")) {
+            asprintf(&g_getfacl,"getfacl");
+        }
     }
 
@@ -876 +893 @@
     while ((opt =
             getopt(argc, argv,
-                   "0123456789A:B:C:DE:FHI:J:K:LNOP:QRS:T:VWb:c:d:ef:gik:l:mn:op:rs:tuw:x:"))
+                   "0123456789A:B:C:DE:FHI:J:K:LNOP:QRS:T:VWb:c:d:ef:gik:l:mn:op:rs:tuw:x:z"))
            != -1) {
         if (opt == '?') {