Added arg-parsing to tls.c.

diff --git a/testsuite/devices.test b/testsuite/devices.test
index b25fa6eab5b1eaa683fc019f595b596b474a51e1..51df996be0c1ef885ff05e38b11daecaac685934 100644 (file)
--- a/testsuite/devices.test
+++ b/testsuite/devices.test
@@ -25,7 +25,7 @@ case `id -u` in
     # If we can't test the real device code, try to test --fake-super instead
     $RSYNC --version | grep ", xattrs" >/dev/null || test_skipped "Rsync needs root/fakeroot/--fake-super for device tests"
     RSYNC="$RSYNC --fake-super"
-    export RSYNC_FAKE_SUPER=1
+    TLS_ARGS=--fake-super
     case "`xattr 2>&1`" in
     *--list:*)
        mknod() {

diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
index 115ae6bca09764e8a6fc6ea91146cae79d498425..19cfb70a3878a1ddf76511e288d9b591deca66bf 100644 (file)
--- a/testsuite/rsync.fns
+++ b/testsuite/rsync.fns
@@ -66,7 +66,7 @@ printmsg() {
 }
 
 rsync_ls_lR() {
-    find "$@" -print | sort | sed 's/ /\\ /g' | xargs "$TOOLDIR/tls"
+    find "$@" -print | sort | sed 's/ /\\ /g' | xargs "$TOOLDIR/tls" $TLS_ARGS
 }
 
 check_perms() {

diff --git a/tls.c b/tls.c
index 8a388199ca0798fcc500d4f1764a255a72824091..f4d46afa80e3504c4d282ffc837218aa3d826714 100644 (file)
--- a/tls.c
+++ b/tls.c
@@ -34,6 +34,7 @@
  * change. */
 
 #include "rsync.h"
+#include "popt.h"
 #include "lib/sysxattrs.h"
 
 #define PROGRAM "tls"
@@ -168,20 +169,53 @@ static void list_file(const char *fname)
               datebuf, fname, linkbuf);
 }
 
+static struct poptOption long_options[] = {
+  /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
+  {"fake-super",      'f', POPT_ARG_VAL,    &am_root, -1, 0, 0 },
+  {"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");
+  fprintf(F," -f, --fake-super            store/recover privileged attrs using xattrs\n");
+  fprintf(F," -h, --help                  show this help (-h works with no other options)\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;
 }