Martin gave his approval to use GPLv3 with this code.

[rsync/rsync.git] / tls.c

diff --git a/tls.c b/tls.c
index 8a38819..6e1c88c 100644 (file)
--- a/tls.c
+++ b/tls.c
@@ -5,7 +5,7 @@
  * Copyright (C) 2003-2007 Wayne Davison
  *
  * 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
+ * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
@@ -34,6 +34,7 @@
  * change. */
 
 #include "rsync.h"
+#include "popt.h"
 #include "lib/sysxattrs.h"
 
 #define PROGRAM "tls"
@@ -45,6 +46,8 @@ int read_only = 1;
 int list_only = 0;
 int preserve_perms = 0;
 
+#ifdef SUPPORT_XATTRS
+
 #ifdef HAVE_LINUX_XATTRS
 #define XSTAT_ATTR "user.rsync.%stat"
 #else
@@ -93,6 +96,8 @@ static int stat_xattr(const char *fname, STRUCT_STAT *fst)
        return 0;
 }
 
+#endif
+
 static void failed(char const *what, char const *where)
 {
        fprintf(stderr, PROGRAM ": %s %s: %s\n",
@@ -110,8 +115,10 @@ static void list_file(const char *fname)
 
        if (do_lstat(fname, &buf) < 0)
                failed("stat", fname);
+#ifdef SUPPORT_XATTRS
        if (am_root < 0)
                stat_xattr(fname, &buf);
+#endif
 
        /* The size of anything but a regular file is probably not
         * worth thinking about. */
@@ -168,20 +175,57 @@ static void list_file(const char *fname)
               datebuf, fname, linkbuf);
 }
 
+static struct poptOption long_options[] = {
+  /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
+#ifdef SUPPORT_XATTRS
+  {"fake-super",      'f', POPT_ARG_VAL,    &am_root, -1, 0, 0 },
+#endif
+  {"help",            'h', POPT_ARG_NONE,   0, 'h', 0, 0 },
+  {0,0,0,0,0,0,0}
+};
+
+static void tls_usage(int ret)
+{
+  FILE *F = ret ? stderr : stdout;
+  fprintf(F,"usage: " PROGRAM " [OPTIONS] FILE ...\n");
+  fprintf(F,"Trivial file listing program for portably checking rsync\n");
+  fprintf(F,"\nOptions:\n");
+#ifdef SUPPORT_XATTRS
+  fprintf(F," -f, --fake-super            display attributes including fake-super xattrs\n");
+#endif
+  fprintf(F," -h, --help                  show this help\n");
+  exit(ret);
+}
+
 int
 main(int argc, char *argv[])
 {
-       if (argc < 2) {
-               fprintf(stderr, "usage: " PROGRAM " FILE ...\n"
-                       "Trivial file listing program for portably checking rsync\n");
-               return 1;
+       poptContext pc;
+       const char **extra_args;
+       int opt;
+
+       pc = poptGetContext(PROGRAM, argc, (const char **)argv,
+                           long_options, 0);
+       while ((opt = poptGetNextOpt(pc)) != -1) {
+               switch (opt) {
+               case 'h':
+                       tls_usage(0);
+               default:
+                       fprintf(stderr,
+                               "%s: %s\n",
+                               poptBadOption(pc, POPT_BADOPTION_NOALIAS),
+                               poptStrerror(opt));
+                       tls_usage(1);
+               }
        }
 
-       if (getenv("RSYNC_FAKE_SUPER"))
-               am_root = -1;
+       extra_args = poptGetArgs(pc);
+       if (!extra_args || *extra_args == NULL)
+               tls_usage(1);
 
-       for (argv++; *argv; argv++)
-               list_file(*argv);
+       for (; *extra_args; extra_args++)
+               list_file(*extra_args);
+       poptFreeContext(pc);
 
        return 0;
 }