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
- Moved the code that turns rule flags into chars into a new
[rsync/rsync.git]
/
main.c
diff --git
a/main.c
b/main.c
index
be8ae39
..
72b5529
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-45,7
+45,6
@@
extern int log_got_error;
extern int module_id;
extern int orig_umask;
extern int copy_links;
extern int module_id;
extern int orig_umask;
extern int copy_links;
-extern int keep_dirs;
extern int keep_dirlinks;
extern int preserve_hard_links;
extern int protocol_version;
extern int keep_dirlinks;
extern int preserve_hard_links;
extern int protocol_version;
@@
-477,7
+476,7
@@
static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
if (delete_before) {
/* I moved this here from recv_files() to prevent a race condition */
if (delete_before) {
/* I moved this here from recv_files() to prevent a race condition */
- if (
keep_dirs
&& !local_name && flist->count > 0)
+ if (
recurse
&& !local_name && flist->count > 0)
delete_files(flist);
}
delete_files(flist);
}
@@
-597,7
+596,9
@@
static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
io_start_buffering_in();
if (delete_mode && !delete_excluded)
io_start_buffering_in();
if (delete_mode && !delete_excluded)
- recv_exclude_list(f_in);
+ recv_filter_list(f_in);
+ if (cvs_exclude)
+ add_cvs_excludes();
if (filesfrom_fd >= 0) {
/* We need to send the files-from names to the sender at the
if (filesfrom_fd >= 0) {
/* We need to send the files-from names to the sender at the
@@
-651,7
+652,7
@@
void start_server(int f_in, int f_out, int argc, char *argv[])
if (am_sender) {
keep_dirlinks = 0; /* Must be disabled on the sender. */
if (am_sender) {
keep_dirlinks = 0; /* Must be disabled on the sender. */
- recv_
exclude
_list(f_in);
+ recv_
filter
_list(f_in);
if (cvs_exclude)
add_cvs_excludes();
do_server_sender(f_in, f_out, argc, argv);
if (cvs_exclude)
add_cvs_excludes();
do_server_sender(f_in, f_out, argc, argv);
@@
-702,7
+703,7
@@
int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
if (cvs_exclude)
add_cvs_excludes();
if (delete_mode && !delete_excluded)
if (cvs_exclude)
add_cvs_excludes();
if (delete_mode && !delete_excluded)
- send_
exclude
_list(f_out);
+ send_
filter
_list(f_out);
if (remote_filesfrom_file)
filesfrom_fd = f_in;
if (remote_filesfrom_file)
filesfrom_fd = f_in;
@@
-736,7
+737,9
@@
int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
list_only |= 1;
if (!read_batch)
list_only |= 1;
if (!read_batch)
- send_exclude_list(f_out);
+ send_filter_list(f_out);
+ if (cvs_exclude)
+ add_cvs_excludes();
if (filesfrom_fd >= 0) {
io_set_filesfrom_fds(filesfrom_fd, f_out);
if (filesfrom_fd >= 0) {
io_set_filesfrom_fds(filesfrom_fd, f_out);