Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make sure that the am_server variable is non-zero after parsing the
[rsync/rsync.git]
/
compat.c
diff --git
a/compat.c
b/compat.c
index
b090c2a
..
e7693ee
100644
(file)
--- a/
compat.c
+++ b/
compat.c
@@
-3,12
+3,11
@@
*
* Copyright (C) Andrew Tridgell 1996
* Copyright (C) Paul Mackerras 1996
*
* Copyright (C) Andrew Tridgell 1996
* Copyright (C) Paul Mackerras 1996
- * Copyright (C) 2004
, 2005, 2006
Wayne Davison
+ * Copyright (C) 2004
-2007
Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-23,31
+22,39
@@
#include "rsync.h"
int remote_protocol = 0;
#include "rsync.h"
int remote_protocol = 0;
-int flist_extra_cnt = 0; /* count of file-list extras that everyone gets */
+int file_extra_cnt = 0; /* count of file-list extras that everyone gets */
+int inc_recurse = 0;
extern int verbose;
extern int am_server;
extern int am_sender;
extern int inplace;
extern int verbose;
extern int am_server;
extern int am_sender;
extern int inplace;
+extern int recurse;
extern int fuzzy_basis;
extern int read_batch;
extern int max_delete;
extern int fuzzy_basis;
extern int read_batch;
extern int max_delete;
+extern int delay_updates;
extern int checksum_seed;
extern int basis_dir_cnt;
extern int prune_empty_dirs;
extern int protocol_version;
extern int checksum_seed;
extern int basis_dir_cnt;
extern int prune_empty_dirs;
extern int protocol_version;
+extern int preserve_uid;
+extern int preserve_gid;
+extern int preserve_hard_links;
+extern int need_messages_from_generator;
+extern int delete_mode, delete_before, delete_during, delete_after;
extern char *dest_option;
void setup_protocol(int f_out,int f_in)
{
if (am_sender)
extern char *dest_option;
void setup_protocol(int f_out,int f_in)
{
if (am_sender)
- f
list
_extra_cnt += PTR_EXTRA_LEN;
+ f
ile
_extra_cnt += PTR_EXTRA_LEN;
else
else
- f
list
_extra_cnt++;
+ f
ile
_extra_cnt++;
if (preserve_uid)
if (preserve_uid)
- preserve_uid = ++f
list
_extra_cnt;
+ preserve_uid = ++f
ile
_extra_cnt;
if (preserve_gid)
if (preserve_gid)
- preserve_gid = ++f
list
_extra_cnt;
+ preserve_gid = ++f
ile
_extra_cnt;
if (remote_protocol == 0) {
if (!read_batch)
if (remote_protocol == 0) {
if (!read_batch)
@@
-97,6
+104,13
@@
void setup_protocol(int f_out,int f_in)
}
}
}
}
+ if (delete_mode && !(delete_before+delete_during+delete_after)) {
+ if (protocol_version < 30)
+ delete_before = 1;
+ else
+ delete_during = 1;
+ }
+
if (protocol_version < 29) {
if (fuzzy_basis) {
rprintf(FERROR,
if (protocol_version < 29) {
if (fuzzy_basis) {
rprintf(FERROR,
@@
-129,6
+143,11
@@
void setup_protocol(int f_out,int f_in)
protocol_version);
exit_cleanup(RERR_PROTOCOL);
}
protocol_version);
exit_cleanup(RERR_PROTOCOL);
}
+ } else if (protocol_version >= 30) {
+ if (recurse && !preserve_hard_links && !delete_before
+ && !delete_after && !delay_updates && !prune_empty_dirs)
+ inc_recurse = 1;
+ need_messages_from_generator = 1;
}
if (am_server) {
}
if (am_server) {