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
New functions, variables, and file-list code to support the new
[rsync/rsync.git]
/
main.c
diff --git
a/main.c
b/main.c
index
31d2faa
..
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;
@@
-103,7
+104,11
@@
static void show_malloc_stats(void);
* remember_children(), we succeed instead of returning an error. */
pid_t wait_process(pid_t pid, int *status_ptr, int flags)
{
* remember_children(), we succeed instead of returning an error. */
pid_t wait_process(pid_t pid, int *status_ptr, int flags)
{
- pid_t waited_pid = waitpid(pid, status_ptr, flags);
+ pid_t waited_pid;
+
+ do {
+ waited_pid = waitpid(pid, status_ptr, flags);
+ } while (waited_pid == -1 && errno == EINTR);
if (waited_pid == -1 && errno == ECHILD) {
/* Status of requested child no longer available: check to
if (waited_pid == -1 && errno == ECHILD) {
/* Status of requested child no longer available: check to
@@
-619,14
+624,13
@@
static void read_final_goodbye(int f_in, int f_out)
}
}
}
}
- if (i !=
-1
) {
+ if (i !=
NDX_DONE
) {
rprintf(FERROR, "Invalid packet at end of run (%d) [%s]\n",
i, who_am_i());
exit_cleanup(RERR_PROTOCOL);
}
}
rprintf(FERROR, "Invalid packet at end of run (%d) [%s]\n",
i, who_am_i());
exit_cleanup(RERR_PROTOCOL);
}
}
-
static void do_server_sender(int f_in, int f_out, int argc, char *argv[])
{
struct file_list *flist;
static void do_server_sender(int f_in, int f_out, int argc, char *argv[])
{
struct file_list *flist;
@@
-667,9
+671,8
@@
static void do_server_sender(int f_in, int f_out, int argc, char *argv[])
}
flist = send_file_list(f_out,argc,argv);
}
flist = send_file_list(f_out,argc,argv);
- if (!flist || flist->count == 0)
{
+ if (!flist || flist->count == 0)
exit_cleanup(0);
exit_cleanup(0);
- }
the_file_list = flist;
io_start_buffering_in();
the_file_list = flist;
io_start_buffering_in();
@@
-695,8
+698,10
@@
static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
* points to an identical file won't be replaced by the referent. */
copy_links = copy_dirlinks = 0;
* points to an identical file won't be replaced by the referent. */
copy_links = copy_dirlinks = 0;
+#ifdef SUPPORT_HARD_LINKS
if (preserve_hard_links)
if (preserve_hard_links)
- init_hard_links();
+ match_hard_links();
+#endif
if (fd_pair(error_pipe) < 0) {
rsyserr(FERROR, errno, "pipe failed in do_recv");
if (fd_pair(error_pipe) < 0) {
rsyserr(FERROR, errno, "pipe failed in do_recv");
@@
-768,7
+773,7
@@
static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
io_flush(FULL_FLUSH);
if (protocol_version >= 24) {
/* send a final goodbye message */
io_flush(FULL_FLUSH);
if (protocol_version >= 24) {
/* send a final goodbye message */
- write_int(f_out,
-1
);
+ write_int(f_out,
NDX_DONE
);
}
io_flush(FULL_FLUSH);
}
io_flush(FULL_FLUSH);
@@
-778,7
+783,6
@@
static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
return exit_code;
}
return exit_code;
}
-
static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
{
int exit_code;
static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
{
int exit_code;
@@
-899,12
+903,10
@@
void start_server(int f_in, int f_out, int argc, char *argv[])
keep_dirlinks = 0; /* Must be disabled on the sender. */
if (need_messages_from_generator)
io_start_multiplex_in();
keep_dirlinks = 0; /* Must be disabled on the sender. */
if (need_messages_from_generator)
io_start_multiplex_in();
-
recv_filter_list(f_in);
do_server_sender(f_in, f_out, argc, argv);
recv_filter_list(f_in);
do_server_sender(f_in, f_out, argc, argv);
- } else
{
+ } else
do_server_recv(f_in, f_out, argc, argv);
do_server_recv(f_in, f_out, argc, argv);
- }
exit_cleanup(0);
}
exit_cleanup(0);
}
@@
-1017,7
+1019,7
@@
int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
return MAX(exit_code, exit_code2);
}
return MAX(exit_code, exit_code2);
}
-static int copy_argv
(char *argv[])
+static int copy_argv(char *argv[])
{
int i;
{
int i;
@@
-1129,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) {
@@
-1359,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;