mirror/rsync
1
0
Fork 0
mirror of https://github.com/RsyncProject/rsync.git synced 2026-02-02 03:02:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Clumped some option-sending together that only happens on the sending side.

Browse Source
This commit is contained in:
Wayne Davison
2007-05-05 18:34:37 +00:00
parent 6b5a8f80fc
commit 4f3797c7e2
1 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
options.c
View File

@@ -1856,35 +1856,37 @@ void server_options(char **args,int *argc)
if (numeric_ids)
args[ac++] = "--numeric-ids";
if (ignore_existing && am_sender)
args[ac++] = "--ignore-existing";
if (am_sender) {
if (ignore_existing)
args[ac++] = "--ignore-existing";
/* Backward compatibility: send --existing, not --ignore-non-existing. */
if (ignore_non_existing && am_sender)
args[ac++] = "--existing";
/* Backward compatibility: send --existing, not --ignore-non-existing. */
if (ignore_non_existing)
args[ac++] = "--existing";
if (tmpdir) {
args[ac++] = "--temp-dir";
args[ac++] = tmpdir;
}
if (basis_dir[0]) {
/* the server only needs this option if it is not the sender,
* and it may be an older version that doesn't know this
* option, so don't send it if client is the sender.
*/
int i;
for (i = 0; i < basis_dir_cnt; i++) {
args[ac++] = dest_option;
args[ac++] = basis_dir[i];
}
}
}
if (append_mode)
args[ac++] = "--append";
else if (inplace)
args[ac++] = "--inplace";
if (tmpdir && am_sender) {
args[ac++] = "--temp-dir";
args[ac++] = tmpdir;
}
if (basis_dir[0] && am_sender) {
/* the server only needs this option if it is not the sender,
* and it may be an older version that doesn't know this
* option, so don't send it if client is the sender.
*/
int i;
for (i = 0; i < basis_dir_cnt; i++) {
args[ac++] = dest_option;
args[ac++] = basis_dir[i];
}
}
if (files_from && (!am_sender || filesfrom_host)) {
if (filesfrom_host) {
args[ac++] = "--files-from";