Matt McCutchen's Web Site
/
rsync
/
rsync-patches.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
def2ace
)
Fixed failing hunk.
author
Wayne Davison
<wayned@samba.org>
Tue, 1 Mar 2005 03:12:50 +0000
(
03:12
+0000)
committer
Wayne Davison
<wayned@samba.org>
Tue, 1 Mar 2005 03:12:50 +0000
(
03:12
+0000)
time-limit.diff
patch
|
blob
|
blame
|
history
diff --git
a/time-limit.diff
b/time-limit.diff
index
f71989e
..
f6d907f
100644
(file)
--- a/
time-limit.diff
+++ b/
time-limit.diff
@@
-3,14
+3,14
@@
to be simpler and more efficient by Wayne Davison.
Do we need configure support for mktime()?
Do we need configure support for mktime()?
---- orig/io.c 2005-0
2-27 18:24:42
-+++ io.c 2005-0
2-26 05:28:35
+--- orig/io.c 2005-0
3-01 03:11:36
++++ io.c 2005-0
3-01 03:12:23
@@ -51,6 +51,7 @@ extern int eol_nulls;
extern int csum_length;
extern int checksum_seed;
extern int protocol_version;
+extern time_t stop_at_utime;
@@ -51,6 +51,7 @@ extern int eol_nulls;
extern int csum_length;
extern int checksum_seed;
extern int protocol_version;
+extern time_t stop_at_utime;
- extern char *
remote_filesfrom_file
;
+ extern char *
filesfrom_host
;
extern struct stats stats;
@@ -137,16 +138,24 @@ static void check_timeout(void)
extern struct stats stats;
@@ -137,16 +138,24 @@ static void check_timeout(void)
@@
-41,7
+41,7
@@
Do we need configure support for mktime()?
if (t - last_io >= io_timeout) {
if (!am_server && !am_daemon) {
rprintf(FERROR, "io timeout after %d seconds -- exiting\n",
if (t - last_io >= io_timeout) {
if (!am_server && !am_daemon) {
rprintf(FERROR, "io timeout after %d seconds -- exiting\n",
---- orig/options.c 2005-0
2-25 18:44:31
+--- orig/options.c 2005-0
3-01 01:22:59
+++ options.c 2005-01-28 19:35:23
@@ -105,6 +105,7 @@ int checksum_seed = 0;
int inplace = 0;
+++ options.c 2005-01-28 19:35:23
@@ -105,6 +105,7 @@ int checksum_seed = 0;
int inplace = 0;
@@
-114,7
+114,7
@@
Do we need configure support for mktime()?
default:
/* A large opt value means that set_refuse_options()
* turned this option off. */
default:
/* A large opt value means that set_refuse_options()
* turned this option off. */
-@@ -134
2,6 +1378
,15 @@ void server_options(char **args,int *arg
+@@ -134
4,6 +1380
,15 @@ void server_options(char **args,int *arg
args[ac++] = arg;
}
args[ac++] = arg;
}
@@
-130,7
+130,7
@@
Do we need configure support for mktime()?
if (backup_dir) {
args[ac++] = "--backup-dir";
args[ac++] = backup_dir;
if (backup_dir) {
args[ac++] = "--backup-dir";
args[ac++] = backup_dir;
---- orig/rsync.yo 2005-0
2-28 02:16:55
+--- orig/rsync.yo 2005-0
3-01 01:22:59
+++ rsync.yo 2005-02-01 10:46:35
@@ -378,6 +378,8 @@ to the detailed description below for a
--password-file=FILE read password from FILE
+++ rsync.yo 2005-02-01 10:46:35
@@ -378,6 +378,8 @@ to the detailed description below for a
--password-file=FILE read password from FILE