if (verbose > 2) {
rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): about to call exit(%d)\n",
---- orig/clientserver.c 2005-06-10 21:33:27
+--- orig/clientserver.c 2005-08-17 06:45:07
+++ clientserver.c 2005-05-23 23:29:31
-@@ -346,6 +346,9 @@ static int rsync_module(int f_in, int f_
+@@ -348,6 +348,9 @@ static int rsync_module(int f_in, int f_
XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES);
log_init();
+ db_log_open();
+#endif
- if (use_chroot) {
- /*
-@@ -468,6 +471,9 @@ static int rsync_module(int f_in, int f_
+ #ifdef HAVE_PUTENV
+ s = lp_prexfer_exec(i);
+@@ -524,6 +527,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",
---- orig/configure.in 2005-07-07 23:11:08
+--- orig/configure.in 2005-07-29 02:47:19
+++ configure.in 2005-05-23 23:32:21
@@ -92,6 +92,8 @@ AC_ARG_WITH(rsync-path,
[ --with-rsync-path=PATH set default --rsync-path to PATH (default: rsync)],
AC_DEFINE_UNQUOTED(RSYNC_PATH, "$RSYNC_PATH", [location of rsync on remote machine])
-@@ -546,6 +548,14 @@ then
+@@ -547,6 +549,14 @@ then
AC_CHECK_LIB(popt, poptGetContext, , [with_included_popt=yes])
fi
+ rprintf(FERROR,"Error at db_log_exit: Not connected to database!\n");
+ }
+}
---- orig/loadparm.c 2005-06-10 21:33:28
+--- orig/loadparm.c 2005-07-28 17:25:13
+++ loadparm.c 2005-05-23 23:29:42
@@ -124,6 +124,17 @@ typedef struct
BOOL list;
BOOL ignore_errors;
char *uid;
char *gid;
-@@ -159,6 +170,17 @@ static service sDefault =
+@@ -161,6 +172,17 @@ static service sDefault =
True, /* list */
True, /* use chroot */
False, /* transfer logging */
False, /* ignore errors */
NOBODY_USER,/* uid */
NOBODY_GROUP,/* gid */
-@@ -294,6 +316,17 @@ static struct parm_struct parm_table[] =
+@@ -298,6 +320,17 @@ static struct parm_struct parm_table[] =
{"include", P_STRING, P_LOCAL, &sDefault.include, NULL, 0},
{"include from", P_STRING, P_LOCAL, &sDefault.include_from,NULL, 0},
{"transfer logging", P_BOOL, P_LOCAL, &sDefault.transfer_logging,NULL,0},
{"ignore errors", P_BOOL, P_LOCAL, &sDefault.ignore_errors,NULL,0},
{"log format", P_STRING, P_LOCAL, &sDefault.log_format, NULL, 0},
{"refuse options", P_STRING, P_LOCAL, &sDefault.refuse_options,NULL, 0},
-@@ -362,6 +395,17 @@ FN_LOCAL_BOOL(lp_write_only, write_only)
+@@ -370,6 +403,17 @@ FN_LOCAL_BOOL(lp_write_only, write_only)
FN_LOCAL_BOOL(lp_list, list)
FN_LOCAL_BOOL(lp_use_chroot, use_chroot)
FN_LOCAL_BOOL(lp_transfer_logging, transfer_logging)
{
int i;
for (i = 0; rerr_names[i].name; i++) {
---- orig/main.c 2005-05-12 07:51:58
+--- orig/main.c 2005-07-27 23:31:12
+++ main.c 2005-05-23 23:30:01
-@@ -144,6 +144,9 @@ static void handle_stats(int f)
+@@ -139,6 +139,9 @@ static void handle_stats(int f)
if (am_daemon) {
log_exit(0, __FILE__, __LINE__);
if (f == -1 || !am_sender)
return;
}
---- orig/receiver.c 2005-04-14 01:53:12
+--- orig/receiver.c 2005-08-17 06:45:08
+++ receiver.c 2005-05-23 23:30:07
-@@ -640,6 +640,9 @@ int recv_files(int f_in, struct file_lis
+@@ -668,6 +668,9 @@ int recv_files(int f_in, struct file_lis
if (!log_before_transfer)
log_item(file, &initial_stats, iflags, NULL);
if (fd1 != -1)
close(fd1);
---- orig/sender.c 2005-05-19 08:52:42
+--- orig/sender.c 2005-07-28 01:46:25
+++ sender.c 2005-05-23 23:30:15
-@@ -347,6 +347,9 @@ void send_files(struct file_list *flist,
+@@ -356,6 +356,9 @@ void send_files(struct file_list *flist,
if (!log_before_transfer)
log_item(file, &initial_stats, iflags, NULL);
the file's name.
---- orig/Makefile.in 2004-11-02 16:47:15
+--- orig/Makefile.in 2005-07-07 23:11:07
+++ Makefile.in 2004-07-03 20:20:15
-@@ -35,7 +35,7 @@ OBJS1=rsync.o generator.o receiver.o cle
+@@ -34,7 +34,7 @@ OBJS1=rsync.o generator.o receiver.o cle
main.o checksum.o match.o syscall.o log.o backup.o
OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o \
fileio.o batch.o clientname.o
+}
+
+#endif
---- orig/options.c 2005-05-19 08:52:42
+--- orig/options.c 2005-08-27 21:11:26
+++ options.c 2005-05-19 08:55:42
@@ -141,6 +141,7 @@ char *log_format = NULL;
char *password_file = NULL;
char backup_dir_buf[MAXPATHLEN];
int rsync_port = 0;
int compare_dest = 0;
-@@ -321,6 +322,7 @@ void usage(enum logcode F)
+@@ -322,6 +323,7 @@ void usage(enum logcode F)
rprintf(F," --compare-dest=DIR also compare destination files relative to DIR\n");
rprintf(F," --copy-dest=DIR ... and include copies of unchanged files\n");
rprintf(F," --link-dest=DIR hardlink to files in DIR when unchanged\n");
OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH, OPT_MAX_SIZE,
OPT_REFUSED_BASE = 9000};
-@@ -432,6 +434,7 @@ static struct poptOption long_options[]
+@@ -446,6 +448,7 @@ static struct poptOption long_options[]
{"compare-dest", 0, POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
{"copy-dest", 0, POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
{"link-dest", 0, POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 },
+ {"link-by-hash", 0, POPT_ARG_STRING, 0, OPT_LINK_BY_HASH, 0, 0},
{"fuzzy", 'y', POPT_ARG_NONE, &fuzzy_basis, 0, 0, 0 },
- /* TODO: Should this take an optional int giving the compression level? */
{"compress", 'z', POPT_ARG_NONE, &do_compression, 0, 0, 0 },
-@@ -876,6 +879,21 @@ int parse_arguments(int *argc, const cha
+ {0, 'P', POPT_ARG_NONE, 0, 'P', 0, 0 },
+@@ -916,6 +919,21 @@ int parse_arguments(int *argc, const cha
basis_dir[basis_dir_cnt++] = (char *)arg;
break;
default:
/* A large opt value means that set_refuse_options()
* turned this option off. */
-@@ -1458,6 +1476,11 @@ void server_options(char **args,int *arg
+@@ -1507,6 +1525,11 @@ void server_options(char **args,int *arg
}
}
if (files_from && (!am_sender || filesfrom_host)) {
if (filesfrom_host) {
args[ac++] = "--files-from";
---- orig/receiver.c 2005-04-14 01:53:12
+--- orig/receiver.c 2005-08-17 06:45:08
+++ receiver.c 2005-01-15 21:29:13
-@@ -52,6 +52,7 @@ extern int delay_updates;
+@@ -53,6 +53,7 @@ extern int delay_updates;
extern struct stats stats;
extern char *log_format;
extern char *tmpdir;
extern char *partial_dir;
extern char *basis_dir[];
extern struct file_list *the_file_list;
-@@ -185,12 +186,13 @@ static int get_tmpname(char *fnametmp, c
+@@ -186,12 +187,13 @@ static int get_tmpname(char *fnametmp, c
static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
int32 len;
OFF_T offset = 0;
OFF_T offset2;
-@@ -210,6 +212,9 @@ static int receive_data(int f_in, char *
+@@ -211,6 +213,9 @@ static int receive_data(int f_in, char *
} else
mapbuf = NULL;
+
sum_init(checksum_seed);
- while ((i = recv_token(f_in, &data)) != 0) {
-@@ -226,6 +231,8 @@ static int receive_data(int f_in, char *
+ if (append_mode) {
+@@ -253,6 +258,8 @@ static int receive_data(int f_in, char *
cleanup_got_literal = 1;
sum_update(data, i);
if (fd != -1 && write_file(fd,data,i) != i)
goto report_write_error;
-@@ -252,6 +259,8 @@ static int receive_data(int f_in, char *
+@@ -279,6 +286,8 @@ static int receive_data(int f_in, char *
see_token(map, len);
sum_update(map, len);
}
if (inplace) {
-@@ -292,6 +301,8 @@ static int receive_data(int f_in, char *
+@@ -319,6 +328,8 @@ static int receive_data(int f_in, char *
}
sum_end(file_sum1);
if (mapbuf)
unmap_file(mapbuf);
-@@ -307,7 +318,7 @@ static int receive_data(int f_in, char *
+@@ -334,7 +345,7 @@ static int receive_data(int f_in, char *
static void discard_receive_data(int f_in, OFF_T length)
{
}
static void handle_delayed_updates(struct file_list *flist, char *local_name)
-@@ -635,8 +646,12 @@ int recv_files(int f_in, struct file_lis
+@@ -663,8 +674,12 @@ int recv_files(int f_in, struct file_lis
rprintf(FINFO, "%s\n", safe_fname(fname));
/* recv file data */
if (!log_before_transfer)
log_item(file, &initial_stats, iflags, NULL);
---- orig/rsync.c 2005-03-16 02:19:30
+--- orig/rsync.c 2005-07-27 23:31:12
+++ rsync.c 2005-02-21 11:04:36
@@ -38,6 +38,7 @@ extern int inplace;
extern int keep_dirlinks;
/*
-@@ -188,7 +189,12 @@ void finish_transfer(char *fname, char *
+@@ -190,7 +191,12 @@ void finish_transfer(char *fname, char *
rprintf(FINFO, "renaming %s to %s\n",
safe_fname(fnametmp), safe_fname(fname));
}
if (ret < 0) {
rsyserr(FERROR, errno, "%s %s -> \"%s\"",
ret == -2 ? "copy" : "rename",
---- orig/rsync.h 2005-05-03 17:11:01
+--- orig/rsync.h 2005-08-17 06:45:08
+++ rsync.h 2004-07-03 20:20:15
-@@ -631,6 +631,14 @@ struct stats {
+@@ -639,6 +639,14 @@ struct stats {
int current_file_index;
};
#include "byteorder.h"
#include "lib/mdfour.h"
---- orig/rsync.yo 2005-05-22 20:53:34
+--- orig/rsync.yo 2005-08-27 21:05:12
+++ rsync.yo 2005-02-13 06:58:47
@@ -356,6 +356,7 @@ to the detailed description below for a
--compare-dest=DIR also compare received files relative to DIR