Updated to apply cleanly.

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

diff --git a/ODBC-dblog.diff b/ODBC-dblog.diff
index 86f091d..e82beeb 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-11-03 11:56:03
+--- orig/Makefile.in   2004-11-02 16:47:15
 +++ 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 \
@@ -99,10 +99,10 @@ This patch adds the following options:
  OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o \
        fileio.o batch.o clientname.o
  OBJS3=progress.o pipe.o
---- orig/cleanup.c     2005-02-07 20:41:56
+--- orig/cleanup.c     2005-03-05 18:58:38
 +++ cleanup.c  2004-07-03 20:22:18
-@@ -142,8 +142,12 @@ void _exit_cleanup(int code, const char 
-                       code = RERR_VANISHED;
+@@ -144,8 +144,12 @@ void _exit_cleanup(int code, const char 
+                       code = RERR_PARTIAL;
        }
  
 -      if (code)
@@ -115,7 +115,7 @@ This patch adds the following options:
  
        if (verbose > 2) {
                rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): about to call exit(%d)\n",
---- orig/clientserver.c        2005-03-01 03:39:47
+--- orig/clientserver.c        2005-03-01 03:39:32
 +++ clientserver.c     2004-07-03 20:22:18
 @@ -351,6 +351,9 @@ static int rsync_module(int f_in, int f_
                   XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES);
@@ -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  2005-03-01 15:57:00
+--- orig/configure.in  2005-03-16 02:19:29.819770817
 +++ 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)],
@@ -612,7 +612,7 @@ This patch adds the following options:
 +              rprintf(FERROR,"Error at db_log_exit: Not connected to database!\n");
 +      }
 +}
---- orig/loadparm.c    2005-02-20 00:02:23
+--- orig/loadparm.c    2005-02-19 17:38:51
 +++ loadparm.c 2004-07-03 20:22:18
 @@ -125,6 +125,17 @@ typedef struct
        BOOL list;
@@ -686,9 +686,9 @@ 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 2005-03-05 00:25:25
+--- orig/log.c 2005-03-16 02:19:30.009754284
 +++ log.c      2004-07-03 20:22:18
-@@ -81,7 +81,7 @@ struct {
+@@ -83,7 +83,7 @@ struct {
  /*
   * Map from rsync error code to name, or return NULL.
   */
@@ -697,7 +697,7 @@ This patch adds the following options:
  {
        int i;
        for (i = 0; rerr_names[i].name; i++) {
---- orig/main.c        2005-03-05 00:25:25
+--- orig/main.c        2005-03-16 02:19:30.077748367
 +++ main.c     2004-07-03 20:22:18
 @@ -139,6 +139,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    2005-03-05 00:25:25
+--- orig/receiver.c    2005-03-16 02:19:30.248733487
 +++ receiver.c 2005-03-05 00:31:00
-@@ -568,6 +568,9 @@ int recv_files(int f_in, struct file_lis
+@@ -618,6 +618,9 @@ int recv_files(int f_in, struct file_lis
  
                if (!log_before_transfer)
                        log_item(file, &initial_stats, iflags, NULL);
@@ -721,10 +721,10 @@ This patch adds the following options:
  
                if (fd1 != -1)
                        close(fd1);
---- orig/sender.c      2005-03-05 00:25:25
+--- orig/sender.c      2005-03-16 02:19:30.828683018
 +++ sender.c   2005-03-05 00:31:19
-@@ -323,6 +323,9 @@ void send_files(struct file_list *flist,
-               match_sums(f_out, s, mbuf, st.st_size);
+@@ -351,6 +351,9 @@ void send_files(struct file_list *flist,
+ 
                if (!log_before_transfer)
                        log_item(file, &initial_stats, iflags, NULL);
 +#if HAVE_LIBODBC