Changed the style of the diff headers (use "patch -p1" now).

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

diff --git a/ODBC-dblog.diff b/ODBC-dblog.diff
index 8ffa209..ae4e47d 100644 (file)
--- a/ODBC-dblog.diff
+++ b/ODBC-dblog.diff
@@ -8,8 +8,8 @@ After applying this patch, run these commands for a successful build:
 
 See the file "instructions" (after applying this patch) for more info.
 
---- orig/Makefile.in   2006-02-06 05:03:50
-+++ Makefile.in        2005-09-23 15:59:02
+--- old/Makefile.in
++++ new/Makefile.in
 @@ -31,7 +31,7 @@ LIBOBJ=lib/wildmatch.o lib/compat.o lib/
  ZLIBOBJ=zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o \
        zlib/trees.o zlib/zutil.o zlib/adler32.o zlib/compress.o zlib/crc32.o
@@ -19,8 +19,8 @@ See the file "instructions" (after applying this patch) for more info.
  OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o \
        fileio.o batch.o clientname.o chmod.o
  OBJS3=progress.o pipe.o
---- orig/cleanup.c     2006-02-03 20:00:35
-+++ cleanup.c  2005-09-23 15:59:19
+--- old/cleanup.c
++++ new/cleanup.c
 @@ -23,6 +23,7 @@
  
  extern int io_error;
@@ -44,8 +44,8 @@ See the file "instructions" (after applying this patch) for more info.
  
        if (verbose > 2) {
                rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): about to call exit(%d)\n",
---- orig/clientserver.c        2006-02-03 20:41:03
-+++ clientserver.c     2005-09-23 15:59:36
+--- old/clientserver.c
++++ new/clientserver.c
 @@ -392,6 +392,9 @@ static int rsync_module(int f_in, int f_
                   XFLG_ABS_IF_SLASH | XFLG_OLD_PREFIXES);
  
@@ -66,8 +66,8 @@ See the file "instructions" (after applying this patch) for more info.
                } else {
                        rprintf(FLOG, "rsync %s %s from %s (%s)\n",
                                am_sender ? "on" : "to",
---- orig/configure.in  2006-02-05 04:53:34
-+++ configure.in       2005-09-24 18:38:47
+--- old/configure.in
++++ new/configure.in
 @@ -536,6 +536,12 @@ if test x"$with_included_popt" != x"yes"
      AC_CHECK_LIB(popt, poptGetContext, , [with_included_popt=yes])
  fi
@@ -81,8 +81,8 @@ See the file "instructions" (after applying this patch) for more info.
  AC_MSG_CHECKING([whether to use included libpopt])
  if test x"$with_included_popt" = x"yes"; then
      AC_MSG_RESULT($srcdir/popt)
---- orig/db_log_error-list.txt 2005-09-23 15:58:32
-+++ db_log_error-list.txt      2005-09-23 15:58:32
+--- old/db_log_error-list.txt
++++ new/db_log_error-list.txt
 @@ -0,0 +1,35 @@
 +error type            description
 +0                     not an error.
@@ -119,8 +119,8 @@ See the file "instructions" (after applying this patch) for more info.
 +31                    unlink
 +32                    failed to open file/directory
 +33                    open?
---- orig/dblog-tables-mysql.sql        2005-09-23 16:08:39
-+++ dblog-tables-mysql.sql     2005-09-23 16:08:39
+--- old/dblog-tables-mysql.sql
++++ new/dblog-tables-mysql.sql
 @@ -0,0 +1,64 @@
 +drop table transfer;
 +drop table exit;
@@ -186,8 +186,8 @@ See the file "instructions" (after applying this patch) for more info.
 +      PrimaryKey (id),
 +      foreign key (session_id) references session (id)
 +);
---- orig/dblog-tables-postgresql.sql   2005-09-23 16:00:34
-+++ dblog-tables-postgresql.sql        2005-09-23 16:00:34
+--- old/dblog-tables-postgresql.sql
++++ new/dblog-tables-postgresql.sql
 @@ -0,0 +1,67 @@
 +drop table transfer;
 +drop table exit;
@@ -256,8 +256,8 @@ See the file "instructions" (after applying this patch) for more info.
 +      Primary Key (id),
 +      foreign key (session_id) references session (id)
 +);
---- orig/dblog.c       2005-09-24 18:25:52
-+++ dblog.c    2005-09-24 18:25:52
+--- old/dblog.c
++++ new/dblog.c
 @@ -0,0 +1,549 @@
 +/*
 + *  ODBC Database logging functions
@@ -808,8 +808,8 @@ See the file "instructions" (after applying this patch) for more info.
 +              rprintf(FERROR,"Error at db_log_error: Not connected to database!\n");
 +      }
 +}
---- orig/instructions  2005-09-23 15:58:24
-+++ instructions       2005-09-23 15:58:24
+--- old/instructions
++++ new/instructions
 @@ -0,0 +1,84 @@
 +This patch adds the following options:
 +
@@ -895,8 +895,8 @@ See the file "instructions" (after applying this patch) for more info.
 +    sequence is used for unique IDs).  If False the statement will be executed
 +    after the session row is inserted (as is done when the session ID is
 +    automatically generates unique IDs).  Defaults to True.
---- orig/loadparm.c    2006-01-30 21:47:45
-+++ loadparm.c 2005-09-24 18:29:59
+--- old/loadparm.c
++++ new/loadparm.c
 @@ -120,9 +120,16 @@ typedef struct
  {
        char *auth_users;
@@ -1044,8 +1044,8 @@ See the file "instructions" (after applying this patch) for more info.
  FN_LOCAL_BOOL(lp_ignore_errors, ignore_errors)
  FN_LOCAL_BOOL(lp_ignore_nonreadable, ignore_nonreadable)
  FN_LOCAL_BOOL(lp_list, list)
---- orig/log.c 2006-02-05 04:53:34
-+++ log.c      2005-09-23 16:01:13
+--- old/log.c
++++ new/log.c
 @@ -93,7 +93,7 @@ struct {
  /*
   * Map from rsync error code to name, or return NULL.
@@ -1055,8 +1055,8 @@ See the file "instructions" (after applying this patch) for more info.
  {
        int i;
        for (i = 0; rerr_names[i].name; i++) {
---- orig/main.c        2006-02-05 04:53:34
-+++ main.c     2005-09-23 16:01:22
+--- old/main.c
++++ new/main.c
 @@ -168,6 +168,9 @@ static void handle_stats(int f)
  
        if (am_daemon) {
@@ -1067,8 +1067,8 @@ See the file "instructions" (after applying this patch) for more info.
                if (f == -1 || !am_sender)
                        return;
        }
---- orig/receiver.c    2006-01-31 02:30:18
-+++ receiver.c 2006-01-14 08:27:51
+--- old/receiver.c
++++ new/receiver.c
 @@ -174,6 +174,10 @@ static int get_tmpname(char *fnametmp, c
  
        if (maxname < 1) {
@@ -1211,8 +1211,8 @@ See the file "instructions" (after applying this patch) for more info.
                        }
                        if (!phase) {
                                SIVAL(numbuf, 0, i);
---- orig/sender.c      2006-01-14 20:27:10
-+++ sender.c   2005-09-23 16:01:44
+--- old/sender.c
++++ new/sender.c
 @@ -352,6 +352,9 @@ void send_files(struct file_list *flist,
  
                if (!log_before_transfer)