Fixed a failing hunk.

diff --git a/ODBC-dblog.diff b/ODBC-dblog.diff
index c75e5bbb71e35b6d15fa07d07035a535efd1cc8b..4182aff6adf9c2b0d1cdc3bab693cdfb4c08d624 100644 (file)
--- a/ODBC-dblog.diff
+++ b/ODBC-dblog.diff
@@ -29,21 +29,21 @@ See the file "instructions" (after applying this patch) for more info.
  extern int log_got_error;
  extern char *partial_dir;
  extern char *logfile_name;
-@@ -154,8 +155,13 @@ void _exit_cleanup(int code, const char 
-                       code = RERR_PARTIAL;
-       }
+@@ -179,8 +180,13 @@ NORETURN void _exit_cleanup(int code, co
+                               code = exit_code = RERR_PARTIAL;
+               }
  
--      if (code || am_daemon || (logfile_name && (am_server || !verbose)))
-+      if (code || am_daemon || (logfile_name && (am_server || !verbose))) {
-               log_exit(code, file, line);
+-              if (code || am_daemon || (logfile_name && (am_server || !verbose)))
++              if (code || am_daemon || (logfile_name && (am_server || !verbose))) {
+                       log_exit(code, file, line);
 +#ifdef HAVE_LIBODBC
-+              db_log_exit(code, file, line);
-+              db_log_close();
++                      db_log_exit(code, file, line);
++                      db_log_close();
 +#endif
-+      }
++              }
  
-       if (verbose > 2) {
-               rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): about to call exit(%d)\n",
+               /* FALLTHROUGH */
+       case 5:
 --- old/clientserver.c
 +++ new/clientserver.c
 @@ -390,6 +390,9 @@ static int rsync_module(int f_in, int f_
@@ -1050,7 +1050,7 @@ See the file "instructions" (after applying this patch) for more info.
  FN_LOCAL_BOOL(lp_list, list)
 --- old/log.c
 +++ new/log.c
-@@ -94,7 +94,7 @@ struct {
+@@ -93,7 +93,7 @@ struct {
  /*
   * Map from rsync error code to name, or return NULL.
   */
@@ -1061,7 +1061,7 @@ See the file "instructions" (after applying this patch) for more info.
        for (i = 0; rerr_names[i].name; i++) {
 --- old/receiver.c
 +++ new/receiver.c
-@@ -111,6 +111,10 @@ static int get_tmpname(char *fnametmp, c
+@@ -110,6 +110,10 @@ static int get_tmpname(char *fnametmp, c
  
        if (maxname < 1) {
                rprintf(FERROR, "temporary filename too long: %s\n", fname);
@@ -1072,7 +1072,7 @@ See the file "instructions" (after applying this patch) for more info.
                fnametmp[0] = '\0';
                return 0;
        }
-@@ -172,6 +176,10 @@ static int receive_data(int f_in, char *
+@@ -173,6 +177,10 @@ static int receive_data(int f_in, char *
                if (fd != -1 && (j = do_lseek(fd, offset, SEEK_SET)) != offset) {
                        rsyserr(FERROR, errno, "lseek of %s returned %.0f, not %.0f",
                                full_fname(fname), (double)j, (double)offset);
@@ -1083,7 +1083,7 @@ See the file "instructions" (after applying this patch) for more info.
                        exit_cleanup(RERR_FILEIO);
                }
        }
-@@ -229,6 +237,11 @@ static int receive_data(int f_in, char *
+@@ -230,6 +238,11 @@ static int receive_data(int f_in, char *
                                                "lseek of %s returned %.0f, not %.0f",
                                                full_fname(fname),
                                                (double)pos, (double)offset);
@@ -1095,7 +1095,7 @@ See the file "instructions" (after applying this patch) for more info.
                                        exit_cleanup(RERR_FILEIO);
                                }
                                continue;
-@@ -254,6 +267,9 @@ static int receive_data(int f_in, char *
+@@ -255,6 +268,9 @@ static int receive_data(int f_in, char *
            report_write_error:
                rsyserr(FERROR, errno, "write failed on %s",
                        full_fname(fname));
@@ -1105,7 +1105,7 @@ See the file "instructions" (after applying this patch) for more info.
                exit_cleanup(RERR_FILEIO);
        }
  
-@@ -297,6 +313,12 @@ static void handle_delayed_updates(struc
+@@ -298,6 +314,12 @@ static void handle_delayed_updates(struc
                                rsyserr(FERROR, errno,
                                        "rename failed for %s (from %s)",
                                        full_fname(fname), partialptr);
@@ -1118,7 +1118,7 @@ See the file "instructions" (after applying this patch) for more info.
                        } else {
                                if (remove_source_files
                                    || (preserve_hard_links
-@@ -421,6 +443,9 @@ int recv_files(int f_in, struct file_lis
+@@ -422,6 +444,9 @@ int recv_files(int f_in, struct file_lis
                if (server_filter_list.head
                    && check_filter(&server_filter_list, fname, 0) < 0) {
                        rprintf(FERROR, "attempt to hack rsync failed.\n");
@@ -1128,7 +1128,7 @@ See the file "instructions" (after applying this patch) for more info.
                        exit_cleanup(RERR_PROTOCOL);
                }
  
-@@ -477,6 +502,11 @@ int recv_files(int f_in, struct file_lis
+@@ -478,6 +503,11 @@ int recv_files(int f_in, struct file_lis
                                        rprintf(FERROR,
                                                "invalid basis_dir index: %d.\n",
                                                fnamecmp_type);
@@ -1140,8 +1140,8 @@ See the file "instructions" (after applying this patch) for more info.
                                        exit_cleanup(RERR_PROTOCOL);
                                }
                                pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
-@@ -522,6 +552,9 @@ int recv_files(int f_in, struct file_lis
-               if (fd1 != -1 && do_fstat(fd1,&st) != 0) {
+@@ -526,6 +556,9 @@ int recv_files(int f_in, struct file_lis
+               } else if (do_fstat(fd1,&st) != 0) {
                        rsyserr(FERROR, errno, "fstat %s failed",
                                full_fname(fnamecmp));
 +#ifdef HAVE_LIBODBC
@@ -1150,7 +1150,7 @@ See the file "instructions" (after applying this patch) for more info.
                        discard_receive_data(f_in, file->length);
                        close(fd1);
                        continue;
-@@ -535,6 +568,9 @@ int recv_files(int f_in, struct file_lis
+@@ -539,6 +572,9 @@ int recv_files(int f_in, struct file_lis
                         */
                        rprintf(FERROR,"recv_files: %s is a directory\n",
                                full_fname(fnamecmp));
@@ -1160,7 +1160,7 @@ See the file "instructions" (after applying this patch) for more info.
                        discard_receive_data(f_in, file->length);
                        close(fd1);
                        continue;
-@@ -558,6 +594,9 @@ int recv_files(int f_in, struct file_lis
+@@ -562,6 +598,9 @@ int recv_files(int f_in, struct file_lis
                        if (fd2 == -1) {
                                rsyserr(FERROR, errno, "open %s failed",
                                        full_fname(fname));
@@ -1170,7 +1170,7 @@ See the file "instructions" (after applying this patch) for more info.
                                discard_receive_data(f_in, file->length);
                                if (fd1 != -1)
                                        close(fd1);
-@@ -591,6 +630,10 @@ int recv_files(int f_in, struct file_lis
+@@ -595,6 +634,10 @@ int recv_files(int f_in, struct file_lis
                        if (fd2 == -1) {
                                rsyserr(FERROR, errno, "mkstemp %s failed",
                                        full_fname(fnametmp));
@@ -1181,7 +1181,7 @@ See the file "instructions" (after applying this patch) for more info.
                                discard_receive_data(f_in, file->length);
                                if (fd1 != -1)
                                        close(fd1);
-@@ -611,12 +654,19 @@ int recv_files(int f_in, struct file_lis
+@@ -615,12 +658,19 @@ int recv_files(int f_in, struct file_lis
                                       fname, fd2, file->length);
  
                log_item(log_code, file, &initial_stats, iflags, NULL);
@@ -1201,7 +1201,7 @@ See the file "instructions" (after applying this patch) for more info.
                        exit_cleanup(RERR_FILEIO);
                }
  
-@@ -675,6 +725,12 @@ int recv_files(int f_in, struct file_lis
+@@ -679,6 +729,12 @@ int recv_files(int f_in, struct file_lis
                                rprintf(msgtype,
                                        "%s: %s failed verification -- update %s%s.\n",
                                        errstr, fname, keptstr, redostr);

diff --git a/openssl-support.diff b/openssl-support.diff
index b1d95eb1dd2faf5ec8c9289d45539fe7f9821430..c6da87fdf177131ca6af55e8bba53f1af07b2669 100644 (file)
--- a/openssl-support.diff
+++ b/openssl-support.diff
@@ -58,18 +58,18 @@ can't say if I've left any cleanup/compatibility errors in the code.
  extern int keep_partial;
  extern int log_got_error;
  extern char *partial_dir;
-@@ -103,6 +106,11 @@ NORETURN void _exit_cleanup(int code, co
- 
-       in_exit_cleanup = 1;
+@@ -122,6 +125,11 @@ NORETURN void _exit_cleanup(int code, co
+       case 1:
+               cleanup_step++;
  
 +#if HAVE_OPENSSL
-+      if (use_ssl)
-+              end_tls();
++              if (use_ssl)
++                      end_tls();
 +#endif
 +
-       if (verbose > 3) {
-               rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): entered\n",
-                       code, file, line);
+               if (cleanup_child_pid != -1) {
+                       int status;
+                       int pid = wait_process(cleanup_child_pid, &status, WNOHANG);
 --- old/clientserver.c
 +++ new/clientserver.c
 @@ -29,6 +29,9 @@ extern int am_sender;
@@ -334,7 +334,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
    {"verbose",         'v', POPT_ARG_NONE,   0, 'v', 0, 0 },
    {"no-verbose",       0,  POPT_ARG_VAL,    &verbose, 0, 0, 0 },
    {"no-v",             0,  POPT_ARG_VAL,    &verbose, 0, 0, 0 },
-@@ -848,6 +889,12 @@ int parse_arguments(int *argc, const cha
+@@ -851,6 +892,12 @@ int parse_arguments(int *argc, const cha
                                        verbose++;
                                        break;
  
@@ -347,7 +347,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
                                default:
                                        rprintf(FERROR,
                                            "rsync: %s: %s (in daemon mode)\n",
-@@ -871,6 +918,17 @@ int parse_arguments(int *argc, const cha
+@@ -874,6 +921,17 @@ int parse_arguments(int *argc, const cha
                                exit_cleanup(RERR_SYNTAX);
                        }
  
@@ -365,7 +365,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
                        *argv = poptGetArgs(pc);
                        *argc = count_args(*argv);
                        am_starting_up = 0;
-@@ -1082,6 +1140,12 @@ int parse_arguments(int *argc, const cha
+@@ -1085,6 +1143,12 @@ int parse_arguments(int *argc, const cha
                        usage(FINFO);
                        exit_cleanup(0);
  
@@ -378,7 +378,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
                default:
                        /* A large opt value means that set_refuse_options()
                         * turned this option off. */
-@@ -1358,6 +1422,17 @@ int parse_arguments(int *argc, const cha
+@@ -1361,6 +1425,17 @@ int parse_arguments(int *argc, const cha
        if (delay_updates && !partial_dir)
                partial_dir = tmp_partialdir;
  
@@ -396,7 +396,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
        if (inplace) {
  #ifdef HAVE_FTRUNCATE
                if (partial_dir) {
-@@ -1775,10 +1850,27 @@ char *check_for_hostspec(char *s, char *
+@@ -1778,10 +1853,27 @@ char *check_for_hostspec(char *s, char *
        char *p;
        int not_host;
        int hostlen;

diff --git a/threaded-receiver.diff b/threaded-receiver.diff
index 8a5ea355d89d4ba5b2ec8ab095d8a07d8c78aa84..18c3e2cdf5a58c8859cf89dd2ac2542b18b5cc30 100644 (file)
--- a/threaded-receiver.diff
+++ b/threaded-receiver.diff
@@ -49,24 +49,24 @@ After applying this patch, run these commands for a successful build:
   * Close all open sockets and files, allowing a (somewhat) graceful
   * shutdown() of socket connections.  This eliminates the abortive
 @@ -98,9 +94,6 @@ NORETURN void _exit_cleanup(int code, co
- {
-       int ocode = code;
+       static int exit_code = 0;
+       static int unmodified_code = 0;
  
 -      SIGACTION(SIGUSR1, SIG_IGN);
 -      SIGACTION(SIGUSR2, SIG_IGN);
 -
-       in_exit_cleanup = 1;
- 
-       if (verbose > 3) {
-@@ -133,8 +126,6 @@ NORETURN void _exit_cleanup(int code, co
-       io_flush(FULL_FLUSH);
-       if (cleanup_fname)
-               do_unlink(cleanup_fname);
--      if (code)
--              kill_all(SIGUSR1);
-       if (cleanup_pid && cleanup_pid == getpid()) {
-               char *pidf = lp_pid_file();
-               if (pidf && *pidf)
+       if (exit_code) /* Preserve first error code when recursing. */
+               code = exit_code;
+ 
+@@ -162,8 +155,6 @@ NORETURN void _exit_cleanup(int code, co
+ 
+               if (cleanup_fname)
+                       do_unlink(cleanup_fname);
+-              if (code)
+-                      kill_all(SIGUSR1);
+               if (cleanup_pid && cleanup_pid == getpid()) {
+                       char *pidf = lp_pid_file();
+                       if (pidf && *pidf)
 --- old/errcode.h
 +++ new/errcode.h
 @@ -37,7 +37,6 @@
@@ -760,7 +760,7 @@ After applying this patch, run these commands for a successful build:
  extern int allow_8bit_chars;
  extern int protocol_version;
  extern int preserve_times;
-@@ -76,7 +75,6 @@ struct {
+@@ -75,7 +74,6 @@ struct {
        { RERR_IPC        , "error in IPC code" },
        { RERR_CRASHED    , "sibling process crashed" },
        { RERR_TERMINATED , "sibling process terminated abnormally" },
@@ -768,9 +768,9 @@ After applying this patch, run these commands for a successful build:
        { RERR_SIGNAL     , "received SIGINT, SIGTERM, or SIGHUP" },
        { RERR_WAITCHILD  , "waitpid() failed" },
        { RERR_MALLOC     , "error allocating core memory buffers" },
-@@ -250,8 +248,8 @@ void rwrite(enum logcode code, char *buf
+@@ -241,8 +239,8 @@ void rwrite(enum logcode code, char *buf
        if (len < 0)
-               EXIT_OR_RETURN(RERR_MESSAGEIO);
+               exit_cleanup(RERR_MESSAGEIO);
  
 -      if (am_server && msg_fd_out >= 0) {
 -              /* Pass the message to our sibling. */
@@ -1035,7 +1035,7 @@ After applying this patch, run these commands for a successful build:
  int keep_partial = 0;
  int safe_symlinks = 0;
  int copy_unsafe_links = 0;
-@@ -1299,6 +1299,7 @@ int parse_arguments(int *argc, const cha
+@@ -1302,6 +1302,7 @@ int parse_arguments(int *argc, const cha
  
        if (do_progress && !verbose && !log_before_transfer && !am_server)
                verbose = 1;