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
Tweaked the month guess in OLDNEWS.
[rsync/rsync.git]
/
main.c
diff --git
a/main.c
b/main.c
index
887f8d2
..
0f16006
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-63,11
+63,8
@@
extern int whole_file;
extern int read_batch;
extern int write_batch;
extern int batch_fd;
extern int read_batch;
extern int write_batch;
extern int batch_fd;
-extern int flist_eof;
extern int filesfrom_fd;
extern int filesfrom_fd;
-extern int delete_during;
extern int connect_timeout;
extern int connect_timeout;
-extern int check_for_io_err;
extern pid_t cleanup_child_pid;
extern unsigned int module_dirlen;
extern struct stats stats;
extern pid_t cleanup_child_pid;
extern unsigned int module_dirlen;
extern struct stats stats;
@@
-472,7
+469,7
@@
static pid_t do_cmd(char *cmd, char *machine, char *user, char **remote_argv, in
#ifdef ICONV_CONST
setup_iconv();
#endif
#ifdef ICONV_CONST
setup_iconv();
#endif
- if (protect_args)
+ if (protect_args
&& !daemon_over_rsh
)
send_protected_args(*f_out_p, args);
}
send_protected_args(*f_out_p, args);
}
@@
-762,8
+759,6
@@
static int do_recv(int f_in, int f_out, char *local_name)
exit_cleanup(RERR_IPC);
}
exit_cleanup(RERR_IPC);
}
- check_for_io_err = inc_recurse && delete_during && !flist_eof;
-
if (pid == 0) {
close(error_pipe[0]);
if (f_in != f_out)
if (pid == 0) {
close(error_pipe[0]);
if (f_in != f_out)
@@
-1192,8
+1187,8
@@
static int start_client(int argc, char *argv[])
rprintf(FERROR, "remote destination is not allowed with --read-batch\n");
exit_cleanup(RERR_SYNTAX);
}
rprintf(FERROR, "remote destination is not allowed with --read-batch\n");
exit_cleanup(RERR_SYNTAX);
}
- remote_argv = argv + argc - 1;
- remote_argc = 1;
+ remote_argv = argv +
=
argc - 1;
+ remote_argc =
argc =
1;
}
if (am_sender) {
}
if (am_sender) {