X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/3cb6f5d6cbe2b1fead0453ffb31488c2ffc2def2..9486289ce452ab82ca8b3f16fae8c2ef5247a923:/main.c

diff --git a/main.c b/main.c
index d476e21a..527daeb6 100644
--- a/main.c
+++ b/main.c
@@ -22,7 +22,7 @@
 int verbose = 0;
 int always_checksum = 0;
 time_t starttime;
-off_t total_size = 0;
+int64 total_size = 0;
 int block_size=BLOCK_SIZE;
 
 char *backup_suffix = BACKUP_SUFFIX;
@@ -55,23 +55,29 @@ int orig_umask=0;
 int relative_paths=0;
 int numeric_ids = 0;
 int force_delete = 0;
+int io_timeout = 0;
+int io_error = 0;
+static int port = RSYNC_PORT;
+
+static char *shell_cmd;
 
 extern int csum_length;
 
 int am_server = 0;
-static int sender;
+int am_sender;
 int recurse = 0;
+int am_daemon;
 
-static void usage(FILE *f);
+static void usage(int fd);
 
 static void report(int f)
 {
-  off_t in,out,tsize;
+  int64 in,out,tsize;
   time_t t = time(NULL);
   
   if (!verbose) return;
 
-  if (am_server && sender) {
+  if (am_server && am_sender) {
     write_longint(f,read_total());
     write_longint(f,write_total());
     write_longint(f,total_size);
@@ -79,7 +85,7 @@ static void report(int f)
     return;
   }
     
-  if (sender) {
+  if (am_sender) {
     in = read_total();
     out = write_total();
     tsize = total_size;
@@ -89,17 +95,10 @@ static void report(int f)
     tsize = read_longint(f);
   }
 
-#if HAVE_LONGLONG
-  printf("wrote %lld bytes  read %lld bytes  %g bytes/sec\n",
-	 (long long)out,(long long)in,(in+out)/(0.5 + (t-starttime)));
-  printf("total size is %lld  speedup is %g\n",
-	 (long long)tsize,(1.0*tsize)/(in+out));
-#else
-  printf("wrote %ld bytes  read %ld bytes  %g bytes/sec\n",
-	 (long)out,(long)in,(in+out)/(0.5 + (t-starttime)));
-  printf("total size is %ld  speedup is %g\n",
-	 (long)tsize,(1.0*tsize)/(in+out));
-#endif
+  printf("wrote %.0f bytes  read %.0f bytes  %.2f bytes/sec\n",
+	 (double)out,(double)in,(in+out)/(0.5 + (t-starttime)));
+  printf("total size is %.0f  speedup is %.2f\n",
+	 (double)tsize,(1.0*tsize)/(in+out));
 }
 
 
@@ -108,11 +107,12 @@ static void server_options(char **args,int *argc)
   int ac = *argc;
   static char argstr[50];
   static char bsize[30];
+  static char iotime[30];
   int i, x;
 
   args[ac++] = "--server";
 
-  if (!sender)
+  if (!am_sender)
     args[ac++] = "--sender";
 
   x = 1;
@@ -168,6 +168,11 @@ static void server_options(char **args,int *argc)
     args[ac++] = bsize;
   }    
 
+  if (io_timeout) {
+    sprintf(iotime,"--timeout=%d",io_timeout);
+    args[ac++] = iotime;
+  }    
+
   if (strcmp(backup_suffix, BACKUP_SUFFIX)) {
 	  args[ac++] = "--suffix";
 	  args[ac++] = backup_suffix;
@@ -194,65 +199,70 @@ static void server_options(char **args,int *argc)
 
 static int do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int *f_out)
 {
-  char *args[100];
-  int i,argc=0, ret;
-  char *tok,*p,*dir=NULL;
-
-  if (!local_server) {
-    if (!cmd)
-      cmd = getenv(RSYNC_RSH_ENV);
-    if (!cmd)
-      cmd = RSYNC_RSH;
-    cmd = strdup(cmd);
-    if (!cmd) 
-      goto oom;
-
-    for (tok=strtok(cmd," ");tok;tok=strtok(NULL," ")) {
-      args[argc++] = tok;
-    }
+	char *args[100];
+	int i,argc=0, ret;
+	char *tok,*dir=NULL;
+
+	if (!local_server) {
+		if (!cmd)
+			cmd = getenv(RSYNC_RSH_ENV);
+		if (!cmd)
+			cmd = RSYNC_RSH;
+		cmd = strdup(cmd);
+		if (!cmd) 
+			goto oom;
+
+		for (tok=strtok(cmd," ");tok;tok=strtok(NULL," ")) {
+			args[argc++] = tok;
+		}
 
 #if HAVE_REMSH
-    /* remsh (on HPUX) takes the arguments the other way around */
-    args[argc++] = machine;
-    if (user) {
-      args[argc++] = "-l";
-      args[argc++] = user;
-    }
+		/* remsh (on HPUX) takes the arguments the other way around */
+		args[argc++] = machine;
+		if (user) {
+			args[argc++] = "-l";
+			args[argc++] = user;
+		}
 #else
-    if (user) {
-      args[argc++] = "-l";
-      args[argc++] = user;
-    }
-    args[argc++] = machine;
+		if (user) {
+			args[argc++] = "-l";
+			args[argc++] = user;
+		}
+		args[argc++] = machine;
 #endif
-  }
 
-  args[argc++] = rsync_path;
+		args[argc++] = rsync_path;
 
-  server_options(args,&argc);
+		server_options(args,&argc);
+	}
 
-  args[argc++] = ".";
+	args[argc++] = ".";
 
-  if (path && *path) 
-	  args[argc++] = path;
+	if (path && *path) 
+		args[argc++] = path;
 
-  args[argc] = NULL;
+	args[argc] = NULL;
 
-  if (verbose > 3) {
-    fprintf(FERROR,"cmd=");
-    for (i=0;i<argc;i++)
-      fprintf(FERROR,"%s ",args[i]);
-    fprintf(FERROR,"\n");
-  }
+	if (verbose > 3) {
+		rprintf(FINFO,"cmd=");
+		for (i=0;i<argc;i++)
+			rprintf(FINFO,"%s ",args[i]);
+		rprintf(FINFO,"\n");
+	}
+
+	if (local_server) {
+		ret = local_child(argc, args, f_in, f_out);
+	} else {
+		ret = piped_child(args,f_in,f_out);
+	}
 
-  ret = piped_child(args,f_in,f_out);
-  if (dir) free(dir);
+	if (dir) free(dir);
 
-  return ret;
+	return ret;
 
 oom:
-  out_of_memory("do_cmd");
-  return 0; /* not reached */
+	out_of_memory("do_cmd");
+	return 0; /* not reached */
 }
 
 
@@ -260,18 +270,18 @@ oom:
 
 static char *get_local_name(struct file_list *flist,char *name)
 {
-  struct stat st;
+  STRUCT_STAT st;
 
-  if (stat(name,&st) == 0) {
+  if (do_stat(name,&st) == 0) {
     if (S_ISDIR(st.st_mode)) {
       if (chdir(name) != 0) {
-	fprintf(FERROR,"chdir %s : %s (1)\n",name,strerror(errno));
+	rprintf(FERROR,"chdir %s : %s (1)\n",name,strerror(errno));
 	exit_cleanup(1);
       }
       return NULL;
     }
     if (flist->count > 1) {
-      fprintf(FERROR,"ERROR: destination must be a directory when copying more than 1 file\n");
+      rprintf(FERROR,"ERROR: destination must be a directory when copying more than 1 file\n");
       exit_cleanup(1);
     }
     return name;
@@ -283,15 +293,15 @@ static char *get_local_name(struct file_list *flist,char *name)
   if (!name) 
     return NULL;
 
-  if (mkdir(name,0777 & ~orig_umask) != 0) {
-    fprintf(FERROR,"mkdir %s : %s (1)\n",name,strerror(errno));
+  if (do_mkdir(name,0777 & ~orig_umask) != 0) {
+    rprintf(FERROR,"mkdir %s : %s (1)\n",name,strerror(errno));
     exit_cleanup(1);
   } else {
-    fprintf(FINFO,"created directory %s\n",name);
+    rprintf(FINFO,"created directory %s\n",name);
   }
 
   if (chdir(name) != 0) {
-    fprintf(FERROR,"chdir %s : %s (2)\n",name,strerror(errno));
+    rprintf(FERROR,"chdir %s : %s (2)\n",name,strerror(errno));
     exit_cleanup(1);
   }
 
@@ -301,17 +311,17 @@ static char *get_local_name(struct file_list *flist,char *name)
 
 
 
-void do_server_sender(int argc,char *argv[])
+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];
 
   if (verbose > 2)
-    fprintf(FERROR,"server_sender starting pid=%d\n",(int)getpid());
+    rprintf(FINFO,"server_sender starting pid=%d\n",(int)getpid());
   
   if (!relative_paths && chdir(dir) != 0) {
-	  fprintf(FERROR,"chdir %s: %s (3)\n",dir,strerror(errno));
+	  rprintf(FERROR,"chdir %s: %s (3)\n",dir,strerror(errno));
 	  exit_cleanup(1);
   }
   argc--;
@@ -332,9 +342,9 @@ void do_server_sender(int argc,char *argv[])
   }
     
 
-  flist = send_file_list(STDOUT_FILENO,argc,argv);
-  send_files(flist,STDOUT_FILENO,STDIN_FILENO);
-  report(STDOUT_FILENO);
+  flist = send_file_list(f_out,argc,argv);
+  send_files(flist,f_out,f_in);
+  report(f_out);
   exit_cleanup(0);
 }
 
@@ -349,7 +359,7 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
     init_hard_links(flist);
 
   if (pipe(recv_pipe) < 0) {
-    fprintf(FERROR,"pipe failed in do_recv\n");
+    rprintf(FERROR,"pipe failed in do_recv\n");
     exit(1);
   }
   
@@ -357,7 +367,7 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
   if ((pid=do_fork()) == 0) {
     recv_files(f_in,flist,local_name,recv_pipe[1]);
     if (verbose > 2)
-      fprintf(FERROR,"receiver read %ld\n",(long)read_total());
+      rprintf(FINFO,"receiver read %ld\n",(long)read_total());
     exit_cleanup(0);
   }
 
@@ -369,7 +379,7 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
 }
 
 
-void do_server_recv(int argc,char *argv[])
+static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
 {
   int status;
   struct file_list *flist;
@@ -377,25 +387,25 @@ void do_server_recv(int argc,char *argv[])
   char *dir = NULL;
   
   if (verbose > 2)
-    fprintf(FERROR,"server_recv(%d) starting pid=%d\n",argc,(int)getpid());
+    rprintf(FINFO,"server_recv(%d) starting pid=%d\n",argc,(int)getpid());
 
   if (argc > 0) {
 	  dir = argv[0];
 	  argc--;
 	  argv++;
 	  if (chdir(dir) != 0) {
-		  fprintf(FERROR,"chdir %s : %s (4)\n",
+		  rprintf(FERROR,"chdir %s : %s (4)\n",
 			  dir,strerror(errno));
 		  exit_cleanup(1);
 	  }    
   }
 
   if (delete_mode)
-    recv_exclude_list(STDIN_FILENO);
+    recv_exclude_list(f_in);
 
-  flist = recv_file_list(STDIN_FILENO);
+  flist = recv_file_list(f_in);
   if (!flist || flist->count == 0) {
-    fprintf(FERROR,"nothing to do\n");
+    rprintf(FERROR,"nothing to do\n");
     exit_cleanup(1);
   }
 
@@ -407,59 +417,225 @@ void do_server_recv(int argc,char *argv[])
 	  local_name = get_local_name(flist,argv[0]);
   }
 
-  status = do_recv(STDIN_FILENO,STDOUT_FILENO,flist,local_name);
+  status = do_recv(f_in,f_out,flist,local_name);
   exit_cleanup(status);
 }
 
 
-static void usage(FILE *f)
+void start_server(int f_in, int f_out, int argc, char *argv[])
+{
+      setup_protocol(f_out, f_in);
+	
+      if (am_sender) {
+	      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);
+      }
+      exit_cleanup(0);
+}
+
+static int client_run(int f_in, int f_out, int pid, int argc, char *argv[])
 {
-  fprintf(f,"rsync version %s Copyright Andrew Tridgell and Paul Mackerras\n\n",
+	struct file_list *flist;
+	int status = 0, status2 = 0;
+	char *local_name = NULL;
+
+	setup_protocol(f_out,f_in);
+	
+	if (am_sender) {
+		if (cvs_exclude)
+			add_cvs_excludes();
+		if (delete_mode) 
+			send_exclude_list(f_out);
+		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 (pid != -1) {
+			if (verbose > 3)
+				rprintf(FINFO,"waiting on %d\n",pid);
+			waitpid(pid, &status, 0);
+		}
+		report(-1);
+		exit_cleanup(status);
+	}
+	
+	send_exclude_list(f_out);
+	
+	flist = recv_file_list(f_in);
+	if (!flist || flist->count == 0) {
+		rprintf(FINFO,"nothing to do\n");
+		exit_cleanup(0);
+	}
+	
+	local_name = get_local_name(flist,argv[0]);
+	
+	status2 = do_recv(f_in,f_out,flist,local_name);
+	
+	report(f_in);
+	
+	if (pid != -1) {
+		waitpid(pid, &status, 0);
+	}
+	
+	return status | status2;
+}
+
+
+int start_socket_client(char *host, char *path, int argc, char *argv[])
+{
+	int fd;
+	char *sargs[100];
+	int sargc=0;
+	
+	fd = open_socket_out(host, port);
+	if (fd == -1) {
+		rprintf(FERROR,"failed to connect to %s - %s\n", host, strerror(errno));
+		exit_cleanup(1);
+	}
+	
+	server_options(sargs,&sargc);
+
+	sargs[sargc++] = ".";
+
+	if (path && *path) 
+		sargs[sargc++] = path;
+
+	sargs[sargc] = NULL;
+
+	return client_run(fd, fd, -1, argc, argv);
+}
+
+int start_client(int argc, char *argv[])
+{
+	char *p;
+	char *shell_machine = NULL;
+	char *shell_path = NULL;
+	char *shell_user = NULL;
+	int pid;
+	int f_in,f_out;
+
+	p = strchr(argv[0],':');
+
+	if (p) {
+		if (p[1] == ':') {
+			*p = 0;
+			return start_socket_client(argv[0], p+2, argc-1, argv+1);
+		}
+		am_sender = 0;
+		*p = 0;
+		shell_machine = argv[0];
+		shell_path = p+1;
+		argc--;
+		argv++;
+	} else {
+		am_sender = 1;
+
+		p = strchr(argv[argc-1],':');
+		if (!p) {
+			local_server = 1;
+		} else if (p[1] == ':') {
+			*p = 0;
+			return start_socket_client(argv[argc-1], p+2, argc-1, argv);
+		}
+		
+		if (local_server) {
+			shell_machine = NULL;
+			shell_path = argv[argc-1];
+		} else {
+			*p = 0;
+			shell_machine = argv[argc-1];
+			shell_path = p+1;
+		}
+		argc--;
+	}
+	
+	if (shell_machine) {
+		p = strchr(shell_machine,'@');
+		if (p) {
+			*p = 0;
+			shell_user = shell_machine;
+			shell_machine = p+1;
+		}
+	}
+
+	if (verbose > 3) {
+		rprintf(FINFO,"cmd=%s machine=%s user=%s path=%s\n",
+			shell_cmd?shell_cmd:"",
+			shell_machine?shell_machine:"",
+			shell_user?shell_user:"",
+			shell_path?shell_path:"");
+	}
+	
+	if (!am_sender && argc != 1) {
+		usage(FERROR);
+		exit_cleanup(1);
+	}
+	
+	pid = do_cmd(shell_cmd,shell_machine,shell_user,shell_path,&f_in,&f_out);
+	
+#if HAVE_SETLINEBUF
+	setlinebuf(stdout);
+	setlinebuf(stderr);
+#endif
+
+	return client_run(f_in, f_out, pid, argc, argv);
+}
+
+
+static void usage(int F)
+{
+  rprintf(F,"rsync version %s Copyright Andrew Tridgell and Paul Mackerras\n\n",
 	  VERSION);
-  fprintf(f,"Usage:\t%s [options] src user@host:dest\nOR",RSYNC_NAME);
-  fprintf(f,"\t%s [options] user@host:src dest\n\n",RSYNC_NAME);
-  fprintf(f,"Options:\n");
-  fprintf(f,"-v, --verbose            increase verbosity\n");
-  fprintf(f,"-c, --checksum           always checksum\n");
-  fprintf(f,"-a, --archive            archive mode (same as -rlptDog)\n");
-  fprintf(f,"-r, --recursive          recurse into directories\n");
-  fprintf(f,"-R, --relative           use relative path names\n");
-  fprintf(f,"-b, --backup             make backups (default ~ extension)\n");
-  fprintf(f,"-u, --update             update only (don't overwrite newer files)\n");
-  fprintf(f,"-l, --links              preserve soft links\n");
-  fprintf(f,"-L, --copy-links         treat soft links like regular files\n");
-  fprintf(f,"-H, --hard-links         preserve hard links\n");
-  fprintf(f,"-p, --perms              preserve permissions\n");
-  fprintf(f,"-o, --owner              preserve owner (root only)\n");
-  fprintf(f,"-g, --group              preserve group\n");
-  fprintf(f,"-D, --devices            preserve devices (root only)\n");
-  fprintf(f,"-t, --times              preserve times\n");  
-  fprintf(f,"-S, --sparse             handle sparse files efficiently\n");
-  fprintf(f,"-n, --dry-run            show what would have been transferred\n");
-  fprintf(f,"-W, --whole-file         copy whole files, no incremental checks\n");
-  fprintf(f,"-x, --one-file-system    don't cross filesystem boundaries\n");
-  fprintf(f,"-B, --block-size SIZE    checksum blocking size\n");  
-  fprintf(f,"-e, --rsh COMMAND        specify rsh replacement\n");
-  fprintf(f,"    --rsync-path PATH    specify path to rsync on the remote machine\n");
-  fprintf(f,"-C, --cvs-exclude        auto ignore files in the same way CVS does\n");
-  fprintf(f,"    --delete             delete files that don't exist on the sending side\n");
-  fprintf(f,"    --force              force deletion of directories even if not empty\n");
-  fprintf(f,"    --numeric-ids        don't map uid/gid values by user/group name\n");
-  fprintf(f,"-I, --ignore-times       don't exclude files that match length and time\n");
-  fprintf(f,"-T  --temp-dir DIR       create temporary files in directory DIR\n");
-  fprintf(f,"-z, --compress           compress file data\n");
-  fprintf(f,"    --exclude FILE       exclude file FILE\n");
-  fprintf(f,"    --exclude-from FILE  exclude files listed in FILE\n");
-  fprintf(f,"    --suffix SUFFIX      override backup suffix\n");  
-  fprintf(f,"    --version            print version number\n");  
-
-  fprintf(f,"\n");
-  fprintf(f,"the backup suffix defaults to %s\n",BACKUP_SUFFIX);
-  fprintf(f,"the block size defaults to %d\n",BLOCK_SIZE);  
+  rprintf(F,"Usage:\t%s [options] src user@host:dest\nOR",RSYNC_NAME);
+  rprintf(F,"\t%s [options] user@host:src dest\n\n",RSYNC_NAME);
+  rprintf(F,"Options:\n");
+  rprintf(F,"-v, --verbose            increase verbosity\n");
+  rprintf(F,"-c, --checksum           always checksum\n");
+  rprintf(F,"-a, --archive            archive mode (same as -rlptDog)\n");
+  rprintf(F,"-r, --recursive          recurse into directories\n");
+  rprintf(F,"-R, --relative           use relative path names\n");
+  rprintf(F,"-b, --backup             make backups (default ~ extension)\n");
+  rprintf(F,"-u, --update             update only (don't overwrite newer files)\n");
+  rprintf(F,"-l, --links              preserve soft links\n");
+  rprintf(F,"-L, --copy-links         treat soft links like regular files\n");
+  rprintf(F,"-H, --hard-links         preserve hard links\n");
+  rprintf(F,"-p, --perms              preserve permissions\n");
+  rprintf(F,"-o, --owner              preserve owner (root only)\n");
+  rprintf(F,"-g, --group              preserve group\n");
+  rprintf(F,"-D, --devices            preserve devices (root only)\n");
+  rprintf(F,"-t, --times              preserve times\n");  
+  rprintf(F,"-S, --sparse             handle sparse files efficiently\n");
+  rprintf(F,"-n, --dry-run            show what would have been transferred\n");
+  rprintf(F,"-W, --whole-file         copy whole files, no incremental checks\n");
+  rprintf(F,"-x, --one-file-system    don't cross filesystem boundaries\n");
+  rprintf(F,"-B, --block-size SIZE    checksum blocking size\n");  
+  rprintf(F,"-e, --rsh COMMAND        specify rsh replacement\n");
+  rprintf(F,"    --rsync-path PATH    specify path to rsync on the remote machine\n");
+  rprintf(F,"-C, --cvs-exclude        auto ignore files in the same way CVS does\n");
+  rprintf(F,"    --delete             delete files that don't exist on the sending side\n");
+  rprintf(F,"    --force              force deletion of directories even if not empty\n");
+  rprintf(F,"    --numeric-ids        don't map uid/gid values by user/group name\n");
+  rprintf(F,"    --timeout TIME       set IO timeout in seconds\n");
+  rprintf(F,"-I, --ignore-times       don't exclude files that match length and time\n");
+  rprintf(F,"-T  --temp-dir DIR       create temporary files in directory DIR\n");
+  rprintf(F,"-z, --compress           compress file data\n");
+  rprintf(F,"    --exclude FILE       exclude file FILE\n");
+  rprintf(F,"    --exclude-from FILE  exclude files listed in FILE\n");
+  rprintf(F,"    --suffix SUFFIX      override backup suffix\n");  
+  rprintf(F,"    --version            print version number\n");  
+
+  rprintf(F,"\n");
+  rprintf(F,"the backup suffix defaults to %s\n",BACKUP_SUFFIX);
+  rprintf(F,"the block size defaults to %d\n",BLOCK_SIZE);  
 }
 
 enum {OPT_VERSION,OPT_SUFFIX,OPT_SENDER,OPT_SERVER,OPT_EXCLUDE,
-      OPT_EXCLUDE_FROM,OPT_DELETE,OPT_NUMERIC_IDS,OPT_RSYNC_PATH,OPT_FORCE};
+      OPT_EXCLUDE_FROM,OPT_DELETE,OPT_NUMERIC_IDS,OPT_RSYNC_PATH,
+      OPT_FORCE,OPT_TIMEOUT,OPT_DAEMON};
 
 static char *short_options = "oblLWHpguDCtcahvrRIxnSe:B:T:z";
 
@@ -498,36 +674,21 @@ static struct option long_options[] = {
   {"rsh",         1,     0,    'e'},
   {"suffix",      1,     0,    OPT_SUFFIX},
   {"block-size",  1,     0,    'B'},
+  {"timeout",     1,     0,    OPT_TIMEOUT},
   {"temp-dir",    1,     0,    'T'},
   {"compress",	  0,	 0,    'z'},
+  {"daemon",      0,     0,    OPT_DAEMON},
   {0,0,0,0}};
 
 RETSIGTYPE sigusr1_handler(int val) {
 	exit_cleanup(1);
 }
 
-int main(int argc,char *argv[])
+
+static void parse_arguments(int argc, char *argv[])
 {
-    int pid, status = 0, status2 = 0;
     int opt;
     int option_index;
-    char *shell_cmd = NULL;
-    char *shell_machine = NULL;
-    char *shell_path = NULL;
-    char *shell_user = NULL;
-    char *p;
-    int f_in,f_out;
-    struct file_list *flist;
-    char *local_name = NULL;
-
-    signal(SIGUSR1, sigusr1_handler);
-
-    starttime = time(NULL);
-    am_root = (getuid() == 0);
-
-    /* we set a 0 umask so that correct file permissions can be
-       carried across */
-    orig_umask = (int)umask(0);
 
     while ((opt = getopt_long(argc, argv, 
 			      short_options, long_options, &option_index)) 
@@ -615,7 +776,7 @@ int main(int argc,char *argv[])
 #if SUPPORT_HARD_LINKS
 	  preserve_hard_links=1;
 #else 
-	  fprintf(FERROR,"ERROR: hard links not supported on this platform\n");
+	  rprintf(FERROR,"ERROR: hard links not supported on this platform\n");
 	  exit_cleanup(1);
 #endif
 	  break;
@@ -671,7 +832,7 @@ int main(int argc,char *argv[])
 	    usage(FERROR);
 	    exit_cleanup(1);
 	  }
-	  sender = 1;
+	  am_sender = 1;
 	  break;
 
 	case 'r':
@@ -690,6 +851,10 @@ int main(int argc,char *argv[])
 	  block_size = atoi(optarg);
 	  break;
 
+	case OPT_TIMEOUT:
+	  io_timeout = atoi(optarg);
+	  break;
+
 	case 'T':
 		tmpdir = optarg;
 		break;
@@ -698,15 +863,35 @@ int main(int argc,char *argv[])
 	  do_compression = 1;
 	  break;
 
+	case OPT_DAEMON:
+		am_daemon = 1;
+		break;
+
 	default:
-	  /* fprintf(FERROR,"bad option -%c\n",opt); */
+	  /* rprintf(FERROR,"bad option -%c\n",opt); */
 	  exit_cleanup(1);
 	}
     }
+}
+
+int main(int argc,char *argv[])
+{
+
+    signal(SIGUSR1, sigusr1_handler);
+
+    starttime = time(NULL);
+    am_root = (getuid() == 0);
+
+    /* we set a 0 umask so that correct file permissions can be
+       carried across */
+    orig_umask = (int)umask(0);
+
+    parse_arguments(argc, argv);
 
-    while (optind--) {
+    while (optind) {
       argc--;
       argv++;
+      optind--;
     }
 
     signal(SIGCHLD,SIG_IGN);
@@ -719,23 +904,13 @@ int main(int argc,char *argv[])
 
 #ifndef SUPPORT_LINKS
     if (!am_server && preserve_links) {
-	    fprintf(FERROR,"ERROR: symbolic links not supported\n");
+	    rprintf(FERROR,"ERROR: symbolic links not supported\n");
 	    exit_cleanup(1);
     }
 #endif
 
     if (am_server) {
-      setup_protocol(STDOUT_FILENO,STDIN_FILENO);
-	
-      if (sender) {
-	recv_exclude_list(STDIN_FILENO);
-	if (cvs_exclude)
-	  add_cvs_excludes();
-	do_server_sender(argc,argv);
-      } else {
-	do_server_recv(argc,argv);
-      }
-      exit_cleanup(0);
+	    start_server(STDIN_FILENO, STDOUT_FILENO, argc, argv);
     }
 
     if (argc < 2) {
@@ -743,101 +918,6 @@ int main(int argc,char *argv[])
       exit_cleanup(1);
     }
 
-    p = strchr(argv[0],':');
-
-    if (p) {
-      sender = 0;
-      *p = 0;
-      shell_machine = argv[0];
-      shell_path = p+1;
-      argc--;
-      argv++;
-    } else {
-      sender = 1;
-
-      p = strchr(argv[argc-1],':');
-      if (!p) {
-	local_server = 1;
-      }
-
-      if (local_server) {
-	shell_machine = NULL;
-	shell_path = argv[argc-1];
-      } else {
-	*p = 0;
-	shell_machine = argv[argc-1];
-	shell_path = p+1;
-      }
-      argc--;
-    }
-
-    if (shell_machine) {
-      p = strchr(shell_machine,'@');
-      if (p) {
-	*p = 0;
-	shell_user = shell_machine;
-	shell_machine = p+1;
-      }
-    }
-
-    if (verbose > 3) {
-      fprintf(FERROR,"cmd=%s machine=%s user=%s path=%s\n",
-	      shell_cmd?shell_cmd:"",
-	      shell_machine?shell_machine:"",
-	      shell_user?shell_user:"",
-	      shell_path?shell_path:"");
-    }
-    
-    if (!sender && argc != 1) {
-      usage(FERROR);
-      exit_cleanup(1);
-    }
-
-    pid = do_cmd(shell_cmd,shell_machine,shell_user,shell_path,&f_in,&f_out);
-
-    setup_protocol(f_out,f_in);
-
-#if HAVE_SETLINEBUF
-    setlinebuf(FINFO);
-    setlinebuf(FERROR);
-#endif
-
-    if (verbose > 3) 
-      fprintf(FERROR,"parent=%d child=%d sender=%d recurse=%d\n",
-	      (int)getpid(),pid,sender,recurse);
-
-    if (sender) {
-      if (cvs_exclude)
-	add_cvs_excludes();
-      if (delete_mode) 
-	send_exclude_list(f_out);
-      flist = send_file_list(f_out,argc,argv);
-      if (verbose > 3) 
-	fprintf(FERROR,"file list sent\n");
-      send_files(flist,f_out,f_in);
-      if (verbose > 3)
-	fprintf(FERROR,"waiting on %d\n",pid);
-      waitpid(pid, &status, 0);
-      report(-1);
-      exit_cleanup(status);
-    }
-
-    send_exclude_list(f_out);
-
-    flist = recv_file_list(f_in);
-    if (!flist || flist->count == 0) {
-      fprintf(FERROR,"nothing to do\n");
-      exit_cleanup(0);
-    }
-
-    local_name = get_local_name(flist,argv[0]);
-
-    status2 = do_recv(f_in,f_out,flist,local_name);
-
-    report(f_in);
-
-    waitpid(pid, &status, 0);
-
-    return status | status2;
+    return start_client(argc, argv);
 }