[SCM] The rsync repository. - branch master updated

[Rsync CVS commit messages]

The branch, master has been updated
       via  342579aa Make -V the short opt for --version.
      from  01b9bbb0 Avoid a deadlock due to huge amounts of verbose messages.

https://git.samba.org/?p=rsync.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 342579aa6ffecf8f4849ac9324881ecb9cffdc36
Author: Wayne Davison <wayne at opencoder.net>
Date:   Thu Jun 4 15:50:57 2020 -0700

    Make -V the short opt for --version.

-----------------------------------------------------------------------

Summary of changes:
 options.c | 10 +++++-----
 rsync.yo  | 12 ++++++++----
 2 files changed, 13 insertions(+), 9 deletions(-)


Changeset truncated at 500 lines:

diff --git a/options.c b/options.c
index 73f80ad2..c93abfcb 100644
--- a/options.c
+++ b/options.c
@@ -873,7 +873,7 @@ void usage(enum logcode F)
   rprintf(F,"     --checksum-seed=NUM     set block/file checksum seed (advanced)\n");
   rprintf(F," -4, --ipv4                  prefer IPv4\n");
   rprintf(F," -6, --ipv6                  prefer IPv6\n");
-  rprintf(F,"     --version               print version number\n");
+  rprintf(F," -V, --version               print the version & other info and exit\n");
   rprintf(F,"(-h) --help                  show this help (-h is --help only if used alone)\n");
 
   rprintf(F,"\n");
@@ -882,19 +882,19 @@ void usage(enum logcode F)
   rprintf(F,"See http://rsync.samba.org/ for updates, bug reports, and answers\n");
 }
 
-enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
+enum {OPT_SERVER = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
       OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST, OPT_HELP,
       OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, OPT_MIN_SIZE, OPT_CHMOD,
       OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH, OPT_MAX_SIZE,
       OPT_NO_D, OPT_APPEND, OPT_NO_ICONV, OPT_INFO, OPT_DEBUG,
       OPT_USERMAP, OPT_GROUPMAP, OPT_CHOWN, OPT_BWLIMIT,
       OPT_OLD_COMPRESS, OPT_NEW_COMPRESS, OPT_NO_COMPRESS,
-      OPT_SERVER, OPT_REFUSED_BASE = 9000};
+      OPT_REFUSED_BASE = 9000};
 
 static struct poptOption long_options[] = {
   /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
   {"help",             0,  POPT_ARG_NONE,   0, OPT_HELP, 0, 0 },
-  {"version",          0,  POPT_ARG_NONE,   0, OPT_VERSION, 0, 0},
+  {"version",         'V', POPT_ARG_NONE,   0, 'V', 0, 0},
   {"verbose",         'v', POPT_ARG_NONE,   0, 'v', 0, 0 },
   {"no-verbose",       0,  POPT_ARG_VAL,    &verbose, 0, 0, 0 },
   {"no-v",             0,  POPT_ARG_VAL,    &verbose, 0, 0, 0 },
@@ -1493,7 +1493,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 		 * only special cases are returned and listed here. */
 
 		switch (opt) {
-		case OPT_VERSION:
+		case 'V':
 			print_rsync_version(FINFO);
 			exit_cleanup(0);
 
diff --git a/rsync.yo b/rsync.yo
index 01017b2d..ad7d6096 100644
--- a/rsync.yo
+++ b/rsync.yo
@@ -470,7 +470,7 @@ to the detailed description below for a complete description.  verb(
      --checksum-seed=NUM     set block/file checksum seed (advanced)
  -4, --ipv4                  prefer IPv4
  -6, --ipv6                  prefer IPv6
-     --version               print version number
+ -V, --version               print the version & other info and exit
 (-h) --help                  show this help (see below for -h comment))
 
 Rsync can also be run as a daemon, in which case the following options are
@@ -511,7 +511,11 @@ available in rsync and exit.  For backward-compatibility with older
 versions of rsync, the help will also be output if you use the bf(-h)
 option without any other args.
 
-dit(bf(--version)) print the rsync version number and exit.
+dit(bf(-V, --version)) print the rsync version & other info and exit.
+
+The output includes the default list of checksum algorithms, the default list
+of compression algorithms, a list of compiled-in capabilities, a link to the
+rsync web site, and some license/copyright info.
 
 dit(bf(-v, --verbose)) This option increases the amount of information you
 are given during the transfer.  By default, rsync works silently. A
@@ -1413,7 +1417,7 @@ unknown checksum names.  If the remote rsync is not new enough to handle a
 checksum negotiation list, the list is silently ignored unless it contains the
 string "FAIL".
 
-Use bf(rsync --version) to see the default checksum list.
+Use bf(rsync -V) to see the default checksum list.
 
 The use of the bf(--checksum-choice) option overrides this environment list.
 
@@ -2115,7 +2119,7 @@ names.  If the remote rsync is not new enough to handle a compression
 negotiation list, the list is silently ignored unless it contains the string
 "FAIL".
 
-Use bf(rsync --version) to see the default compress list.
+Use bf(rsync -V) to see the default compress list.
 
 dit(bf(--compress-level=NUM)) Explicitly set the compression level to use
 (see bf(--compress)) instead of letting it default.  If NUM is non-zero,


-- 
The rsync repository.