search for: delete_excluded

...-- write_int(f_out, -1); } io_flush(); ! msleep(100); kill(pid, SIGUSR2); wait_process(pid, &status); return status; *************** *** 476,481 **** --- 478,484 ---- } } + io_start_buffering_in(f_in); if (delete_mode && !delete_excluded) recv_exclude_list(f_in); *************** *** 569,574 **** --- 572,578 ---- extern int cvs_exclude; extern int delete_mode; extern int delete_excluded; + io_start_buffering_out(f_out); if (cvs_exclude) add_cvs_excludes();...

...if (local_server) { - if (read_batch) - create_flist_from_batch(); /* sets batch_flist */ ret = local_child(argc, args, f_in, f_out, child_main); } else { ret = piped_child(args,f_in,f_out); --- 263,268 ---- *************** *** 505,515 **** if (delete_mode && !delete_excluded) recv_exclude_list(f_in); ! ! if (read_batch) ! flist = batch_flist; ! else ! flist = recv_file_list(f_in); if (!flist) { rprintf(FERROR,"server_recv: recv_file_list error\n"); exit_cleanup(RERR_FILESELECT); --- 503,509 ---- if (delete_mode && !de...

...report(f_out); @@ -421,7 +423,7 @@ close(error_pipe[1]); if (f_in != f_out) close(f_in); - io_start_buffering(f_out); + io_start_buffering_out(f_out); io_set_error_fd(error_pipe[0]); @@ -476,6 +478,7 @@ } } + io_start_buffering_in(f_in); if (delete_mode && !delete_excluded) recv_exclude_list(f_in); @@ -569,6 +572,7 @@ extern int cvs_exclude; extern int delete_mode; extern int delete_excluded; + io_start_buffering_out(f_out); if (cvs_exclude) add_cvs_excludes(); if (delete_mode && !delete_excluded) @@ -578,7 +582,10 @@...

> Just curious: what about the rsync+ patch? Thanks for the reminder. I've just committed Jos's rsync+ patch onto the "branch_mbp_rsyncplus_merge" branch. If it works OK and nobody screams I will move it across onto the main tree tomorrow or Wednesday. I see the patch doesn't add documentation about the new options to the man page, so we should fix that in the future.

...& strcmp(fname, lastdir) == 0) { file->dirname = lastdir; } else { - file->dirname = strdup(fname); + file->dirname = STRDUP(ap,fname); lastdir = file->dirname; } file->basename = STRDUP(ap, p + 1); @@ -804,6 +804,9 @@ struct file_struct *file; extern int delete_excluded; + struct file_struct *file_hfsrf; + extern char *hfs_mode; + /* f is set to -1 when calculating deletion file list */ file = make_file(fname, &flist->string_area, f == -1 && delete_excluded? SERVER_EXCLUDES @@ -831,8 +834,77 @@ local_exclude_list = last_exclude_list;...

rsync-2.6.6 manpage says: --delete [...] This option has no effect unless directory recursion is enabled. True. In fact, I noted that --delete doesn't delete anything if --dirs is used rather than --recursive. Is there any reason for --delete not to delete when used with --dirs? Is there a way to get rsync to actually delete files on the receiving end when using

...-2.5.6/options.c 2003-01-28 04:11:57.000000000 +0100 +++ rsync-2.5.6-filtered/options.c 2003-11-16 14:06:29.000000000 +0100 @@ -48,6 +48,9 @@ int dry_run=0; int local_server=0; int ignore_times=0; +char *source_filter = NULL; +char *dest_filter = NULL; +int times_only=0; int delete_mode=0; int delete_excluded=0; int one_file_system=0; @@ -246,6 +249,7 @@ rprintf(F," --timeout=TIME set IO timeout in seconds\n"); rprintf(F," -I, --ignore-times don't exclude files that match length and time\n"); rprintf(F," --size-only only use fi...

...Best regards, Marko Riedel *** options.c Tue Oct 5 15:46:00 2004 --- /tmp/rsync-2.6.3/options.c Thu Sep 23 19:39:05 2004 *************** *** 52,62 **** int cvs_exclude = 0; int dry_run = 0; int local_server = 0; int ignore_times = 0; int delete_mode = 0; - int delete_mdays = -1; int delete_excluded = 0; int one_file_system = 0; int protocol_version = PROTOCOL_VERSION; int sparse_files = 0; int do_compression = 0; --- 52,61 ---- *************** *** 263,273 **** rprintf(F," -e, --rsh=COMMAND specify the remote shell\n"); rprintf(F," --rsync-path=PATH...

...p;& flist && flist->hlink_pool) { + file->link_u.idev = pool_talloc(flist->hlink_pool, + struct idev, 1, "inode_table"); file->F_DEV = st.st_dev; file->F_INODE = st.st_ino; } @@ -905,9 +917,8 @@ void send_file_name(int f, struct file_l extern int delete_excluded; /* f is set to -1 when calculating deletion file list */ - file = make_file(fname, - f == -1 && delete_excluded? SERVER_EXCLUDES - : ALL_EXCLUDES); + file = make_file(fname, flist, + f == -1 && delete_excluded? SERVER_EXCLUDES : ALL_EXCLUDES); if (!file) r...

...file_list *recv_file_list(int f) { --- main.c.orig Fri Nov 2 14:48:47 2001 +++ main.c Thu Nov 8 18:01:37 2001 @@ -23,6 +23,8 @@ struct stats stats; +static FILE *src_list_fp; + extern int verbose; @@ -480,11 +482,13 @@ extern int cvs_exclude; extern int delete_mode; extern int delete_excluded; + extern int source_list; if (cvs_exclude) add_cvs_excludes(); if (delete_mode && !delete_excluded) send_exclude_list(f_out); - flist = send_file_list(f_out,argc,argv); + flist = (source_list ? send_file_list_fp(f_out,src_list_fp) : + send_file_list(f_out,argc,argv));...

...ode) != 0, filter_level); + if ((m == M_EXCLUDE) || (m == M_IGNORE)) { + return NULL; + } + } if (lp_ignore_nonreadable(module_id)) { #if SUPPORT_LINKS @@ -981,7 +992,8 @@ /* f is set to -1 when calculating deletion file list */ file = make_file(fname, flist, - f == -1 && delete_excluded? SERVER_FILTERS : ALL_FILTERS); + f == -1 && delete_excluded? SERVER_FILTERS : ALL_FILTERS); + if (!file) return; diff -ur ../rsync-HEAD-20050125-1221GMT.orig/generator.c ./generator.c --- ../rsync-HEAD-20050125-1221GMT.orig/generator.c Tue Jan 25 12:21:14 2005 +++ ./generator.c Thu...

...serv, diffserv) FN_LOCAL_BOOL(lp_fake_super, fake_super) FN_LOCAL_BOOL(lp_forward_lookup, forward_lookup) diff --git a/options.c b/options.c index 9e95c86..6085444 100644 --- a/options.c +++ b/options.c @@ -69,6 +69,8 @@ int delete_during = 0; int delete_before = 0; int delete_after = 0; int delete_excluded = 0; +int diffserv = 8; +char *congestion_alg = NULL; int remove_source_files = 0; int one_file_system = 0; int protocol_version = PROTOCOL_VERSION; @@ -776,6 +778,8 @@ void usage(enum logcode F) rprintf(F," --address=ADDRESS bind address for outgoing socket to daemon\n");...

...ern const char *rsync_exclude; extern int recurse; @@ -62,6 +63,7 @@ extern int write_batch; static struct exclude_struct **local_exclude_list; +static struct exclude_struct **recur_local_exclude_list; static struct file_struct null_file; @@ -258,7 +260,8 @@ if ((f == -1) && delete_excluded) { return 0; } - if (check_exclude(fname, local_exclude_list, st)) { + if (check_exclude(fname, local_exclude_list, + recur_local_exclude_list, st)) { return 1; } return 0; @@ -773,7 +776,32 @@ return file; } +static struct exclude_struct **copy_exclude_list(struct exclude_str...

This is a patch to add an --rsync-exclude option to rsync-2.5.6cvs. File names in .rsync- (or .rsync+) are excluded (or included) from the file lists associated with the current directory and all of its subdirectories. This has advantages over --cvs-exclude for backing up large file systems since the .cvsignore files only apply to the current directory: unless the .cvsignore restrictions apply

...--- /** + * Despite its name, send_file_list() is called by the receiver. + * * The delete_files() function in receiver.c sets f to -1 so that we just * construct the file list in memory without sending it over the wire. It * also has the side-effect of ignoring user-excludes if delete_excluded *************** *** 1306,1311 **** --- 1308,1325 ---- else io_error |= read_int(f); } + if (write_batch) { + /* TODO: remove this FLAG_TOP_DIR stuff and test + * CAS: I'm not sure what the FLAG_TOP_DIR does, + * but we set it here, just so it matches what +...

...ct file_list *recv_file_list(int f) { --- main.c.orig Wed Mar 27 00:10:44 2002 +++ main.c Fri Jan 10 10:59:51 2003 @@ -25,6 +25,8 @@ struct stats stats; +static FILE *src_list_fp; + extern int verbose; static void show_malloc_stats(void); @@ -559,7 +561,9 @@ if (delete_mode && !delete_excluded) send_exclude_list(f_out); if (!read_batch) /* dw -- don't write to pipe */ - flist = send_file_list(f_out,argc,argv); + flist = (src_list_fp ? + send_file_list_fp(f_out,src_list_fp) : + send_file_list(f_out,argc,argv)); if (verbose > 3) rprintf(FINFO...

...int read_batch; /* dw */ - extern struct file_list *batch_flist; /* dw */ + extern int read_batch; + extern struct file_list *batch_flist; if (verbose > 2) rprintf(FINFO,"server_recv(%d) starting pid=%d\n",argc,(int)getpid()); @@ -470,7 +470,7 @@ if (delete_mode && !delete_excluded) recv_exclude_list(f_in); - if (read_batch) /* dw */ + if (read_batch) flist = batch_flist; else flist = recv_file_list(f_in); @@ -497,7 +497,7 @@ extern int cvs_exclude; extern int am_sender; extern int remote_version; - extern int read_batch; /* dw */ + extern int read_...

...#1419: external declaration in primary source file extern int prune_empty_dirs; ^ exclude.c(35): remark #1419: external declaration in primary source file extern int delete_mode; ^ exclude.c(36): remark #1419: external declaration in primary source file extern int delete_excluded; ^ exclude.c(37): remark #1419: external declaration in primary source file extern int cvs_exclude; ^ exclude.c(38): remark #1419: external declaration in primary source file extern int sanitize_paths; ^ exclude.c(39): remark #1419: external declaration...