From 8a0123e50e05c471997f5999ce3347689e54ef8c Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Fri, 16 Dec 2005 23:52:12 +0000 Subject: [PATCH] Fixed some failing hunks. --- fname-convert.diff | 18 +++++++++--------- threaded-receiver.diff | 33 +++++++++++++++++++++------------ 2 files changed, 30 insertions(+), 21 deletions(-) diff --git a/fname-convert.diff b/fname-convert.diff index 4c4fd3f..13075cc 100644 --- a/fname-convert.diff +++ b/fname-convert.diff @@ -77,7 +77,7 @@ Note that you'll need to run 'make proto' after applying this patch. if (cleanup_fname) do_unlink(cleanup_fname); if (code) ---- orig/errcode.h 2005-09-26 17:09:27 +--- orig/errcode.h 2005-12-16 23:48:43 +++ errcode.h 2005-09-29 17:23:35 @@ -36,6 +36,7 @@ #define RERR_IPC 14 /* error in IPC code */ @@ -85,8 +85,8 @@ Note that you'll need to run 'make proto' after applying this patch. #define RERR_TERMINATED 16 /* sibling terminated abnormally */ +#define RERR_FNAMECONV 17 /* error in filename conversion */ - #define RERR_SIGNAL 20 /* status returned when sent SIGUSR1, SIGINT */ - #define RERR_WAITCHILD 21 /* some error returned by waitpid() */ + #define RERR_SIGNAL1 19 /* status returned when sent SIGUSR1 */ + #define RERR_SIGNAL 20 /* status returned when sent SIGINT, SIGTERM, SIGHUP */ --- orig/flist.c 2005-11-10 16:58:36 +++ flist.c 2005-03-05 00:29:08 @@ -57,6 +57,7 @@ extern int copy_unsafe_links; @@ -399,17 +399,17 @@ Note that you'll need to run 'make proto' after applying this patch. static void recv_generator(char *fname, struct file_struct *file, int ndx, int itemizing, int maybe_PERMS_REPORT, enum logcode code, int f_out) ---- orig/log.c 2005-12-16 04:03:06 -+++ log.c 2005-12-16 04:03:49 +--- orig/log.c 2005-12-16 23:48:44 ++++ log.c 2005-12-16 23:49:07 @@ -68,6 +68,7 @@ struct { { RERR_IPC , "error in IPC code" }, { RERR_CRASHED , "sibling process crashed" }, { RERR_TERMINATED , "sibling process terminated abnormally" }, + { RERR_FNAMECONV , "error in filename conversion" }, - { RERR_SIGNAL , "received SIGINT, SIGTERM, SIGHUP, or SIGUSR1" }, + { RERR_SIGNAL1 , "received SIGUSR1" }, + { RERR_SIGNAL , "received SIGINT, SIGTERM, or SIGHUP" }, { RERR_WAITCHILD , "waitpid() failed" }, - { RERR_MALLOC , "error allocating core memory buffers" }, ---- orig/main.c 2005-12-15 07:55:39 +--- orig/main.c 2005-12-16 23:48:44 +++ main.c 2004-07-22 00:31:47 @@ -414,7 +414,7 @@ static pid_t do_cmd(char *cmd, char *mac whole_file = 1; @@ -420,7 +420,7 @@ Note that you'll need to run 'make proto' after applying this patch. if (dir) free(dir); ---- orig/options.c 2005-11-15 18:21:22 +--- orig/options.c 2005-12-16 23:48:44 +++ options.c 2005-10-26 16:49:33 @@ -142,6 +142,7 @@ char *basis_dir[MAX_BASIS_DIRS+1]; char *config_file = NULL; diff --git a/threaded-receiver.diff b/threaded-receiver.diff index 6d6f60c..6cdf480 100644 --- a/threaded-receiver.diff +++ b/threaded-receiver.diff @@ -50,6 +50,16 @@ 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 +@@ -37,7 +37,6 @@ + #define RERR_CRASHED 15 /* sibling crashed */ + #define RERR_TERMINATED 16 /* sibling terminated abnormally */ + +-#define RERR_SIGNAL1 19 /* status returned when sent SIGUSR1 */ + #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 2005-12-16 04:03:06 +++ generator.c 2005-12-08 23:17:08 @@ -65,7 +65,6 @@ extern OFF_T min_size; @@ -695,8 +705,8 @@ Be sure to run "make proto" before running "make". - write_batch_monitor_out = -1; - write_batch_monitor_in = -1; -} ---- orig/log.c 2005-12-16 04:03:06 -+++ log.c 2005-12-16 04:04:49 +--- orig/log.c 2005-12-16 23:48:44 ++++ log.c 2005-12-16 23:49:57 @@ -35,7 +35,6 @@ extern int am_sender; extern int local_server; extern int quiet; @@ -705,16 +715,15 @@ Be sure to run "make proto" before running "make". extern int protocol_version; extern int preserve_times; extern int log_format_has_i; -@@ -68,7 +67,7 @@ struct { +@@ -68,7 +67,6 @@ struct { { RERR_IPC , "error in IPC code" }, { RERR_CRASHED , "sibling process crashed" }, { RERR_TERMINATED , "sibling process terminated abnormally" }, -- { RERR_SIGNAL , "received SIGINT, SIGTERM, SIGHUP, or SIGUSR1" }, -+ { RERR_SIGNAL , "received SIGINT, SIGTERM, or SIGHUP" }, +- { RERR_SIGNAL1 , "received SIGUSR1" }, + { RERR_SIGNAL , "received SIGINT, SIGTERM, or SIGHUP" }, { RERR_WAITCHILD , "waitpid() failed" }, { RERR_MALLOC , "error allocating core memory buffers" }, - { RERR_PARTIAL , "some files could not be transferred" }, -@@ -205,8 +204,8 @@ void rwrite(enum logcode code, char *buf +@@ -206,8 +204,8 @@ void rwrite(enum logcode code, char *buf buf[len] = 0; @@ -725,8 +734,8 @@ Be sure to run "make proto" before running "make". send_msg((enum msgcode)code, buf, len); return; } ---- orig/main.c 2005-12-15 07:55:39 -+++ main.c 2005-12-10 19:02:56 +--- orig/main.c 2005-12-16 23:48:44 ++++ main.c 2005-12-16 23:50:33 @@ -30,7 +30,6 @@ extern int list_only; extern int am_root; extern int am_server; @@ -900,7 +909,7 @@ Be sure to run "make proto" before running "make". - -static RETSIGTYPE sigusr1_handler(UNUSED(int val)) -{ -- exit_cleanup(RERR_SIGNAL); +- exit_cleanup(RERR_SIGNAL1); -} - -static RETSIGTYPE sigusr2_handler(UNUSED(int val)) @@ -963,7 +972,7 @@ 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 2005-11-15 18:21:22 +--- orig/options.c 2005-12-16 23:48:44 +++ options.c 2005-12-08 23:17:09 @@ -69,7 +69,6 @@ int def_compress_level = Z_DEFAULT_COMPR int am_root = 0; @@ -981,7 +990,7 @@ Be sure to run "make proto" before running "make". int keep_partial = 0; int safe_symlinks = 0; int copy_unsafe_links = 0; -@@ -1232,6 +1232,7 @@ int parse_arguments(int *argc, const cha +@@ -1236,6 +1236,7 @@ int parse_arguments(int *argc, const cha if ((do_progress || dry_run) && !verbose && !log_before_transfer && !am_server) verbose = 1; -- 2.34.1