Updated to apply cleanly.

[rsync/rsync-patches.git] / openssl-support.diff

diff --git a/openssl-support.diff b/openssl-support.diff
index ded6bdb..4e265b1 100644 (file)
--- a/openssl-support.diff
+++ b/openssl-support.diff
@@ -37,7 +37,7 @@ All warnings apply; I don't do C programming all that often, so I
 can't say if I've left any cleanup/compatibility errors in the code.
 
 
---- orig/Makefile.in   2004-08-09 21:07:09
+--- orig/Makefile.in   2004-08-13 07:18:58
 +++ Makefile.in        2004-07-03 20:22:28
 @@ -39,7 +39,7 @@ OBJS3=progress.o pipe.o
  DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o
@@ -189,7 +189,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
        if (*line == '#') {
                /* it's some sort of command that I don't understand */
                io_printf(f_out, "@ERROR: Unknown command '%s'\n", line);
---- orig/configure.in  2004-08-02 21:56:58
+--- orig/configure.in  2004-08-13 07:18:59
 +++ configure.in       2004-07-03 20:22:28
 @@ -271,6 +271,21 @@ yes
        AC_SEARCH_LIBS(getaddrinfo, inet6)
@@ -213,7 +213,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
  AC_MSG_CHECKING([whether to call shutdown on all sockets])
  case $host_os in
        *cygwin* ) AC_MSG_RESULT(yes)
---- orig/main.c        2004-08-05 18:24:21
+--- orig/main.c        2004-09-18 01:49:33
 +++ main.c     2004-07-15 02:40:51
 @@ -56,6 +56,9 @@ extern int write_batch;
  extern int batch_fd;
@@ -260,8 +260,8 @@ can't say if I've left any cleanup/compatibility errors in the code.
 +              host = argv[0] + url_prefix;
                p = strchr(host,'/');
                if (p) {
-                       *p = 0;
-@@ -820,12 +837,27 @@ static int start_client(int argc, char *
+                       *p = '\0';
+@@ -825,12 +842,27 @@ static int start_client(int argc, char *
                        argv++;
                } else { /* source is local */
                        am_sender = 1;
@@ -290,8 +290,8 @@ can't say if I've left any cleanup/compatibility errors in the code.
 +                              host = argv[argc-1] + url_prefix;
                                p = strchr(host,'/');
                                if (p) {
-                                       *p = 0;
---- orig/options.c     2004-08-11 23:42:23
+                                       *p = '\0';
+--- orig/options.c     2004-09-20 05:10:48
 +++ options.c  2004-07-16 20:19:50
 @@ -135,6 +135,14 @@ int quiet = 0;
  int always_checksum = 0;
@@ -377,7 +377,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
    {0,0,0,0, 0, 0, 0}
  };
  
-@@ -620,6 +647,12 @@ int parse_arguments(int *argc, const cha
+@@ -616,6 +643,12 @@ int parse_arguments(int *argc, const cha
                        return 0;
  #endif
  
@@ -390,7 +390,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 (opt-BASE is its index). */
-@@ -811,6 +844,17 @@ int parse_arguments(int *argc, const cha
+@@ -807,6 +840,17 @@ int parse_arguments(int *argc, const cha
        if (do_progress && !verbose)
                verbose = 1;