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
Mention a couple more changes.
[rsync/rsync.git]
/
compat.c
diff --git
a/compat.c
b/compat.c
index
c8066bd
..
e7693ee
100644
(file)
--- a/
compat.c
+++ b/
compat.c
@@
-3,40
+3,59
@@
*
* 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
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- *
along with this program; if not, write to the Free Software
- *
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License
along
+ *
with this program; if not, write to the Free Software Foundation, Inc.,
+ *
51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "rsync.h"
int remote_protocol = 0;
*/
#include "rsync.h"
int remote_protocol = 0;
+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 verbose;
extern int am_server;
+extern int am_sender;
extern int inplace;
extern int inplace;
+extern int recurse;
extern int fuzzy_basis;
extern int read_batch;
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)
{
extern char *dest_option;
void setup_protocol(int f_out,int f_in)
{
+ if (am_sender)
+ file_extra_cnt += PTR_EXTRA_LEN;
+ else
+ file_extra_cnt++;
+ if (preserve_uid)
+ preserve_uid = ++file_extra_cnt;
+ if (preserve_gid)
+ preserve_gid = ++file_extra_cnt;
+
if (remote_protocol == 0) {
if (!read_batch)
write_int(f_out, protocol_version);
if (remote_protocol == 0) {
if (!read_batch)
write_int(f_out, protocol_version);
@@
-75,6
+94,23
@@
void setup_protocol(int f_out,int f_in)
exit_cleanup(RERR_PROTOCOL);
}
exit_cleanup(RERR_PROTOCOL);
}
+ 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 (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,
@@
-107,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) {