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
Mention the index number for an "invalid packet at end of run".
[rsync/rsync.git]
/
main.c
diff --git
a/main.c
b/main.c
index
2b207be
..
81be989
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-66,6
+66,7
@@
extern char *shell_cmd;
extern char *batch_name;
int local_server = 0;
extern char *batch_name;
int local_server = 0;
+struct file_list *the_file_list;
/* There's probably never more than at most 2 outstanding child processes,
* but set it higher, just in case. */
/* There's probably never more than at most 2 outstanding child processes,
* but set it higher, just in case. */
@@
-429,23
+430,24
@@
static char *get_local_name(struct file_list *flist,char *name)
/* This is only called by the sender. */
/* This is only called by the sender. */
-static void read_final_goodbye(int f_in, int f_out
, int flist_count
)
+static void read_final_goodbye(int f_in, int f_out)
{
int i;
if (protocol_version < 29)
i = read_int(f_in);
else {
{
int i;
if (protocol_version < 29)
i = read_int(f_in);
else {
- while ((i = read_int(f_in)) ==
flist_
count
+ while ((i = read_int(f_in)) ==
the_file_list->
count
&& read_shortint(f_in) == ITEM_IS_NEW) {
/* Forward the keep-alive (no-op) to the receiver. */
&& read_shortint(f_in) == ITEM_IS_NEW) {
/* Forward the keep-alive (no-op) to the receiver. */
- write_int(f_out,
flist_
count);
+ write_int(f_out,
the_file_list->
count);
write_shortint(f_out, ITEM_IS_NEW);
}
}
if (i != -1) {
write_shortint(f_out, ITEM_IS_NEW);
}
}
if (i != -1) {
- rprintf(FERROR, "Invalid packet from generator at end of run.\n");
+ rprintf(FERROR, "Invalid packet at end of run (%d) [%s]\n",
+ i, who_am_i());
exit_cleanup(RERR_PROTOCOL);
}
}
exit_cleanup(RERR_PROTOCOL);
}
}
@@
-500,6
+502,7
@@
static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
if (!flist || flist->count == 0) {
exit_cleanup(0);
}
if (!flist || flist->count == 0) {
exit_cleanup(0);
}
+ the_file_list = flist;
io_start_buffering_in();
io_start_buffering_out();
io_start_buffering_in();
io_start_buffering_out();
@@
-508,7
+511,7
@@
static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
io_flush(FULL_FLUSH);
report(f_out);
if (protocol_version >= 24)
io_flush(FULL_FLUSH);
report(f_out);
if (protocol_version >= 24)
- read_final_goodbye(f_in, f_out
, flist->count
);
+ read_final_goodbye(f_in, f_out);
io_flush(FULL_FLUSH);
exit_cleanup(0);
}
io_flush(FULL_FLUSH);
exit_cleanup(0);
}
@@
-518,19
+521,16
@@
static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
{
int pid;
int status = 0;
{
int pid;
int status = 0;
- int error_pipe[2], name_pipe[2];
- BOOL need_name_pipe = (basis_dir[0] || partial_dir || fuzzy_basis
- || (inplace && make_backups)) && !dry_run;
+ int error_pipe[2];
/* The receiving side mustn't obey this, or an existing symlink that
* points to an identical file won't be replaced by the referent. */
copy_links = 0;
if (preserve_hard_links)
/* The receiving side mustn't obey this, or an existing symlink that
* points to an identical file won't be replaced by the referent. */
copy_links = 0;
if (preserve_hard_links)
- init_hard_links(
flist
);
+ init_hard_links();
- if (fd_pair(error_pipe) < 0
- || (need_name_pipe && fd_pair(name_pipe) < 0)) {
+ if (fd_pair(error_pipe) < 0) {
rsyserr(FERROR, errno, "pipe failed in do_recv");
exit_cleanup(RERR_IPC);
}
rsyserr(FERROR, errno, "pipe failed in do_recv");
exit_cleanup(RERR_IPC);
}
@@
-544,11
+544,6
@@
static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
if (pid == 0) {
close(error_pipe[0]);
if (pid == 0) {
close(error_pipe[0]);
- if (need_name_pipe) {
- close(name_pipe[1]);
- set_blocking(name_pipe[0]);
- } else
- name_pipe[0] = -1;
if (f_in != f_out)
close(f_out);
if (f_in != f_out)
close(f_out);
@@
-558,7
+553,7
@@
static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
/* set place to send errors */
set_msg_fd_out(error_pipe[1]);
/* set place to send errors */
set_msg_fd_out(error_pipe[1]);
- recv_files(f_in, flist, local_name
, name_pipe[0]
);
+ recv_files(f_in, flist, local_name);
io_flush(FULL_FLUSH);
report(f_in);
io_flush(FULL_FLUSH);
report(f_in);
@@
-574,7
+569,8
@@
static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
while (read_int(f_in) == flist->count
&& read_shortint(f_in) == ITEM_IS_NEW) {}
while (read_int(f_in) == flist->count
&& read_shortint(f_in) == ITEM_IS_NEW) {}
- rprintf(FERROR, "Invalid packet from server at end of run.\n");
+ rprintf(FERROR, "Invalid packet at end of run [%s]\n",
+ who_am_i());
exit_cleanup(RERR_PROTOCOL);
}
exit_cleanup(RERR_PROTOCOL);
}
@@
-591,11
+587,6
@@
static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
stop_write_batch();
close(error_pipe[1]);
stop_write_batch();
close(error_pipe[1]);
- if (need_name_pipe) {
- close(name_pipe[0]);
- set_nonblocking(name_pipe[1]);
- } else
- name_pipe[1] = -1;
if (f_in != f_out)
close(f_in);
if (f_in != f_out)
close(f_in);
@@
-603,7
+594,7
@@
static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
set_msg_fd_in(error_pipe[0]);
set_msg_fd_in(error_pipe[0]);
- generate_files(f_out, flist, local_name
, name_pipe[1]
);
+ generate_files(f_out, flist, local_name);
report(-1);
io_flush(FULL_FLUSH);
report(-1);
io_flush(FULL_FLUSH);
@@
-676,6
+667,7
@@
static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
rprintf(FERROR,"server_recv: recv_file_list error\n");
exit_cleanup(RERR_FILESELECT);
}
rprintf(FERROR,"server_recv: recv_file_list error\n");
exit_cleanup(RERR_FILESELECT);
}
+ the_file_list = flist;
if (argc > 0) {
if (strcmp(dir,".")) {
if (argc > 0) {
if (strcmp(dir,".")) {
@@
-766,17
+758,17
@@
int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
if (write_batch)
start_write_batch(f_out);
if (write_batch)
start_write_batch(f_out);
- if (!read_batch) /* don't write to pipe */
- flist = send_file_list(f_out,argc,argv);
+ flist = send_file_list(f_out, argc, argv);
set_msg_fd_in(-1);
if (verbose > 3)
rprintf(FINFO,"file list sent\n");
set_msg_fd_in(-1);
if (verbose > 3)
rprintf(FINFO,"file list sent\n");
+ the_file_list = flist;
io_flush(NORMAL_FLUSH);
send_files(flist,f_out,f_in);
io_flush(FULL_FLUSH);
if (protocol_version >= 24)
io_flush(NORMAL_FLUSH);
send_files(flist,f_out,f_in);
io_flush(FULL_FLUSH);
if (protocol_version >= 24)
- read_final_goodbye(f_in, f_out
, flist->count
);
+ read_final_goodbye(f_in, f_out);
if (pid != -1) {
if (verbose > 3)
rprintf(FINFO,"client_run waiting on %d\n", (int) pid);
if (pid != -1) {
if (verbose > 3)
rprintf(FINFO,"client_run waiting on %d\n", (int) pid);
@@
-810,6
+802,7
@@
int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
"the --recursive option?\n");
exit_cleanup(0);
}
"the --recursive option?\n");
exit_cleanup(0);
}
+ the_file_list = flist;
local_name = get_local_name(flist,argv[0]);
local_name = get_local_name(flist,argv[0]);
@@
-866,8
+859,10
@@
static int start_client(int argc, char *argv[])
return rc;
if (!read_batch) { /* for read_batch, NO source is specified */
return rc;
if (!read_batch) { /* for read_batch, NO source is specified */
+ argc--;
shell_path = check_for_hostspec(argv[0], &shell_machine, &rsync_port);
if (shell_path) { /* source is remote */
shell_path = check_for_hostspec(argv[0], &shell_machine, &rsync_port);
if (shell_path) { /* source is remote */
+ argv++;
if (filesfrom_host && *filesfrom_host
&& strcmp(filesfrom_host, shell_machine) != 0) {
rprintf(FERROR,
if (filesfrom_host && *filesfrom_host
&& strcmp(filesfrom_host, shell_machine) != 0) {
rprintf(FERROR,
@@
-878,22
+873,21
@@
static int start_client(int argc, char *argv[])
if (!shell_cmd) {
return start_socket_client(shell_machine,
shell_path,
if (!shell_cmd) {
return start_socket_client(shell_machine,
shell_path,
- argc
-1, argv+1
);
+ argc
, argv
);
}
daemon_over_rsh = 1;
}
}
daemon_over_rsh = 1;
}
+ am_sender = 0;
+ } else { /* source is local, check dest arg */
+ am_sender = 1;
+
if (argc < 1) { /* destination required */
usage(FERROR);
exit_cleanup(RERR_SYNTAX);
}
if (argc < 1) { /* destination required */
usage(FERROR);
exit_cleanup(RERR_SYNTAX);
}
- am_sender = 0;
- argv++;
- } else { /* source is local, check dest arg */
- am_sender = 1;
-
- shell_path = check_for_hostspec(argv[argc-1], &shell_machine, &rsync_port);
+ shell_path = check_for_hostspec(argv[argc], &shell_machine, &rsync_port);
if (shell_path && filesfrom_host && *filesfrom_host
&& strcmp(filesfrom_host, shell_machine) != 0) {
rprintf(FERROR,
if (shell_path && filesfrom_host && *filesfrom_host
&& strcmp(filesfrom_host, shell_machine) != 0) {
rprintf(FERROR,
@@
-908,22
+902,16
@@
static int start_client(int argc, char *argv[])
exit_cleanup(RERR_SYNTAX);
}
shell_machine = NULL;
exit_cleanup(RERR_SYNTAX);
}
shell_machine = NULL;
- shell_path = argv[argc
-1
];
+ shell_path = argv[argc];
} else if (rsync_port) {
if (!shell_cmd) {
return start_socket_client(shell_machine,
shell_path,
} else if (rsync_port) {
if (!shell_cmd) {
return start_socket_client(shell_machine,
shell_path,
- argc
-1
, argv);
+ argc, argv);
}
daemon_over_rsh = 1;
}
}
daemon_over_rsh = 1;
}
-
- if (argc < 2) {
- usage(FERROR);
- exit_cleanup(RERR_SYNTAX);
- }
}
}
- argc--;
} else { /* read_batch */
local_server = 1;
shell_path = argv[argc-1];
} else { /* read_batch */
local_server = 1;
shell_path = argv[argc-1];