automatically generates unique IDs). Defaults to True.
---- Makefile.in 15 May 2004 00:48:11 -0000 1.101
-+++ Makefile.in 30 Jun 2004 00:03:29 -0000
+--- 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 \
zlib/zutil.o zlib/adler32.o
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
---- cleanup.c 13 May 2004 07:08:18 -0000 1.22
-+++ cleanup.c 30 Jun 2004 00:03:29 -0000
-@@ -140,7 +140,12 @@ void _exit_cleanup(int code, const char
+--- orig/cleanup.c 2004-07-29 16:08:03
++++ cleanup.c 2004-07-03 20:22:18
+@@ -139,8 +139,12 @@ void _exit_cleanup(int code, const char
code = RERR_VANISHED;
}
-- if (code) log_exit(code, file, line);
+- if (code)
+ if (code) {
-+ log_exit(code, file, line);
+ log_exit(code, file, line);
+#ifdef HAVE_LIBODBC
+ db_log_exit(code,file,line);
+#endif
if (verbose > 2) {
rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): about to call exit(%d)\n",
---- clientserver.c 13 Jun 2004 14:18:48 -0000 1.127
-+++ clientserver.c 30 Jun 2004 00:03:29 -0000
-@@ -315,6 +315,9 @@ static int rsync_module(int f_in, int f_
+--- orig/clientserver.c 2004-08-02 02:29:16
++++ clientserver.c 2004-07-03 20:22:18
+@@ -322,6 +322,9 @@ static int rsync_module(int f_in, int f_
exclude_path_prefix = NULL;
log_init();
if (use_chroot) {
/*
-@@ -433,6 +436,9 @@ static int rsync_module(int f_in, int f_
+@@ -440,6 +443,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);
} else {
rprintf(FLOG, "rsync %s %s from %s (%s)\n",
am_sender ? "on" : "to",
---- configure.in 30 Apr 2004 18:03:33 -0000 1.196
-+++ configure.in 30 Jun 2004 00:03:29 -0000
+--- orig/configure.in 2004-09-23 17:42:07
++++ 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)],
[ RSYNC_PATH="$with_rsync_path" ],
AC_DEFINE_UNQUOTED(RSYNC_PATH, "$RSYNC_PATH", [location of rsync on remote machine])
-@@ -465,6 +467,14 @@ then
+@@ -466,6 +468,14 @@ then
AC_CHECK_LIB(popt, poptGetContext, , [with_included_popt=yes])
fi
AC_MSG_CHECKING([whether to use included libpopt])
if test x"$with_included_popt" = x"yes"
then
---- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ dblog-tables-mysql.sql 30 Jun 2004 00:03:29 -0000
+--- orig/dblog-tables-mysql.sql 2004-07-02 21:35:58
++++ dblog-tables-mysql.sql 2004-07-02 21:35:58
@@ -0,0 +1,43 @@
+drop table transfer;
+drop table exit;
+ Primary Key (id),
+ foreign key (session_id) references session (id)
+);
---- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ dblog-tables-postgresql.sql 30 Jun 2004 00:03:29 -0000
+--- orig/dblog-tables-postgresql.sql 2004-07-02 21:35:58
++++ dblog-tables-postgresql.sql 2004-07-02 21:35:58
@@ -0,0 +1,45 @@
+drop table transfer;
+drop table exit;
+ Primary Key (id),
+ foreign key (session_id) references session (id)
+);
---- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ dblog.c 30 Jun 2004 00:03:30 -0000
+--- orig/dblog.c 2004-07-02 21:35:58
++++ dblog.c 2004-07-02 21:35:58
@@ -0,0 +1,352 @@
+/*
+ * ODBC Database logging functions
+ rprintf(FERROR,"Error at db_log_exit: Not connected to database!\n");
+ }
+}
---- loadparm.c 19 May 2004 22:19:19 -0000 1.51
-+++ loadparm.c 30 Jun 2004 00:03:30 -0000
+--- orig/loadparm.c 2004-07-31 16:41:04
++++ loadparm.c 2004-07-03 20:22:18
@@ -123,6 +123,17 @@ typedef struct
BOOL list;
BOOL use_chroot;
FN_LOCAL_BOOL(lp_ignore_errors, ignore_errors)
FN_LOCAL_BOOL(lp_ignore_nonreadable, ignore_nonreadable)
FN_LOCAL_STRING(lp_uid, uid)
---- log.c 7 Jun 2004 22:51:14 -0000 1.74
-+++ log.c 30 Jun 2004 00:03:30 -0000
+--- orig/log.c 2004-09-07 19:54:51
++++ log.c 2004-07-03 20:22:18
@@ -75,7 +75,7 @@ struct {
/*
* Map from rsync error code to name, or return NULL.
{
int i;
for (i = 0; rerr_names[i].name; i++) {
---- main.c 28 Jun 2004 17:45:40 -0000 1.201
-+++ main.c 30 Jun 2004 00:03:30 -0000
-@@ -121,6 +121,9 @@ static void report(int f)
+--- orig/main.c 2004-09-29 17:58:26
++++ main.c 2004-07-03 20:22:18
+@@ -136,6 +136,9 @@ static void report(int f)
if (am_daemon) {
log_exit(0, __FILE__, __LINE__);
if (f == -1 || !am_sender)
return;
}
---- receiver.c 29 Jun 2004 15:12:01 -0000 1.83
-+++ receiver.c 30 Jun 2004 00:03:30 -0000
-@@ -463,7 +463,9 @@ int recv_files(int f_in,struct file_list
- recv_ok = receive_data(f_in,mapbuf,fd2,fname,file->length);
+--- orig/receiver.c 2004-09-21 09:40:27
++++ receiver.c 2004-07-20 21:47:47
+@@ -546,6 +546,9 @@ int recv_files(int f_in, struct file_lis
+ fname, fd2, file->length);
log_recv(file, &initial_stats);
--
+#ifdef HAVE_LIBODBC
-+ db_log_transfer(file, &initial_stats,"receive");
++ db_log_transfer(file, &initial_stats, "receive");
+#endif
- if (mapbuf) unmap_file(mapbuf);
- if (fd1 != -1) {
+
+ if (fd1 != -1)
close(fd1);
---- sender.c 18 Jun 2004 16:55:12 -0000 1.41
-+++ sender.c 30 Jun 2004 00:03:30 -0000
-@@ -281,6 +281,9 @@ void send_files(struct file_list *flist,
- } else { /* not read_batch */
- match_sums(f_out, s, mbuf, st.st_size);
- log_send(file, &initial_stats);
+--- orig/sender.c 2004-09-20 05:10:48
++++ sender.c 2004-07-15 02:37:48
+@@ -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);
+#ifdef HAVE_LIBODBC
-+ db_log_transfer(file, &initial_stats,"send");
++ db_log_transfer(file, &initial_stats,"send");
+#endif
- }
- if (!read_batch) {
+ if (mbuf) {
+ j = unmap_file(mbuf);
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff