Copyright (C) 1996-2001 by Andrew Tridgell <tridge@samba.org>
Copyright (C) Paul Mackerras 1996
+ Copyright (C) 2001 by Martin Pool <mbp@samba.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
extern int local_server;
extern char *rsync_path;
extern int blocking_io;
+ extern int read_batch;
- if (!local_server) {
+ if (!read_batch && !local_server) { /* dw -- added read_batch */
if (!cmd)
cmd = getenv(RSYNC_RSH_ENV);
if (!cmd)
}
if (local_server) {
+ if (read_batch)
+ create_flist_from_batch();
ret = local_child(argc, args, f_in, f_out);
} else {
ret = piped_child(args,f_in,f_out);
/* finally we go to sleep until our parent kills us
with a USR2 signal. We sleep for a short time as on
some OSes a signal won't interrupt a sleep! */
- while (1) msleep(20);
+ while (msleep(20))
+ ;
}
close(recv_pipe[1]);
extern int am_daemon;
extern int module_id;
extern int am_sender;
+ extern int read_batch; /* dw */
+ extern struct file_list *batch_flist; /* dw */
if (verbose > 2)
rprintf(FINFO,"server_recv(%d) starting pid=%d\n",argc,(int)getpid());
if (delete_mode && !delete_excluded)
recv_exclude_list(f_in);
- flist = recv_file_list(f_in);
+ if (read_batch) /* dw */
+ flist = batch_flist;
+ else
+ flist = recv_file_list(f_in);
if (!flist) {
rprintf(FERROR,"server_recv: recv_file_list error\n");
exit_cleanup(RERR_FILESELECT);
extern int cvs_exclude;
extern int am_sender;
extern int remote_version;
+ extern int read_batch; /* dw */
setup_protocol(f_out, f_in);
io_start_multiplex_out(f_out);
if (am_sender) {
- recv_exclude_list(f_in);
- if (cvs_exclude)
+ if (!read_batch) { /* dw */
+ recv_exclude_list(f_in);
+ if (cvs_exclude)
add_cvs_excludes();
+ }
do_server_sender(f_in, f_out, argc, argv);
} else {
do_server_recv(f_in, f_out, argc, argv);
extern int am_sender;
extern int remote_version;
extern pid_t cleanup_child_pid;
+ extern int write_batch; /* dw */
+ extern int read_batch; /* dw */
+ extern struct file_list *batch_flist; /* dw */
cleanup_child_pid = pid;
+ if (read_batch)
+ flist = batch_flist; /* dw */
set_nonblocking(f_in);
set_nonblocking(f_out);
add_cvs_excludes();
if (delete_mode && !delete_excluded)
send_exclude_list(f_out);
- flist = send_file_list(f_out,argc,argv);
+ if (!read_batch) /* dw -- don't write to pipe */
+ flist = send_file_list(f_out,argc,argv);
if (verbose > 3)
rprintf(FINFO,"file list sent\n");
send_files(flist,f_out,f_in);
+ if (remote_version >= 24) {
+ /* final goodbye message */
+ read_int(f_in);
+ }
if (pid != -1) {
if (verbose > 3)
- rprintf(FINFO,"client_run waiting on %d\n",pid);
+ rprintf(FINFO,"client_run waiting on %d\n", (int) pid);
io_flush();
wait_process(pid, &status);
}
- if (remote_version >= 24) {
- /* final goodbye message */
- read_int(f_in);
- }
report(-1);
exit_cleanup(status);
}
list_only = 1;
}
- send_exclude_list(f_out);
+ if (!write_batch) /* dw */
+ send_exclude_list(f_out);
flist = recv_file_list(f_in);
if (!flist || flist->count == 0) {
if (pid != -1) {
if (verbose > 3)
- rprintf(FINFO,"client_run2 waiting on %d\n",pid);
+ rprintf(FINFO,"client_run2 waiting on %d\n", (int) pid);
io_flush();
wait_process(pid, &status);
}
}
+static int copy_argv (char *argv[])
+{
+ int i;
+
+ for (i = 0; argv[i]; i++) {
+ if (!(argv[i] = strdup(argv[i]))) {
+ rprintf (FERROR, "out of memory at %s(%d)\n",
+ __FILE__, __LINE__);
+ return RERR_MALLOC;
+ }
+ }
+
+ return 0;
+}
+
+
/*
* Start a client for either type of remote connection. Work out
* whether the arguments request a remote shell or rsyncd connection,
extern char *shell_cmd;
extern int rsync_port;
extern int whole_file;
- char *argv0 = strdup(argv[0]);
+ extern int read_batch;
+ int rc;
+
+ /* Don't clobber argv[] so that ps(1) can still show the right
+ command line. */
+ if ((rc = copy_argv (argv)))
+ return rc;
- if (strncasecmp(URL_PREFIX, argv0, strlen(URL_PREFIX)) == 0) {
+ if (strncasecmp(URL_PREFIX, argv[0], strlen(URL_PREFIX)) == 0) {
char *host, *path;
- host = argv0 + strlen(URL_PREFIX);
+ host = argv[0] + strlen(URL_PREFIX);
p = strchr(host,'/');
if (p) {
*p = 0;
return start_socket_client(host, path, argc-1, argv+1);
}
- p = find_colon(argv0);
+ if (!read_batch) { /* dw */
+ p = find_colon(argv[0]);
if (p) {
if (p[1] == ':') {
*p = 0;
- return start_socket_client(argv0, p+2, argc-1, argv+1);
+ return start_socket_client(argv[0], p+2, argc-1, argv+1);
}
if (argc < 1) {
am_sender = 0;
*p = 0;
- shell_machine = argv0;
+ shell_machine = argv[0];
shell_path = p+1;
argc--;
argv++;
}
argc--;
}
-
+ } else {
+ am_sender = 1; /* dw */
+ local_server = 1; /* dw */
+ shell_path = argv[argc-1]; /* dw */
+ }
+
if (shell_machine) {
p = strchr(shell_machine,'@');
if (p) {
}
static RETSIGTYPE sigchld_handler(int val) {
+#ifdef WNOHANG
+ while (waitpid(-1, NULL, WNOHANG) > 0) ;
+#endif
}
int main(int argc,char *argv[])
extern int am_daemon;
extern int am_server;
int ret;
+ extern int read_batch; /* dw */
+ extern int write_batch; /* dw */
+ extern char *batch_ext; /* dw */
+ int orig_argc; /* dw */
+
+ orig_argc = argc; /* dw */
signal(SIGUSR1, sigusr1_handler);
signal(SIGUSR2, sigusr2_handler);
that implement getcwd that way "pwd" can't be found after chroot. */
push_dir(NULL,0);
+ if (write_batch) { /* dw */
+ create_batch_file_ext();
+ write_batch_argvs_file(orig_argc, argc, argv);
+ }
+
+ if (read_batch) { /* dw */
+ set_batch_file_ext(batch_ext);
+ }
+
if (am_daemon) {
return daemon_main();
}
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff