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
Some new defines for incremental-recursion mode.
[rsync/rsync.git]
/
main.c
diff --git
a/main.c
b/main.c
index
9a1bec0
..
76692e1
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-68,6
+68,7
@@
extern char *basis_dir[];
extern char *rsync_path;
extern char *shell_cmd;
extern char *batch_name;
extern char *rsync_path;
extern char *shell_cmd;
extern char *batch_name;
+extern char *password_file;
extern char curr_dir[MAXPATHLEN];
extern struct filter_list_struct server_filter_list;
extern char curr_dir[MAXPATHLEN];
extern struct filter_list_struct server_filter_list;
@@
-1130,6
+1131,12
@@
static int start_client(int argc, char *argv[])
}
}
}
}
+ if (password_file && !daemon_over_rsh) {
+ rprintf(FERROR, "The --password-file option may only be "
+ "used when accessing an rsync daemon.\n");
+ exit_cleanup(RERR_SYNTAX);
+ }
+
if (shell_machine) {
p = strrchr(shell_machine,'@');
if (p) {
if (shell_machine) {
p = strrchr(shell_machine,'@');
if (p) {
@@
-1360,6
+1367,9
@@
int main(int argc,char *argv[])
}
if (read_batch)
read_stream_flags(batch_fd);
}
if (read_batch)
read_stream_flags(batch_fd);
+ else
+ write_stream_flags(batch_fd);
+
}
if (write_batch < 0)
dry_run = 1;
}
if (write_batch < 0)
dry_run = 1;