Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Let's go with "delta transfer algorithm" (thanks, Matt).
[rsync/rsync.git]
/
options.c
diff --git
a/options.c
b/options.c
index
5adcf7b
..
a404a8d
100644
(file)
--- a/
options.c
+++ b/
options.c
@@
-1887,6
+1887,9
@@
void server_options(char **args,int *argc)
if (numeric_ids)
args[ac++] = "--numeric-ids";
if (numeric_ids)
args[ac++] = "--numeric-ids";
+ if (!allow_inc_recurse)
+ args[ac++] = "--no-ir";
+
if (am_sender) {
if (ignore_existing)
args[ac++] = "--ignore-existing";
if (am_sender) {
if (ignore_existing)
args[ac++] = "--ignore-existing";
@@
-1978,7
+1981,7
@@
char *check_for_hostspec(char *s, char **host_ptr, int *port_ptr)
if (p[1] == ':')
*port_ptr = atoi(p+2);
} else {
if (p[1] == ':')
*port_ptr = atoi(p+2);
} else {
- if ((p = strchr(s, ':')) != NULL) {
+ if ((p = strchr(s, ':')) != NULL
&& p < s + hostlen
) {
hostlen = p - s;
*port_ptr = atoi(p+1);
}
hostlen = p - s;
*port_ptr = atoi(p+1);
}