Matt McCutchen's Web Site
/
rsync
/
rsync-patches.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding the manpage writeup from Matt.
[rsync/rsync-patches.git]
/
ODBC-dblog.diff
diff --git
a/ODBC-dblog.diff
b/ODBC-dblog.diff
index
4b70c94
..
f0ef396
100644
(file)
--- a/
ODBC-dblog.diff
+++ b/
ODBC-dblog.diff
@@
-14,10
+14,10
@@
See the newly-created file "instructions" for more info.
@@ -32,7 +32,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
@@ -32,7 +32,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
- OBJS1=
rsync.o generator.o receiver.o cleanup.o sender.o exclude.o util
.o \
-- main.o checksum.o match.o syscall.o log.o backup.o
-+ main.o checksum.o match.o syscall.o log.o backup.o @EXTRA_OBJECT@
- OBJS2=options.o
flist.o
io.o compat.o hlink.o token.o uidlist.o socket.o \
+ OBJS1=
flist.o rsync.o generator.o receiver.o cleanup.o sender.o exclude
.o \
+-
util.o
main.o checksum.o match.o syscall.o log.o backup.o
++
util.o
main.o checksum.o match.o syscall.o log.o backup.o @EXTRA_OBJECT@
+ OBJS2=options.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
--- old/cleanup.c
fileio.o batch.o clientname.o chmod.o
OBJS3=progress.o pipe.o
--- old/cleanup.c
@@
-47,7
+47,7
@@
See the newly-created file "instructions" for more info.
#include "case_N.h"
--- old/clientserver.c
+++ new/clientserver.c
#include "case_N.h"
--- old/clientserver.c
+++ new/clientserver.c
-@@ -39
4,6 +394
,9 @@ static int rsync_module(int f_in, int f_
+@@ -39
6,6 +396
,9 @@ static int rsync_module(int f_in, int f_
XFLG_ABS_IF_SLASH | XFLG_OLD_PREFIXES);
log_init(1);
XFLG_ABS_IF_SLASH | XFLG_OLD_PREFIXES);
log_init(1);
@@
-57,7
+57,7
@@
See the newly-created file "instructions" for more info.
#ifdef HAVE_PUTENV
if (*lp_prexfer_exec(i) || *lp_postxfer_exec(i)) {
#ifdef HAVE_PUTENV
if (*lp_prexfer_exec(i) || *lp_postxfer_exec(i)) {
-@@ -63
3,6 +636
,9 @@ static int rsync_module(int f_in, int f_
+@@ -63
5,6 +638
,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);
rprintf(FLOG, "rsync %s %s from %s@%s (%s)\n",
am_sender ? "on" : "to",
request, auth_user, host, addr);
@@
-1119,7
+1119,7
@@
See the newly-created file "instructions" for more info.
} else {
if (remove_source_files
|| (preserve_hard_links && F_IS_HLINKED(file)))
} else {
if (remove_source_files
|| (preserve_hard_links && F_IS_HLINKED(file)))
-@@ -41
9,6 +441
,9 @@ int recv_files(int f_in, struct file_lis
+@@ -41
4,6 +436
,9 @@ int recv_files(int f_in, struct file_lis
if (server_filter_list.head
&& check_filter(&server_filter_list, fname, 0) < 0) {
rprintf(FERROR, "attempt to hack rsync failed.\n");
if (server_filter_list.head
&& check_filter(&server_filter_list, fname, 0) < 0) {
rprintf(FERROR, "attempt to hack rsync failed.\n");
@@
-1129,7
+1129,7
@@
See the newly-created file "instructions" for more info.
exit_cleanup(RERR_PROTOCOL);
}
exit_cleanup(RERR_PROTOCOL);
}
-@@ -47
5,6 +500
,11 @@ int recv_files(int f_in, struct file_lis
+@@ -47
0,6 +495
,11 @@ int recv_files(int f_in, struct file_lis
rprintf(FERROR,
"invalid basis_dir index: %d.\n",
fnamecmp_type);
rprintf(FERROR,
"invalid basis_dir index: %d.\n",
fnamecmp_type);
@@
-1141,7
+1141,7
@@
See the newly-created file "instructions" for more info.
exit_cleanup(RERR_PROTOCOL);
}
pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
exit_cleanup(RERR_PROTOCOL);
}
pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
-@@ -5
23,6 +553
,9 @@ int recv_files(int f_in, struct file_lis
+@@ -5
18,6 +548
,9 @@ int recv_files(int f_in, struct file_lis
} else if (do_fstat(fd1,&st) != 0) {
rsyserr(FERROR, errno, "fstat %s failed",
full_fname(fnamecmp));
} else if (do_fstat(fd1,&st) != 0) {
rsyserr(FERROR, errno, "fstat %s failed",
full_fname(fnamecmp));
@@
-1151,7
+1151,7
@@
See the newly-created file "instructions" for more info.
discard_receive_data(f_in, F_LENGTH(file));
close(fd1);
continue;
discard_receive_data(f_in, F_LENGTH(file));
close(fd1);
continue;
-@@ -53
6,6 +569
,9 @@ int recv_files(int f_in, struct file_lis
+@@ -53
1,6 +564
,9 @@ int recv_files(int f_in, struct file_lis
*/
rprintf(FERROR,"recv_files: %s is a directory\n",
full_fname(fnamecmp));
*/
rprintf(FERROR,"recv_files: %s is a directory\n",
full_fname(fnamecmp));
@@
-1161,7
+1161,7
@@
See the newly-created file "instructions" for more info.
discard_receive_data(f_in, F_LENGTH(file));
close(fd1);
continue;
discard_receive_data(f_in, F_LENGTH(file));
close(fd1);
continue;
-@@ -55
9,6 +595
,9 @@ int recv_files(int f_in, struct file_lis
+@@ -55
4,6 +590
,9 @@ int recv_files(int f_in, struct file_lis
if (fd2 == -1) {
rsyserr(FERROR, errno, "open %s failed",
full_fname(fname));
if (fd2 == -1) {
rsyserr(FERROR, errno, "open %s failed",
full_fname(fname));
@@
-1171,7
+1171,7
@@
See the newly-created file "instructions" for more info.
discard_receive_data(f_in, F_LENGTH(file));
if (fd1 != -1)
close(fd1);
discard_receive_data(f_in, F_LENGTH(file));
if (fd1 != -1)
close(fd1);
-@@ -5
92,6 +631
,10 @@ int recv_files(int f_in, struct file_lis
+@@ -5
87,6 +626
,10 @@ int recv_files(int f_in, struct file_lis
if (fd2 == -1) {
rsyserr(FERROR, errno, "mkstemp %s failed",
full_fname(fnametmp));
if (fd2 == -1) {
rsyserr(FERROR, errno, "mkstemp %s failed",
full_fname(fnametmp));
@@
-1182,7
+1182,7
@@
See the newly-created file "instructions" for more info.
discard_receive_data(f_in, F_LENGTH(file));
if (fd1 != -1)
close(fd1);
discard_receive_data(f_in, F_LENGTH(file));
if (fd1 != -1)
close(fd1);
-@@ -6
12,12 +655
,19 @@ int recv_files(int f_in, struct file_lis
+@@ -6
07,12 +650
,19 @@ int recv_files(int f_in, struct file_lis
fname, fd2, F_LENGTH(file));
log_item(log_code, file, &initial_stats, iflags, NULL);
fname, fd2, F_LENGTH(file));
log_item(log_code, file, &initial_stats, iflags, NULL);
@@
-1202,7
+1202,7
@@
See the newly-created file "instructions" for more info.
exit_cleanup(RERR_FILEIO);
}
exit_cleanup(RERR_FILEIO);
}
-@@ -6
74,6 +724
,12 @@ int recv_files(int f_in, struct file_lis
+@@ -6
69,6 +719
,12 @@ int recv_files(int f_in, struct file_lis
rprintf(msgtype,
"%s: %s failed verification -- update %s%s.\n",
errstr, fname, keptstr, redostr);
rprintf(msgtype,
"%s: %s failed verification -- update %s%s.\n",
errstr, fname, keptstr, redostr);
@@
-1214,7
+1214,7
@@
See the newly-created file "instructions" for more info.
+#endif
}
if (!phase)
+#endif
}
if (!phase)
- send_msg_int(MSG_REDO,
i
);
+ send_msg_int(MSG_REDO,
ndx
);
--- old/sender.c
+++ new/sender.c
@@ -305,6 +305,9 @@ void send_files(struct file_list *flist,
--- old/sender.c
+++ new/sender.c
@@ -305,6 +305,9 @@ void send_files(struct file_list *flist,