Changed main() definition to avoid an extra prototype being put

[rsync/rsync.git] / tls.c

diff --git a/tls.c b/tls.c
index a4fda6b..1903e1f 100644 (file)
--- a/tls.c
+++ b/tls.c
@@ -1,6 +1,6 @@
 /* -*- c-file-style: "linux" -*-
  *
 /* -*- c-file-style: "linux" -*-
  *

- * Copyright (C) 2001 by Martin Pool
+ * 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
  * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version


@@ -17,29 +17,25 @@
  */
 
 /**
  */
 
 /**

- * \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
  * our purposes they're the same -- for example, the BSD braindamage
  * about setting the mode on symlinks based on your current umask.
  *
  *
  * 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.
  *

- * There are some restrictions compared to regular ls: all the names
- * on the command line must be directories rather than files; you
- * can't give wildcards either.
+ * All the filenames must be given on the command line -- tls does not
+ * even read directories, let alone recurse.  The typical usage is
+ * "find|sort|xargs tls".

  *
  *

- * At the moment we don't sort the output, but all the files have full
- * names, so you can run it through sort(1).
+ * The format is not exactly the same as any particular Unix ls(1).

  *
  *

- * We need to recurse downwards and show all the interesting
- * information and no more.
- *
- * \todo Use readdir64 if available?
- */
-
+ * A key requirement for this program is that the output be "very
+ * reproducible."  So we mask away information that can accidentally
+ * change.
+ **/

 
 
 #include "rsync.h"
 
 
 #include "rsync.h"


@@ -50,6 +46,7 @@
 int dry_run = 0;
 int read_only = 1;
 int list_only = 0;
 int dry_run = 0;
 int read_only = 1;
 int list_only = 0;

+int preserve_perms = 0;

 
 
 static void failed (char const *what,
 
 
 static void failed (char const *what,


@@ -62,27 +59,73 @@ static void failed (char const *what,
 
 
 
 
 
 

-static void list_dir (char const *dn)
+static void list_file (const char *fname)

 {
 {

-       DIR *d;
-       struct dirent *de;
-
-       if (!(d = opendir (dn)))
-               failed ("opendir", dn);
+       STRUCT_STAT buf;
+       char permbuf[PERMSTRING_SIZE];
+       struct tm *mt;
+       char datebuf[50];
+       char linkbuf[4096];
+
+       if (do_lstat(fname, &buf) == -1)
+               failed ("stat", fname);
+
+       /* The size of anything but a regular file is probably not
+        * worth thinking about. */
+       if (!S_ISREG(buf.st_mode))
+               buf.st_size = 0;
+
+       /* On some BSD platforms the mode bits of a symlink are
+        * 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 */
+               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;
+       }

 
 

-       while ((de = readdir (d))) {
-               char *dname = d_name (de);
-               if (!strcmp (dname, ".")  ||  !strcmp (dname, ".."))
-                       continue;
-               printf ("%s\n", dname);
+       permstring(permbuf, buf.st_mode);
+
+       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);
+       } else {
+               strcpy(datebuf, "                   ");

        }
        
        }
        

-       if (closedir (d) == -1)
-               failed ("closedir", dn);
+       /* 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 %6d %s %s%s\n",
+              permbuf, (double) buf.st_size,
+              (long) buf.st_uid, (long) buf.st_gid,
+              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"
 {
        if (argc < 2) {
                fprintf (stderr, "usage: " PROGRAM " DIR ...\n"


@@ -91,7 +134,7 @@ int main (int argc, char *argv[])
        }
 
        for (argv++; *argv; argv++) {
        }
 
        for (argv++; *argv; argv++) {

-               list_dir (*argv);
+               list_file (*argv);

        }
 
        return 0;
        }
 
        return 0;