From d9eaffe5643328eaa465c19e34940c29ea470641 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Mon, 17 Jan 2022 17:11:58 -0800 Subject: [PATCH] Complain about --old-args with --protect-args. --- options.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/options.c b/options.c index 0a7b4cc7..d08f0003 100644 --- a/options.c +++ b/options.c @@ -1933,10 +1933,18 @@ int parse_arguments(int *argc_p, const char ***argv_p) } if (old_style_args < 0) { - if (!am_server && (arg = getenv("RSYNC_OLD_ARGS")) != NULL && *arg) + if (!am_server && protect_args <= 0 && (arg = getenv("RSYNC_OLD_ARGS")) != NULL && *arg) { + protect_args = 0; old_style_args = atoi(arg); - else + } else old_style_args = 0; + } else if (old_style_args) { + if (protect_args > 0) { + snprintf(err_buf, sizeof err_buf, + "--protect-args conflicts with --old-args.\n"); + return 0; + } + protect_args = 0; } if (protect_args < 0) { -- 2.34.1