X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/ce0b384fa69a0b4dc3323cc3fef815a03bcaa555..4ce838e1f107239f1b18f3f8cd7c7fbab65e0bd5:/options.c

diff --git a/options.c b/options.c
index 002aa9a8..60b59b0c 100644
--- a/options.c
+++ b/options.c
@@ -248,7 +248,7 @@ void usage(enum logcode F)
   rprintf(F,"     --backup-dir            make backups into this directory\n");
   rprintf(F,"     --suffix=SUFFIX         backup suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX);
   rprintf(F," -u, --update                update only (don't overwrite newer files)\n");
-  rprintf(F,"     --inplace               update destination files inplace (SEE MAN PAGE)\n");
+  rprintf(F,"     --inplace               update destination files in-place (SEE MAN PAGE)\n");
   rprintf(F," -K, --keep-dirlinks         treat symlinked dir on receiver as dir\n");
   rprintf(F," -l, --links                 copy symlinks as symlinks\n");
   rprintf(F," -L, --copy-links            copy the referent of all symlinks\n");
@@ -738,7 +738,7 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 			compare_dest = 1;
 			dest_option = "--compare-dest";
 		set_dest_dir:
-			if (basis_dir_cnt >= MAX_BASIS_DIRS-1) {
+			if (basis_dir_cnt >= MAX_BASIS_DIRS) {
 				snprintf(err_buf, sizeof err_buf,
 					"ERROR: at most %d %s args may be specified\n",
 					MAX_BASIS_DIRS, dest_option);
@@ -952,12 +952,6 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 			return 0;
 		}
 		keep_partial = 0;
-		if (dest_option) {
-			snprintf(err_buf, sizeof err_buf,
-				 "--inplace does not yet work with %s\n",
-				 dest_option);
-			return 0;
-		}
 #else
 		snprintf(err_buf, sizeof err_buf,
 			 "--inplace is not supported on this %s\n",