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 int log_got_error;
extern int module_id;
extern int orig_umask;
+extern int keep_dirlinks;
extern int preserve_hard_links;
extern int protocol_version;
extern int recurse;
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.
*/
io_flush(FULL_FLUSH);
}
- if ((waited_pid == -1) && (errno == ECHILD)) {
+ if (waited_pid == -1 && errno == ECHILD) {
/* status of requested child no longer available.
* check to see if it was processed by the sigchld_handler.
*/
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;
+ 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)
{
- char *args[100];
- int i,argc=0;
+ int i, argc = 0;
+ char *args[MAX_ARGS];
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, " ")) {
+ /* Comparison leaves rooms for server_options(). */
+ if (argc >= MAX_ARGS - 100) {
+ rprintf(FERROR, "internal: args[] overflowed in do_cmd()\n");
+ exit_cleanup(RERR_SYNTAX);
+ }
args[argc++] = tok;
}
}
server_options(args,&argc);
+
+ if (argc >= MAX_ARGS - 2) {
+ rprintf(FERROR, "internal: args[] overflowed in do_cmd()\n");
+ exit_cleanup(RERR_SYNTAX);
+ }
}
args[argc++] = ".";
if (verbose > 3) {
rprintf(FINFO,"cmd=");
- for (i=0;i<argc;i++)
+ for (i = 0; i < argc; i++)
rprintf(FINFO,"%s ",args[i]);
rprintf(FINFO,"\n");
}
ret = piped_child(args,f_in,f_out);
}
- if (dir) free(dir);
+ if (dir)
+ free(dir);
return ret;
}
-
-
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)) {
- rprintf(FERROR, "push_dir %s failed: %s (1)\n",
- full_fname(name), strerror(errno));
+ if (!push_dir(name)) {
+ rsyserr(FERROR, errno, "push_dir#1 %s failed",
+ full_fname(name));
exit_cleanup(RERR_FILESELECT);
}
return NULL;
return name;
if (do_mkdir(name,0777 & ~orig_umask) != 0) {
- rprintf(FERROR, "mkdir %s failed: %s\n",
- full_fname(name), strerror(errno));
+ rsyserr(FERROR, errno, "mkdir %s failed", full_fname(name));
exit_cleanup(RERR_FILEIO);
} else {
if (verbose > 0)
rprintf(FINFO,"created directory %s\n",name);
}
- if (!push_dir(name, 0)) {
- rprintf(FERROR, "push_dir %s failed: %s (2)\n",
- full_fname(name), strerror(errno));
+ if (!push_dir(name)) {
+ rsyserr(FERROR, errno, "push_dir#2 %s failed",
+ full_fname(name));
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)) {
- rprintf(FERROR, "push_dir %s failed: %s (3)\n",
- full_fname(dir), strerror(errno));
+ if (am_daemon && lp_write_only(module_id) && am_sender) {
+ rprintf(FERROR, "ERROR: module is write only\n");
+ exit_cleanup(RERR_SYNTAX);
+ return;
+ }
+
+ if (!relative_paths && !push_dir(dir)) {
+ rsyserr(FERROR, errno, "push_dir#3 %s failed",
+ full_fname(dir));
exit_cleanup(RERR_FILESELECT);
}
argc--;
int l = strlen(dir);
if (strcmp(dir,"/") == 0)
l = 0;
- for (i=0;i<argc;i++)
+ for (i = 0; i < argc; i++)
argv[i] += l+1;
}
if (argc == 0 && recurse) {
- argc=1;
+ argc = 1;
argv--;
argv[0] = ".";
}
static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
{
int pid;
- int status=0;
+ int status = 0;
int error_pipe[2];
if (preserve_hard_links)
io_flush(NORMAL_FLUSH);
- if ((pid=do_fork()) == 0) {
+ if ((pid = do_fork()) == 0) {
close(error_pipe[0]);
- if (f_in != f_out) close(f_out);
+ if (f_in != f_out)
+ close(f_out);
/* we can't let two processes write to the socket at one time */
io_multiplexing_close();
msleep(20);
}
+ am_generator = 1;
+
close(error_pipe[1]);
- if (f_in != f_out) close(f_in);
+ if (f_in != f_out)
+ close(f_in);
io_start_buffering_out(f_out);
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)) {
- rprintf(FERROR, "push_dir %s failed: %s (4)\n",
- full_fname(dir), strerror(errno));
+ if (!am_daemon && !push_dir(dir)) {
+ rsyserr(FERROR, errno, "push_dir#4 %s failed",
+ full_fname(dir));
exit_cleanup(RERR_FILESELECT);
}
}
if (argc > 0) {
if (strcmp(dir,".")) {
argv[0] += strlen(dir);
- if (argv[0][0] == '/') argv[0]++;
+ if (argv[0][0] == '/')
+ argv[0]++;
}
local_name = get_local_name(flist,argv[0]);
}
io_start_multiplex_out(f_out);
if (am_sender) {
+ keep_dirlinks = 0; /* Must be disabled on the sender. */
if (!read_batch) {
recv_exclude_list(f_in);
if (cvs_exclude)
io_start_multiplex_in(f_in);
if (am_sender) {
+ keep_dirlinks = 0; /* Must be disabled on the sender. */
io_start_buffering_out(f_out);
if (cvs_exclude)
add_cvs_excludes();
exit_cleanup(status);
}
- if (argc == 0) {
+ if (argc == 0)
list_only = 1;
- }
- if (!write_batch)
+ if (!read_batch)
send_exclude_list(f_out);
if (filesfrom_fd >= 0) {
return start_socket_client(host, path, argc-1, argv+1);
}
- if (!read_batch) {
+ if (!read_batch) { /* for read_batch, NO source is specified */
p = find_colon(argv[0]);
- if (p) {
+ if (p) { /* source is remote */
if (remote_filesfrom_file
&& remote_filesfrom_file != files_from + 1
&& strncmp(files_from, argv[0], p-argv[0]+1) != 0) {
daemon_over_rsh = 1;
}
- if (argc < 1) {
+ if (argc < 1) { /* destination required */
usage(FERROR);
exit_cleanup(RERR_SYNTAX);
}
*p = 0;
shell_machine = argv[0];
shell_path = p+1;
- argc--;
argv++;
- } else {
+ } else { /* source is local */
am_sender = 1;
/* rsync:// destination uses rsync server over direct socket */
return start_socket_client(host, path, argc-1, argv);
}
- p = find_colon(argv[argc-1]);
+ p = find_colon(argv[argc-1]); /* look in dest arg */
if (p && remote_filesfrom_file
&& remote_filesfrom_file != files_from + 1
&& strncmp(files_from, argv[argc-1], p-argv[argc-1]+1) != 0) {
"--files-from hostname is not transfer hostname\n");
exit_cleanup(RERR_SYNTAX);
}
- if (!p) {
+ if (!p) { /* no colon found, so src & dest are local */
local_server = 1;
if (remote_filesfrom_file) {
rprintf(FERROR,
shell_machine = argv[argc-1];
shell_path = p+1;
}
- argc--;
}
- } else {
+ argc--;
+ } else { /* read_batch */
am_sender = 1;
local_server = 1;
shell_path = argv[argc-1];
}
if (shell_machine) {
- p = strchr(shell_machine,'@');
+ p = strrchr(shell_machine,'@');
if (p) {
*p = 0;
shell_user = shell_machine;
shell_path?shell_path:"");
}
+ /* for remote source, only single dest arg can remain ... */
if (!am_sender && argc > 1) {
usage(FERROR);
exit_cleanup(RERR_SYNTAX);
}
- if (argc == 0 && !am_sender) {
+ /* ... or no dest at all */
+ if (!am_sender && argc == 0) {
list_only = 1;
}
#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);
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff