Output numbers in 3-digit groups by default (e.g. 1,234,567).

[rsync/rsync.git] / tls.c

diff --git a/tls.c b/tls.c
index c52b25a..501a932 100644 (file)
--- a/tls.c
+++ b/tls.c
@@ -35,7 +35,7 @@
  * change. */
 
 #include "rsync.h"
-#include "popt.h"
+#include <popt.h>
 #include "lib/sysxattrs.h"
 
 #define PROGRAM "tls"
@@ -45,8 +45,11 @@ int dry_run = 0;
 int am_root = 0;
 int read_only = 1;
 int list_only = 0;
+int link_times = 0;
+int link_owner = 0;
 int preserve_perms = 0;
 int preserve_executability = 0;
+char number_separator;
 
 #ifdef SUPPORT_XATTRS
 
@@ -134,12 +137,14 @@ static void list_file(const char *fname)
 
        /* 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. */
+        * symlink's mtime, so we default to ignoring 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;
+               if (!link_times)
+                       buf.st_mtime = (time_t)0;
+               if (!link_owner)
+                       buf.st_uid = buf.st_gid = 0;
                strlcpy(linkbuf, " -> ", sizeof linkbuf);
                /* const-cast required for silly UNICOS headers */
                len = readlink((char *) fname, linkbuf+4, sizeof(linkbuf) - 4);
@@ -175,8 +180,8 @@ static void list_file(const char *fname)
                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);
+       } else
+               printf("%15s", do_big_num(buf.st_size, 1, NULL));
        printf(" %6ld.%-6ld %6ld %s %s%s\n",
               (long)buf.st_uid, (long)buf.st_gid, (long)buf.st_nlink,
               datebuf, fname, linkbuf);
@@ -184,6 +189,8 @@ static void list_file(const char *fname)
 
 static struct poptOption long_options[] = {
   /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
+  {"link-times",      'l', POPT_ARG_NONE,   &link_times, 0, 0, 0 },
+  {"link-owner",      'L', POPT_ARG_NONE,   &link_owner, 0, 0, 0 },
 #ifdef SUPPORT_XATTRS
   {"fake-super",      'f', POPT_ARG_VAL,    &am_root, -1, 0, 0 },
 #endif
@@ -197,6 +204,8 @@ static void tls_usage(int ret)
   fprintf(F,"usage: " PROGRAM " [OPTIONS] FILE ...\n");
   fprintf(F,"Trivial file listing program for portably checking rsync\n");
   fprintf(F,"\nOptions:\n");
+  fprintf(F," -l, --link-times            display the time on a symlink\n");
+  fprintf(F," -L, --link-owner            display the owner+group on a symlink\n");
 #ifdef SUPPORT_XATTRS
   fprintf(F," -f, --fake-super            display attributes including fake-super xattrs\n");
 #endif
@@ -209,6 +218,7 @@ main(int argc, char *argv[])
 {
        poptContext pc;
        const char **extra_args;
+       char buf[32];
        int opt;
 
        pc = poptGetContext(PROGRAM, argc, (const char **)argv,
@@ -230,6 +240,12 @@ main(int argc, char *argv[])
        if (!extra_args || *extra_args == NULL)
                tls_usage(1);
 
+       snprintf(buf, sizeof buf, "%f", 3.14);
+       if (strchr(buf, '.') != NULL)
+               number_separator = ',';
+       else
+               number_separator = '.';
+
        for (; *extra_args; extra_args++)
                list_file(*extra_args);
        poptFreeContext(pc);