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
Change "long" to "uint32" in the create_time struct.
[rsync/rsync-patches.git]
/
db.diff
diff --git
a/db.diff
b/db.diff
index
7b5b19b
..
d2635f3
100644
(file)
--- a/
db.diff
+++ b/
db.diff
@@
-23,7
+23,7
@@
To use this patch, run these commands for a successful build:
./configure (optional if already run)
make
./configure (optional if already run)
make
-based-on:
3b8f8192227b14e708bf535072485e50f436227
0
+based-on:
a01e3b490eb36ccf9e704840e1b6683dab86755
0
diff --git a/Makefile.in b/Makefile.in
--- a/Makefile.in
+++ b/Makefile.in
diff --git a/Makefile.in b/Makefile.in
--- a/Makefile.in
+++ b/Makefile.in
@@
-82,15
+82,15
@@
diff --git a/checksum.c b/checksum.c
diff --git a/cleanup.c b/cleanup.c
--- a/cleanup.c
+++ b/cleanup.c
diff --git a/cleanup.c b/cleanup.c
--- a/cleanup.c
+++ b/cleanup.c
-@@ -25,6 +25,7 @@
- extern int am_server;
+@@ -26,6 +26,7 @@ extern int am_server;
extern int am_daemon;
extern int am_daemon;
+ extern int am_receiver;
extern int io_error;
+extern int use_db;
extern int keep_partial;
extern int got_xfer_error;
extern int io_error;
+extern int use_db;
extern int keep_partial;
extern int got_xfer_error;
- extern int
output_needs_newline
;
-@@ -1
30,6 +13
1,12 @@ NORETURN void _exit_cleanup(int code, const char *file, int line)
+ extern int
protocol_version
;
+@@ -1
40,6 +14
1,12 @@ NORETURN void _exit_cleanup(int code, const char *file, int line)
/* FALLTHROUGH */
#include "case_N.h"
/* FALLTHROUGH */
#include "case_N.h"
@@
-123,7
+123,7
@@
diff --git a/clientserver.c b/clientserver.c
extern char *bind_address;
extern char *config_file;
extern char *logfile_format;
extern char *bind_address;
extern char *config_file;
extern char *logfile_format;
-@@ -66
8,6 +671
,9 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
+@@ -66
7,6 +670
,9 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
log_init(1);
log_init(1);
@@
-133,7
+133,7
@@
diff --git a/clientserver.c b/clientserver.c
#ifdef HAVE_PUTENV
if (*lp_prexfer_exec(i) || *lp_postxfer_exec(i)) {
int status;
#ifdef HAVE_PUTENV
if (*lp_prexfer_exec(i) || *lp_postxfer_exec(i)) {
int status;
-@@ -8
59,6 +865
,10 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
+@@ -8
62,6 +868
,10 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
am_server = 1; /* Don't let someone try to be tricky. */
quiet = 0;
am_server = 1; /* Don't let someone try to be tricky. */
quiet = 0;
@@
-147,7
+147,7
@@
diff --git a/clientserver.c b/clientserver.c
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
-@@ -3
22,7 +322
,7 @@ AC_CHECK_HEADERS(sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h \
+@@ -3
37,7 +337
,7 @@ AC_CHECK_HEADERS(sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h \
sys/un.h sys/attr.h mcheck.h arpa/inet.h arpa/nameser.h locale.h \
netdb.h malloc.h float.h limits.h iconv.h libcharset.h langinfo.h \
sys/acl.h acl/libacl.h attr/xattr.h sys/xattr.h sys/extattr.h \
sys/un.h sys/attr.h mcheck.h arpa/inet.h arpa/nameser.h locale.h \
netdb.h malloc.h float.h limits.h iconv.h libcharset.h langinfo.h \
sys/acl.h acl/libacl.h attr/xattr.h sys/xattr.h sys/extattr.h \
@@
-156,7
+156,7
@@
diff --git a/configure.in b/configure.in
AC_HEADER_MAJOR
AC_CACHE_CHECK([if makedev takes 3 args],rsync_cv_MAKEDEV_TAKES_3_ARGS,[
AC_HEADER_MAJOR
AC_CACHE_CHECK([if makedev takes 3 args],rsync_cv_MAKEDEV_TAKES_3_ARGS,[
-@@ -10
04,6 +1004
,29 @@ if test x"$enable_acl_support" = x"no" -o x"$enable_xattr_support" = x"no" -o x"
+@@ -10
19,6 +1019
,29 @@ if test x"$enable_acl_support" = x"no" -o x"$enable_xattr_support" = x"no" -o x"
fi
fi
fi
fi
@@
-761,7
+761,7
@@
new file mode 100644
diff --git a/flist.c b/flist.c
--- a/flist.c
+++ b/flist.c
diff --git a/flist.c b/flist.c
--- a/flist.c
+++ b/flist.c
-@@ -54,6 +54,7 @@ extern int
preserve_specials
;
+@@ -54,6 +54,7 @@ extern int
delete_during
;
extern int missing_args;
extern int uid_ndx;
extern int gid_ndx;
extern int missing_args;
extern int uid_ndx;
extern int gid_ndx;
@@
-769,7
+769,7
@@
diff --git a/flist.c b/flist.c
extern int eol_nulls;
extern int relative_paths;
extern int implied_dirs;
extern int eol_nulls;
extern int relative_paths;
extern int implied_dirs;
-@@ -130
8,11 +1309
,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
+@@ -130
9,11 +1310
,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
extra_len += EXTRA_LEN;
#endif
extra_len += EXTRA_LEN;
#endif
@@
-783,7
+783,7
@@
diff --git a/flist.c b/flist.c
#if EXTRA_ROUNDING > 0
if (extra_len & (EXTRA_ROUNDING * EXTRA_LEN))
#if EXTRA_ROUNDING > 0
if (extra_len & (EXTRA_ROUNDING * EXTRA_LEN))
-@@ -139
5,8 +1393
,12 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
+@@ -139
6,8 +1394
,12 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
return NULL;
}
return NULL;
}
@@
-798,7
+798,7
@@
diff --git a/flist.c b/flist.c
if (unsort_ndx)
F_NDX(file) = stats.num_dirs;
if (unsort_ndx)
F_NDX(file) = stats.num_dirs;
-@@ -20
61,6 +2063
,9 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
+@@ -20
75,6 +2077
,9 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
| (eol_nulls || reading_remotely ? RL_EOL_NULLS : 0);
int implied_dot_dir = 0;
| (eol_nulls || reading_remotely ? RL_EOL_NULLS : 0);
int implied_dot_dir = 0;
@@
-819,7
+819,7
@@
diff --git a/generator.c b/generator.c
extern int append_mode;
extern int make_backups;
extern int csum_length;
extern int append_mode;
extern int make_backups;
extern int csum_length;
-@@ -53
2,7 +533
,8 @@ int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
+@@ -53
0,7 +531
,8 @@ int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
of the file time to determine whether to sync */
if (always_checksum > 0 && S_ISREG(st->st_mode)) {
char sum[MAX_DIGEST_LEN];
of the file time to determine whether to sync */
if (always_checksum > 0 && S_ISREG(st->st_mode)) {
char sum[MAX_DIGEST_LEN];
@@
-829,16
+829,16
@@
diff --git a/generator.c b/generator.c
return memcmp(sum, F_SUM(file), checksum_len) == 0;
}
return memcmp(sum, F_SUM(file), checksum_len) == 0;
}
-@@ -207
4,6 +2076
,9 @@ void generate_files(int f_out, const char *local_name)
+@@ -207
5,6 +2077
,9 @@ void generate_files(int f_out, const char *local_name)
: "enabled");
}
+ if (use_db && always_checksum)
+ db_connect();
+
: "enabled");
}
+ if (use_db && always_checksum)
+ db_connect();
+
- /* Since we often fill up the outgoing socket and then just sit around
- * waiting for the other 2 processes to do their thing, we don't want
- * to exit on a timeout. If the data stops flowing, the receiver will
+ dflt_perms = (ACCESSPERMS & ~orig_umask);
+
+ do {
diff --git a/loadparm.c b/loadparm.c
--- a/loadparm.c
+++ b/loadparm.c
diff --git a/loadparm.c b/loadparm.c
--- a/loadparm.c
+++ b/loadparm.c
@@
-877,7
+877,7
@@
diff --git a/loadparm.c b/loadparm.c
diff --git a/main.c b/main.c
--- a/main.c
+++ b/main.c
diff --git a/main.c b/main.c
--- a/main.c
+++ b/main.c
-@@ -5
0,6 +50
,7 @@ extern int copy_unsafe_links;
+@@ -5
1,6 +51
,7 @@ extern int copy_unsafe_links;
extern int keep_dirlinks;
extern int preserve_hard_links;
extern int protocol_version;
extern int keep_dirlinks;
extern int preserve_hard_links;
extern int protocol_version;
@@
-885,7
+885,7
@@
diff --git a/main.c b/main.c
extern int file_total;
extern int recurse;
extern int xfer_dirs;
extern int file_total;
extern int recurse;
extern int xfer_dirs;
-@@ -
79,6 +80
,7 @@ extern char *filesfrom_host;
+@@ -
83,6 +84
,7 @@ extern char *filesfrom_host;
extern char *partial_dir;
extern char *dest_option;
extern char *rsync_path;
extern char *partial_dir;
extern char *dest_option;
extern char *rsync_path;
@@
-893,7
+893,7
@@
diff --git a/main.c b/main.c
extern char *shell_cmd;
extern char *batch_name;
extern char *password_file;
extern char *shell_cmd;
extern char *batch_name;
extern char *password_file;
-@@ -1
584,6 +1586
,9 @@ int main(int argc,char *argv[])
+@@ -1
609,6 +1611
,9 @@ int main(int argc,char *argv[])
exit_cleanup(RERR_SYNTAX);
}
exit_cleanup(RERR_SYNTAX);
}
@@
-912,7
+912,7
@@
diff --git a/options.c b/options.c
char *filesfrom_host = NULL;
+char *db_config = NULL;
int eol_nulls = 0;
char *filesfrom_host = NULL;
+char *db_config = NULL;
int eol_nulls = 0;
- int protect_args =
0
;
+ int protect_args =
-1
;
int human_readable = 1;
@@ -567,6 +568,7 @@ static void print_rsync_version(enum logcode f)
char const *links = "no ";
int human_readable = 1;
@@ -567,6 +568,7 @@ static void print_rsync_version(enum logcode f)
char const *links = "no ";