/* -*- 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
**/
-
#include "rsync.h"
#define PROGRAM "tls"
int dry_run = 0;
int read_only = 1;
int list_only = 0;
+int preserve_perms = 0;
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];
* 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_mtime = (time_t)0;
buf.st_uid = buf.st_gid = 0;
strcpy(linkbuf, " -> ");
/* const-cast required for silly UNICOS headers */
- readlink((char *) fname, linkbuf+4, sizeof(linkbuf) - 4);
+ 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;
}
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,
} 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("%5ld,%6ld",
+ (long)major(buf.st_rdev),
+ (long)minor(buf.st_rdev));
+ } else /* NB: use double for size since 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"