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 the year 2007 in the copyright declarations.
[rsync/rsync.git]
/
compat.c
diff --git
a/compat.c
b/compat.c
index
f62c191
..
ef9292f
100644
(file)
--- a/
compat.c
+++ b/
compat.c
@@
-3,7
+3,7
@@
*
* 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, 2005, 2006
, 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 as published by
*
* 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
@@
-24,7
+24,7
@@
int remote_protocol = 0;
int file_extra_cnt = 0; /* count of file-list extras that everyone gets */
int remote_protocol = 0;
int file_extra_cnt = 0; /* count of file-list extras that everyone gets */
-int inc
remental
= 0;
+int inc
_recurse
= 0;
extern int verbose;
extern int am_server;
extern int verbose;
extern int am_server;
@@
-146,8
+146,8
@@
void setup_protocol(int f_out,int f_in)
}
} else if (protocol_version >= 30) {
if (recurse && !preserve_hard_links && !delete_before
}
} else if (protocol_version >= 30) {
if (recurse && !preserve_hard_links && !delete_before
- && !delete_after && !delay_updates)
- inc
remental
= 1;
+ && !delete_after && !delay_updates
&& !prune_empty_dirs
)
+ inc
_recurse
= 1;
need_messages_from_generator = 1;
}
need_messages_from_generator = 1;
}