-/* -*- c-file-style: "linux" -*-
+/*
+ * Trivial ls for comparing two directories after running an rsync.
+ *
+ * Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>
+ * Copyright (C) 2003, 2004, 2005 Wayne Davison
*
- * 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.
+ *
+ * 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.
*
* 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"
int list_only = 0;
int preserve_perms = 0;
-
-static void failed (char const *what,
- char const *where)
+static void failed(char const *what, char const *where)
{
- fprintf (stderr, PROGRAM ": %s %s: %s\n",
- what, where, strerror (errno));
- exit (1);
+ fprintf(stderr, PROGRAM ": %s %s: %s\n",
+ what, where, strerror(errno));
+ exit(1);
}
-
-
-static void list_file (const char *fname)
+static void list_file(const char *fname)
{
STRUCT_STAT buf;
char permbuf[PERMSTRING_SIZE];
char datebuf[50];
char linkbuf[4096];
- if (do_lstat(fname, &buf) == -1)
- failed ("stat", fname);
+ if (do_lstat(fname, &buf) < 0)
+ failed("stat", fname);
/* The size of anything but a regular file is probably not
* worth thinking about. */
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 */
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);
+ (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 {
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 %6ld.%-6ld %6ld %s %s%s\n",
- permbuf, (double)buf.st_size, (long)buf.st_uid,
- (long)buf.st_gid, (long)buf.st_nlink,
+
+ printf("%s ", permbuf);
+ if (S_ISCHR(buf.st_mode) || S_ISBLK(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[])
{
if (argc < 2) {
- fprintf (stderr, "usage: " PROGRAM " DIR ...\n"
- "Trivial file listing program for portably checking rsync\n");
+ fprintf(stderr, "usage: " PROGRAM " DIR ...\n"
+ "Trivial file listing program for portably checking rsync\n");
return 1;
}
for (argv++; *argv; argv++) {
- list_file (*argv);
+ list_file(*argv);
}
return 0;