X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/bd397b8cbaec1fb144e83c4e93047d50cd4759ee..9a5e37fca877b019ba595aa2e12e6a9332806255:/options.c diff --git a/options.c b/options.c index f51e1773..348a2da5 100644 --- a/options.c +++ b/options.c @@ -833,10 +833,14 @@ int parse_arguments(int *argc, const char ***argv, int frommain) link_dest ? "--link-dest" : "--compare-dest"); return 0; } - } else if (partial_dir) { - if (strcmp(partial_dir, ".") == 0) - partial_dir = NULL; - keep_partial = 1; + } else { + if (keep_partial && !partial_dir) + partial_dir = getenv("RSYNC_PARTIAL_DIR"); + if (partial_dir) { + if (!*partial_dir || strcmp(partial_dir, ".") == 0) + partial_dir = NULL; + keep_partial = 1; + } } if (files_from) { @@ -1013,8 +1017,7 @@ void server_options(char **args,int *argc) if (am_sender) { if (delete_excluded) args[ac++] = "--delete-excluded"; - else if (delete_mode - && (!delete_after || protocol_version < 27)) + else if (delete_mode) args[ac++] = "--delete"; if (delete_after)