search for: remove_source_files

...rprintf(FINFO, "recreating %s due to changed attributes\n", fname); + goto recreate_symlink; + } if (itemizing) itemize(fname, file, ndx, 0, &sx, 0, 0, NULL); #if defined SUPPORT_HARD_LINKS && defined CAN_HARDLINK_SYMLINK @@ -1538,7 +1547,9 @@ if (remove_source_files == 1) goto return_with_success; goto cleanup; - } + } else + iflags = ITEM_REPORT_CHANGE; + recreate_symlink: /* Not the right symlink (or not a symlink), so * delete it. */ if (delete_item(fname, sx.st.st_mode, del_opts | DEL_FOR_SYMLINK) != 0) @@ -1572,18 +1583,20...

I've been experimenting with the --remove-sent-files option with patchy success. Often --remove-sent-files will not remove the remote files. It copies them locally but "apparently" failed to remove them remotely. After some experimentation I was able to identify one problem as a permission problem. I continue to have problems with rsync not removing some more files. What troubles

...4 fixes the issue. However, it has been tested on FreeBSD only. The patch is also available on http://sysoev.ru/tmp/rsync.symlink.patch --- generator.c 2008-08-31 20:51:29.000000000 +0400 +++ generator.c 2008-10-08 23:10:17.000000000 +0400 @@ -1556,9 +1556,40 @@ if (remove_source_files == 1) goto return_with_success; goto cleanup; + } else { + char fnametmp[MAXPATHLEN]; + + /* Replace the symlink atomically. */ +...

...write_devices = 1; + inplace = 1; + break; + default: /* A large opt value means that set_refuse_options() * turned this option off. */ @@ -2069,6 +2077,9 @@ else if (remove_source_files) args[ac++] = "--remove-sent-files"; + if (write_devices) + args[ac++] = "--write-devices"; + if (ac > MAX_SERVER_ARGS) { /* Not possible... */ rprintf(FERROR, "argc overflow in server_options().\n");...

...:33:06.000000000 +0400 @@ -678,8 +678,6 @@ recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size, fname, fd2, F_LENGTH(file)); - log_item(log_code, file, &initial_stats, iflags, NULL); - if (fd1 != -1) close(fd1); if (close(fd2) < 0) { @@ -719,6 +717,7 @@ if (remove_source_files || inc_recurse || (preserve_hard_links && F_IS_HLINKED(file))) send_msg_int(MSG_SUCCESS, ndx); + log_item(log_code, file, &initial_stats, iflags, NULL); break; case 0: { enum logcode msgtype = redoing ? FERROR_XFER : FWARNING;

..., the generator sets real_ret to 0 if a basis file is found, even though the destination file does not exist: if (statret != 0 && basis_dir[0] != NULL) { int j = try_dests_reg(file, fname, ndx, fnamecmpbuf, &sx, itemizing, maybe_ATTRS_REPORT, code); if (j == -2) { if (remove_source_files == 1) goto return_with_success; goto cleanup; } if (j >= 0) { fnamecmp = fnamecmpbuf; fnamecmp_type = j; statret = 0; } } real_ret = statret; real_sx = sx; A few lines later, rsync checks for a fuzzy basis file; if it finds one, it sets statret = 0, and that change doe...

...0) { - int len1 = MIN(len, SPARSE_WRITE_SIZE); + int len1 = MIN(len, (size_t)sparse_files_block_size); r1 = write_sparse(f, buf, len1); } else { if (!wf_writeBuf) { diff --git a/options.c b/options.c index f2d23f6..aaffdc7 100644 --- a/options.c +++ b/options.c @@ -73,6 +73,7 @@ int remove_source_files = 0; int one_file_system = 0; int protocol_version = PROTOCOL_VERSION; int sparse_files = 0; +long sparse_files_block_size = SPARSE_WRITE_SIZE; int do_compression = 0; int def_compress_level = Z_DEFAULT_COMPRESSION; int am_root = 0; /* 0 = normal, 1 = root, 2 = --super, -1 = --fake-super */ @...

...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"); rprintf(F," --port=PORT specify double-colon alternate...

...der.c --- rsync-3.0.6/sender.c 2009-04-12 22:48:59.000000000 +0300 +++ rsync-3.0.6.fast/sender.c 2009-09-23 22:24:59.000000000 +0300 @@ -35,6 +35,8 @@ extern int allowed_lull; extern int preserve_xattrs; extern int protocol_version; +extern int local_server; +extern int local_socket; extern int remove_source_files; extern int updating_basis_file; extern int make_backups; @@ -319,6 +321,16 @@ path,slash,fname, (double)st.st_size); } + /* send_fd for fast copy before sending sum head, + * which will trigger the recv_fd at the receiver -goldor */ + if (local_server && local_socket &...

...L, &preserve_specials, 1, 0, 0 }, {"no-specials", 0, POPT_ARG_VAL, &preserve_specials, 0, 0, 0 }, {"links", 'l', POPT_ARG_VAL, &preserve_links, 1, 0, 0 }, @@ -2069,6 +2072,9 @@ void server_options(char **args, int *ar else if (remove_source_files) args[ac++] = "--remove-sent-files"; + if (copy_devices) + args[ac++] = "--copy-devices"; + if (ac > MAX_SERVER_ARGS) { /* Not possible... */ rprintf(FERROR, "argc overflow in server_options().\n"); exit_cleanup(RERR_MALLOC); diff -pur rsync-3.0.7/rece...

...k #1419: external declaration in primary source file extern int module_id; ^ generator.c(52): remark #1419: external declaration in primary source file extern int ignore_errors; ^ generator.c(53): remark #1419: external declaration in primary source file extern int remove_source_files; ^ generator.c(54): remark #1419: external declaration in primary source file extern int delay_updates; ^ generator.c(55): remark #1419: external declaration in primary source file extern int update_only; ^ generator.c(56): remark #1419: external declar...