time_t starttime = 0;
extern struct stats stats;
-extern char *files_from;
-extern int filesfrom_fd;
-extern char *remote_filesfrom_file;
+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 cvs_exclude;
+extern int delete_mode;
+extern int delete_excluded;
+extern int delete_after;
+extern int daemon_over_rsh;
+extern int do_stats;
+extern int dry_run;
+extern int list_only;
+extern int local_server;
+extern int log_got_error;
+extern int module_id;
+extern int orig_umask;
+extern int preserve_hard_links;
extern int protocol_version;
+extern int recurse;
+extern int relative_paths;
+extern int rsync_port;
+extern int read_batch;
+extern int write_batch;
+extern int filesfrom_fd;
+extern pid_t cleanup_child_pid;
+extern char *files_from;
+extern char *remote_filesfrom_file;
+extern char *rsync_path;
+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);
- extern int do_stats;
int send_stats;
if (do_stats && verbose > 1) {
show_flist_stats();
}
+ if (am_generator)
+ return;
+
if (am_daemon) {
log_exit(0, __FILE__, __LINE__);
if (f == -1 || !am_sender) return;
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);
pid_t ret;
char *tok,*dir=NULL;
int dash_l_set = 0;
- extern int local_server;
- extern char *rsync_path;
- extern int blocking_io;
- extern int daemon_over_rsh;
- extern int read_batch;
if (!read_batch && !local_server) {
char *rsh_env = getenv(RSYNC_RSH_ENV);
}
-
-
static char *get_local_name(struct file_list *flist,char *name)
{
STRUCT_STAT st;
int e;
- extern int orig_umask;
if (verbose > 2)
rprintf(FINFO,"get_local_name count=%d %s\n",
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);
}
-
-
static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
{
int i;
struct file_list *flist;
char *dir = argv[0];
- extern int relative_paths;
- extern int recurse;
- 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);
int pid;
int status=0;
int error_pipe[2];
- extern int preserve_hard_links;
- extern int delete_after;
- extern int recurse;
- extern int delete_mode;
if (preserve_hard_links)
init_hard_links(flist);
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 */
struct file_list *flist;
char *local_name=NULL;
char *dir = NULL;
- extern int delete_mode;
- extern int delete_excluded;
- extern int module_id;
- extern int read_batch;
- extern struct file_list *batch_flist;
- 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);
void start_server(int f_in, int f_out, int argc, char *argv[])
{
- extern int cvs_exclude;
- extern int read_batch;
-
setup_protocol(f_out, f_in);
set_nonblocking(f_in);
struct file_list *flist = NULL;
int status = 0, status2 = 0;
char *local_name = NULL;
- extern pid_t cleanup_child_pid;
- extern int write_batch;
- extern int read_batch;
- extern struct file_list *batch_flist;
cleanup_child_pid = pid;
if (read_batch)
io_start_multiplex_in(f_in);
if (am_sender) {
- extern int cvs_exclude;
- extern int delete_mode;
- extern int delete_excluded;
io_start_buffering_out(f_out);
if (cvs_exclude)
add_cvs_excludes();
rprintf(FINFO,"file list sent\n");
io_flush(NORMAL_FLUSH);
- io_start_buffering_out(f_out);
send_files(flist,f_out,f_in);
io_flush(FULL_FLUSH);
if (protocol_version >= 24) {
}
if (argc == 0) {
- extern int list_only;
list_only = 1;
}
int ret;
pid_t pid;
int f_in,f_out;
- extern int local_server;
- extern char *shell_cmd;
- extern int rsync_port;
- extern int daemon_over_rsh;
- extern int read_batch;
int rc;
/* Don't clobber argv[] so that ps(1) can still show the right
}
if (shell_machine) {
- p = strchr(shell_machine,'@');
+ p = strrchr(shell_machine,'@');
if (p) {
*p = 0;
shell_user = shell_machine;
}
if (argc == 0 && !am_sender) {
- extern int list_only;
list_only = 1;
}
static RETSIGTYPE sigusr2_handler(UNUSED(int val))
{
- extern int log_got_error;
if (log_got_error) _exit(RERR_PARTIAL);
_exit(0);
}
int main(int argc,char *argv[])
{
- extern int am_root;
- extern int orig_umask;
- extern int dry_run;
int ret;
- extern int write_batch;
int orig_argc;
char **orig_argv;
#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