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.
*/
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);
}
-
-
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. */
io_flush(FULL_FLUSH);
if (protocol_version >= 24) {
/* send a final goodbye message */
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;
* (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);