search for: delete_mod

...n status; --- 436,442 ---- 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)...

...and "receiver.c" from version 2.6.3. 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...

...* *** 263,270 **** } 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 ---- i...

...ut,f_in); io_flush(); 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_excl...

FYI, We've been using the 2.4.7pre1 release for several days now, with nary a hang problem. We haven't seen the EOF bug at all, which was what we upgraded for. This is with transfers of as much as 50GB to set up an initial mirror. The only thing we did was set timeout=0 -- which I guess is unnecessary. The semantics of this flag are a bit unclear. We thought was 'time since

> 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.

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

...ludes deletion. -Rob -------------- next part -------------- Adds an archive mode that includes the delete option. --- orig/options.c 2004-09-23 13:39:05.000000000 -0400 +++ options.c 2004-11-13 09:56:27.000000000 -0500 @@ -39,6 +39,7 @@ int whole_file = -1; int archive_mode = 0; +int archive_delete_mode = 0; int keep_dirlinks = 0; int copy_links = 0; int preserve_links = 0; @@ -233,6 +234,7 @@ rprintf(F," -q, --quiet decrease verbosity\n"); rprintf(F," -c, --checksum always checksum\n"); rprintf(F," -a, --archive arch...

...et_stdio,fp); +} struct 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) : + se...

...9-15 11:12:02.000000000 -0600 +++ devel-3.2.7/generator.c 2022-09-15 11:12:02.000000000 -0600 @@ -47,6 +47,8 @@ extern int preserve_perms; extern int preserve_mtimes; extern int omit_dir_times; extern int omit_link_times; +extern int omit_device_times; +extern int omit_special_times; extern int delete_mode; extern int delete_before; extern int delete_during; @@ -482,7 +484,12 @@ int unchanged_attrs(const char *fname, struct file_struct *file, stat_x *sxp) return 0; #endif } else { - if (preserve_mtimes && any_time_differs(sxp, file, fname)) + int keep_time = !preserve_mtimes ? 0 +...

...void recv_generator(char *fname, struct file_struct *file, int ndx, char *fnamecmp, *partialptr, *backupptr = NULL; char fnamecmpbuf[MAXPATHLEN]; uchar fnamecmp_type; - int implied_dirs_are_missing = relative_paths && !implied_dirs && protocol_version < 30; int del_opts = delete_mode || force_delete ? DEL_RECURSE : 0; int is_dir = !S_ISDIR(file->mode) ? 0 : inc_recurse && ndx != cur_flist->ndx_start - 1 ? -1 @@ -1258,22 +1268,16 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, return; } - if (missing_below >= 0) { -...

...mlinks\n"); rprintf(F," -L, --copy-links copy the referent of all symlinks\n"); rprintf(F," --copy-unsafe-links copy the referent of \"unsafe\" symlinks\n"); @@ -321,6 +323,7 @@ {"delete", 0, POPT_ARG_NONE, &delete_mode, 0, 0, 0 }, {"existing", 0, POPT_ARG_NONE, &only_existing, 0, 0, 0 }, {"ignore-existing", 0, POPT_ARG_NONE, &opt_ignore_existing, 0, 0, 0 }, + {"inplace", 0, POPT_ARG_NONE, &inplace, 0, 0, 0 }, {"delete-after&quot...

...generator.c,v retrieving revision 1.282 diff -u -r1.282 generator.c --- generator.c 1 Jun 2006 08:04:40 -0000 1.282 +++ generator.c 2 Jun 2006 13:00:01 -0000 @@ -45,6 +45,7 @@ extern int preserve_gid; extern int preserve_times; extern int omit_dir_times; +extern int omit_dir_changes; extern int delete_mode; extern int delete_before; extern int delete_during; @@ -348,10 +349,11 @@ iflags |= ITEM_REPORT_TIME; if ((file->mode & CHMOD_BITS) != (st->st_mode & CHMOD_BITS)) iflags |= ITEM_REPORT_PERMS; - if (preserve_uid && am_root && file->uid != st->st_ui...

.../options.c --- rsync-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-onl...

...0, POPT_ARG_NONE, &force_delete, 0, 0, 0 }, {"numeric-ids", 0, POPT_ARG_NONE, &numeric_ids, 0, 0, 0 }, {"exclude", 0, POPT_ARG_STRING, 0, OPT_EXCLUDE, 0, 0 }, @@ -498,6 +502,11 @@ int parse_arguments(int *argc, const cha delete_mode = 1; break; + case OPT_DELETE_SENT_FILES: + delete_sent_files = 1; + need_messages_from_generator = 1; + break; + case OPT_EXCLUDE: add_exclude(&exclude_list, poptGetOptArg(pc), ADD_EXCLUDE); @@ -902,6 +911,9 @@ void server_options(char **args,int *arg args[ac+...

...-- rsync-2.6.1pre-1/options.c 2004-02-22 09:56:43.000000000 +0100 +++ rsync-2.6.1pre-1J/options.c 2004-04-08 10:11:13.000000000 +0200 @@ -47,6 +47,7 @@ int update_only = 0; int cvs_exclude = 0; int dry_run = 0; +const char *rsync_exclude = NULL; int local_server = 0; int ignore_times = 0; int delete_mode = 0; @@ -267,6 +268,7 @@ rprintf(F," -P equivalent to --partial --progress\n"); rprintf(F," -z, --compress compress file data\n"); rprintf(F," -C, --cvs-exclude auto ignore files in the same way CVS does\n"); +...

...et_stdio,fp); +} struct 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 (verbo...

...tch) { snprintf(err_buf, sizeof err_buf, "--write-batch and --read-batch can not be used together\n"); @@ -1803,6 +1820,9 @@ void server_options(char **args, int *ar * sans -r because the --no-r option was added at the same time. */ if (xfer_dirs && !recurse && delete_mode && am_sender) args[ac++] = "--no-r"; + + if (preserve_fileflags) + args[ac++] = "--fileflags"; if (do_compression && def_compress_level != Z_DEFAULT_COMPRESSION) { if (asprintf(&arg, "--compress-level=%d", def_compress_level) < 0) dif...

...int am_sender; - extern 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...

...9: external declaration in primary source file extern int preserve_times; ^ generator.c(46): remark #1419: external declaration in primary source file extern int omit_dir_times; ^ generator.c(47): remark #1419: external declaration in primary source file extern int delete_mode; ^ generator.c(48): remark #1419: external declaration in primary source file extern int delete_before; ^ generator.c(49): remark #1419: external declaration in primary source file extern int delete_during; ^ generator.c(50): remark #1419: external dec...