X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/0771727d41929db4e7e592f85a9691ca473e6251..04575bcab50c688b26560928e7c0bcd3b6ee32e8:/tls.c

diff --git a/tls.c b/tls.c
index f57648da..3af402fd 100644
--- a/tls.c
+++ b/tls.c
@@ -1,26 +1,25 @@
 /* -*- 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
  * 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.
  */
 
 /**
- * \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,7 +61,7 @@ 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];
@@ -87,7 +86,7 @@ static void list_file (const char *fname)
 		strcpy(linkbuf, " -> ");
 		/* const-cast required for silly UNICOS headers */
 		len = readlink((char *) fname, linkbuf+4, sizeof(linkbuf) - 4);
-		if (len == -1) 
+		if (len == -1)
 			failed("readlink", fname);
 		else
 			/* it's not nul-terminated */
@@ -100,7 +99,7 @@ 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,
@@ -111,20 +110,22 @@ static void list_file (const char *fname)
 	} 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 %s %s%s\n",
-	       permbuf, (double) buf.st_size,
-	       buf.st_uid, buf.st_gid,
+
+	printf("%s ", permbuf);
+	if (IS_DEVICE(buf.st_mode))
+		printf("%6d,%5d", major(buf.st_rdev), minor(buf.st_rdev));
+	else /* NB: use double for size because it might not fit in a long. */
+		printf("%12.0f", (double)buf.st_size);
+	printf(" %6ld.%-6ld %6ld %s %s%s\n",
+	       (long)buf.st_uid, (long)buf.st_gid, (long)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"