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. */
/* TODO: Perhaps escape special characters in fname? */
printf("%s ", permbuf);
-#if MAJOR_IN_MKDEV
- printf("! "); /* XXX trying to debug Solaris build-farm weirdness */
-#else
- 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. */
-#endif
+ 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,
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;