View | Details | Raw Unified | Return to bug 1175854
Collapse All | Expand All

(-)rsync-3.1.3/token.c (-8 / +10 lines)
Lines 418-431 send_deflated_token(int f, int32 token, Link Here
418
			tx_strm.avail_in = n1;
418
			tx_strm.avail_in = n1;
419
			if (protocol_version >= 31) /* Newer protocols avoid a data-duplicating bug */
419
			if (protocol_version >= 31) /* Newer protocols avoid a data-duplicating bug */
420
				offset += n1;
420
				offset += n1;
421
			tx_strm.next_out = (Bytef *) obuf;
421
			do {
422
			tx_strm.avail_out = AVAIL_OUT_SIZE(CHUNK_SIZE);
422
				tx_strm.next_out = (Bytef *) obuf;
423
			r = deflate(&tx_strm, Z_INSERT_ONLY);
423
				tx_strm.avail_out = AVAIL_OUT_SIZE(CHUNK_SIZE);
424
			if (r != Z_OK || tx_strm.avail_in != 0) {
424
				r = deflate(&tx_strm, Z_INSERT_ONLY);
425
				rprintf(FERROR, "deflate on token returned %d (%d bytes left)\n",
425
				if (r != Z_OK) {
426
					r, tx_strm.avail_in);
426
					rprintf(FERROR, "deflate on token returned %d (%d bytes left)\n",
427
				exit_cleanup(RERR_STREAMIO);
427
						r, tx_strm.avail_in);
428
			}
428
					exit_cleanup(RERR_STREAMIO);
429
				}
430
			} while (tx_strm.avail_in != 0);
429
		} while (toklen > 0);
431
		} while (toklen > 0);
430
	}
432
	}
431
}
433
}

Return to bug 1175854