aboutsummaryrefslogtreecommitdiffstats
path: root/main.c
diff options
context:
space:
mode:
authorDavid Dykstra <dwd@samba.org>1999-02-22 19:55:57 +0000
committerDavid Dykstra <dwd@samba.org>1999-02-22 19:55:57 +0000
commitb33b791e6ba823589bdee416b91ad9278cb36ef2 (patch)
tree34db8739446b45fd4178bffebcf1130951e2127a /main.c
parent17d31b380b7c748837b30e7e0c54ab17974f7ab6 (diff)
downloadandroid_external_rsync-b33b791e6ba823589bdee416b91ad9278cb36ef2.tar.gz
android_external_rsync-b33b791e6ba823589bdee416b91ad9278cb36ef2.tar.bz2
android_external_rsync-b33b791e6ba823589bdee416b91ad9278cb36ef2.zip
Add --delete-excluded option to delete files on the receiving side that
are excluded. Implies --delete.
Diffstat (limited to 'main.c')
-rw-r--r--main.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/main.c b/main.c
index 2846f881..5bd5b8a1 100644
--- a/main.c
+++ b/main.c
@@ -335,6 +335,7 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
char *local_name=NULL;
char *dir = NULL;
extern int delete_mode;
+ extern int delete_excluded;
extern int am_daemon;
if (verbose > 2)
@@ -351,7 +352,7 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
}
}
- if (delete_mode)
+ if (delete_mode && !delete_excluded)
recv_exclude_list(f_in);
flist = recv_file_list(f_in);
@@ -408,9 +409,10 @@ int client_run(int f_in, int f_out, int pid, int argc, char *argv[])
if (am_sender) {
extern int cvs_exclude;
extern int delete_mode;
+ extern int delete_excluded;
if (cvs_exclude)
add_cvs_excludes();
- if (delete_mode)
+ if (delete_mode && !delete_excluded)
send_exclude_list(f_out);
flist = send_file_list(f_out,argc,argv);
if (verbose > 3)