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
include/exclude cluestick: with -vv, print out whether files are
[rsync/rsync.git]
/
main.c
diff --git
a/main.c
b/main.c
index
06c5e9b
..
5ac407a
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-349,14
+349,13
@@
static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
close(recv_pipe[1]);
io_flush();
/* finally we go to sleep until our parent kills us
close(recv_pipe[1]);
io_flush();
/* finally we go to sleep until our parent kills us
- with a USR2 signal. We sleep
p
for a short time as on
+ with a USR2 signal. We sleep for a short time as on
some OSes a signal won't interrupt a sleep! */
some OSes a signal won't interrupt a sleep! */
- while (1)
sleep(1
);
+ while (1)
msleep(20
);
}
close(recv_pipe[1]);
close(error_pipe[1]);
}
close(recv_pipe[1]);
close(error_pipe[1]);
- io_close_input(f_in);
if (f_in != f_out) close(f_in);
io_start_buffering(f_out);
if (f_in != f_out) close(f_in);
io_start_buffering(f_out);
@@
-465,7
+464,6
@@
int client_run(int f_in, int f_out, int pid, int argc, char *argv[])
int status = 0, status2 = 0;
char *local_name = NULL;
extern int am_sender;
int status = 0, status2 = 0;
char *local_name = NULL;
extern int am_sender;
- extern int list_only;
extern int remote_version;
set_nonblocking(f_in);
extern int remote_version;
set_nonblocking(f_in);
@@
-503,7
+501,10
@@
int client_run(int f_in, int f_out, int pid, int argc, char *argv[])
exit_cleanup(status);
}
exit_cleanup(status);
}
- if (argc == 0) list_only = 1;
+ if (argc == 0) {
+ extern int list_only;
+ list_only = 1;
+ }
send_exclude_list(f_out);
send_exclude_list(f_out);
@@
-641,6
+642,11
@@
static int start_client(int argc, char *argv[])
usage(FERROR);
exit_cleanup(RERR_SYNTAX);
}
usage(FERROR);
exit_cleanup(RERR_SYNTAX);
}
+
+ if (argc == 0 && !am_sender) {
+ extern int list_only;
+ list_only = 1;
+ }
pid = do_cmd(shell_cmd,shell_machine,shell_user,shell_path,&f_in,&f_out);
pid = do_cmd(shell_cmd,shell_machine,shell_user,shell_path,&f_in,&f_out);