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
Moved the xattr setting and added code to make sure that we set
[rsync/rsync-patches.git]
/
ODBC-dblog.diff
diff --git
a/ODBC-dblog.diff
b/ODBC-dblog.diff
index
f0ef396
..
68078cb
100644
(file)
--- a/
ODBC-dblog.diff
+++ b/
ODBC-dblog.diff
@@
-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
6,6 +396
,9 @@ static int rsync_module(int f_in, int f_
+@@ -39
7,6 +397
,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
5,6 +638
,9 @@ static int rsync_module(int f_in, int f_
+@@ -63
8,6 +641
,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);
@@
-69,7
+69,7
@@
See the newly-created file "instructions" for more info.
am_sender ? "on" : "to",
--- old/configure.in
+++ new/configure.in
am_sender ? "on" : "to",
--- old/configure.in
+++ new/configure.in
-@@ -63
2,6 +632
,12 @@ if test x"$with_included_popt" != x"yes"
+@@ -63
7,6 +637
,12 @@ if test x"$with_included_popt" != x"yes"
AC_CHECK_LIB(popt, poptGetContext, , [with_included_popt=yes])
fi
AC_CHECK_LIB(popt, poptGetContext, , [with_included_popt=yes])
fi
@@
-1106,7
+1106,7
@@
See the newly-created file "instructions" for more info.
exit_cleanup(RERR_FILEIO);
}
exit_cleanup(RERR_FILEIO);
}
-@@ -298,6 +314,12 @@ static void handle_delayed_updates(
struc
+@@ -298,6 +314,12 @@ static void handle_delayed_updates(
char
rsyserr(FERROR, errno,
"rename failed for %s (from %s)",
full_fname(fname), partialptr);
rsyserr(FERROR, errno,
"rename failed for %s (from %s)",
full_fname(fname), partialptr);
@@
-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)))
-@@ -4
14,6 +436,9 @@ int recv_files(int f_in, struct file_lis
+@@ -4
31,6 +453,9 @@ int recv_files(int f_in, char *local_nam
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);
}
-@@ -4
70,6 +495,11 @@ int recv_files(int f_in, struct file_lis
+@@ -4
87,6 +512,11 @@ int recv_files(int f_in, char *local_nam
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
18,6 +548,9 @@ int recv_files(int f_in, struct file_lis
+@@ -5
35,6 +565,9 @@ int recv_files(int f_in, char *local_nam
} 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;
-@@ -5
31,6 +564,9 @@ int recv_files(int f_in, struct file_lis
+@@ -5
48,6 +581,9 @@ int recv_files(int f_in, char *local_nam
*/
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;
-@@ -5
54,6 +590,9 @@ int recv_files(int f_in, struct file_lis
+@@ -5
71,6 +607,9 @@ int recv_files(int f_in, char *local_nam
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);
-@@ -
587,6 +626,10 @@ int recv_files(int f_in, struct file_lis
+@@ -
604,6 +643,10 @@ int recv_files(int f_in, char *local_nam
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
07,12 +650,19 @@ int recv_files(int f_in, struct file_lis
+@@ -6
24,12 +667,19 @@ int recv_files(int f_in, char *local_nam
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
69,6 +719,12 @@ int recv_files(int f_in, struct file_lis
+@@ -6
86,6 +736,12 @@ int recv_files(int f_in, char *local_nam
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);
@@
-1213,11
+1213,11
@@
See the newly-created file "instructions" for more info.
+ keptstr, redostr);
+#endif
}
+ keptstr, redostr);
+#endif
}
- if (!phase
)
+ if (!phase
|| incremental) {
send_msg_int(MSG_REDO, ndx);
--- old/sender.c
+++ new/sender.c
send_msg_int(MSG_REDO, ndx);
--- old/sender.c
+++ new/sender.c
-@@ -3
05,6 +305,9 @@ void send_files(struct file_list *flist,
+@@ -3
26,6 +326,9 @@ void send_files(int f_in, int f_out)
end_progress(st.st_size);
log_item(log_code, file, &initial_stats, iflags, NULL);
end_progress(st.st_size);
log_item(log_code, file, &initial_stats, iflags, NULL);