Updated to apply cleanly.

[rsync/rsync-patches.git] / ODBC-dblog.diff

diff --git a/ODBC-dblog.diff b/ODBC-dblog.diff
index 400247d..2cfa9a6 100644 (file)
--- a/ODBC-dblog.diff
+++ b/ODBC-dblog.diff
@@ -88,7 +88,7 @@ This patch adds the following options:
     automatically generates unique IDs).  Defaults to True.
 
 
---- 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:18
 @@ -32,7 +32,7 @@ ZLIBOBJ=zlib/deflate.o zlib/infblock.o z
        zlib/inflate.o zlib/inftrees.o zlib/infutil.o zlib/trees.o \
@@ -137,7 +137,7 @@ This patch adds the following options:
                } else {
                        rprintf(FLOG, "rsync %s %s from %s (%s)\n",
                                am_sender ? "on" : "to",
---- 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:18
 @@ -94,6 +94,8 @@ AC_ARG_WITH(rsync-path,
        [  --with-rsync-path=PATH  set default --rsync-path to PATH (default: rsync)],
@@ -686,7 +686,7 @@ This patch adds the following options:
  FN_LOCAL_BOOL(lp_ignore_errors, ignore_errors)
  FN_LOCAL_BOOL(lp_ignore_nonreadable, ignore_nonreadable)
  FN_LOCAL_STRING(lp_uid, uid)
---- orig/log.c 2004-06-09 15:34:38
+--- orig/log.c 2004-09-07 19:54:51
 +++ log.c      2004-07-03 20:22:18
 @@ -75,7 +75,7 @@ struct {
  /*
@@ -697,7 +697,7 @@ This patch adds the following options:
  {
        int i;
        for (i = 0; rerr_names[i].name; i++) {
---- orig/main.c        2004-08-05 18:24:21
+--- orig/main.c        2004-09-18 01:49:33
 +++ main.c     2004-07-03 20:22:18
 @@ -136,6 +136,9 @@ static void report(int f)
  
@@ -709,9 +709,9 @@ This patch adds the following options:
                if (f == -1 || !am_sender)
                        return;
        }
---- orig/receiver.c    2004-08-03 15:34:32
+--- orig/receiver.c    2004-09-21 09:40:27
 +++ receiver.c 2004-07-20 21:47:47
-@@ -545,6 +545,9 @@ int recv_files(int f_in, struct file_lis
+@@ -546,6 +546,9 @@ int recv_files(int f_in, struct file_lis
                                       fname, fd2, file->length);
  
                log_recv(file, &initial_stats);
@@ -721,9 +721,9 @@ This patch adds the following options:
  
                if (fd1 != -1)
                        close(fd1);
---- orig/sender.c      2004-08-03 15:34:32
+--- orig/sender.c      2004-09-20 05:10:48
 +++ sender.c   2004-07-15 02:37:48
-@@ -234,6 +234,9 @@ void send_files(struct file_list *flist,
+@@ -239,6 +239,9 @@ void send_files(struct file_list *flist,
  
                match_sums(f_out, s, mbuf, st.st_size);
                log_send(file, &initial_stats);