Got rid of some patch fuzz.

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

diff --git a/ODBC-dblog.diff b/ODBC-dblog.diff
index 22515d8..b6f44f2 100644 (file)
--- a/ODBC-dblog.diff
+++ b/ODBC-dblog.diff
@@ -99,7 +99,7 @@ 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-01-28 23:01:07
+--- orig/cleanup.c     2005-02-07 20:41:56
 +++ cleanup.c  2004-07-03 20:22:18
 @@ -142,8 +142,12 @@ void _exit_cleanup(int code, const char 
                        code = RERR_VANISHED;
@@ -115,10 +115,10 @@ 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-02-01 10:39:22
+--- orig/clientserver.c        2005-02-14 02:45:10
 +++ clientserver.c     2004-07-03 20:22:18
 @@ -344,6 +344,9 @@ static int rsync_module(int f_in, int f_
-           XFLG_WORD_SPLIT | XFLG_ANCHORED2ABS | XFLG_DEF_EXCLUDE);
+                  XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES);
  
        log_init();
 +#if HAVE_LIBODBC
@@ -127,7 +127,7 @@ This patch adds the following options:
  
        if (use_chroot) {
                /*
-@@ -463,6 +466,9 @@ static int rsync_module(int f_in, int f_
+@@ -466,6 +469,9 @@ static int rsync_module(int f_in, int f_
                        rprintf(FLOG, "rsync %s %s from %s@%s (%s)\n",
                                am_sender ? "on" : "to",
                                request, auth_user, host, addr);
@@ -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-02-01 10:39:22
+--- orig/log.c 2005-02-16 15:35:53
 +++ log.c      2004-07-03 20:22:18
-@@ -75,7 +75,7 @@ struct {
+@@ -77,7 +77,7 @@ struct {
  /*
   * Map from rsync error code to name, or return NULL.
   */
@@ -697,9 +697,9 @@ This patch adds the following options:
  {
        int i;
        for (i = 0; rerr_names[i].name; i++) {
---- orig/main.c        2005-01-30 10:07:21
+--- orig/main.c        2005-02-15 19:27:04
 +++ main.c     2004-07-03 20:22:18
-@@ -137,6 +137,9 @@ static void report(int f)
+@@ -136,6 +136,9 @@ static void report(int f)
  
        if (am_daemon) {
                log_exit(0, __FILE__, __LINE__);
@@ -709,24 +709,24 @@ This patch adds the following options:
                if (f == -1 || !am_sender)
                        return;
        }
---- orig/receiver.c    2005-02-03 02:04:20
-+++ receiver.c 2004-07-20 21:47:47
-@@ -504,6 +504,9 @@ int recv_files(int f_in, struct file_lis
-                                      fname, fd2, file->length);
+--- orig/receiver.c    2005-02-16 15:35:53
++++ receiver.c 2005-02-16 15:40:15
+@@ -560,6 +560,9 @@ int recv_files(int f_in, struct file_lis
  
-               log_recv(file, &initial_stats);
+               if (!log_before_transfer)
+                       log_recv(file, &initial_stats, iflags);
 +#if HAVE_LIBODBC
 +              db_log_transfer(file, &initial_stats, "receive");
 +#endif
  
                if (fd1 != -1)
                        close(fd1);
---- orig/sender.c      2005-02-03 02:04:20
-+++ sender.c   2004-07-15 02:37:48
-@@ -236,6 +236,9 @@ void send_files(struct file_list *flist,
- 
+--- orig/sender.c      2005-02-16 15:35:54
++++ sender.c   2005-02-16 15:40:44
+@@ -263,6 +263,9 @@ void send_files(struct file_list *flist,
                match_sums(f_out, s, mbuf, st.st_size);
-               log_send(file, &initial_stats);
+               if (!log_before_transfer)
+                       log_send(file, &initial_stats, iflags);
 +#if HAVE_LIBODBC
 +              db_log_transfer(file, &initial_stats,"send");
 +#endif