Renamed sum_table -> hash_table.

[rsync/rsync.git] / tls.c

diff --git a/tls.c b/tls.c
index 78feae3..569c55b 100644 (file)
--- a/tls.c
+++ b/tls.c
@@ -49,17 +49,16 @@ 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];
@@ -67,8 +66,8 @@ static void list_file (const char *fname)
        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. */
@@ -101,12 +100,12 @@ static void list_file (const char *fname)
                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, "                   ");
        }
@@ -114,7 +113,7 @@ static void list_file (const char *fname)
        /* TODO: Perhaps escape special characters in fname? */
 
        printf("%s ", permbuf);
-       if (IS_DEVICE(buf.st_mode)) {
+       if (S_ISCHR(buf.st_mode) || S_ISBLK(buf.st_mode)) {
                printf("%5ld,%6ld",
                    (long)major(buf.st_rdev),
                    (long)minor(buf.st_rdev));
@@ -130,13 +129,13 @@ 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;