you configured it with --enable-syscall-soft --enable-pthread (you may need
to twiddle the Makefile options if you didn't install the library, though).
+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:
+
+ ./prepare-source
+ ./configure (optional if already run)
+ make
---- orig/Makefile.in 2006-01-14 08:14:29
+--- orig/Makefile.in 2006-02-06 05:03:50
+++ Makefile.in 2005-12-10 18:35:39
@@ -6,7 +6,7 @@ exec_prefix=@exec_prefix@
bindir=@bindir@
CC=@CC@
CFLAGS=@CFLAGS@
CPPFLAGS=@CPPFLAGS@
---- orig/cleanup.c 2006-01-14 08:14:29
-+++ cleanup.c 2005-12-08 23:17:08
-@@ -94,9 +94,6 @@ void _exit_cleanup(int code, const char
+--- orig/cleanup.c 2006-02-03 20:00:35
++++ cleanup.c 2006-02-03 20:07:44
+@@ -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);
-@@ -127,8 +124,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);
#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-14 08:14:30
+--- orig/generator.c 2006-02-05 06:40:40
+++ generator.c 2005-12-08 23:17:08
-@@ -65,7 +65,6 @@ extern OFF_T min_size;
+@@ -67,7 +67,6 @@ extern OFF_T min_size;
extern int io_error;
extern int allowed_lull;
extern int sock_f_out;
extern int protocol_version;
extern int fuzzy_basis;
extern int always_checksum;
-@@ -96,6 +95,11 @@ static int deletion_count = 0; /* used t
+@@ -98,6 +97,11 @@ static int deletion_count = 0; /* used t
static int can_link_symlinks = 1; /* start out optimistic */
static int can_link_devices = 1;
/* For calling delete_file() */
#define DEL_FORCE_RECURSE (1<<1) /* recurse even w/o --force */
#define DEL_TERSE (1<<3)
-@@ -445,8 +449,8 @@ static void sum_sizes_sqroot(struct sum_
+@@ -446,8 +450,8 @@ static void sum_sizes_sqroot(struct sum_
}
if (protocol_version < 27) {
s2length = SUM_LENGTH;
} else {
int32 c;
-@@ -456,7 +460,7 @@ static void sum_sizes_sqroot(struct sum_
+@@ -457,7 +461,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-- */
s2length = MIN(s2length, SUM_LENGTH);
}
-@@ -490,7 +494,7 @@ static void generate_and_send_sums(int f
+@@ -491,7 +495,7 @@ static void generate_and_send_sums(int f
sum_sizes_sqroot(&sum, len);
write_sum_head(f_out, &sum);
return;
if (len > 0)
-@@ -509,7 +513,7 @@ static void generate_and_send_sums(int f
+@@ -510,7 +514,7 @@ static void generate_and_send_sums(int f
if (f_copy >= 0) {
full_write(f_copy, map, n1);
continue;
}
-@@ -1135,7 +1139,7 @@ static void recv_generator(char *fname,
+@@ -1140,7 +1144,7 @@ static void recv_generator(char *fname,
return;
}
return;
if (fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH)
-@@ -1190,7 +1194,7 @@ static void recv_generator(char *fname,
+@@ -1195,7 +1199,7 @@ static void recv_generator(char *fname,
goto notify_others;
}
if (!(backupptr = get_backup_name(fname))) {
close(fd);
return;
-@@ -1280,7 +1284,10 @@ void generate_files(int f_out, struct fi
+@@ -1284,7 +1288,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;
if (protocol_version >= 29) {
itemizing = 1;
-@@ -1309,7 +1316,7 @@ void generate_files(int f_out, struct fi
+@@ -1313,7 +1320,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",
-@@ -1318,12 +1325,6 @@ void generate_files(int f_out, struct fi
+@@ -1322,12 +1329,6 @@ void generate_files(int f_out, struct fi
: "enabled");
}
for (i = 0; i < flist->count; i++) {
struct file_struct *file = flist->files[i];
-@@ -1367,23 +1368,34 @@ void generate_files(int f_out, struct fi
- delete_in_dir(NULL, NULL, NULL);
+@@ -1371,23 +1372,34 @@ void generate_files(int f_out, struct fi
+ delete_in_dir(NULL, NULL, NULL, NULL);
phase++;
- csum_length = SUM_LENGTH;
if (local_name)
strlcpy(fbuf, local_name, sizeof fbuf);
else
-@@ -1395,27 +1407,43 @@ void generate_files(int f_out, struct fi
+@@ -1399,27 +1411,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;
---- orig/io.c 2005-12-08 21:19:31
-+++ io.c 2005-12-10 19:03:08
+--- orig/io.c 2006-02-04 21:53:39
++++ io.c 2006-02-01 19:50:09
@@ -47,7 +47,6 @@ extern int allowed_lull;
extern int am_server;
extern int am_daemon;
static void read_msg_fd(void)
{
char buf[2048];
-@@ -266,40 +267,6 @@ static void read_msg_fd(void)
+@@ -266,47 +267,6 @@ static void read_msg_fd(void)
tag = (tag >> 24) - MPLEX_BASE;
switch (tag) {
- if (preserve_hard_links)
- flist_ndx_push(&hlink_list, IVAL(buf,0));
- break;
+- case MSG_SOCKERR:
+- if (!am_generator) {
+- rprintf(FERROR, "invalid message %d:%d\n", tag, len);
+- exit_cleanup(RERR_STREAMIO);
+- }
+- close_multiplexing_out();
+- /* FALL THROUGH */
case MSG_INFO:
case MSG_ERROR:
case MSG_LOG:
-@@ -320,71 +287,72 @@ static void read_msg_fd(void)
+@@ -327,71 +287,75 @@ static void read_msg_fd(void)
msg_fd_in = fd;
}
- written = 0;
+ struct msg_list_item *ml = (struct msg_list_item *)msg_list.head;
+ switch (ml->code) {
++ case MSG_SOCKERR:
++ close_multiplexing_out();
++ /* FALL THROUGH */
+ case MSG_INFO:
+ case MSG_ERROR:
+ case MSG_LOG:
return flist_ndx_pop(&hlink_list);
}
-@@ -465,11 +433,6 @@ static int read_timeout(int fd, char *bu
+@@ -471,11 +435,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) {
-@@ -502,9 +465,6 @@ static int read_timeout(int fd, char *bu
+@@ -508,9 +467,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)) {
-@@ -832,6 +792,8 @@ static void readfd(int fd, char *buffer,
+@@ -832,6 +788,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);
}
-@@ -1091,7 +1053,6 @@ static void writefd_unbuffered(int fd,ch
+@@ -1087,7 +1045,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);
}
-@@ -1101,7 +1062,7 @@ static void writefd_unbuffered(int fd,ch
- total += ret;
+@@ -1097,7 +1054,7 @@ static void writefd_unbuffered(int fd,ch
+ total += cnt;
if (fd == sock_f_out) {
- if (io_timeout || am_generator)
+ if (io_timeout || am_generator())
last_io_out = time(NULL);
- sleep_for_bwlimit(ret);
+ sleep_for_bwlimit(cnt);
}
-@@ -1126,7 +1087,7 @@ static void mplex_write(enum msgcode cod
+@@ -1121,7 +1078,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). */
contiguous_write_len = len + 4;
if (n > sizeof buffer - 4)
-@@ -1141,33 +1102,31 @@ static void mplex_write(enum msgcode cod
+@@ -1137,31 +1094,29 @@ static void mplex_write(enum msgcode cod
if (len)
writefd_unbuffered(sock_f_out, buf, len);
contiguous_write_len = 0;
}
-
void io_flush(int flush_it_all)
{
- msg_list_flush(flush_it_all);
+ msg_list_flush(flush_it_all);
}
-
static void writefd(int fd,char *buf,size_t len)
{
- if (fd == msg_fd_out) {
if (fd == sock_f_out)
stats.total_written += len;
-@@ -1387,9 +1346,3 @@ void start_write_batch(int fd)
+@@ -1374,9 +1329,3 @@ void start_write_batch(int fd)
else
write_batch_monitor_in = fd;
}
- write_batch_monitor_out = -1;
- write_batch_monitor_in = -1;
-}
---- orig/log.c 2006-01-14 08:14:30
+--- orig/log.c 2006-02-05 04:53:34
+++ log.c 2005-12-16 23:49:57
-@@ -35,7 +35,6 @@ extern int am_sender;
+@@ -38,7 +38,6 @@ extern int am_sender;
extern int local_server;
extern int quiet;
extern int module_id;
extern int protocol_version;
extern int preserve_times;
extern int log_format_has_i;
-@@ -68,7 +67,6 @@ struct {
+@@ -74,7 +73,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" },
-@@ -206,8 +204,8 @@ void rwrite(enum logcode code, char *buf
-
- buf[len] = 0;
+@@ -234,8 +232,8 @@ void rwrite(enum logcode code, char *buf
+ if (quiet && code == FINFO)
+ return;
- if (am_server && msg_fd_out >= 0) {
- /* Pass the message to our sibling. */
send_msg((enum msgcode)code, buf, len);
return;
}
---- orig/main.c 2006-01-14 08:14:30
-+++ main.c 2005-12-16 23:50:33
+--- orig/main.c 2006-02-05 04:53:34
++++ main.c 2006-02-02 02:43:44
@@ -30,7 +30,6 @@ extern int list_only;
extern int am_root;
extern int am_server;
extern int am_daemon;
extern int blocking_io;
extern int remove_sent_files;
-@@ -75,9 +74,20 @@ struct pid_status {
+@@ -84,9 +83,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
* sigchld_handler(), 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)
+@@ -163,7 +173,7 @@ static void handle_stats(int f)
show_flist_stats();
}
return;
if (am_daemon) {
-@@ -558,12 +568,30 @@ static void do_server_sender(int f_in, i
+@@ -618,12 +628,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. */
-@@ -572,70 +600,16 @@ static int do_recv(int f_in,int f_out,st
+@@ -632,70 +660,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);
-@@ -646,10 +620,13 @@ static int do_recv(int f_in,int f_out,st
+@@ -706,10 +680,13 @@ static int do_recv(int f_in,int f_out,st
}
io_flush(FULL_FLUSH);
}
-@@ -1011,22 +988,6 @@ static int start_client(int argc, char *
+@@ -1077,22 +1054,6 @@ static int start_client(int argc, char *
return ret;
}
static RETSIGTYPE sigchld_handler(UNUSED(int val))
{
#ifdef WNOHANG
-@@ -1109,8 +1070,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);
+@@ -1184,8 +1145,6 @@ int main(int argc,char *argv[])
+ # endif
+ sigact.sa_flags = SA_NOCLDSTOP;
+ #endif
+- SIGACTMASK(SIGUSR1, sigusr1_handler);
+- SIGACTMASK(SIGUSR2, sigusr2_handler);
+ SIGACTMASK(SIGCHLD, sigchld_handler);
#ifdef MAINTAINER_MODE
- signal(SIGSEGV, rsync_panic_handler);
+ SIGACTMASK(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 @@
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-14 08:14:30
+--- orig/options.c 2006-02-03 23:51:57
+++ options.c 2005-12-08 23:17:09
-@@ -69,7 +69,6 @@ int def_compress_level = Z_DEFAULT_COMPR
+@@ -73,7 +73,6 @@ int def_compress_level = Z_DEFAULT_COMPR
int am_root = 0;
int am_server = 0;
int am_sender = 0;
int am_starting_up = 1;
int orig_umask = 0;
int relative_paths = -1;
-@@ -89,6 +88,7 @@ int am_daemon = 0;
+@@ -94,6 +93,7 @@ int am_daemon = 0;
int daemon_over_rsh = 0;
int do_stats = 0;
int do_progress = 0;
int keep_partial = 0;
int safe_symlinks = 0;
int copy_unsafe_links = 0;
-@@ -1234,6 +1234,7 @@ int parse_arguments(int *argc, const cha
+@@ -1290,6 +1290,7 @@ int parse_arguments(int *argc, const cha
if ((do_progress || dry_run) && !verbose && !log_before_transfer
&& !am_server)
verbose = 1;
if (dry_run)
do_xfers = 0;
---- orig/pipe.c 2006-01-14 08:14:31
+--- orig/pipe.c 2006-01-21 08:03:40
+++ pipe.c 2005-12-08 23:17:09
-@@ -55,7 +55,7 @@ pid_t piped_child(char **command, int *f
+@@ -56,7 +56,7 @@ pid_t piped_child(char **command, int *f
exit_cleanup(RERR_IPC);
}
if (pid == -1) {
rsyserr(FERROR, errno, "fork");
exit_cleanup(RERR_IPC);
-@@ -116,7 +116,7 @@ pid_t local_child(int argc, char **argv,
+@@ -120,7 +120,7 @@ pid_t local_child(int argc, char **argv,
exit_cleanup(RERR_IPC);
}
if (pid == -1) {
rsyserr(FERROR, errno, "fork");
exit_cleanup(RERR_IPC);
---- orig/receiver.c 2006-01-14 08:14:31
+--- orig/receiver.c 2006-01-31 02:30:18
+++ receiver.c 2006-01-14 08:30:29
@@ -24,7 +24,7 @@ extern int verbose;
extern int do_xfers;
rprintf(FINFO, "%s\n", fname);
/* recv file data */
-@@ -702,11 +697,12 @@ int recv_files(int f_in, struct file_lis
+@@ -705,11 +700,12 @@ 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) {
-@@ -728,10 +724,8 @@ int recv_files(int f_in, struct file_lis
+@@ -731,10 +727,8 @@ int recv_files(int f_in, struct file_lis
"%s: %s failed verification -- update %s%s.\n",
errstr, fname, keptstr, redostr);
}
}
}
make_backups = save_make_backups;
---- orig/rsync.c 2006-01-14 08:14:31
+--- orig/rsync.c 2006-02-05 15:31:49
+++ rsync.c 2005-12-08 23:17:10
-@@ -30,7 +30,6 @@ extern int omit_dir_times;
+@@ -41,7 +41,6 @@ extern int orig_umask;
extern int am_root;
extern int am_server;
extern int am_sender;
extern int am_starting_up;
extern int preserve_uid;
extern int preserve_gid;
-@@ -208,5 +207,5 @@ const char *who_am_i(void)
+@@ -291,5 +290,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-01-14 08:14:31
-+++ rsync.h 2005-12-10 19:02:58
-@@ -165,10 +165,8 @@ enum msgcode {
+--- orig/rsync.h 2006-02-03 20:00:36
++++ rsync.h 2006-01-17 02:46:03
+@@ -166,10 +166,8 @@ enum msgcode {
MSG_DATA=0, /* raw data on the multiplexed stream */
MSG_ERROR=FERROR, MSG_INFO=FINFO, /* remote logging */
- MSG_LOG=FLOG, MSG_FCLIENT=FCLIENT, /* sibling logging */
+ MSG_LOG=FLOG, MSG_SOCKERR=FSOCKERR, /* sibling logging */
- MSG_REDO=9, /* reprocess indicated flist index */
MSG_SUCCESS=100,/* successfully updated indicated flist index */
MSG_DELETED=101,/* successfully deleted a file on receiving side */
};
#include "errcode.h"
-@@ -319,6 +317,7 @@ enum msgcode {
+@@ -320,6 +318,7 @@ enum msgcode {
#endif
#include <assert.h>
#include "lib/pool_alloc.h"
---- orig/util.c 2006-01-14 08:14:31
+--- orig/util.c 2006-02-03 20:00:36
+++ util.c 2005-12-08 23:17:10
-@@ -405,51 +405,6 @@ int robust_rename(char *from, char *to,
+@@ -413,51 +413,6 @@ int robust_rename(char *from, char *to,
return -1;
}
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff