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
Added a check for ftruncate.
[rsync/rsync.git]
/
main.c
diff --git
a/main.c
b/main.c
index
b34127c
..
a94dfe8
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-59,7
+59,7
@@
extern char *files_from;
extern char *remote_filesfrom_file;
extern char *rsync_path;
extern char *shell_cmd;
extern char *remote_filesfrom_file;
extern char *rsync_path;
extern char *shell_cmd;
-extern char *batch_
prefix
;
+extern char *batch_
name
;
/* there's probably never more than at most 2 outstanding child processes,
/* there's probably never more than at most 2 outstanding child processes,
@@
-598,7
+598,7
@@
void start_server(int f_in, int f_out, int argc, char *argv[])
if (am_sender) {
keep_dirlinks = 0; /* Must be disabled on the sender. */
if (am_sender) {
keep_dirlinks = 0; /* Must be disabled on the sender. */
-
+
recv_exclude_list(f_in);
if (cvs_exclude)
add_cvs_excludes();
recv_exclude_list(f_in);
if (cvs_exclude)
add_cvs_excludes();
@@
-1074,12
+1074,16
@@
int main(int argc,char *argv[])
if (write_batch)
write_batch_argvs_file(orig_argc, orig_argv);
if (write_batch)
write_batch_argvs_file(orig_argc, orig_argv);
- batch_fd = do_open(batch_prefix,
+ if (read_batch && strcmp(batch_name, "-") == 0)
+ batch_fd = STDIN_FILENO;
+ else {
+ batch_fd = do_open(batch_name,
write_batch ? O_WRONLY | O_CREAT | O_TRUNC
: O_RDONLY, S_IRUSR | S_IWUSR);
write_batch ? O_WRONLY | O_CREAT | O_TRUNC
: O_RDONLY, S_IRUSR | S_IWUSR);
+ }
if (batch_fd < 0) {
rsyserr(FERROR, errno, "Batch file %s open error",
if (batch_fd < 0) {
rsyserr(FERROR, errno, "Batch file %s open error",
- batch_
prefix
);
+ batch_
name
);
exit_cleanup(RERR_FILEIO);
}
}
exit_cleanup(RERR_FILEIO);
}
}