extern int am_root;
extern int am_server;
extern int am_sender;
+extern int am_generator;
extern int am_daemon;
extern int verbose;
extern int blocking_io;
extern char *shell_cmd;
extern struct file_list *batch_flist;
+
/* there's probably never more than at most 2 outstanding child processes,
* but set it higher just in case.
*/
static void report(int f)
{
time_t t = time(NULL);
- int send_stats;
if (do_stats && verbose > 1) {
/* These come out from every process */
show_flist_stats();
}
+ if (am_generator)
+ return;
+
if (am_daemon) {
log_exit(0, __FILE__, __LINE__);
if (f == -1 || !am_sender) return;
}
- send_stats = verbose || protocol_version >= 20;
if (am_server) {
- if (am_sender && send_stats) {
+ if (am_sender) {
int64 w;
/* store total_written in a temporary
* because write_longint changes it */
/* this is the client */
- if (!am_sender && send_stats) {
+ if (!am_sender) {
int64 r;
stats.total_written = read_longint(f);
/* store total_read in a temporary, read_longint changes it */
}
if (do_stats) {
- if (!am_sender && !send_stats) {
- /* missing the bytes written by the generator */
- rprintf(FINFO, "\nCannot show stats as receiver because remote protocol version is less than 20\n");
- rprintf(FINFO, "Use --stats -v to show stats\n");
- return;
- }
rprintf(FINFO,"\nNumber of files: %d\n", stats.num_files);
rprintf(FINFO,"Number of files transferred: %d\n",
stats.num_transferred_files);
getpid(),
am_server ? "server " : "",
am_daemon ? "daemon " : "",
- am_sender ? "sender" : "receiver");
+ who_am_i());
rprintf(FINFO, " arena: %10d (bytes from sbrk)\n", mi.arena);
rprintf(FINFO, " ordblks: %10d (chunks not in use)\n", mi.ordblks);
rprintf(FINFO, " smblks: %10d\n", mi.smblks);
rprintf(FINFO, " hblks: %10d (chunks from mmap)\n", mi.hblks);
rprintf(FINFO, " hblkhd: %10d (bytes from mmap)\n", mi.hblkhd);
+ rprintf(FINFO, " allmem: %10d (bytes from sbrk + mmap)\n",
+ mi.arena + mi.hblkhd);
rprintf(FINFO, " usmblks: %10d\n", mi.usmblks);
rprintf(FINFO, " fsmblks: %10d\n", mi.fsmblks);
rprintf(FINFO, " uordblks: %10d (bytes used)\n", mi.uordblks);
/* Start the remote shell. cmd may be NULL to use the default. */
-static pid_t do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int *f_out)
+static pid_t do_cmd(char *cmd, char *machine, char *user, char *path,
+ int *f_in, int *f_out)
{
+ int i, argc = 0;
char *args[100];
- int i,argc=0;
pid_t ret;
- char *tok,*dir=NULL;
+ char *tok, *dir = NULL;
int dash_l_set = 0;
if (!read_batch && !local_server) {
if (!cmd)
goto oom;
- for (tok=strtok(cmd," ");tok;tok=strtok(NULL," ")) {
+ for (tok = strtok(cmd, " "); tok; tok = strtok(NULL, " "))
args[argc++] = tok;
- }
/* check to see if we've already been given '-l user' in
* the remote-shell command */
if (!daemon_over_rsh && path && *path)
args[argc++] = path;
+ if (argc >= (int)(sizeof args / sizeof args[0])) {
+ rprintf(FERROR, "internal: args[] overflowed in do_cmd()\n");
+ exit_cleanup(RERR_MALLOC); /* XXX Need better RERR? */
+ }
+
args[argc] = NULL;
if (verbose > 3) {
}
-
-
static char *get_local_name(struct file_list *flist,char *name)
{
STRUCT_STAT st;
if (do_stat(name,&st) == 0) {
if (S_ISDIR(st.st_mode)) {
- if (!push_dir(name, 0)) {
+ if (!push_dir(name)) {
rprintf(FERROR, "push_dir %s failed: %s (1)\n",
full_fname(name), strerror(errno));
exit_cleanup(RERR_FILESELECT);
rprintf(FINFO,"created directory %s\n",name);
}
- if (!push_dir(name, 0)) {
+ if (!push_dir(name)) {
rprintf(FERROR, "push_dir %s failed: %s (2)\n",
full_fname(name), strerror(errno));
exit_cleanup(RERR_FILESELECT);
struct file_list *flist;
char *dir = argv[0];
- if (verbose > 2)
- rprintf(FINFO,"server_sender starting pid=%d\n",(int)getpid());
+ if (verbose > 2) {
+ rprintf(FINFO, "server_sender starting pid=%ld\n",
+ (long)getpid());
+ }
- if (!relative_paths && !push_dir(dir, 0)) {
+ if (!relative_paths && !push_dir(dir)) {
rprintf(FERROR, "push_dir %s failed: %s (3)\n",
full_fname(dir), strerror(errno));
exit_cleanup(RERR_FILESELECT);
msleep(20);
}
+ am_generator = 1;
+
close(error_pipe[1]);
if (f_in != f_out) close(f_in);
generate_files(f_out, flist, local_name);
- get_redo_num(); /* Read final -1, and any prior messages. */
+ get_redo_num(); /* Read final MSG_DONE and any prior messages. */
+ report(-1);
io_flush(FULL_FLUSH);
if (protocol_version >= 24) {
/* send a final goodbye message */
{
int status;
struct file_list *flist;
- char *local_name=NULL;
+ char *local_name = NULL;
char *dir = NULL;
- if (verbose > 2)
- rprintf(FINFO,"server_recv(%d) starting pid=%d\n",argc,(int)getpid());
+ if (verbose > 2) {
+ rprintf(FINFO, "server_recv(%d) starting pid=%ld\n",
+ argc, (long)getpid());
+ }
if (am_daemon && lp_read_only(module_id) && !am_sender) {
rprintf(FERROR,"ERROR: module is read only\n");
dir = argv[0];
argc--;
argv++;
- if (!am_daemon && !push_dir(dir, 0)) {
+ if (!am_daemon && !push_dir(dir)) {
rprintf(FERROR, "push_dir %s failed: %s (4)\n",
full_fname(dir), strerror(errno));
exit_cleanup(RERR_FILESELECT);
}
if (shell_machine) {
- p = strchr(shell_machine,'@');
+ p = strrchr(shell_machine,'@');
if (p) {
*p = 0;
shell_user = shell_machine;
#endif /* def MAINTAINER_MODE */
starttime = time(NULL);
- am_root = (getuid() == 0);
+ am_root = (MY_UID() == 0);
memset(&stats, 0, sizeof(stats));
* (implemented by forking "pwd" and reading its output) doesn't
* work when there are other child processes. Also, on all systems
* that implement getcwd that way "pwd" can't be found after chroot. */
- push_dir(NULL,0);
+ push_dir(NULL);
+
+ init_flist();
if (write_batch && !am_server) {
write_batch_argvs_file(orig_argc, orig_argv);
if (dry_run)
verbose = MAX(verbose,1);
-#ifndef SUPPORT_LINKS
- if (!am_server && preserve_links) {
- rprintf(FERROR,"ERROR: symbolic links not supported\n");
- exit_cleanup(RERR_UNSUPPORTED);
- }
-#endif
-
if (am_server) {
set_nonblocking(STDIN_FILENO);
set_nonblocking(STDOUT_FILENO);