X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/dfd7d541b0bab0e4ead576ba0f459a522389ec22..9f125ea7c1a55f8c86b2efe296ba750d7ccb9106:/options.c

diff --git a/options.c b/options.c
index a4513549..c34047d6 100644
--- a/options.c
+++ b/options.c
@@ -76,6 +76,7 @@ int filesfrom_fd = -1;
 char *remote_filesfrom_file = NULL;
 int eol_nulls = 0;
 int recurse = 0;
+int keep_dirs = 0;
 int am_daemon = 0;
 int daemon_over_rsh = 0;
 int do_stats = 0;
@@ -133,6 +134,7 @@ int rsync_port = 0;
 int compare_dest = 0;
 int copy_dest = 0;
 int link_dest = 0;
+int basis_dir_cnt = 0;
 
 int verbose = 0;
 int quiet = 0;
@@ -144,7 +146,6 @@ char *batch_name = NULL;
 
 static int daemon_opt;   /* sets am_daemon after option error-reporting */
 static int modify_window_set;
-static int basis_dir_cnt = 0;
 static char *dest_option = NULL;
 static char *max_size_arg;
 
@@ -199,7 +200,7 @@ static void print_rsync_version(enum logcode f)
 	rprintf(f, "              %sinplace, %sIPv6, %d-bit system inums, %d-bit internal inums\n",
 		have_inplace, ipv6,
 		(int) (sizeof dumstat->st_ino * 8),
-		(int) (sizeof (uint64) * 8));
+		(int) (sizeof (int64) * 8));
 #ifdef MAINTAINER_MODE
 	rprintf(f, "              panic action: \"%s\"\n",
 		get_panic_action());
@@ -248,7 +249,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 +739,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);
@@ -850,6 +851,9 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 		preserve_uid = 1;
 		preserve_devices = 1;
 	}
+	if (recurse) {
+		keep_dirs = 1;
+	}
 
 	if (relative_paths < 0)
 		relative_paths = files_from? 1 : 0;
@@ -952,12 +956,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",
@@ -1009,6 +1007,7 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 				return 0;
 			}
 		}
+		keep_dirs = 1;
 	}
 
 	return 1;
@@ -1239,6 +1238,8 @@ void server_options(char **args,int *argc)
 		if (!relative_paths)
 			args[ac++] = "--no-relative";
 	}
+	if (!implied_dirs && !am_sender)
+		args[ac++] = "--no-implied-dirs";
 
 	*argc = ac;
 	return;