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
Don't write out the protocol_version number in read_batch mode.
[rsync/rsync.git]
/
main.c
diff --git
a/main.c
b/main.c
index
c41e224
..
085e578
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-392,7
+392,7
@@
static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
(long)getpid());
}
(long)getpid());
}
- if (am_daemon && lp_write_only(module_id)
&& am_sender
) {
+ if (am_daemon && lp_write_only(module_id)) {
rprintf(FERROR, "ERROR: module is write only\n");
exit_cleanup(RERR_SYNTAX);
return;
rprintf(FERROR, "ERROR: module is write only\n");
exit_cleanup(RERR_SYNTAX);
return;
@@
-529,7
+529,7
@@
static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
argc, (long)getpid());
}
argc, (long)getpid());
}
- if (am_daemon && lp_read_only(module_id)
&& !am_sender
) {
+ if (am_daemon && lp_read_only(module_id)) {
rprintf(FERROR,"ERROR: module is read only\n");
exit_cleanup(RERR_SYNTAX);
return;
rprintf(FERROR,"ERROR: module is read only\n");
exit_cleanup(RERR_SYNTAX);
return;
@@
-1020,11
+1020,8
@@
static RETSIGTYPE rsync_panic_handler(UNUSED(int whatsig))
int main(int argc,char *argv[])
{
int ret;
int main(int argc,char *argv[])
{
int ret;
- int orig_argc;
- char **orig_argv;
-
- orig_argc = argc;
- orig_argv = argv;
+ int orig_argc = argc;
+ char **orig_argv = argv;
signal(SIGUSR1, sigusr1_handler);
signal(SIGUSR2, sigusr2_handler);
signal(SIGUSR1, sigusr1_handler);
signal(SIGUSR2, sigusr2_handler);
@@
-1075,7
+1072,7
@@
int main(int argc,char *argv[])
if (write_batch || read_batch) {
if (write_batch)
if (write_batch || read_batch) {
if (write_batch)
- write_batch_
argvs_file(orig_argc, orig_argv
);
+ write_batch_
shell_file(orig_argc, orig_argv, argc
);
if (read_batch && strcmp(batch_name, "-") == 0)
batch_fd = STDIN_FILENO;
if (read_batch && strcmp(batch_name, "-") == 0)
batch_fd = STDIN_FILENO;