X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/db9c9e27660be8672abf55886ff7226abd21004f..d3d07a5e860f1cde0e234ec7a1aff7111a2c514f:/tls.c

diff --git a/tls.c b/tls.c
index f4d46afa..c52b25ab 100644
--- a/tls.c
+++ b/tls.c
@@ -2,11 +2,12 @@
  * Trivial ls for comparing two directories after running an rsync.
  *
  * Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2003-2007 Wayne Davison
+ * Copyright (C) 2003-2008 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -45,6 +46,9 @@ int am_root = 0;
 int read_only = 1;
 int list_only = 0;
 int preserve_perms = 0;
+int preserve_executability = 0;
+
+#ifdef SUPPORT_XATTRS
 
 #ifdef HAVE_LINUX_XATTRS
 #define XSTAT_ATTR "user.rsync.%stat"
@@ -86,7 +90,12 @@ static int stat_xattr(const char *fname, STRUCT_STAT *fst)
 		exit(1);
 	}
 
-	fst->st_mode = from_wire_mode(mode);
+#if _S_IFLNK != 0120000
+	if ((mode & (_S_IFMT)) == 0120000)
+		mode = (mode & ~(_S_IFMT)) | _S_IFLNK;
+#endif
+	fst->st_mode = mode;
+
 	fst->st_rdev = MAKEDEV(rdev_major, rdev_minor);
 	fst->st_uid = uid;
 	fst->st_gid = gid;
@@ -94,6 +103,8 @@ static int stat_xattr(const char *fname, STRUCT_STAT *fst)
 	return 0;
 }
 
+#endif
+
 static void failed(char const *what, char const *where)
 {
 	fprintf(stderr, PROGRAM ": %s %s: %s\n",
@@ -111,8 +122,10 @@ static void list_file(const char *fname)
 
 	if (do_lstat(fname, &buf) < 0)
 		failed("stat", fname);
+#ifdef SUPPORT_XATTRS
 	if (am_root < 0)
 		stat_xattr(fname, &buf);
+#endif
 
 	/* The size of anything but a regular file is probably not
 	 * worth thinking about. */
@@ -171,7 +184,9 @@ static void list_file(const char *fname)
 
 static struct poptOption long_options[] = {
   /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
+#ifdef SUPPORT_XATTRS
   {"fake-super",      'f', POPT_ARG_VAL,    &am_root, -1, 0, 0 },
+#endif
   {"help",            'h', POPT_ARG_NONE,   0, 'h', 0, 0 },
   {0,0,0,0,0,0,0}
 };
@@ -182,8 +197,10 @@ static void tls_usage(int ret)
   fprintf(F,"usage: " PROGRAM " [OPTIONS] FILE ...\n");
   fprintf(F,"Trivial file listing program for portably checking rsync\n");
   fprintf(F,"\nOptions:\n");
-  fprintf(F," -f, --fake-super            store/recover privileged attrs using xattrs\n");
-  fprintf(F," -h, --help                  show this help (-h works with no other options)\n");
+#ifdef SUPPORT_XATTRS
+  fprintf(F," -f, --fake-super            display attributes including fake-super xattrs\n");
+#endif
+  fprintf(F," -h, --help                  show this help\n");
   exit(ret);
 }