Improved the summary of the --password-file option.

[rsync/rsync.git] / options.c

diff --git a/options.c b/options.c
index f1538e8..7695e77 100644 (file)
--- a/options.c
+++ b/options.c
@@ -117,7 +117,6 @@ int inplace = 0;
 int delay_updates = 0;
 long block_size = 0; /* "long" because popt can't set an int32. */
 
-
 /** Network address family. **/
 #ifdef INET6
 int default_af_hint = 0;       /* Any protocol */
@@ -227,19 +226,15 @@ static void print_rsync_version(enum logcode f)
                RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION);
        rprintf(f, "Copyright (C) 1996-2006 by Andrew Tridgell, Wayne Davison, and others.\n");
        rprintf(f, "<http://rsync.samba.org/>\n");
-       rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, "
-               "%shard links, %ssymlinks, batchfiles,\n",
-               (int) (sizeof (OFF_T) * 8),
-               got_socketpair, hardlinks, links);
-
-       /* Note that this field may not have type ino_t.  It depends
-        * on the complicated interaction between largefile feature
-        * macros. */
-       rprintf(f, "              %sinplace, %sIPv6, "
-               "%d-bit system inums, %d-bit internal inums\n",
-               have_inplace, ipv6,
-               (int) (sizeof dumstat->st_ino * 8),
-               (int) (sizeof (int64) * 8));
+       rprintf(f, "Capabilities: %d-bit files, %d-bit system inums, %d-bit internal inums,\n",
+               (int)(sizeof (OFF_T) * 8),
+               (int)(sizeof dumstat->st_ino * 8), /* Don't check ino_t! */
+               (int)(sizeof (int64) * 8));
+       rprintf(f, "    %ssocketpairs, %shardlinks, %ssymlinks, %sIPv6, batchfiles, %sinplace,\n",
+               got_socketpair, hardlinks, links, ipv6, have_inplace);
+       rprintf(f, "    %sappend\n",
+               have_inplace);
+
 #ifdef MAINTAINER_MODE
        rprintf(f, "Panic Action: \"%s\"\n", get_panic_action());
 #endif
@@ -375,7 +370,7 @@ void usage(enum logcode F)
   rprintf(F,"     --out-format=FORMAT     output updates using the specified FORMAT\n");
   rprintf(F,"     --log-file=FILE         log what we're doing to the specified FILE\n");
   rprintf(F,"     --log-file-format=FMT   log updates using the specified FMT\n");
-  rprintf(F,"     --password-file=FILE    read password from FILE\n");
+  rprintf(F,"     --password-file=FILE    read daemon password from FILE\n");
   rprintf(F,"     --list-only             list the files instead of copying them\n");
   rprintf(F,"     --bwlimit=KBPS          limit I/O bandwidth; KBytes per second\n");
   rprintf(F,"     --write-batch=FILE      write a batched update to FILE\n");
@@ -1665,11 +1660,11 @@ void server_options(char **args,int *argc)
                        args[ac++] = "--delete";
                if (delete_before > 1)
                        args[ac++] = "--delete-before";
-               if (delete_during) {
-                       args[ac++] = delete_during == 2 ? "--delete-delay"
-                                                       : "--delete-during";
-               }
-               if (delete_after)
+               else if (delete_during == 2)
+                       args[ac++] = "--delete-delay";
+               else if (delete_during)
+                       args[ac++] = "--delete-during";
+               else if (delete_after)
                        args[ac++] = "--delete-after";
                if (force_delete)
                        args[ac++] = "--force";