From 57b12568e640b4e47039a30a6aa66e5d3a8efe12 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Wed, 9 Mar 2005 18:53:55 +0000 Subject: [PATCH] Complain if a feature that requires protocol 29 doesn't get it. --- compat.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/compat.c b/compat.c index 93f0f278..be0bf473 100644 --- a/compat.c +++ b/compat.c @@ -30,10 +30,13 @@ int remote_protocol = 0; extern int verbose; extern int am_server; extern int am_sender; +extern int inplace; extern int fuzzy_basis; extern int read_batch; extern int checksum_seed; +extern int basis_dir_cnt; extern int protocol_version; +extern char *dest_option; void setup_protocol(int f_out,int f_in) { @@ -77,11 +80,25 @@ void setup_protocol(int f_out,int f_in) if (fuzzy_basis && protocol_version < 29) { rprintf(FERROR, - "--fuzzy requres protocol 29 or higher (negotiated %d).\n", + "--fuzzy requires protocol 29 or higher (negotiated %d).\n", protocol_version); exit_cleanup(RERR_PROTOCOL); } + if (basis_dir_cnt && inplace && protocol_version < 29) { + rprintf(FERROR, + "%s with --inplace requires protocol 29 or higher (negotiated %d).\n", + dest_option, protocol_version); + exit_cleanup(RERR_PROTOCOL); + } + + if (basis_dir_cnt > 1 && protocol_version < 29) { + rprintf(FERROR, + "Multiple %s options requires protocol 29 or higher (negotiated %d).\n", + dest_option, protocol_version); + exit_cleanup(RERR_PROTOCOL); + } + if (am_server) { if (!checksum_seed) checksum_seed = time(NULL); -- 2.34.1