Hi,
Ingo Schwarze wrote on Sat, Mar 30, 2019 at 02:14:43PM +0100:
> Christian Weisgerber wrote on Sat, Mar 30, 2019 at 10:34:59AM -0000:
>> I think that if openrsync ever grows anywhere near the number of options
>> that the GPL rsync has, listing them all in usage/synopsis will be
>> unfeasible.
> In general, i recommend only listing long options in the SYNOPSIS
> and usage() when they have no short alias,
I committed that part, thanks to jmc@ and deraadt@ for checking.
> P.S.
> I feel tempted to even delete --devices and --specials from the
> synopsis because they provide little benefit compared to -D. But
> i didn't include that in the patch to avoid muddling the waters.
> The patch is strictly systematic, whereas deleting --devices
> and --specials would be a judgement call.
So here is a patch doing that. I think it is nice because it makes
the synopsis fit on two lines for now, and the approach of skipping
long options that are merely low-utility parts of other, more useful
options buys us even more time before the synopsis may grow disgusting
again.
OK?
Ingo
P.S.
Again, patch not mixed with anything unrelated, just in case it
turns out to be controversial. After committing this, or after
dropping it in case there are objections, i'll send another patch
fixing various bugs in this page.
Index: main.c
===================================================================
RCS file: /cvs/src/usr.bin/rsync/main.c,v
retrieving revision 1.40
diff -u -p -r1.40 main.c
--- main.c 30 Mar 2019 23:48:24 -0000 1.40
+++ main.c 31 Mar 2019 00:22:59 -0000
@@ -498,10 +498,9 @@ main(int argc, char *argv[])
exit(rc);
usage:
- fprintf(stderr,
- "usage: %s [-aDglnoprtv] [-e program] [--del] [--devices]\n"
- "\t[--port=portnumber] [--rsync-path=program] [--specials]\n"
- "\t[--version] source ... directory\n",
+ fprintf(stderr, "usage: %s"
+ " [-aDglnoprtv] [-e program] [--del] [--port=portnumber]\n"
+ "\t[--rsync-path=program] [--version] source ... directory\n",
getprogname());
exit(1);
}
Index: rsync.1
===================================================================
RCS file: /cvs/src/usr.bin/rsync/rsync.1,v
retrieving revision 1.14
diff -u -p -r1.14 rsync.1
--- rsync.1 30 Mar 2019 23:48:24 -0000 1.14
+++ rsync.1 31 Mar 2019 00:22:59 -0000
@@ -25,10 +25,8 @@
.Op Fl aDglnoprtv
.Op Fl e Ar program
.Op Fl -del
-.Op Fl -devices
.Op Fl -port Ns = Ns Ar portnumber
.Op Fl -rsync-path Ns = Ns Ar program
-.Op Fl -specials
.Op Fl -version
.Ar source ...
.Ar directory
