search for: read_batch

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

...ints of interaction are: 1) opening a batch file in main() 2) a hook in readfd() for writing batches from a receiver 3) a hook in writefd() for writing batches from a sender 4) file descriptor swaping in client_run() for reading batches 5) aborting the unneeded server in local_child() during a read_batch 6) a special-case for writing the protocol version during an rsyncd inband exchange 7) a special-case for writing the checksum-seed 8) a special-case for not reading end-of-run statistics Points 1-5 are very simple and clean. Points 6-8 are all the result of protocol dependance on server-n...

...5,7 @@ (struct file_struct **) malloc(sizeof(batch_flist->files[0]) * batch_flist->malloced); if (!batch_flist->files) { - out_of_memory("create_flist_from_batch"); /* dw -- will exit */ + out_of_memory("create_flist_from_batch"); } for (flags = read_batch_flags(); flags; flags = read_batch_flags()) { @@ -231,23 +225,23 @@ } return batch_flist; - } int read_batch_flist_file(char *buff, int len) { int bytes_read; + char filename[MAXPATHLEN]; if (fdb_open) { - - /* Set up file extension */ - strcat(rsync_flist_file, batch_file_ext)...

...ist *flist ) + { + int n; + for (n = 0; n < flist->count; n++ ) { + send_file_entry(flist->files[n], f, 0); + } + send_file_entry(NULL, f, 0); + if (f != -1 && remote_version >= 15) { + send_uid_list(f); + } + if (f != -1 && remote_version >= 17 && !read_batch) { /* dw-added readbatch */ + extern int module_id; + write_int(f, lp_ignore_errors(module_id) ? 0 : io_error); + } + } struct file_list *recv_file_list(int f) { diff -E -B -c -r rsync-2.5.6/main.c rsync-2.5.6-remotebatch/main.c *** rsync-2.5.6/main.c Tue Jan 28 05:05:53 2003 --- rsync-...

...h. One of my concerns is that even though we are setting --whole-file, when I follow the program logic and the output of test runs with -vvv it is still computing CRCs and (at least seems to be) preparing deltas. Hmmm, re-reading it now it seems that the do_open() I am thinking of is in an if(!read_batch) block and the CRC/deltas are under if(read_batch). Is read_batch always true when using --whole-files? Seems to be. Second concern: where is the reading and transmission of th file happening? If the do_open is in line 183, where's the read/transmit, map_file() line 202 puts the data uin bu...

...fit to splitting up the data into 3 files, essentially creating a batch-mode specific protocol on the disk, with special reading and writing functions. Simplify, simplify. What do you think? -chris -------------- next part -------------- ? patches/make-write-batch-local.diff ? patches/patch_fix_read_batch_bug Index: batch.c =================================================================== RCS file: /cvsroot/rsync/batch.c,v retrieving revision 1.32 diff -c -b -d -r1.32 batch.c *** a/batch.c 15 May 2004 19:31:10 -0000 1.32 --- b/batch.c 17 Jun 2004 04:01:54 -0000 *************** *** 172,177 **** ---...

...NULL; int dash_l_set = 0; /* Start ofc PFC patched section to handle the of the whole command under cygwin rsh ---------------------------------------------------- */ char *other_args[100] ; int other_argc = 0 ; char the_cmd[1024] ; /* End of PFC patched section */ if (!read_batch && !local_server) { char *rsh_env = getenv(RSYNC_RSH_ENV); if (!cmd) cmd = rsh_env; if (!cmd) cmd = RSYNC_RSH; cmd = strdup(cmd); if (!cmd) goto oom; for (tok = strtok(cmd, " "); tok; tok = strtok(NULL, " ")) args[argc++] = tok; /* check to s...

Hi, I have question about the behavior of --backup-dir with --delete-after option. In my testing with version 2.6.4, it appears that the backup option only backups altered files. Files that will be deleted on the destination system will NOT be placed in --backup-dir location. I would like to back up deleted files. Is there a way to do this? Thanks

...diff -ru rsync-2.5.5.orig/generator.c rsync-2.5.5/generator.c --- rsync-2.5.5.orig/generator.c Mon Mar 25 07:54:31 2002 +++ rsync-2.5.5/generator.c Sun Jun 2 20:25:54 2002 @@ -141,6 +141,7 @@ extern int whole_file, no_whole_file; extern int local_server; extern int write_batch; + extern int read_batch; assert(whole_file == 0 || whole_file == 1); @@ -150,7 +151,7 @@ return True; else if (no_whole_file) return False; - else if (write_batch) + else if (write_batch || read_batch) return False; else return local_server;

...return 0; } #endif - if (delete_mdays!=-1 && delete_mdays<1){ - snprintf(err_buf, sizeof err_buf, - "--delete-mdays needs a positive integer argument (number of days); " - "got %d\n", delete_mdays); - return 0; - } - if (write_batch && read_batch) { snprintf(err_buf, sizeof err_buf, "--write-batch and --read-batch can not be used together\n"); return 0; } --- 656,665 ---- *************** *** 1037,1052 **** if (delete_after) args[ac++] = "--delete-after"; if (force_delete) args[ac++] =...

....4. cheers, Tony rsync-2.5.4-force_fd.apc.patch ----- diff -urN rsync-2.5.4-2/main.c rsync-2.5.4-2apc/main.c --- rsync-2.5.4-2/main.c Mon Sep 30 10:09:17 2002 +++ rsync-2.5.4-2apc/main.c Thu Mar 6 15:29:27 2003 @@ -665,6 +665,8 @@ extern int whole_file; extern int write_batch; extern int read_batch; + extern int force_f_in; + extern int force_f_out; int rc; /* Don't clobber argv[] so that ps(1) can still show the right @@ -770,9 +772,14 @@ list_only = 1; } - pid = do_cmd(shell_cmd,shell_machine,shell_user,shell_path,&f_in,&f_out); + if (force_f_in != -1) { + ret =...

...int giving the compression level? */ {"compress", 'z', POPT_ARG_NONE, &do_compression , 0, 0, 0 }, {"daemon", 0, POPT_ARG_NONE, &am_daemon , 0, 0, 0 }, @@ -591,6 +593,19 @@ /* popt stores the filename in batch_prefix for us */ read_batch = 1; break; + case OPT_LINK_DEST: +#if HAVE_LINK + compare_dest = poptGetOptArg(pc); + link_dest = 1; + break; +#else + snprintf(err_buf,sizeof(err_buf), + "hard links are not supported on this %s\n", + am_server ? "server" : &quo...

Hopefully the email to the announce list will show up soon. Until then, you can get a jump on the rest by checking out the rsync home page to read the announcement: http://rsync.samba.org/ It includes a security note about a fix that affects read/write daemons that are not using chroot. If that includes you, you should look into upgrading (or maybe enabling chroot on an older rsync).

...amed.diff.orig 2013-09-29 07:02:08.000000000 +0400 +++ detect-renamed.diff 2013-10-24 18:42:22.000000000 +0400 @@ -42,15 +42,15 @@ diff --git a/compat.c b/compat.c --- a/compat.c +++ b/compat.c -@@ -43,6 +43,7 @@ extern int checksum_seed; +@@ -39,6 +39,7 @@ + extern int fuzzy_basis; + extern int read_batch; + extern int delay_updates; ++extern int detect_renamed; + extern int checksum_seed; extern int basis_dir_cnt; extern int prune_empty_dirs; - extern int protocol_version; -+extern int detect_renamed; - extern int protect_args; - extern int preserve_uid; - extern int preserve_gid; -@@ -123,6 +1...

Whats the reason that using a batch file can't be used with a remote destination? rsync --read-batch=foo /mysrc remote:/dest gives remote destination is not allowed with --read-batch I need to push the same set of files to about 20 servers and because of firewall rules, the 20 servers cannot pull from the central one. Thanks Kimo

Hi, I have awaited the new release inorder to use the -"-partial-dir" option. But after testing it seems that it does not behave like it says on the tin. It will correctly move and rename the interrupted file to the declared directory, but it will not attempt to use it when the client attempts to rsync the file again. I have a Solaris 8 box running as a server (Matthew), and another

...&initial_stats); if (mbuf) { Index: rsync-2.6.3/options.c =================================================================== --- rsync-2.6.3.orig/options.c 2005-03-18 17:19:30.%N -0800 +++ rsync-2.6.3/options.c 2005-03-19 12:45:22.%N -0800 @@ -113,6 +113,7 @@ int write_batch = 0; int read_batch = 0; +int offline = 0; int backup_dir_len = 0; int backup_suffix_len; unsigned int backup_dir_remainder; @@ -304,6 +305,7 @@ rprintf(F," --bwlimit=KBPS limit I/O bandwidth, KBytes per second\n"); rprintf(F," --write-batch=FILE write a batch to FILE\n&qu...

...) { + rprintf(FERROR,"Too many arguments to source-filter (> %d)\n", i); + exit_cleanup(RERR_SYNTAX); + } + } if (verbose > 2) rprintf(FINFO,"send_files starting\n"); @@ -178,7 +199,34 @@ write_batch_csum_info(&i,flist->count,s); if (!read_batch) { + unlink_tmp=0; + fd = do_open(fname, O_RDONLY, 0); + + if (fd != -1 && source_filter) { + int fd2, status; + pid_t pid = 0; /* assignment to get rid of compiler warning */ + + tmp = strdup(tmpl); + fd2 = mkstemp(tmp); + if (fd2 == -1) + rprintf(FERROR,"m...

Hi NG, I want to do incremental backups to a remote server running rsyncd (because daemonless transfer via ssh often hangs!). In contrast to transfer via ssh (without remote rsyncd) this doesn't seem possible, or do I miss something? Imagine I want to incrementally backup `mydir' to the backup space `backup' on e remote server `alpha' running an rsync daemon. rsyncd on

Hi, The following lines in compat.c are rather imprudent: if (read_batch || write_batch) checksum_seed = 32761; else checksum_seed = time(NULL); write_int(f_out,checksum_seed); Setting checksum_seed to a constant in batch mode means block collisions are reproducible and predictable. Thus, some files will be permanently "unlucky" in ba...