diff options
| author | Wayne Davison <wayned@samba.org> | 2005-01-29 20:29:06 +0000 |
|---|---|---|
| committer | Wayne Davison <wayned@samba.org> | 2005-01-29 20:29:06 +0000 |
| commit | 91c5833bd093803fa7bb1e4f6614dca92f286085 (patch) | |
| tree | 07b68a22137689122ee46f35865c80404ccb493e /main.c | |
| parent | 8311f1c11e22148d0528da42889d4d555d1e9b3b (diff) | |
| download | android_external_rsync-91c5833bd093803fa7bb1e4f6614dca92f286085.tar.gz android_external_rsync-91c5833bd093803fa7bb1e4f6614dca92f286085.tar.bz2 android_external_rsync-91c5833bd093803fa7bb1e4f6614dca92f286085.zip | |
Change one call to add_cvs_excludes() to add_filter() to just add
the per-dir .cvsignore rule for protocols < 29.
Diffstat (limited to 'main.c')
| -rw-r--r-- | main.c | 11 |
1 files changed, 5 insertions, 6 deletions
@@ -65,11 +65,10 @@ extern char *basis_dir[]; extern char *rsync_path; extern char *shell_cmd; extern char *batch_name; +extern struct filter_list_struct filter_list; - -/* there's probably never more than at most 2 outstanding child processes, - * but set it higher just in case. - */ +/* There's probably never more than at most 2 outstanding child processes, + * but set it higher, just in case. */ #define MAXCHILDPROCS 5 struct pid_status { @@ -625,8 +624,8 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[]) io_start_buffering_in(); if (delete_mode && !delete_excluded) recv_filter_list(f_in); - if (cvs_exclude) - add_cvs_excludes(); + if (cvs_exclude && protocol_version < 29) + add_filter(&filter_list, ":C", 0); if (filesfrom_fd >= 0) { /* We need to send the files-from names to the sender at the |
