X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/e89d5d9a383a6327574d29e39d37c6c5bd4e3ecc..a94141d9fb91e0f615d8c888217e451904c7898e:/threaded-receiver.diff diff --git a/threaded-receiver.diff b/threaded-receiver.diff index 78d15ae..ea26547 100644 --- a/threaded-receiver.diff +++ b/threaded-receiver.diff @@ -18,10 +18,14 @@ NOTE: we still need to duplicate the partial_fname static in util.c! If you try this out, please send some email to wayned@samba.org or the rsync mailing list with your results, build changes, bug reports, etc. Thanks! -Be sure to run "make proto" before running "make". +After applying this patch, run these commands for a successful build: ---- orig/Makefile.in 2006-01-14 08:14:29 -+++ Makefile.in 2005-12-10 18:35:39 + ./prepare-source + ./configure (optional if already run) + make + +--- old/Makefile.in ++++ new/Makefile.in @@ -6,7 +6,7 @@ exec_prefix=@exec_prefix@ bindir=@bindir@ mandir=@mandir@ @@ -31,19 +35,30 @@ Be sure to run "make proto" before running "make". CC=@CC@ CFLAGS=@CFLAGS@ CPPFLAGS=@CPPFLAGS@ ---- orig/cleanup.c 2006-02-01 19:37:05 -+++ cleanup.c 2005-12-08 23:17:08 -@@ -94,9 +94,6 @@ void _exit_cleanup(int code, const char +--- old/cleanup.c ++++ new/cleanup.c +@@ -26,10 +26,6 @@ extern int keep_partial; + extern int log_got_error; + extern char *partial_dir; + +-#ifdef HAVE_SIGACTION +-static struct sigaction sigact; +-#endif +- + /** + * Close all open sockets and files, allowing a (somewhat) graceful + * shutdown() of socket connections. This eliminates the abortive +@@ -98,9 +94,6 @@ void _exit_cleanup(int code, const char } inside_cleanup++; -- signal(SIGUSR1, SIG_IGN); -- signal(SIGUSR2, SIG_IGN); +- SIGACTION(SIGUSR1, SIG_IGN); +- SIGACTION(SIGUSR2, SIG_IGN); - if (verbose > 3) { rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): entered\n", code, file, line); -@@ -128,8 +125,6 @@ void _exit_cleanup(int code, const char +@@ -132,8 +125,6 @@ void _exit_cleanup(int code, const char io_flush(FULL_FLUSH); if (cleanup_fname) do_unlink(cleanup_fname); @@ -52,8 +67,8 @@ Be sure to run "make proto" before running "make". if (cleanup_pid && cleanup_pid == getpid()) { char *pidf = lp_pid_file(); if (pidf && *pidf) ---- orig/errcode.h 2005-12-16 23:48:43 -+++ errcode.h 2005-12-16 23:50:02 +--- old/errcode.h ++++ new/errcode.h @@ -37,7 +37,6 @@ #define RERR_CRASHED 15 /* sibling crashed */ #define RERR_TERMINATED 16 /* sibling terminated abnormally */ @@ -62,9 +77,9 @@ Be sure to run "make proto" before running "make". #define RERR_SIGNAL 20 /* status returned when sent SIGINT, SIGTERM, SIGHUP */ #define RERR_WAITCHILD 21 /* some error returned by waitpid() */ #define RERR_MALLOC 22 /* error allocating core memory buffers */ ---- orig/generator.c 2006-01-31 18:59:39 -+++ generator.c 2005-12-08 23:17:08 -@@ -68,7 +68,6 @@ extern OFF_T min_size; +--- old/generator.c ++++ new/generator.c +@@ -67,7 +67,6 @@ extern OFF_T min_size; extern int io_error; extern int allowed_lull; extern int sock_f_out; @@ -72,7 +87,7 @@ Be sure to run "make proto" before running "make". extern int protocol_version; extern int fuzzy_basis; extern int always_checksum; -@@ -99,6 +98,11 @@ static int deletion_count = 0; /* used t +@@ -97,6 +96,11 @@ static int deletion_count = 0; /* used t static int can_link_symlinks = 1; /* start out optimistic */ static int can_link_devices = 1; @@ -84,7 +99,7 @@ Be sure to run "make proto" before running "make". /* For calling delete_file() */ #define DEL_FORCE_RECURSE (1<<1) /* recurse even w/o --force */ #define DEL_TERSE (1<<3) -@@ -448,8 +452,8 @@ static void sum_sizes_sqroot(struct sum_ +@@ -445,8 +449,8 @@ static void sum_sizes_sqroot(struct sum_ } if (protocol_version < 27) { @@ -95,7 +110,7 @@ Be sure to run "make proto" before running "make". s2length = SUM_LENGTH; } else { int32 c; -@@ -459,7 +463,7 @@ static void sum_sizes_sqroot(struct sum_ +@@ -456,7 +460,7 @@ static void sum_sizes_sqroot(struct sum_ for (c = blength; c >>= 1 && b; b--) {} /* add a bit, subtract rollsum, round up. */ s2length = (b + 1 - 32 + 7) / 8; /* --optimize in compiler-- */ @@ -104,7 +119,7 @@ Be sure to run "make proto" before running "make". s2length = MIN(s2length, SUM_LENGTH); } -@@ -493,7 +497,7 @@ static void generate_and_send_sums(int f +@@ -490,7 +494,7 @@ static void generate_and_send_sums(int f sum_sizes_sqroot(&sum, len); write_sum_head(f_out, &sum); @@ -113,7 +128,7 @@ Be sure to run "make proto" before running "make". return; if (len > 0) -@@ -512,7 +516,7 @@ static void generate_and_send_sums(int f +@@ -509,7 +513,7 @@ static void generate_and_send_sums(int f if (f_copy >= 0) { full_write(f_copy, map, n1); @@ -122,7 +137,7 @@ Be sure to run "make proto" before running "make". continue; } -@@ -1142,7 +1146,7 @@ static void recv_generator(char *fname, +@@ -1152,7 +1156,7 @@ static void recv_generator(char *fname, return; } @@ -131,7 +146,7 @@ Be sure to run "make proto" before running "make". return; if (fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH) -@@ -1197,7 +1201,7 @@ static void recv_generator(char *fname, +@@ -1207,7 +1211,7 @@ static void recv_generator(char *fname, goto notify_others; } @@ -140,7 +155,7 @@ Be sure to run "make proto" before running "make". if (!(backupptr = get_backup_name(fname))) { close(fd); return; -@@ -1286,7 +1290,10 @@ void generate_files(int f_out, struct fi +@@ -1298,7 +1302,10 @@ void generate_files(int f_out, struct fi int save_ignore_existing = ignore_existing; int save_ignore_non_existing = ignore_non_existing; int save_do_progress = do_progress; @@ -152,7 +167,7 @@ Be sure to run "make proto" before running "make". if (protocol_version >= 29) { itemizing = 1; -@@ -1315,7 +1322,7 @@ void generate_files(int f_out, struct fi +@@ -1327,7 +1334,7 @@ void generate_files(int f_out, struct fi do_delete_pass(flist); do_progress = 0; @@ -161,7 +176,7 @@ Be sure to run "make proto" before running "make". whole_file = 0; if (verbose >= 2) { rprintf(FINFO, "delta-transmission %s\n", -@@ -1324,12 +1331,6 @@ void generate_files(int f_out, struct fi +@@ -1336,12 +1343,6 @@ void generate_files(int f_out, struct fi : "enabled"); } @@ -174,7 +189,7 @@ Be sure to run "make proto" before running "make". for (i = 0; i < flist->count; i++) { struct file_struct *file = flist->files[i]; -@@ -1373,23 +1374,34 @@ void generate_files(int f_out, struct fi +@@ -1385,23 +1386,34 @@ void generate_files(int f_out, struct fi delete_in_dir(NULL, NULL, NULL, NULL); phase++; @@ -215,7 +230,7 @@ Be sure to run "make proto" before running "make". if (local_name) strlcpy(fbuf, local_name, sizeof fbuf); else -@@ -1401,27 +1413,43 @@ void generate_files(int f_out, struct fi +@@ -1413,27 +1425,43 @@ void generate_files(int f_out, struct fi phase++; ignore_non_existing = save_ignore_non_existing; ignore_existing = save_ignore_existing; @@ -266,9 +281,9 @@ Be sure to run "make proto" before running "make". } do_progress = save_do_progress; ---- orig/io.c 2006-02-01 19:37:05 -+++ io.c 2006-02-01 19:50:09 -@@ -47,7 +47,6 @@ extern int allowed_lull; +--- old/io.c ++++ new/io.c +@@ -46,20 +46,17 @@ extern int allowed_lull; extern int am_server; extern int am_daemon; extern int am_sender; @@ -276,7 +291,12 @@ Be sure to run "make proto" before running "make". extern int eol_nulls; extern int read_batch; extern int csum_length; -@@ -60,7 +59,6 @@ extern struct stats stats; + extern int checksum_seed; + extern int protocol_version; +-extern int remove_sent_files; + extern int preserve_hard_links; + extern char *filesfrom_host; + extern struct stats stats; extern struct file_list *the_file_list; const char phase_unknown[] = "unknown"; @@ -284,7 +304,7 @@ Be sure to run "make proto" before running "make". int batch_fd = -1; int batch_gen_fd = -1; -@@ -84,7 +82,6 @@ const char *io_read_phase = phase_unknow +@@ -83,7 +80,6 @@ const char *io_read_phase = phase_unknow int kluge_around_eof = 0; int msg_fd_in = -1; @@ -292,7 +312,7 @@ Be sure to run "make proto" before running "make". int sock_f_in = -1; int sock_f_out = -1; -@@ -109,27 +106,32 @@ static int select_timeout = SELECT_TIMEO +@@ -110,27 +106,32 @@ static OFF_T active_bytecnt = 0; static void read_loop(int fd, char *buf, size_t len); struct flist_ndx_item { @@ -331,7 +351,7 @@ Be sure to run "make proto" before running "make". static void flist_ndx_push(struct flist_ndx_list *lp, int ndx) { -@@ -139,27 +141,31 @@ static void flist_ndx_push(struct flist_ +@@ -140,27 +141,31 @@ static void flist_ndx_push(struct flist_ out_of_memory("flist_ndx_push"); item->next = NULL; item->ndx = ndx; @@ -369,7 +389,7 @@ Be sure to run "make proto" before running "make". return ndx; } -@@ -168,7 +174,7 @@ static void check_timeout(void) +@@ -169,7 +174,7 @@ static void check_timeout(void) { time_t t; @@ -378,7 +398,7 @@ Be sure to run "make proto" before running "make". return; if (!last_io_in) { -@@ -209,45 +215,40 @@ void set_io_timeout(int secs) +@@ -210,45 +215,40 @@ void set_io_timeout(int secs) /* Setup the fd used to receive MSG_* messages. Only needed during the * early stages of being a local sender (up through the sending of the @@ -436,7 +456,7 @@ Be sure to run "make proto" before running "make". static void read_msg_fd(void) { char buf[2048]; -@@ -266,47 +267,6 @@ static void read_msg_fd(void) +@@ -267,51 +267,6 @@ static void read_msg_fd(void) tag = (tag >> 24) - MPLEX_BASE; switch (tag) { @@ -453,6 +473,8 @@ Be sure to run "make proto" before running "make". - exit_cleanup(RERR_STREAMIO); - } - read_loop(fd, buf, 4); +- if (remove_sent_files) +- decrement_active_files(IVAL(buf,0)); - flist_ndx_push(&redo_list, IVAL(buf,0)); - break; - case MSG_DELETED: @@ -469,8 +491,10 @@ Be sure to run "make proto" before running "make". - exit_cleanup(RERR_STREAMIO); - } - read_loop(fd, buf, len); -- if (remove_sent_files) +- if (remove_sent_files) { +- decrement_active_files(IVAL(buf,0)); - io_multiplex_write(MSG_SUCCESS, buf, len); +- } - if (preserve_hard_links) - flist_ndx_push(&hlink_list, IVAL(buf,0)); - break; @@ -484,8 +508,8 @@ Be sure to run "make proto" before running "make". case MSG_INFO: case MSG_ERROR: case MSG_LOG: -@@ -327,71 +287,75 @@ static void read_msg_fd(void) - msg_fd_in = fd; +@@ -354,71 +309,75 @@ void decrement_active_files(int ndx) + active_bytecnt -= the_file_list->files[ndx]->length; } -/* Try to push messages off the list onto the wire. If we leave with more @@ -604,7 +628,7 @@ Be sure to run "make proto" before running "make". return flist_ndx_pop(&hlink_list); } -@@ -471,11 +435,6 @@ static int read_timeout(int fd, char *bu +@@ -498,11 +457,6 @@ static int read_timeout(int fd, char *bu FD_ZERO(&r_fds); FD_ZERO(&w_fds); FD_SET(fd, &r_fds); @@ -616,7 +640,7 @@ Be sure to run "make proto" before running "make". if (io_filesfrom_f_out >= 0) { int new_fd; if (io_filesfrom_buflen == 0) { -@@ -508,9 +467,6 @@ static int read_timeout(int fd, char *bu +@@ -535,9 +489,6 @@ static int read_timeout(int fd, char *bu continue; } @@ -626,7 +650,7 @@ Be sure to run "make proto" before running "make". if (io_filesfrom_f_out >= 0) { if (io_filesfrom_buflen) { if (FD_ISSET(io_filesfrom_f_out, &w_fds)) { -@@ -831,6 +787,8 @@ static void readfd(int fd, char *buffer, +@@ -859,6 +810,8 @@ static void readfd(int fd, char *buffer, } if (fd == write_batch_monitor_in) { @@ -635,7 +659,7 @@ Be sure to run "make proto" before running "make". if ((size_t)write(batch_fd, buffer, total) != total) exit_cleanup(RERR_FILEIO); } -@@ -1086,7 +1044,6 @@ static void writefd_unbuffered(int fd,ch +@@ -1114,7 +1067,6 @@ static void writefd_unbuffered(int fd,ch * to grab any messages they sent before they died. */ while (fd == sock_f_out && io_multiplexing_in) { set_io_timeout(30); @@ -643,7 +667,7 @@ Be sure to run "make proto" before running "make". readfd_unbuffered(sock_f_in, io_filesfrom_buf, sizeof io_filesfrom_buf); } -@@ -1096,7 +1053,7 @@ static void writefd_unbuffered(int fd,ch +@@ -1124,7 +1076,7 @@ static void writefd_unbuffered(int fd,ch total += cnt; if (fd == sock_f_out) { @@ -652,7 +676,7 @@ Be sure to run "make proto" before running "make". last_io_out = time(NULL); sleep_for_bwlimit(cnt); } -@@ -1120,7 +1077,7 @@ static void mplex_write(enum msgcode cod +@@ -1148,7 +1100,7 @@ static void mplex_write(enum msgcode cod * cause output to occur down the socket. Setting contiguous_write_len * prevents the reading of msg_fd_in once we actually start to write * this sequence of data (though we might read it before the start). */ @@ -661,7 +685,7 @@ Be sure to run "make proto" before running "make". contiguous_write_len = len + 4; if (n > sizeof buffer - 4) -@@ -1135,31 +1092,29 @@ static void mplex_write(enum msgcode cod +@@ -1164,31 +1116,29 @@ static void mplex_write(enum msgcode cod if (len) writefd_unbuffered(sock_f_out, buf, len); @@ -705,7 +729,7 @@ Be sure to run "make proto" before running "make". if (fd == sock_f_out) stats.total_written += len; -@@ -1372,9 +1327,3 @@ void start_write_batch(int fd) +@@ -1401,9 +1351,3 @@ void start_write_batch(int fd) else write_batch_monitor_in = fd; } @@ -715,17 +739,17 @@ Be sure to run "make proto" before running "make". - write_batch_monitor_out = -1; - write_batch_monitor_in = -1; -} ---- orig/log.c 2006-02-01 19:37:05 -+++ log.c 2005-12-16 23:49:57 -@@ -35,7 +35,6 @@ extern int am_sender; +--- old/log.c ++++ new/log.c +@@ -38,7 +38,6 @@ extern int am_sender; extern int local_server; extern int quiet; extern int module_id; -extern int msg_fd_out; + extern int allow_8bit_chars; extern int protocol_version; extern int preserve_times; - extern int log_format_has_i; -@@ -68,7 +67,6 @@ struct { +@@ -76,7 +75,6 @@ struct { { RERR_IPC , "error in IPC code" }, { RERR_CRASHED , "sibling process crashed" }, { RERR_TERMINATED , "sibling process terminated abnormally" }, @@ -733,7 +757,7 @@ Be sure to run "make proto" before running "make". { RERR_SIGNAL , "received SIGINT, SIGTERM, or SIGHUP" }, { RERR_WAITCHILD , "waitpid() failed" }, { RERR_MALLOC , "error allocating core memory buffers" }, -@@ -224,8 +222,8 @@ void rwrite(enum logcode code, char *buf +@@ -232,8 +230,8 @@ void rwrite(enum logcode code, char *buf if (quiet && code == FINFO) return; @@ -744,8 +768,8 @@ Be sure to run "make proto" before running "make". send_msg((enum msgcode)code, buf, len); return; } ---- orig/main.c 2006-01-15 14:46:15 -+++ main.c 2005-12-16 23:50:33 +--- old/main.c ++++ new/main.c @@ -30,7 +30,6 @@ extern int list_only; extern int am_root; extern int am_server; @@ -754,7 +778,7 @@ Be sure to run "make proto" before running "make". extern int am_daemon; extern int blocking_io; extern int remove_sent_files; -@@ -75,9 +74,20 @@ struct pid_status { +@@ -85,9 +84,20 @@ struct pid_status { static time_t starttime, endtime; static int64 total_read, total_written; @@ -773,9 +797,9 @@ Be sure to run "make proto" before running "make". +} + /* Works like waitpid(), but if we already harvested the child pid in our - * sigchld_handler(), we succeed instead of returning an error. */ + * remember_children(), we succeed instead of returning an error. */ pid_t wait_process(pid_t pid, int *status_ptr, int flags) -@@ -154,7 +164,7 @@ static void handle_stats(int f) +@@ -164,7 +174,7 @@ static void handle_stats(int f) show_flist_stats(); } @@ -784,7 +808,7 @@ Be sure to run "make proto" before running "make". return; if (am_daemon) { -@@ -609,12 +619,30 @@ static void do_server_sender(int f_in, i +@@ -617,12 +627,30 @@ static void do_server_sender(int f_in, i exit_cleanup(0); } @@ -818,7 +842,7 @@ Be sure to run "make proto" before running "make". /* The receiving side mustn't obey this, or an existing symlink that * points to an identical file won't be replaced by the referent. */ -@@ -623,70 +651,16 @@ static int do_recv(int f_in,int f_out,st +@@ -631,70 +659,16 @@ static int do_recv(int f_in,int f_out,st if (preserve_hard_links) init_hard_links(); @@ -894,7 +918,7 @@ Be sure to run "make proto" before running "make". generate_files(f_out, flist, local_name); handle_stats(-1); -@@ -697,10 +671,13 @@ static int do_recv(int f_in,int f_out,st +@@ -705,10 +679,13 @@ static int do_recv(int f_in,int f_out,st } io_flush(FULL_FLUSH); @@ -912,7 +936,7 @@ Be sure to run "make proto" before running "make". } -@@ -1062,22 +1039,6 @@ static int start_client(int argc, char * +@@ -1078,22 +1055,6 @@ static int start_client(int argc, char * return ret; } @@ -932,30 +956,30 @@ Be sure to run "make proto" before running "make". - _exit(0); -} - - static RETSIGTYPE sigchld_handler(UNUSED(int val)) + RETSIGTYPE remember_children(UNUSED(int val)) { #ifdef WNOHANG -@@ -1160,8 +1121,6 @@ int main(int argc,char *argv[]) - int orig_argc = argc; - char **orig_argv = argv; - -- signal(SIGUSR1, sigusr1_handler); -- signal(SIGUSR2, sigusr2_handler); - signal(SIGCHLD, sigchld_handler); +@@ -1185,8 +1146,6 @@ int main(int argc,char *argv[]) + # endif + sigact.sa_flags = SA_NOCLDSTOP; + #endif +- SIGACTMASK(SIGUSR1, sigusr1_handler); +- SIGACTMASK(SIGUSR2, sigusr2_handler); + SIGACTMASK(SIGCHLD, remember_children); #ifdef MAINTAINER_MODE - signal(SIGSEGV, rsync_panic_handler); ---- orig/match.c 2005-11-10 16:58:36 -+++ match.c 2005-12-08 23:17:09 -@@ -21,7 +21,7 @@ + SIGACTMASK(SIGSEGV, rsync_panic_handler); +--- old/match.c ++++ new/match.c +@@ -20,7 +20,7 @@ + #include "rsync.h" extern int verbose; - extern int am_server; -extern int do_progress; +extern int recv_progress; extern int checksum_seed; extern int append_mode; -@@ -133,7 +133,7 @@ static void matched(int f, struct sum_st +@@ -132,7 +132,7 @@ static void matched(int f, struct sum_st else last_match = offset; @@ -964,7 +988,7 @@ Be sure to run "make proto" before running "make". show_progress(last_match, buf->file_size); } -@@ -333,7 +333,7 @@ void match_sums(int f, struct sum_struct +@@ -332,7 +332,7 @@ void match_sums(int f, struct sum_struct if (append_mode) { OFF_T j = 0; for (j = CHUNK_SIZE; j < s->flength; j += CHUNK_SIZE) { @@ -973,7 +997,7 @@ Be sure to run "make proto" before running "make". show_progress(last_match, buf->file_size); sum_update(map_ptr(buf, last_match, CHUNK_SIZE), CHUNK_SIZE); -@@ -341,7 +341,7 @@ void match_sums(int f, struct sum_struct +@@ -340,7 +340,7 @@ void match_sums(int f, struct sum_struct } if (last_match < s->flength) { int32 len = s->flength - last_match; @@ -982,17 +1006,17 @@ Be sure to run "make proto" before running "make". show_progress(last_match, buf->file_size); sum_update(map_ptr(buf, last_match, len), len); last_match = s->flength; ---- orig/options.c 2006-01-31 03:11:30 -+++ options.c 2005-12-08 23:17:09 -@@ -73,7 +73,6 @@ int def_compress_level = Z_DEFAULT_COMPR +--- old/options.c ++++ new/options.c +@@ -74,7 +74,6 @@ int def_compress_level = Z_DEFAULT_COMPR int am_root = 0; int am_server = 0; int am_sender = 0; -int am_generator = 0; int am_starting_up = 1; - int orig_umask = 0; int relative_paths = -1; -@@ -94,6 +93,7 @@ int am_daemon = 0; + int implied_dirs = 1; +@@ -95,6 +94,7 @@ int am_daemon = 0; int daemon_over_rsh = 0; int do_stats = 0; int do_progress = 0; @@ -1000,16 +1024,16 @@ Be sure to run "make proto" before running "make". int keep_partial = 0; int safe_symlinks = 0; int copy_unsafe_links = 0; -@@ -1290,6 +1290,7 @@ int parse_arguments(int *argc, const cha - if ((do_progress || dry_run) && !verbose && !log_before_transfer - && !am_server) +@@ -1299,6 +1299,7 @@ int parse_arguments(int *argc, const cha + + if (do_progress && !verbose && !log_before_transfer && !am_server) verbose = 1; + recv_progress = do_progress; if (dry_run) do_xfers = 0; ---- orig/pipe.c 2006-01-21 08:03:40 -+++ pipe.c 2005-12-08 23:17:09 +--- old/pipe.c ++++ new/pipe.c @@ -56,7 +56,7 @@ pid_t piped_child(char **command, int *f exit_cleanup(RERR_IPC); } @@ -1028,8 +1052,8 @@ Be sure to run "make proto" before running "make". if (pid == -1) { rsyserr(FERROR, errno, "fork"); exit_cleanup(RERR_IPC); ---- orig/receiver.c 2006-01-31 02:30:18 -+++ receiver.c 2006-01-14 08:30:29 +--- old/receiver.c ++++ new/receiver.c @@ -24,7 +24,7 @@ extern int verbose; extern int do_xfers; extern int am_daemon; @@ -1039,7 +1063,7 @@ Be sure to run "make proto" before running "make". extern int log_before_transfer; extern int log_format_has_i; extern int daemon_log_format_has_i; -@@ -219,7 +219,7 @@ static int receive_data(int f_in, char * +@@ -153,7 +153,7 @@ static int receive_data(int f_in, char * if (sum.remainder) sum.flength -= sum.blength - sum.remainder; for (j = CHUNK_SIZE; j < sum.flength; j += CHUNK_SIZE) { @@ -1048,7 +1072,7 @@ Be sure to run "make proto" before running "make". show_progress(offset, total_size); sum_update(map_ptr(mapbuf, offset, CHUNK_SIZE), CHUNK_SIZE); -@@ -227,7 +227,7 @@ static int receive_data(int f_in, char * +@@ -161,7 +161,7 @@ static int receive_data(int f_in, char * } if (offset < sum.flength) { int32 len = sum.flength - offset; @@ -1057,7 +1081,7 @@ Be sure to run "make proto" before running "make". show_progress(offset, total_size); sum_update(map_ptr(mapbuf, offset, len), len); offset = sum.flength; -@@ -240,7 +240,7 @@ static int receive_data(int f_in, char * +@@ -174,7 +174,7 @@ static int receive_data(int f_in, char * } while ((i = recv_token(f_in, &data)) != 0) { @@ -1066,7 +1090,7 @@ Be sure to run "make proto" before running "make". show_progress(offset, total_size); if (i > 0) { -@@ -308,7 +308,7 @@ static int receive_data(int f_in, char * +@@ -242,7 +242,7 @@ static int receive_data(int f_in, char * ftruncate(fd, offset); #endif @@ -1075,7 +1099,7 @@ Be sure to run "make proto" before running "make". end_progress(total_size); if (fd != -1 && offset > 0 && sparse_end(fd) != 0) { -@@ -359,12 +359,12 @@ static void handle_delayed_updates(struc +@@ -293,12 +293,12 @@ static void handle_delayed_updates(struc "rename failed for %s (from %s)", full_fname(fname), partialptr); } else { @@ -1091,7 +1115,7 @@ Be sure to run "make proto" before running "make". handle_partial_dir(partialptr, PDIR_DELETE); } } -@@ -415,11 +415,6 @@ int recv_files(int f_in, struct file_lis +@@ -349,11 +349,6 @@ int recv_files(int f_in, struct file_lis if (verbose > 2) rprintf(FINFO,"recv_files(%d) starting\n",flist->count); @@ -1101,9 +1125,9 @@ Be sure to run "make proto" before running "make". - } - if (delay_updates) - init_delayed_bits(flist->count); + delayed_bits = bitbag_create(flist->count); -@@ -440,7 +435,7 @@ int recv_files(int f_in, struct file_lis +@@ -374,7 +369,7 @@ int recv_files(int f_in, struct file_lis rprintf(FINFO, "recv_files phase=%d\n", phase); if (phase == 2 && delay_updates) handle_delayed_updates(flist, local_name); @@ -1112,7 +1136,7 @@ Be sure to run "make proto" before running "make". if (keep_partial && !partial_dir) make_backups = 0; /* prevents double backup */ if (append_mode) { -@@ -662,7 +657,7 @@ int recv_files(int f_in, struct file_lis +@@ -596,7 +591,7 @@ int recv_files(int f_in, struct file_lis /* log the transfer */ if (log_before_transfer) log_item(file, &initial_stats, iflags, NULL); @@ -1121,13 +1145,14 @@ Be sure to run "make proto" before running "make". rprintf(FINFO, "%s\n", fname); /* recv file data */ -@@ -705,11 +700,12 @@ int recv_files(int f_in, struct file_lis +@@ -639,11 +634,13 @@ int recv_files(int f_in, struct file_lis cleanup_disable(); if (recv_ok > 0) { - if (remove_sent_files - || (preserve_hard_links && file->link_u.links)) { + if (remove_sent_files) { ++ decrement_active_files(i); SIVAL(numbuf, 0, i); send_msg(MSG_SUCCESS, numbuf, 4); } @@ -1136,38 +1161,36 @@ Be sure to run "make proto" before running "make". } else if (!recv_ok) { int msgtype = phase || read_batch ? FERROR : FINFO; if (msgtype == FERROR || verbose) { -@@ -731,10 +727,8 @@ int recv_files(int f_in, struct file_lis - "%s: %s failed verification -- update %s%s.\n", +@@ -666,8 +663,8 @@ int recv_files(int f_in, struct file_lis errstr, fname, keptstr, redostr); } -- if (!phase) { + if (!phase) { - SIVAL(numbuf, 0, i); - send_msg(MSG_REDO, numbuf, 4); -- } -+ if (!phase) ++ decrement_active_files(i); + push_redo_num(i); + } } } - make_backups = save_make_backups; ---- orig/rsync.c 2006-01-31 02:30:18 -+++ rsync.c 2005-12-08 23:17:10 -@@ -32,7 +32,6 @@ extern int orig_umask; +--- old/rsync.c ++++ new/rsync.c +@@ -40,7 +40,6 @@ extern int omit_dir_times; extern int am_root; extern int am_server; extern int am_sender; -extern int am_generator; extern int am_starting_up; + extern int allow_8bit_chars; extern int preserve_uid; - extern int preserve_gid; -@@ -247,5 +246,5 @@ const char *who_am_i(void) +@@ -303,5 +302,5 @@ const char *who_am_i(void) { if (am_starting_up) return am_server ? "server" : "client"; - return am_sender ? "sender" : am_generator ? "generator" : "receiver"; + return am_sender ? "sender" : am_generator() ? "generator" : "receiver"; } ---- orig/rsync.h 2006-02-01 19:37:05 -+++ rsync.h 2006-01-17 02:46:03 +--- old/rsync.h ++++ new/rsync.h @@ -166,10 +166,8 @@ enum msgcode { MSG_DATA=0, /* raw data on the multiplexed stream */ MSG_ERROR=FERROR, MSG_INFO=FINFO, /* remote logging */ @@ -1187,13 +1210,12 @@ Be sure to run "make proto" before running "make". #include "lib/pool_alloc.h" ---- orig/util.c 2006-01-30 07:18:28 -+++ util.c 2005-12-08 23:17:10 -@@ -413,51 +413,6 @@ int robust_rename(char *from, char *to, +--- old/util.c ++++ new/util.c +@@ -420,49 +420,6 @@ int robust_rename(char *from, char *to, return -1; } -- -static pid_t all_pids[10]; -static int num_pids; - @@ -1236,7 +1258,6 @@ Be sure to run "make proto" before running "make". - kill(p, sig); - } -} -- - /** Turn a user name into a uid */ int name_to_uid(char *name, uid_t *uid)