search for: simple_send_token

...stats); } if (!read_batch) { /* dw */ diff -r -u4 rsync-2.5.5/token.c rsync-patched/token.c --- rsync-2.5.5/token.c Tue Aug 14 05:04:49 2001 +++ rsync-patched/token.c Mon Aug 5 10:05:15 2002 @@ -85,27 +85,32 @@ return n; } -/* non-compressing send token */ -static void simple_send_token(int f,int token, +/* non-compressing send token. returns size of data sent. */ +static int simple_send_token(int f,int token, struct map_struct *buf,OFF_T offset,int n) { extern int write_batch; /* dw */ int hold_int; /* dw */ + int l = 0; if (n > 0) { - int l = 0; while (...

...lt;= 0) { + if (protocol_version >= 32) { + int32 j = read_int(f); /* additional metadata */ + } return i; + } residue = i; } @@ -252,8 +256,11 @@ static void simple_send_token(int f, int } } /* a -2 token means to send data only and no token */ - if (token != -2) + if (token != -2) { write_int(f, -(token+1)); + if (protocol_version >= 32) + write_int(f, -(2*(token+1))); /*...

...#1 0x8058124 in writefd_unbuffered (fd=3, buf=0x92b8000 "...", len=32768) at io.c:865 #2 0x8058447 in writefd (fd=3, buf=0x92b8000 "...", len=32768) at io.c:981 #3 0x8058551 in write_buf (f=3, buf=0x92b8000 "...", len=32768) at io.c:1045 #4 0x8058ff8 in simple_send_token (f=3, token=-2, buf=0x807d0c0, offset=3833856, n=32768) at token.c:104 #5 0x80598c0 in send_token (f=3, token=-2, buf=0x807d0c0, offset=3833856, n=32768, toklen=0) at token.c:472 #6 0x805108c in matched (f=3, s=0x807b020, buf=0x807d0c0, offset=3866624, i=-2) at match.c:114 #7 0x80519...

....c =================================================================== RCS file: /vol/cvs/datacube/src/auxcmd/rsync/token.c,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 token.c --- token.c 8 Apr 2002 08:35:30 -0000 1.1.1.1 +++ token.c 27 Jun 2003 11:24:25 -0000 @@ -125,7 +125,8 @@ static void simple_send_token(int f,int #define TOKEN_REL 0x80 /* + 6-bit relative token number */ #define TOKENRUN_REL 0xc0 /* ditto with 16-bit run count */ -#define MAX_DATA_COUNT 16383 /* fit 14 bit count into 2 bytes with flags */ +/* must be bigger than block_size + deflate()'s overhead */ +#define MAX_DATA_COUNT...

Rsync 2.5.5; transfer via ssh; sparc-sun-solaris2.5 (Ultra 1); gcc 2.8.1. Every time rsync on this box causes boundary violation. I attached two strange examples. I have a few rsync's corefiles (100MB and above) and I can examine them. I will be grateful for any help. -Mirek <-------------------------------------------------------------------------> received 966761 names done

...-632,7 +872,9 @@ static void see_deflate_token(char *buf, int32 len) void send_token(int f, int32 token, struct map_struct *buf, OFF_T offset, int32 n, int32 toklen) { - if (!do_compression) + if (do_compression_zstd) + send_zstd_token(f, token, buf, offset, n); + else if (!do_compression) simple_send_token(f, token, buf, offset, n); else send_deflated_token(f, token, buf, offset, n, toklen); @@ -648,7 +890,9 @@ int32 recv_token(int f, char **data) { int tok; - if (!do_compression) { + if (do_compression_zstd) { + tok = recv_zstd_token(f, data); + } else if (!do_compression) { tok = simp...

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

Hello, I'm running HP-UX 11i on an rp74xx. It's 64-bit. C compiler is as follows: B3901BA B.11.11.03 HP C/ANSI C Developer's Bundle for HP-UX 11.i (S800) B3913DB C.03.30.02 HP aC++ Compiler (S800) /usr/bin/cc: LINT B.11.11.02 CXREF B.11.11.02 HP92453-01 B.11.11.02 HP C Compiler $ Sep 8 2000 23:13:51 $ I have successfully compiled rsync 2.6.2 and it