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
Changed error message for incompatible 2.6.4 pre-release versions.
[rsync/rsync.git]
/
main.c
diff --git
a/main.c
b/main.c
index
b8be0d4
..
81be989
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-430,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);
}
}
@@
-510,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);
}
@@
-520,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);
}
@@
-546,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);
@@
-560,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);
@@
-576,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);
}
@@
-593,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);
@@
-605,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);
@@
-779,7
+768,7
@@
int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
send_files(flist,f_out,f_in);
io_flush(FULL_FLUSH);
if (protocol_version >= 24)
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);