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
Autoindent
[rsync/rsync.git]
/
main.c
diff --git
a/main.c
b/main.c
index
ca2b456
..
c092bd2
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-1,7
+1,8
@@
/* -*- c-file-style: "linux" -*-
/* -*- c-file-style: "linux" -*-
- Copyright (C) 1996-200
0 by Andrew Tridgell
+ Copyright (C) 1996-200
1 by Andrew Tridgell <tridge@samba.org>
Copyright (C) Paul Mackerras 1996
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
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
@@
-36,6
+37,12
@@
void wait_process(pid_t pid, int *status)
msleep(20);
io_flush();
}
msleep(20);
io_flush();
}
+
+ /* TODO: If the child exited on a signal, then log an
+ * appropriate error message. Perhaps we should also accept a
+ * message describing the purpose of the child. Also indicate
+ * this to the caller so that thhey know something went
+ * wrong. */
*status = WEXITSTATUS(*status);
}
*status = WEXITSTATUS(*status);
}
@@
-119,16
+126,19
@@
static void report(int f)
}
}
-static int do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int *f_out)
+/* 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)
{
char *args[100];
{
char *args[100];
- int i,argc=0, ret;
+ int i,argc=0;
+ pid_t ret;
char *tok,*dir=NULL;
extern int local_server;
extern char *rsync_path;
extern int blocking_io;
char *tok,*dir=NULL;
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 (!cmd)
cmd = getenv(RSYNC_RSH_ENV);
if (!cmd)
@@
-179,6
+189,8
@@
static int do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int *f
}
if (local_server) {
}
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);
ret = local_child(argc, args, f_in, f_out);
} else {
ret = piped_child(args,f_in,f_out);
@@
-352,7
+364,8
@@
static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
/* 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! */
/* 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]);
}
close(recv_pipe[1]);
@@
-390,6
+403,8
@@
static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
extern int am_daemon;
extern int module_id;
extern int am_sender;
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 (verbose > 2)
rprintf(FINFO,"server_recv(%d) starting pid=%d\n",argc,(int)getpid());
@@
-415,7
+430,10
@@
static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
if (delete_mode && !delete_excluded)
recv_exclude_list(f_in);
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);
if (!flist) {
rprintf(FERROR,"server_recv: recv_file_list error\n");
exit_cleanup(RERR_FILESELECT);
@@
-439,6
+457,7
@@
void start_server(int f_in, int f_out, int argc, char *argv[])
extern int cvs_exclude;
extern int am_sender;
extern int remote_version;
extern int cvs_exclude;
extern int am_sender;
extern int remote_version;
+ extern int read_batch; /* dw */
setup_protocol(f_out, f_in);
setup_protocol(f_out, f_in);
@@
-449,9
+468,11
@@
void start_server(int f_in, int f_out, int argc, char *argv[])
io_start_multiplex_out(f_out);
if (am_sender) {
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();
add_cvs_excludes();
+ }
do_server_sender(f_in, f_out, argc, argv);
} else {
do_server_recv(f_in, f_out, argc, argv);
do_server_sender(f_in, f_out, argc, argv);
} else {
do_server_recv(f_in, f_out, argc, argv);
@@
-464,13
+485,21
@@
void start_server(int f_in, int f_out, int argc, char *argv[])
* This is called once the connection has been negotiated. It is used
* for rsyncd, remote-shell, and local connections.
*/
* This is called once the connection has been negotiated. It is used
* for rsyncd, remote-shell, and local connections.
*/
-int client_run(int f_in, int f_out,
in
t pid, int argc, char *argv[])
+int client_run(int f_in, int f_out,
pid_
t pid, int argc, char *argv[])
{
struct file_list *flist;
int status = 0, status2 = 0;
char *local_name = NULL;
extern int am_sender;
extern int remote_version;
{
struct file_list *flist;
int status = 0, status2 = 0;
char *local_name = NULL;
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);
set_nonblocking(f_in);
set_nonblocking(f_out);
@@
-488,21
+517,22
@@
int client_run(int f_in, int f_out, int pid, int argc, char *argv[])
add_cvs_excludes();
if (delete_mode && !delete_excluded)
send_exclude_list(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 (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)
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);
}
io_flush();
wait_process(pid, &status);
}
- if (remote_version >= 24) {
- /* final goodbye message */
- read_int(f_in);
- }
report(-1);
exit_cleanup(status);
}
report(-1);
exit_cleanup(status);
}
@@
-512,7
+542,8
@@
int client_run(int f_in, int f_out, int pid, int argc, char *argv[])
list_only = 1;
}
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) {
flist = recv_file_list(f_in);
if (!flist || flist->count == 0) {
@@
-528,12
+559,12
@@
int client_run(int f_in, int f_out, int pid, int argc, char *argv[])
if (pid != -1) {
if (verbose > 3)
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);
}
io_flush();
wait_process(pid, &status);
}
- return
status | status2
;
+ return
MAX(status, status2)
;
}
static char *find_colon(char *s)
}
static char *find_colon(char *s)
@@
-552,6
+583,22
@@
static char *find_colon(char *s)
}
}
+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,
/*
* Start a client for either type of remote connection. Work out
* whether the arguments request a remote shell or rsyncd connection,
@@
-563,18
+610,26
@@
static int start_client(int argc, char *argv[])
char *shell_machine = NULL;
char *shell_path = NULL;
char *shell_user = NULL;
char *shell_machine = NULL;
char *shell_path = NULL;
char *shell_user = NULL;
- int pid, ret;
+ int ret;
+ pid_t pid;
int f_in,f_out;
extern int local_server;
extern int am_sender;
extern char *shell_cmd;
extern int rsync_port;
int f_in,f_out;
extern int local_server;
extern int am_sender;
extern char *shell_cmd;
extern int rsync_port;
- char *argv0 = strdup(argv[0]);
+ extern int whole_file;
+ extern int read_batch;
+ int rc;
- if (strncasecmp(URL_PREFIX, argv0, strlen(URL_PREFIX)) == 0) {
+ /* 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, argv[0], strlen(URL_PREFIX)) == 0) {
char *host, *path;
char *host, *path;
- host = argv
0
+ strlen(URL_PREFIX);
+ host = argv
[0]
+ strlen(URL_PREFIX);
p = strchr(host,'/');
if (p) {
*p = 0;
p = strchr(host,'/');
if (p) {
*p = 0;
@@
-590,12
+645,13
@@
static int start_client(int argc, char *argv[])
return start_socket_client(host, path, argc-1, argv+1);
}
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;
if (p) {
if (p[1] == ':') {
*p = 0;
- return start_socket_client(argv
0
, p+2, argc-1, argv+1);
+ return start_socket_client(argv
[0]
, p+2, argc-1, argv+1);
}
if (argc < 1) {
}
if (argc < 1) {
@@
-605,7
+661,7
@@
static int start_client(int argc, char *argv[])
am_sender = 0;
*p = 0;
am_sender = 0;
*p = 0;
- shell_machine = argv
0
;
+ shell_machine = argv
[0]
;
shell_path = p+1;
argc--;
argv++;
shell_path = p+1;
argc--;
argv++;
@@
-615,6
+671,8
@@
static int start_client(int argc, char *argv[])
p = find_colon(argv[argc-1]);
if (!p) {
local_server = 1;
p = find_colon(argv[argc-1]);
if (!p) {
local_server = 1;
+ /* disable "rsync algorithm" when both sides local */
+ whole_file = 1;
} else if (p[1] == ':') {
*p = 0;
return start_socket_client(argv[argc-1], p+2, argc-1, argv);
} else if (p[1] == ':') {
*p = 0;
return start_socket_client(argv[argc-1], p+2, argc-1, argv);
@@
-635,7
+693,12
@@
static int start_client(int argc, char *argv[])
}
argc--;
}
}
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) {
if (shell_machine) {
p = strchr(shell_machine,'@');
if (p) {
@@
-679,9
+742,17
@@
static RETSIGTYPE sigusr1_handler(int val) {
}
static RETSIGTYPE sigusr2_handler(int val) {
}
static RETSIGTYPE sigusr2_handler(int val) {
+ extern int log_got_error;
+ if (log_got_error) _exit(RERR_PARTIAL);
_exit(0);
}
_exit(0);
}
+static RETSIGTYPE sigchld_handler(int val) {
+#ifdef WNOHANG
+ while (waitpid(-1, NULL, WNOHANG) > 0) ;
+#endif
+}
+
int main(int argc,char *argv[])
{
extern int am_root;
int main(int argc,char *argv[])
{
extern int am_root;
@@
-689,9
+760,17
@@
int main(int argc,char *argv[])
extern int dry_run;
extern int am_daemon;
extern int am_server;
extern int dry_run;
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);
signal(SIGUSR1, sigusr1_handler);
signal(SIGUSR2, sigusr2_handler);
+ signal(SIGCHLD, sigchld_handler);
starttime = time(NULL);
am_root = (getuid() == 0);
starttime = time(NULL);
am_root = (getuid() == 0);
@@
-707,15
+786,13
@@
int main(int argc,char *argv[])
carried across */
orig_umask = (int)umask(0);
carried across */
orig_umask = (int)umask(0);
- if (!parse_arguments(argc, argv, 1)) {
+ if (!parse_arguments(&argc, (const char ***) &argv, 1)) {
+ /* FIXME: We ought to call the same error-handling
+ * code here, rather than relying on getopt. */
+ option_error();
exit_cleanup(RERR_SYNTAX);
}
exit_cleanup(RERR_SYNTAX);
}
- argc -= optind;
- argv += optind;
- optind = 0;
-
- signal(SIGCHLD,SIG_IGN);
signal(SIGINT,SIGNAL_CAST sig_int);
signal(SIGPIPE,SIGNAL_CAST sig_int);
signal(SIGHUP,SIGNAL_CAST sig_int);
signal(SIGINT,SIGNAL_CAST sig_int);
signal(SIGPIPE,SIGNAL_CAST sig_int);
signal(SIGHUP,SIGNAL_CAST sig_int);
@@
-727,6
+804,15
@@
int main(int argc,char *argv[])
that implement getcwd that way "pwd" can't be found after chroot. */
push_dir(NULL,0);
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();
}
if (am_daemon) {
return daemon_main();
}
@@
-752,6
+838,8
@@
int main(int argc,char *argv[])
start_server(STDIN_FILENO, STDOUT_FILENO, argc, argv);
}
start_server(STDIN_FILENO, STDOUT_FILENO, argc, argv);
}
- return start_client(argc, argv);
+ ret = start_client(argc, argv);
+ exit_cleanup(ret);
+ return ret;
}
}