CPPFLAGS=@CPPFLAGS@
--- old/cleanup.c
+++ new/cleanup.c
-@@ -26,10 +26,6 @@ extern int keep_partial;
- extern int log_got_error;
+@@ -31,10 +31,6 @@ extern int log_got_error;
extern char *partial_dir;
+ extern char *logfile_name;
-#ifdef HAVE_SIGACTION
-static struct sigaction sigact;
/**
* 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
+@@ -103,9 +99,6 @@ void _exit_cleanup(int code, const char
}
inside_cleanup++;
if (verbose > 3) {
rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): entered\n",
code, file, line);
-@@ -132,8 +125,6 @@ void _exit_cleanup(int code, const char
+@@ -137,8 +130,6 @@ void _exit_cleanup(int code, const char
io_flush(FULL_FLUSH);
if (cleanup_fname)
do_unlink(cleanup_fname);
extern int protocol_version;
extern int fuzzy_basis;
extern int always_checksum;
-@@ -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;
+@@ -95,6 +94,11 @@ extern struct filter_list_struct server_
+
+ static int deletion_count = 0; /* used to implement --max-delete */
+/* These vars are local copies so that the receiver can use the originals. */
+static int GEN_append_mode;
continue;
}
-@@ -1152,7 +1156,7 @@ static void recv_generator(char *fname,
+@@ -1182,7 +1186,7 @@ static void recv_generator(char *fname,
return;
}
return;
if (fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH)
-@@ -1207,7 +1211,7 @@ static void recv_generator(char *fname,
+@@ -1237,7 +1241,7 @@ static void recv_generator(char *fname,
goto notify_others;
}
if (!(backupptr = get_backup_name(fname))) {
close(fd);
return;
-@@ -1298,9 +1302,12 @@ void generate_files(int f_out, struct fi
+@@ -1328,9 +1332,12 @@ 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;
+
if (protocol_version >= 29) {
itemizing = 1;
- maybe_ATTRS_REPORT = log_format_has_i ? 0 : ATTRS_REPORT;
-@@ -1328,7 +1335,7 @@ void generate_files(int f_out, struct fi
+ maybe_ATTRS_REPORT = stdout_format_has_i ? 0 : ATTRS_REPORT;
+@@ -1358,7 +1365,7 @@ void generate_files(int f_out, struct fi
do_delete_pass(flist);
do_progress = 0;
whole_file = 0;
if (verbose >= 2) {
rprintf(FINFO, "delta-transmission %s\n",
-@@ -1337,12 +1344,6 @@ void generate_files(int f_out, struct fi
+@@ -1367,12 +1374,6 @@ void generate_files(int f_out, struct fi
: "enabled");
}
for (i = 0; i < flist->count; i++) {
struct file_struct *file = flist->files[i];
-@@ -1386,23 +1387,34 @@ void generate_files(int f_out, struct fi
+@@ -1416,23 +1417,34 @@ void generate_files(int f_out, struct fi
delete_in_dir(NULL, NULL, NULL, NULL);
phase++;
if (local_name)
strlcpy(fbuf, local_name, sizeof fbuf);
else
-@@ -1414,27 +1426,43 @@ void generate_files(int f_out, struct fi
+@@ -1444,27 +1456,43 @@ void generate_files(int f_out, struct fi
phase++;
ignore_non_existing = save_ignore_non_existing;
ignore_existing = save_ignore_existing;
do_progress = save_do_progress;
--- old/io.c
+++ new/io.c
-@@ -46,20 +46,17 @@ extern int allowed_lull;
+@@ -40,20 +40,17 @@ extern int allowed_lull;
extern int am_server;
extern int am_daemon;
extern int am_sender;
int batch_fd = -1;
int batch_gen_fd = -1;
-@@ -83,7 +80,6 @@ const char *io_read_phase = phase_unknow
+@@ -61,7 +58,6 @@ int batch_gen_fd = -1;
int kluge_around_eof = 0;
int msg_fd_in = -1;
int sock_f_in = -1;
int sock_f_out = -1;
-@@ -110,27 +106,31 @@ static OFF_T active_bytecnt = 0;
+@@ -88,27 +84,31 @@ static OFF_T active_bytecnt = 0;
static void read_loop(int fd, char *buf, size_t len);
struct flist_ndx_item {
static void flist_ndx_push(struct flist_ndx_list *lp, int ndx)
{
-@@ -140,27 +140,31 @@ static void flist_ndx_push(struct flist_
+@@ -118,27 +118,31 @@ static void flist_ndx_push(struct flist_
out_of_memory("flist_ndx_push");
item->next = NULL;
item->ndx = ndx;
return ndx;
}
-@@ -169,7 +173,7 @@ static void check_timeout(void)
+@@ -147,7 +151,7 @@ static void check_timeout(void)
{
time_t t;
return;
if (!last_io_in) {
-@@ -210,44 +214,38 @@ void set_io_timeout(int secs)
+@@ -188,44 +192,38 @@ 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
static void read_msg_fd(void)
{
char buf[2048];
-@@ -266,57 +264,6 @@ static void read_msg_fd(void)
+@@ -244,51 +242,6 @@ static void read_msg_fd(void)
tag = (tag >> 24) - MPLEX_BASE;
switch (tag) {
- exit_cleanup(RERR_STREAMIO);
- }
- read_loop(fd, buf, len);
-- if (defer_forwarding_messages)
-- msg_list_add(&msg2sndr, MSG_DELETED, buf, len);
-- else
-- io_multiplex_write(MSG_DELETED, buf, len);
+- send_msg(MSG_DELETED, buf, len);
- break;
- case MSG_SUCCESS:
- if (len != 4 || !am_generator) {
- read_loop(fd, buf, len);
- if (remove_sent_files) {
- decrement_active_files(IVAL(buf,0));
-- if (defer_forwarding_messages)
-- msg_list_add(&msg2sndr, MSG_SUCCESS, buf, len);
-- else
-- io_multiplex_write(MSG_SUCCESS, buf, len);
+- send_msg(MSG_SUCCESS, buf, len);
- }
- if (preserve_hard_links)
- flist_ndx_push(&hlink_list, IVAL(buf,0));
case MSG_INFO:
case MSG_ERROR:
case MSG_LOG:
-@@ -325,10 +272,7 @@ static void read_msg_fd(void)
- if (n >= sizeof buf)
- n = sizeof buf - 1;
- read_loop(fd, buf, n);
-- if (am_generator && am_server && defer_forwarding_messages)
-- msg_list_add(&msg2sndr, tag, buf, n);
-- else
-- rwrite((enum logcode)tag, buf, n);
-+ rwrite((enum logcode)tag, buf, n);
- len -= n;
- }
- break;
-@@ -362,70 +306,76 @@ void decrement_active_files(int ndx)
+@@ -332,75 +285,80 @@ void decrement_active_files(int ndx)
active_bytecnt -= the_file_list->files[ndx]->length;
}
+ no_flush--;
}
- void send_msg(enum msgcode code, char *buf, int len)
+ int send_msg(enum msgcode code, char *buf, int len)
{
- if (msg_fd_out < 0) {
-+ if (am_receiver())
-+ msg_list_add(code, buf, len);
-+ else
- io_multiplex_write(code, buf, len);
-- return;
-- }
++ if (!am_receiver()) {
+ if (!defer_forwarding_messages)
+ return io_multiplex_write(code, buf, len);
+ if (!io_multiplexing_out)
+ return 0;
+- msg_list_add(&msg2sndr, code, buf, len);
+- return 1;
+ }
- msg_list_add(&msg2genr, code, buf, len);
- msg2genr_flush(NORMAL_FLUSH);
++ msg_list_add(code, buf, len);
+ return 1;
}
-int get_redo_num(int itemizing, enum logcode code)
return flist_ndx_pop(&hlink_list);
}
-@@ -505,11 +455,6 @@ static int read_timeout(int fd, char *bu
+@@ -480,11 +438,6 @@ static int read_timeout(int fd, char *bu
FD_ZERO(&r_fds);
FD_ZERO(&w_fds);
FD_SET(fd, &r_fds);
if (io_filesfrom_f_out >= 0) {
int new_fd;
if (io_filesfrom_buflen == 0) {
-@@ -542,9 +487,6 @@ static int read_timeout(int fd, char *bu
+@@ -517,9 +470,6 @@ static int read_timeout(int fd, char *bu
continue;
}
if (io_filesfrom_f_out >= 0) {
if (io_filesfrom_buflen) {
if (FD_ISSET(io_filesfrom_f_out, &w_fds)) {
-@@ -866,6 +808,8 @@ static void readfd(int fd, char *buffer,
+@@ -841,6 +791,8 @@ static void readfd(int fd, char *buffer,
}
if (fd == write_batch_monitor_in) {
if ((size_t)write(batch_fd, buffer, total) != total)
exit_cleanup(RERR_FILEIO);
}
-@@ -1127,7 +1071,6 @@ static void writefd_unbuffered(int fd,ch
+@@ -1102,7 +1054,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);
readfd_unbuffered(sock_f_in, io_filesfrom_buf,
sizeof io_filesfrom_buf);
}
-@@ -1138,7 +1081,7 @@ static void writefd_unbuffered(int fd,ch
+@@ -1113,7 +1064,7 @@ static void writefd_unbuffered(int fd,ch
defer_forwarding_messages = 1;
if (fd == sock_f_out) {
last_io_out = time(NULL);
sleep_for_bwlimit(cnt);
}
-@@ -1148,23 +1091,6 @@ static void writefd_unbuffered(int fd,ch
+@@ -1123,23 +1074,6 @@ static void writefd_unbuffered(int fd,ch
no_flush--;
}
/**
* Write an message to a multiplexed stream. If this fails then rsync
* exits.
-@@ -1190,14 +1116,15 @@ static void mplex_write(enum msgcode cod
+@@ -1165,14 +1099,15 @@ static void mplex_write(enum msgcode cod
defer_forwarding_messages = 1;
writefd_unbuffered(sock_f_out, buf, len);
defer_forwarding_messages = 0;
if (!iobuf_out_cnt || no_flush)
return;
-@@ -1211,11 +1138,6 @@ void io_flush(int flush_it_all)
+@@ -1186,11 +1121,6 @@ void io_flush(int flush_it_all)
static void writefd(int fd,char *buf,size_t len)
{
if (fd == sock_f_out)
stats.total_written += len;
-@@ -1428,9 +1350,3 @@ void start_write_batch(int fd)
+@@ -1396,9 +1326,3 @@ void start_write_batch(int fd)
else
write_batch_monitor_in = fd;
}
-}
--- old/log.c
+++ new/log.c
-@@ -38,7 +38,6 @@ extern int am_sender;
+@@ -33,7 +33,6 @@ extern int am_sender;
extern int local_server;
extern int quiet;
extern int module_id;
extern int allow_8bit_chars;
extern int protocol_version;
extern int preserve_times;
-@@ -76,7 +75,6 @@ struct {
+@@ -73,7 +72,6 @@ struct {
{ RERR_IPC , "error in IPC code" },
{ RERR_CRASHED , "sibling process crashed" },
{ RERR_TERMINATED , "sibling process terminated abnormally" },
{ RERR_SIGNAL , "received SIGINT, SIGTERM, or SIGHUP" },
{ RERR_WAITCHILD , "waitpid() failed" },
{ RERR_MALLOC , "error allocating core memory buffers" },
-@@ -232,8 +230,8 @@ void rwrite(enum logcode code, char *buf
- if (quiet && code == FINFO)
- return;
+@@ -225,8 +223,8 @@ void rwrite(enum logcode code, char *buf
+ if (len < 0)
+ exit_cleanup(RERR_MESSAGEIO);
- if (am_server && msg_fd_out >= 0) {
- /* Pass the message to our sibling. */
}
--- old/main.c
+++ new/main.c
-@@ -30,7 +30,6 @@ extern int list_only;
+@@ -32,7 +32,6 @@ extern int list_only;
extern int am_root;
extern int am_server;
extern int am_sender;
extern int am_daemon;
extern int blocking_io;
extern int remove_sent_files;
-@@ -85,9 +84,20 @@ struct pid_status {
+@@ -93,9 +92,20 @@ struct pid_status {
static time_t starttime, endtime;
static int64 total_read, total_written;
/* Works like waitpid(), but if we already harvested the child pid in our
* remember_children(), we succeed instead of returning an error. */
pid_t wait_process(pid_t pid, int *status_ptr, int flags)
-@@ -164,7 +174,7 @@ static void handle_stats(int f)
+@@ -172,7 +182,7 @@ static void handle_stats(int f)
show_flist_stats();
}
return;
if (am_daemon) {
-@@ -628,12 +638,30 @@ static void do_server_sender(int f_in, i
+@@ -650,12 +660,30 @@ static void do_server_sender(int f_in, i
exit_cleanup(0);
}
/* The receiving side mustn't obey this, or an existing symlink that
* points to an identical file won't be replaced by the referent. */
-@@ -642,70 +670,16 @@ static int do_recv(int f_in,int f_out,st
+@@ -664,70 +692,16 @@ static int do_recv(int f_in,int f_out,st
if (preserve_hard_links)
init_hard_links();
generate_files(f_out, flist, local_name);
handle_stats(-1);
-@@ -716,10 +690,13 @@ static int do_recv(int f_in,int f_out,st
+@@ -738,10 +712,13 @@ static int do_recv(int f_in,int f_out,st
}
io_flush(FULL_FLUSH);
}
-@@ -1089,22 +1066,6 @@ static int start_client(int argc, char *
+@@ -1143,22 +1120,6 @@ static int start_client(int argc, char *
return ret;
}
RETSIGTYPE remember_children(UNUSED(int val))
{
#ifdef WNOHANG
-@@ -1196,8 +1157,6 @@ int main(int argc,char *argv[])
+@@ -1250,8 +1211,6 @@ int main(int argc,char *argv[])
# endif
sigact.sa_flags = SA_NOCLDSTOP;
#endif
SIGACTMASK(SIGSEGV, rsync_panic_handler);
--- old/match.c
+++ new/match.c
-@@ -20,7 +20,7 @@
+@@ -23,7 +23,7 @@
#include "rsync.h"
extern int verbose;
extern int checksum_seed;
extern int append_mode;
-@@ -110,7 +110,7 @@ static void matched(int f, struct sum_st
+@@ -113,7 +113,7 @@ static void matched(int f, struct sum_st
else
last_match = offset;
show_progress(last_match, buf->file_size);
}
-@@ -314,7 +314,7 @@ void match_sums(int f, struct sum_struct
+@@ -317,7 +317,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) {
show_progress(last_match, buf->file_size);
sum_update(map_ptr(buf, last_match, CHUNK_SIZE),
CHUNK_SIZE);
-@@ -322,7 +322,7 @@ void match_sums(int f, struct sum_struct
+@@ -325,7 +325,7 @@ void match_sums(int f, struct sum_struct
}
if (last_match < s->flength) {
int32 len = s->flength - last_match;
int keep_partial = 0;
int safe_symlinks = 0;
int copy_unsafe_links = 0;
-@@ -1301,6 +1301,7 @@ int parse_arguments(int *argc, const cha
+@@ -1304,6 +1304,7 @@ int parse_arguments(int *argc, const cha
if (do_progress && !verbose && !log_before_transfer && !am_server)
verbose = 1;
do_xfers = 0;
--- old/pipe.c
+++ new/pipe.c
-@@ -56,7 +56,7 @@ pid_t piped_child(char **command, int *f
+@@ -59,7 +59,7 @@ pid_t piped_child(char **command, int *f
exit_cleanup(RERR_IPC);
}
if (pid == -1) {
rsyserr(FERROR, errno, "fork");
exit_cleanup(RERR_IPC);
-@@ -120,7 +120,7 @@ pid_t local_child(int argc, char **argv,
+@@ -123,7 +123,7 @@ pid_t local_child(int argc, char **argv,
exit_cleanup(RERR_IPC);
}
exit_cleanup(RERR_IPC);
--- old/receiver.c
+++ new/receiver.c
-@@ -24,7 +24,7 @@ extern int verbose;
+@@ -25,7 +25,7 @@
+ extern int verbose;
extern int do_xfers;
- extern int am_daemon;
extern int am_server;
-extern int do_progress;
+extern int recv_progress;
extern int log_before_transfer;
- extern int log_format_has_i;
- extern int daemon_log_format_has_i;
-@@ -153,7 +153,7 @@ static int receive_data(int f_in, char *
+ extern int stdout_format_has_i;
+ extern int logfile_format_has_i;
+@@ -154,7 +154,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) {
show_progress(offset, total_size);
sum_update(map_ptr(mapbuf, offset, CHUNK_SIZE),
CHUNK_SIZE);
-@@ -161,7 +161,7 @@ static int receive_data(int f_in, char *
+@@ -162,7 +162,7 @@ static int receive_data(int f_in, char *
}
if (offset < sum.flength) {
int32 len = sum.flength - offset;
show_progress(offset, total_size);
sum_update(map_ptr(mapbuf, offset, len), len);
offset = sum.flength;
-@@ -174,7 +174,7 @@ static int receive_data(int f_in, char *
+@@ -175,7 +175,7 @@ static int receive_data(int f_in, char *
}
while ((i = recv_token(f_in, &data)) != 0) {
show_progress(offset, total_size);
if (i > 0) {
-@@ -242,7 +242,7 @@ static int receive_data(int f_in, char *
+@@ -245,7 +245,7 @@ static int receive_data(int f_in, char *
ftruncate(fd, offset);
#endif
end_progress(total_size);
if (fd != -1 && offset > 0 && sparse_end(fd) != 0) {
-@@ -293,12 +293,12 @@ static void handle_delayed_updates(struc
+@@ -296,12 +296,12 @@ static void handle_delayed_updates(struc
"rename failed for %s (from %s)",
full_fname(fname), partialptr);
} else {
handle_partial_dir(partialptr, PDIR_DELETE);
}
}
-@@ -349,11 +349,6 @@ int recv_files(int f_in, struct file_lis
+@@ -352,11 +352,6 @@ int recv_files(int f_in, struct file_lis
if (verbose > 2)
rprintf(FINFO,"recv_files(%d) starting\n",flist->count);
if (delay_updates)
delayed_bits = bitbag_create(flist->count);
-@@ -374,7 +369,7 @@ int recv_files(int f_in, struct file_lis
+@@ -377,7 +372,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);
if (keep_partial && !partial_dir)
make_backups = 0; /* prevents double backup */
if (append_mode) {
-@@ -596,7 +591,7 @@ int recv_files(int f_in, struct file_lis
+@@ -597,7 +592,7 @@ int recv_files(int f_in, struct file_lis
/* log the transfer */
if (log_before_transfer)
- log_item(file, &initial_stats, iflags, NULL);
+ log_item(FCLIENT, file, &initial_stats, iflags, NULL);
- else if (!am_server && verbose && do_progress)
+ else if (!am_server && verbose && recv_progress)
rprintf(FINFO, "%s\n", fname);
/* recv file data */
-@@ -639,11 +634,13 @@ int recv_files(int f_in, struct file_lis
+@@ -644,11 +639,13 @@ int recv_files(int f_in, struct file_lis
cleanup_disable();
if (recv_ok > 0) {
} else if (!recv_ok) {
int msgtype = phase || read_batch ? FERROR : FINFO;
if (msgtype == FERROR || verbose) {
-@@ -666,8 +663,8 @@ int recv_files(int f_in, struct file_lis
+@@ -671,8 +668,8 @@ int recv_files(int f_in, struct file_lis
errstr, fname, keptstr, redostr);
}
if (!phase) {
extern int am_starting_up;
extern int allow_8bit_chars;
extern int preserve_uid;
-@@ -303,5 +302,5 @@ const char *who_am_i(void)
+@@ -301,5 +300,5 @@ const char *who_am_i(void)
{
if (am_starting_up)
return am_server ? "server" : "client";
}
--- old/rsync.h
+++ new/rsync.h
-@@ -166,10 +166,8 @@ enum msgcode {
+@@ -168,10 +168,8 @@ enum msgcode {
MSG_DATA=0, /* raw data on the multiplexed stream */
MSG_ERROR=FERROR, MSG_INFO=FINFO, /* remote logging */
MSG_LOG=FLOG, MSG_SOCKERR=FSOCKERR, /* sibling logging */
};
#include "errcode.h"
-@@ -320,6 +318,7 @@ enum msgcode {
+@@ -322,6 +320,7 @@ enum msgcode {
#endif
#include <assert.h>
--- old/util.c
+++ new/util.c
-@@ -420,49 +420,6 @@ int robust_rename(char *from, char *to,
+@@ -415,49 +415,6 @@ int robust_rename(char *from, char *to,
return -1;
}
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff