X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/4ed886ae6ef86b4eba3a2a92e441261c42969cbf..f69204adad8d9fc3538d510fa88079e4c890eef8:/tls.c

diff --git a/tls.c b/tls.c
index 2deaabf3..1903e1f7 100644
--- a/tls.c
+++ b/tls.c
@@ -1,6 +1,6 @@
 /* -*- c-file-style: "linux" -*-
  *
- * Copyright (C) 2001 by Martin Pool <mbp@samba.org>
+ * Copyright (C) 2001, 2002 by Martin Pool <mbp@samba.org>
  * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version
@@ -17,10 +17,9 @@
  */
 
 /**
- * \section tls
+ * @file tls.c
  *
- * tls -- Trivial recursive ls, for comparing two directories after
- * running an rsync.
+ * Trivial @c ls for comparing two directories after running an rsync.
  *
  * The problem with using the system's own ls is that some features
  * have little quirks that make directories look different when for
@@ -39,7 +38,6 @@
  **/
 
 
-
 #include "rsync.h"
 
 #define PROGRAM "tls"
@@ -48,6 +46,7 @@
 int dry_run = 0;
 int read_only = 1;
 int list_only = 0;
+int preserve_perms = 0;
 
 
 static void failed (char const *what,
@@ -62,42 +61,71 @@ static void failed (char const *what,
 
 static void list_file (const char *fname)
 {
-	struct stat buf;
+	STRUCT_STAT buf;
 	char permbuf[PERMSTRING_SIZE];
 	struct tm *mt;
+	char datebuf[50];
+	char linkbuf[4096];
 
 	if (do_lstat(fname, &buf) == -1)
 		failed ("stat", fname);
 
+	/* The size of anything but a regular file is probably not
+	 * worth thinking about. */
+	if (!S_ISREG(buf.st_mode))
+		buf.st_size = 0;
+
 	/* On some BSD platforms the mode bits of a symlink are
-	 * undefined.  The size of a link is also somewhat shaky. */
+	 * undefined.  Also it tends not to be possible to reset a
+	 * symlink's mtime, so we have to ignore it too. */
 	if (S_ISLNK(buf.st_mode)) {
+		int len;
 		buf.st_mode &= ~0777;
-		buf.st_size = 0;
+		buf.st_mtime = (time_t)0;
+		buf.st_uid = buf.st_gid = 0;
+		strcpy(linkbuf, " -> ");
+		/* const-cast required for silly UNICOS headers */
+		len = readlink((char *) fname, linkbuf+4, sizeof(linkbuf) - 4);
+		if (len == -1) 
+			failed("readlink", fname);
+		else
+			/* it's not nul-terminated */
+			linkbuf[4+len] = 0;
+	} else {
+		linkbuf[0] = 0;
 	}
 
 	permstring(permbuf, buf.st_mode);
 
-	mt = gmtime(&buf.st_mtime);
-
+	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, "                   ");
+	}
+	
 	/* TODO: Perhaps escape special characters in fname? */
-
+	
+	
 	/* NB: need to pass size as a double because it might be be
 	 * too large for a long. */
-	printf("%s %12.0f %6d.%-6d %04d-%02d-%02d %02d:%02d:%02d %s\n",
+	printf("%s %12.0f %6ld.%-6ld %6d %s %s%s\n",
 	       permbuf, (double) buf.st_size,
-	       buf.st_uid, buf.st_gid,
-	       mt->tm_year + 1900,
-	       mt->tm_mon + 1,
-	       mt->tm_mday,
-	       mt->tm_hour,
-	       mt->tm_min,
-	       mt->tm_sec,
-	       fname);
+	       (long) buf.st_uid, (long) buf.st_gid,
+	       buf.st_nlink,
+	       datebuf, fname, linkbuf);
 }
 
 
-int main (int argc, char *argv[])
+int
+main(int argc, char *argv[])
 {
 	if (argc < 2) {
 		fprintf (stderr, "usage: " PROGRAM " DIR ...\n"