Updated to apply cleanly.

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

diff --git a/ODBC-dblog.diff b/ODBC-dblog.diff
index 4871be9..eff227f 100644 (file)
--- a/ODBC-dblog.diff
+++ b/ODBC-dblog.diff
@@ -13,7 +13,7 @@ dblog.c file has a compile problem, it's probably my fault...)
 
 
 --- Makefile.in        10 Feb 2004 17:06:11 -0000      1.98
-+++ Makefile.in        24 Apr 2004 08:14:37 -0000
++++ Makefile.in        30 Apr 2004 18:08:05 -0000
 @@ -32,7 +32,7 @@ ZLIBOBJ=zlib/deflate.o zlib/infblock.o z
        zlib/inflate.o zlib/inftrees.o zlib/infutil.o zlib/trees.o \
        zlib/zutil.o zlib/adler32.o
@@ -24,7 +24,7 @@ dblog.c file has a compile problem, it's probably my fault...)
        fileio.o batch.o clientname.o
  OBJS3=progress.o pipe.o
 --- /dev/null  1 Jan 1970 00:00:00 -0000
-+++ README-ODBC        24 Apr 2004 08:14:37 -0000
++++ README-ODBC        30 Apr 2004 18:08:05 -0000
 @@ -0,0 +1,80 @@
 +This patch adds the following options:
 +
@@ -107,7 +107,7 @@ dblog.c file has a compile problem, it's probably my fault...)
 +unique IDs).
 +Defaults to True.
 --- cleanup.c  27 Jan 2004 08:14:33 -0000      1.21
-+++ cleanup.c  24 Apr 2004 08:14:37 -0000
++++ cleanup.c  30 Apr 2004 18:08:06 -0000
 @@ -138,7 +138,12 @@ void _exit_cleanup(int code, const char 
                        code = RERR_VANISHED;
        }
@@ -123,7 +123,7 @@ dblog.c file has a compile problem, it's probably my fault...)
        if (verbose > 2)
                rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): about to call exit(%d)\n", 
 --- clientserver.c     14 Apr 2004 23:33:34 -0000      1.121
-+++ clientserver.c     24 Apr 2004 08:14:37 -0000
++++ clientserver.c     30 Apr 2004 18:08:06 -0000
 @@ -311,6 +311,9 @@ static int rsync_module(int f_in, int f_
        exclude_path_prefix = NULL;
  
@@ -144,8 +144,8 @@ dblog.c file has a compile problem, it's probably my fault...)
                } else {
                        rprintf(FINFO,"rsync %s %s from %s (%s)\n",
                                am_sender?"on":"to",
---- configure.in       17 Apr 2004 18:40:16 -0000      1.191
-+++ configure.in       24 Apr 2004 08:14:38 -0000
+--- configure.in       30 Apr 2004 18:03:33 -0000      1.196
++++ configure.in       30 Apr 2004 18:08:06 -0000
 @@ -94,6 +94,8 @@ AC_ARG_WITH(rsync-path,
        [  --with-rsync-path=PATH  set default --rsync-path to PATH (default: rsync)],
        [ RSYNC_PATH="$with_rsync_path" ],
@@ -155,7 +155,7 @@ dblog.c file has a compile problem, it's probably my fault...)
  
  AC_DEFINE_UNQUOTED(RSYNC_PATH, "$RSYNC_PATH", [location of rsync on remote machine])
  
-@@ -458,6 +460,14 @@ fi
+@@ -463,6 +465,14 @@ fi
  if test x"$with_included_popt" != x"yes"
  then
      AC_CHECK_LIB(popt, poptGetContext, , [with_included_popt=yes])
@@ -171,7 +171,7 @@ dblog.c file has a compile problem, it's probably my fault...)
  
  AC_MSG_CHECKING([whether to use included libpopt])
 --- /dev/null  1 Jan 1970 00:00:00 -0000
-+++ dblog-tables-mysql.sql     24 Apr 2004 08:14:38 -0000
++++ dblog-tables-mysql.sql     30 Apr 2004 18:08:06 -0000
 @@ -0,0 +1,43 @@
 +drop table transfer;
 +drop table exit;
@@ -217,7 +217,7 @@ dblog.c file has a compile problem, it's probably my fault...)
 +      foreign key (session_id) references session (id)
 +);
 --- /dev/null  1 Jan 1970 00:00:00 -0000
-+++ dblog-tables-postgresql.sql        24 Apr 2004 08:14:38 -0000
++++ dblog-tables-postgresql.sql        30 Apr 2004 18:08:06 -0000
 @@ -0,0 +1,45 @@
 +drop table transfer;
 +drop table exit;
@@ -265,7 +265,7 @@ dblog.c file has a compile problem, it's probably my fault...)
 +      foreign key (session_id) references session (id)
 +);
 --- /dev/null  1 Jan 1970 00:00:00 -0000
-+++ dblog.c    24 Apr 2004 08:14:38 -0000
++++ dblog.c    30 Apr 2004 18:08:06 -0000
 @@ -0,0 +1,352 @@
 +/*
 + *  ODBC Database logging functions
@@ -620,7 +620,7 @@ dblog.c file has a compile problem, it's probably my fault...)
 +      }
 +}
 --- loadparm.c 4 Feb 2004 07:31:29 -0000       1.50
-+++ loadparm.c 24 Apr 2004 08:14:38 -0000
++++ loadparm.c 30 Apr 2004 18:08:07 -0000
 @@ -122,6 +122,17 @@ typedef struct
        BOOL list;
        BOOL use_chroot;
@@ -693,8 +693,8 @@ dblog.c file has a compile problem, it's probably my fault...)
  FN_LOCAL_BOOL(lp_ignore_errors, ignore_errors)
  FN_LOCAL_BOOL(lp_ignore_nonreadable, ignore_nonreadable)
  FN_LOCAL_STRING(lp_uid, uid)
---- log.c      20 Jan 2004 05:15:14 -0000      1.71
-+++ log.c      24 Apr 2004 08:14:38 -0000
+--- log.c      29 Apr 2004 19:34:31 -0000      1.72
++++ log.c      30 Apr 2004 18:08:07 -0000
 @@ -75,7 +75,7 @@ struct {
  /*
   * Map from rsync error code to name, or return NULL.
@@ -705,7 +705,7 @@ dblog.c file has a compile problem, it's probably my fault...)
        int i;
        for (i = 0; rerr_names[i].name; i++) {
 --- main.c     10 Feb 2004 03:54:47 -0000      1.192
-+++ main.c     24 Apr 2004 08:14:38 -0000
++++ main.c     30 Apr 2004 18:08:07 -0000
 @@ -120,6 +120,9 @@ static void report(int f)
  
        if (am_daemon) {
@@ -717,7 +717,7 @@ dblog.c file has a compile problem, it's probably my fault...)
        }
  
 --- proto.h    22 Apr 2004 09:58:09 -0000      1.189
-+++ proto.h    24 Apr 2004 08:14:38 -0000
++++ proto.h    30 Apr 2004 18:08:07 -0000
 @@ -51,6 +51,12 @@ int start_daemon(int f_in, int f_out);
  int daemon_main(void);
  void setup_protocol(int f_out,int f_in);
@@ -757,8 +757,8 @@ dblog.c file has a compile problem, it's probably my fault...)
  void log_init(void);
  void log_open(void);
  void log_close(void);
---- receiver.c 23 Mar 2004 16:50:40 -0000      1.75
-+++ receiver.c 24 Apr 2004 08:14:39 -0000
+--- receiver.c 27 Apr 2004 19:51:33 -0000      1.76
++++ receiver.c 30 Apr 2004 18:08:08 -0000
 @@ -453,7 +453,9 @@ int recv_files(int f_in,struct file_list
                recv_ok = receive_data(f_in,mapbuf,fd2,fname,file->length);
  
@@ -771,7 +771,7 @@ dblog.c file has a compile problem, it's probably my fault...)
                if (fd1 != -1) {
                        close(fd1);
 --- sender.c   17 Feb 2004 21:57:44 -0000      1.38
-+++ sender.c   24 Apr 2004 08:14:39 -0000
++++ sender.c   30 Apr 2004 18:08:08 -0000
 @@ -283,6 +283,9 @@ void send_files(struct file_list *flist,
                } else  {
                        match_sums(f_out, s, buf, st.st_size);