* Copyright (C) 2004-2007 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
extern int recurse;
extern int use_qsort;
extern int allow_inc_recurse;
+extern int relative_paths;
extern int fuzzy_basis;
extern int read_batch;
-extern int max_delete;
+extern int implied_dirs;
extern int delay_updates;
extern int checksum_seed;
extern int basis_dir_cnt;
}
if (protocol_version < 30) {
- if (max_delete == 0 && am_sender) {
- rprintf(FERROR,
- "--max-delete=0 requires protocol 30 or higher"
- " (negotiated %d).\n",
- protocol_version);
- exit_cleanup(RERR_PROTOCOL);
- }
if (preserve_acls && !local_server) {
rprintf(FERROR,
"--acls requires protocol 30 or higher"
} else if (protocol_version >= 30) {
if (recurse && allow_inc_recurse && !preserve_hard_links
&& !delete_before && !delete_after && !delay_updates
- && !prune_empty_dirs && !use_qsort)
+ && (!relative_paths || implied_dirs) && !use_qsort
+ && !prune_empty_dirs)
inc_recurse = 1;
need_messages_from_generator = 1;
}