X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/f6b384d41f056dea0ec9a0abe873be078fb09570..9439c0cb5a4b020b9bfcfe0351e33c17b9c53b54:/tls.c

diff --git a/tls.c b/tls.c
index 80d20c8b..8a388199 100644
--- a/tls.c
+++ b/tls.c
@@ -1,27 +1,24 @@
-/* -*- c-file-style: "linux" -*-
+/*
+ * Trivial ls for comparing two directories after running an rsync.
  *
- * Copyright (C) 2001, 2002 by Martin Pool <mbp@samba.org>
+ * Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>
+ * Copyright (C) 2003-2007 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.
+ * 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.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-/**
- * @file tls.c
- *
- * Trivial @c ls for comparing two directories after running an rsync.
- *
- * The problem with using the system's own ls is that some features
+/* The problem with using the system's own ls is that some features
  * have little quirks that make directories look different when for
  * our purposes they're the same -- for example, the BSD braindamage
  * about setting the mode on symlinks based on your current umask.
@@ -34,20 +31,67 @@
  *
  * A key requirement for this program is that the output be "very
  * reproducible."  So we mask away information that can accidentally
- * change.
- **/
-
+ * change. */
 
 #include "rsync.h"
+#include "lib/sysxattrs.h"
 
 #define PROGRAM "tls"
 
 /* These are to make syscall.o shut up. */
 int dry_run = 0;
+int am_root = 0;
 int read_only = 1;
 int list_only = 0;
 int preserve_perms = 0;
 
+#ifdef HAVE_LINUX_XATTRS
+#define XSTAT_ATTR "user.rsync.%stat"
+#else
+#define XSTAT_ATTR "rsync.%stat"
+#endif
+
+static int stat_xattr(const char *fname, STRUCT_STAT *fst)
+{
+	int mode, rdev_major, rdev_minor, uid, gid, len;
+	char buf[256];
+
+	if (am_root >= 0 || IS_DEVICE(fst->st_mode) || IS_SPECIAL(fst->st_mode))
+		return -1;
+
+	len = sys_lgetxattr(fname, XSTAT_ATTR, buf, sizeof buf - 1);
+	if (len >= (int)sizeof buf) {
+		len = -1;
+		errno = ERANGE;
+	}
+	if (len < 0) {
+		if (errno == ENOTSUP || errno == ENOATTR)
+			return -1;
+		if (errno == EPERM && S_ISLNK(fst->st_mode)) {
+			fst->st_uid = 0;
+			fst->st_gid = 0;
+			return 0;
+		}
+		fprintf(stderr, "failed to read xattr %s for %s: %s\n",
+			XSTAT_ATTR, fname, strerror(errno));
+		return -1;
+	}
+	buf[len] = '\0';
+
+	if (sscanf(buf, "%o %d,%d %d:%d",
+		   &mode, &rdev_major, &rdev_minor, &uid, &gid) != 5) {
+		fprintf(stderr, "Corrupt %s xattr attached to %s: \"%s\"\n",
+			XSTAT_ATTR, fname, buf);
+		exit(1);
+	}
+
+	fst->st_mode = from_wire_mode(mode);
+	fst->st_rdev = MAKEDEV(rdev_major, rdev_minor);
+	fst->st_uid = uid;
+	fst->st_gid = gid;
+
+	return 0;
+}
 
 static void failed(char const *what, char const *where)
 {
@@ -56,8 +100,6 @@ static void failed(char const *what, char const *where)
 	exit(1);
 }
 
-
-
 static void list_file(const char *fname)
 {
 	STRUCT_STAT buf;
@@ -65,15 +107,11 @@ static void list_file(const char *fname)
 	struct tm *mt;
 	char datebuf[50];
 	char linkbuf[4096];
-	int ret;
 
-#if SUPPORT_LINKS
-	ret = do_lstat(fname, &buf);
-#else
-	ret = do_stat(fname, &buf);
-#endif
-	if (ret < 0)
+	if (do_lstat(fname, &buf) < 0)
 		failed("stat", fname);
+	if (am_root < 0)
+		stat_xattr(fname, &buf);
 
 	/* The size of anything but a regular file is probably not
 	 * worth thinking about. */
@@ -88,7 +126,7 @@ static void list_file(const char *fname)
 		buf.st_mode &= ~0777;
 		buf.st_mtime = (time_t)0;
 		buf.st_uid = buf.st_gid = 0;
-		strcpy(linkbuf, " -> ");
+		strlcpy(linkbuf, " -> ", sizeof linkbuf);
 		/* const-cast required for silly UNICOS headers */
 		len = readlink((char *) fname, linkbuf+4, sizeof(linkbuf) - 4);
 		if (len == -1)
@@ -105,16 +143,16 @@ static void list_file(const char *fname)
 	if (buf.st_mtime) {
 		mt = gmtime(&buf.st_mtime);
 
-		sprintf(datebuf, "%04d-%02d-%02d %02d:%02d:%02d",
-			mt->tm_year + 1900,
-			mt->tm_mon + 1,
-			mt->tm_mday,
-			mt->tm_hour,
-			mt->tm_min,
-			mt->tm_sec);
-	} else {
-		strcpy(datebuf, "                   ");
-	}
+		snprintf(datebuf, sizeof datebuf,
+			"%04d-%02d-%02d %02d:%02d:%02d",
+			(int)mt->tm_year + 1900,
+			(int)mt->tm_mon + 1,
+			(int)mt->tm_mday,
+			(int)mt->tm_hour,
+			(int)mt->tm_min,
+			(int)mt->tm_sec);
+	} else
+		strlcpy(datebuf, "                   ", sizeof datebuf);
 
 	/* TODO: Perhaps escape special characters in fname? */
 
@@ -130,19 +168,20 @@ static void list_file(const char *fname)
 	       datebuf, fname, linkbuf);
 }
 
-
 int
 main(int argc, char *argv[])
 {
 	if (argc < 2) {
-		fprintf(stderr, "usage: " PROGRAM " DIR ...\n"
+		fprintf(stderr, "usage: " PROGRAM " FILE ...\n"
 			"Trivial file listing program for portably checking rsync\n");
 		return 1;
 	}
 
-	for (argv++; *argv; argv++) {
+	if (getenv("RSYNC_FAKE_SUPER"))
+		am_root = -1;
+
+	for (argv++; *argv; argv++)
 		list_file(*argv);
-	}
 
 	return 0;
 }