search for: write_batch

...h.c =================================================================== RCS file: /cvsroot/rsync/batch.c,v retrieving revision 1.32 diff -c -b -d -r1.32 batch.c *** batch.c 15 May 2004 19:31:10 -0000 1.32 --- batch.c 12 Jul 2004 00:37:45 -0000 *************** *** 25,30 **** --- 25,31 ---- void write_batch_flist_info(int flist_count, struct file_struct **files) { + return; char filename[MAXPATHLEN]; int i, f, save_pv; int64 save_written; *************** *** 180,185 **** --- 181,187 ---- **/ void write_batch_csum_info(int *flist_entry, struct sum_struct *s) { + return; size_t i;...

...* If flist_entry < 0, just open the file * * @todo This will break if s->count is ever larger than maxint. The * batch code should probably be changed to consistently use the *************** *** 198,203 **** --- 199,206 ---- } } + if (*flist_entry < 0) + return; write_batch_csums_file(flist_entry, sizeof (int)); int_count = s ? (int) s->count : 0; write_batch_csums_file(&int_count, sizeof int_count); *************** *** 285,290 **** --- 288,296 ---- } } + if (buff == NULL) + return; + if (write(f_delta, buff, bytes_to_write) < 0) {...

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

...quot;.rsync_flist"; +static char rsync_csums_file[] = ".rsync_csums"; +static char rsync_delta_file[] = ".rsync_delta"; +static char rsync_argvs_file[] = ".rsync_argvs"; + +static int fdb; +static int fdb_delta; +static int fdb_open; +static int fdb_close; void write_batch_flist_file(char *buff, int bytes_to_write) { + char filename[MAXPATHLEN]; if (fdb_open) { /* Set up file extension */ - strcat(rsync_flist_file, batch_file_ext); + strlcpy(filename, batch_prefix, sizeof(filename)); + strlcat(filename, rsync_flist_file, sizeof(filename)); - /* Open bat...

...- next part -------------- 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;

...I expect not too many people to use the rsync+ features (but I could be wrong, of course). --- receiver.c 7 May 2001 06:59:37 -0000 1.33 +++ receiver.c 7 Dec 2001 02:16:04 -0000 @@ -36,6 +36,7 @@ extern char *compare_dest; extern int make_backups; extern char *backup_suffix; +extern int write_batch; static struct delete_list { dev_t dev; @@ -357,6 +358,12 @@ if (!am_server) { log_transfer(file, fname); } + continue; + } + + if (write_batch) { +...

...was made against rsync 2.5.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...

I'm in the midst of coding a patch set for consideration that will bump the protocol version and have a couple of observations. The current minimum backwards-compatible protocol is 15 but we have code that checks for protocol versions as old as 12. If someone else doesn't beat me to it i'm considering cleaning out the pre-15 compatibility code. A backwards compatibility patch could

...er.c =================================================================== --- rsync-2.6.3.orig/sender.c 2004-09-19 21:17:42.%N -0700 +++ rsync-2.6.3/sender.c 2005-03-19 12:26:03.%N -0800 @@ -29,6 +29,9 @@ extern int protocol_version; extern int make_backups; extern struct stats stats; +extern int write_batch; +extern int offline; +extern int write_batch_monitor_out; /** @@ -123,16 +126,27 @@ struct stats initial_stats; int save_make_backups = make_backups; int j; + int f_alt, old_monitor; if (verbose > 2) rprintf(FINFO, "send_files starting\n"); + old_monitor = write_ba...

...ched(f,s,buf,buf->file_size,-1); + + /*#ET# Why was this needed? map_ptr(buf,len-1,1); */ } -void match_sums(int f,struct sum_struct *s,struct map_struct *buf,OFF_T len) +void match_sums(int f,struct sum_struct *s,struct map_struct *buf) { char file_sum[MD4_SUM_LENGTH]; extern int write_batch; /* dw */ @@ -269,27 +277,33 @@ matches=0; data_transfer=0; sum_init(); + rprintf(FINFO, "#ET#>match_sums(), s->count=%.0f, csum_length=%d\n", (double)s->count, csum_length); - if (len > 0 && s->count>0) { + if (buf==NULL) { + rprintf(FINFO, "...

...ng-io", 0, POPT_ARG_VAL, &blocking_io, 1, 0, 0 }, @@ -566,6 +566,10 @@ keep_partial = 1; break; + case OPT_PROGRESS: + do_progress = 1; + break; + case OPT_WRITE_BATCH: /* popt stores the filename in batch_prefix for us */ write_batch = 1; @@ -629,6 +633,10 @@ if (relative_paths < 0) relative_paths = files_from? 1 : 0; + + if (do_progress & (!verbose)) { + ver...

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

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 batch mode and wi...

...uot;client"); 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_del...

...o 2.5.5 to no avail. While compiling, I receive a good number of generator.c: In function `recv_generator': generator.c:344: warning: comparison between signed and unsigned type errors in various files, as well as main.c: In function `start_client': main.c:665: warning: unused variable `write_batch' main.c:664: warning: unused variable `whole_file' including... zlib/inftrees.c: In function `huft_build': zlib/inftrees.c:216: warning: signed and unsigned type in conditional expression zlib/inftrees.c: In function `inflate_trees_fixed': zlib/inftrees.c:403: warning: unused param...

...f HAVE_SOCKETPAIR + local_socket = child_socket[1]; +#endif return pid; } diff -au rsync-3.0.6/receiver.c rsync-3.0.6.fast/receiver.c --- rsync-3.0.6/receiver.c 2009-04-12 22:48:59.000000000 +0300 +++ rsync-3.0.6.fast/receiver.c 2009-09-23 17:05:35.000000000 +0300 @@ -35,6 +35,8 @@ extern int write_batch; extern int batch_gen_fd; extern int protocol_version; +extern int local_server; +extern int local_socket; extern int relative_paths; extern int preserve_hard_links; extern int preserve_perms; @@ -172,12 +174,24 @@ int32 len, sum_len; OFF_T offset = 0; OFF_T offset2; - char *data; + char...

Attached is a patch that makes window strides constant when files are walked with a constant block size. In these cases, it completely avoids all memmoves. In my simple local test of rsyncing 57MB of 10 local files, memmoved bytes went from 18MB to zero. I haven't tested this for a big variety of file cases. I think that this will always reduce the memmoves involved with walking a large

...c-2.5.6/flist.c rsync-2.5.6J/flist.c --- rsync-2.5.6/flist.c Sat Jan 18 11:00:23 2003 +++ rsync-2.5.6J/flist.c Thu Feb 13 09:59:40 2003 @@ -39,6 +39,7 @@ extern int always_checksum; extern int cvs_exclude; +extern 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 (c...

There are quite a few compilation warnings from rsync-2.5.5rc1 that could be eliminated by code cleanup. gcc -I. -I. -g -O2 -DHAVE_CONFIG_H -Wall -W -c main.c -o main.o main.c: In function `start_client': main.c:665: warning: unused variable `write_batch' main.c:664: warning: unused variable `whole_file' These warnings will go away when the two variables are properly bracketed by #ifdef INET6 ... #endif: gcc -I. -I. -g -O2 -DHAVE_CONFIG_H -Wall -W -I./popt -c lib/getaddrinfo.c -o lib/getaddrinfo.o lib/getaddrinfo.c: In function `getad...

...86 -DHAVE_CONFIG_H -Wall -W -c exclude.c -o exclude.o gcc -I. -I. -O3 -mcpu=i686 -march=i686 -DHAVE_CONFIG_H -Wall -W -c util.c -o util.o gcc -I. -I. -O3 -mcpu=i686 -march=i686 -DHAVE_CONFIG_H -Wall -W -c main.c -o main.o main.c: In function `start_client': main.c:665: warning: unused variable `write_batch' main.c:664: warning: unused variable `whole_file' gcc -I. -I. -O3 -mcpu=i686 -march=i686 -DHAVE_CONFIG_H -Wall -W -c checksum.c -o checksum.o gcc -I. -I. -O3 -mcpu=i686 -march=i686 -DHAVE_CONFIG_H -Wall -W -c match.c -o match.o gcc -I. -I. -O3 -mcpu=i686 -march=i686 -DHAVE_CONFIG_H -Wall -...