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
Use new log_format_has() function instead of strstr().
[rsync/rsync.git]
/
clientserver.c
diff --git
a/clientserver.c
b/clientserver.c
index
0ed0514
..
47ed5e7
100644
(file)
--- a/
clientserver.c
+++ b/
clientserver.c
@@
-87,15
+87,12
@@
int start_socket_client(char *host, char *path, int argc, char *argv[])
return -1;
}
return -1;
}
- if ((p = strchr(host, '@')) != NULL) {
+ if ((p = str
r
chr(host, '@')) != NULL) {
user = host;
host = p+1;
*p = '\0';
}
user = host;
host = p+1;
*p = '\0';
}
- if (rsync_port == 0)
- rsync_port = RSYNC_PORT;
-
fd = open_socket_out_wrapped(host, rsync_port, bind_address,
default_af_hint);
if (fd == -1)
fd = open_socket_out_wrapped(host, rsync_port, bind_address,
default_af_hint);
if (fd == -1)
@@
-286,10
+283,10
@@
static int rsync_module(int f_in, int f_out, int i)
read_only = 1;
if (lp_transfer_logging(i)) {
read_only = 1;
if (lp_transfer_logging(i)) {
- if (
strstr(lp_log_format(i), "%i") != NULL
)
+ if (
log_format_has(lp_log_format(i), 'i')
)
daemon_log_format_has_i = 1;
if (daemon_log_format_has_i
daemon_log_format_has_i = 1;
if (daemon_log_format_has_i
- ||
strstr(lp_log_format(i), "%o") != NULL
)
+ ||
log_format_has(lp_log_format(i), 'o')
)
daemon_log_format_has_o_or_i = 1;
}
daemon_log_format_has_o_or_i = 1;
}