- switched on multiplexing for all connections, not just daemon
[rsync.git] / main.c
diff --git a/main.c b/main.c
index 09e0ef3391c934019035453e350b909f038d53a4..2a5597e4bc05dc1814606ae5edc964af52a9d9e9 100644 (file)
--- a/main.c
+++ b/main.c
 
 #include "rsync.h"
 
-int verbose = 0;
-int always_checksum = 0;
-time_t starttime;
-off_t total_size = 0;
-int block_size=BLOCK_SIZE;
-
-char *backup_suffix = BACKUP_SUFFIX;
-
-static char *rsync_path = RSYNC_NAME;
-
-int make_backups = 0;
-int preserve_links = 0;
-int preserve_hard_links = 0;
-int preserve_perms = 0;
-int preserve_devices = 0;
-int preserve_uid = 0;
-int preserve_gid = 0;
-int preserve_times = 0;
-int update_only = 0;
-int cvs_exclude = 0;
-int dry_run=0;
-int local_server=0;
-int ignore_times=0;
-int delete_mode=0;
-int one_file_system=0;
-int remote_version=0;
-int sparse_files=0;
-int do_compression=0;
-int am_root=0;
-int orig_umask=0;
-int relative_paths=0;
-
-extern int csum_length;
-
-int am_server = 0;
-static int sender = 0;
-int recurse = 0;
-
-static void usage(FILE *f);
+time_t starttime = 0;
+
+struct stats stats;
+
+extern int verbose;
 
 static void report(int f)
 {
-  int in,out,tsize;
-  time_t t = time(NULL);
-  
-  if (!verbose) return;
-
-  if (am_server && sender) {
-    write_int(f,read_total());
-    write_int(f,write_total());
-    write_int(f,total_size);
-    write_flush(f);
-    return;
-  }
-    
-  if (sender) {
-    in = read_total();
-    out = write_total();
-    tsize = (int)total_size;
-  } else {
-    in = read_int(f);
-    out = read_int(f);
-    tsize = read_int(f);
-  }
-
-  printf("wrote %d bytes  read %d bytes  %g bytes/sec\n",
-        out,in,(in+out)/(0.5 + (t-starttime)));        
-  printf("total size is %d  speedup is %g\n",
-        tsize,(1.0*tsize)/(in+out));
-}
+       time_t t = time(NULL);
+       extern int am_server;
+       extern int am_sender;
+       extern int am_daemon;
+       extern int do_stats;
+       extern int remote_version;
+       int send_stats;
+
+       if (am_daemon) {
+               log_exit(0, __FILE__, __LINE__);
+               if (f == -1 || !am_sender) return;
+       }
 
+       send_stats = verbose || (remote_version >= 20);
+       if (am_server) {
+               if (am_sender && send_stats) {
+                       int64 w;
+                       /* store total_written in a temporary
+                           because write_longint changes it */
+                       w = stats.total_written;
+                       write_longint(f,stats.total_read);
+                       write_longint(f,w);
+                       write_longint(f,stats.total_size);
+               }
+               return;
+       }
 
-static void server_options(char **args,int *argc)
-{
-  int ac = *argc;
-  static char argstr[50];
-  static char bsize[30];
-  int i, x;
-
-  args[ac++] = "--server";
-
-  if (!sender)
-    args[ac++] = "--sender";
-
-  x = 1;
-  argstr[0] = '-';
-  for (i=0;i<verbose;i++)
-    argstr[x++] = 'v';
-  if (make_backups)
-    argstr[x++] = 'b';
-  if (update_only)
-    argstr[x++] = 'u';
-  if (dry_run)
-    argstr[x++] = 'n';
-  if (preserve_links)
-    argstr[x++] = 'l';
-  if (preserve_hard_links)
-    argstr[x++] = 'H';
-  if (preserve_uid)
-    argstr[x++] = 'o';
-  if (preserve_gid)
-    argstr[x++] = 'g';
-  if (preserve_devices)
-    argstr[x++] = 'D';
-  if (preserve_times)
-    argstr[x++] = 't';
-  if (preserve_perms)
-    argstr[x++] = 'p';
-  if (recurse)
-    argstr[x++] = 'r';
-  if (always_checksum)
-    argstr[x++] = 'c';
-  if (cvs_exclude)
-    argstr[x++] = 'C';
-  if (ignore_times)
-    argstr[x++] = 'I';
-  if (relative_paths)
-    argstr[x++] = 'R';
-  if (one_file_system)
-    argstr[x++] = 'x';
-  if (sparse_files)
-    argstr[x++] = 'S';
-  if (do_compression)
-    argstr[x++] = 'z';
-  argstr[x] = 0;
-
-  if (x != 1) args[ac++] = argstr;
-
-  if (block_size != BLOCK_SIZE) {
-    sprintf(bsize,"-B%d",block_size);
-    args[ac++] = bsize;
-  }    
-
-  if (delete_mode)
-    args[ac++] = "--delete";
-
-  *argc = ac;
-}
+       /* this is the client */
+           
+       if (!am_sender && send_stats) {
+               int64 r;
+               stats.total_written = read_longint(f);
+               /* store total_read in a temporary, read_longint changes it */
+               r = read_longint(f);
+               stats.total_size = read_longint(f);
+               stats.total_read = r;
+       }
 
+       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);
+               rprintf(FINFO,"Total file size: %.0f bytes\n", 
+                      (double)stats.total_size);
+               rprintf(FINFO,"Total transferred file size: %.0f bytes\n", 
+                      (double)stats.total_transferred_size);
+               rprintf(FINFO,"Literal data: %.0f bytes\n", 
+                      (double)stats.literal_data);
+               rprintf(FINFO,"Matched data: %.0f bytes\n", 
+                      (double)stats.matched_data);
+               rprintf(FINFO,"File list size: %d\n", stats.flist_size);
+               rprintf(FINFO,"Total bytes written: %.0f\n", 
+                      (double)stats.total_written);
+               rprintf(FINFO,"Total bytes read: %.0f\n\n", 
+                      (double)stats.total_read);
+       }
+       
+       if (verbose || do_stats) {
+               rprintf(FINFO,"wrote %.0f bytes  read %.0f bytes  %.2f bytes/sec\n",
+                      (double)stats.total_written,
+                      (double)stats.total_read,
+                      (stats.total_written+stats.total_read)/(0.5 + (t-starttime)));
+               rprintf(FINFO,"total size is %.0f  speedup is %.2f\n",
+                      (double)stats.total_size,
+                      (1.0*stats.total_size)/(stats.total_written+stats.total_read));
+       }
+
+       fflush(stdout);
+       fflush(stderr);
+}
 
 
-int do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int *f_out)
+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;
-  char *tok,*p;
-
-  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;
+       extern int local_server;
+       extern char *rsync_path;
+
+       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;
-
-  server_options(args,&argc);
-
-  if (path && *path) {
-    char *dir = strdup(path);
-    p = strrchr(dir,'/');
-    if (p && !relative_paths) {
-      *p = 0;
-      if (!dir[0])
-       args[argc++] = "/";
-      else
-       args[argc++] = dir;
-      p++;
-    } else {
-      args[argc++] = ".";
-      p = dir;
-    }
-    if (p[0])
-      args[argc++] = path;
-  }
-
-  args[argc] = NULL;
-
-  if (verbose > 3) {
-    fprintf(FERROR,"cmd=");
-    for (i=0;i<argc;i++)
-      fprintf(FERROR,"%s ",args[i]);
-    fprintf(FERROR,"\n");
-  }
-
-  return piped_child(args,f_in,f_out);
+
+               args[argc++] = rsync_path;
+
+               server_options(args,&argc);
+       }
+
+       args[argc++] = ".";
+
+       if (path && *path) 
+               args[argc++] = path;
+
+       args[argc] = NULL;
+
+       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);
+       }
+
+       if (dir) free(dir);
+
+       return ret;
 
 oom:
-  out_of_memory("do_cmd");
-  return 0; /* not reached */
+       out_of_memory("do_cmd");
+       return 0; /* not reached */
 }
 
 
@@ -238,535 +180,493 @@ oom:
 
 static char *get_local_name(struct file_list *flist,char *name)
 {
-  struct stat st;
-
-  if (stat(name,&st) == 0) {
-    if (S_ISDIR(st.st_mode)) {
-      if (chdir(name) != 0) {
-       fprintf(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");
-      exit_cleanup(1);
-    }
-    return name;
-  }
-
-  if (flist->count == 1)
-    return name;
-
-  if (!name) 
-    return NULL;
-
-  if (mkdir(name,0777 & ~orig_umask) != 0) {
-    fprintf(FERROR,"mkdir %s : %s (1)\n",name,strerror(errno));
-    exit_cleanup(1);
-  } else {
-    fprintf(FINFO,"created directory %s\n",name);
-  }
-
-  if (chdir(name) != 0) {
-    fprintf(FERROR,"chdir %s : %s (2)\n",name,strerror(errno));
-    exit_cleanup(1);
-  }
-
-  return NULL;
+       STRUCT_STAT st;
+       extern int orig_umask;
+
+       if (verbose > 2)
+               rprintf(FINFO,"get_local_name count=%d %s\n", 
+                       flist->count, NS(name));
+
+       if (!name) 
+               return NULL;
+
+       if (do_stat(name,&st) == 0) {
+               if (S_ISDIR(st.st_mode)) {
+                       if (!push_dir(name, 0)) {
+                               rprintf(FERROR,"push_dir %s : %s (1)\n",
+                                       name,strerror(errno));
+                               exit_cleanup(RERR_FILESELECT);
+                       }
+                       return NULL;
+               }
+               if (flist->count > 1) {
+                       rprintf(FERROR,"ERROR: destination must be a directory when copying more than 1 file\n");
+                       exit_cleanup(RERR_FILESELECT);
+               }
+               return name;
+       }
+
+       if (flist->count <= 1)
+               return name;
+
+       if (do_mkdir(name,0777 & ~orig_umask) != 0) {
+               rprintf(FERROR,"mkdir %s : %s (1)\n",name,strerror(errno));
+               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 : %s (2)\n",
+                       name,strerror(errno));
+               exit_cleanup(RERR_FILESELECT);
+       }
+
+       return NULL;
 }
 
 
 
 
-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;
-  char *dir = argv[0];
-  struct file_list *flist;
-
-  if (verbose > 2)
-    fprintf(FERROR,"server_sender starting pid=%d\n",(int)getpid());
+       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 (!relative_paths && chdir(dir) != 0) {
-    fprintf(FERROR,"chdir %s: %s (3)\n",dir,strerror(errno));
-    exit_cleanup(1);
-  }
-  argc--;
-  argv++;
+       if (!relative_paths && !push_dir(dir, 0)) {
+               rprintf(FERROR,"push_dir %s: %s (3)\n",dir,strerror(errno));
+               exit_cleanup(RERR_FILESELECT);
+       }
+       argc--;
+       argv++;
   
-  if (strcmp(dir,".")) {
-    int l = strlen(dir);
-    if (strcmp(dir,"/") == 0) 
-      l = 0;
-    for (i=0;i<argc;i++)
-      argv[i] += l+1;
-  }
-
-  if (argc == 0 && recurse) {
-    argc=1;
-    argv--;
-    argv[0] = ".";
-  }
-    
-
-  flist = send_file_list(STDOUT_FILENO,argc,argv);
-  send_files(flist,STDOUT_FILENO,STDIN_FILENO);
-  report(STDOUT_FILENO);
-  exit_cleanup(0);
+       if (strcmp(dir,".")) {
+               int l = strlen(dir);
+               if (strcmp(dir,"/") == 0) 
+                       l = 0;
+               for (i=0;i<argc;i++)
+                       argv[i] += l+1;
+       }
+
+       if (argc == 0 && recurse) {
+               argc=1;
+               argv--;
+               argv[0] = ".";
+       }
+       
+       flist = send_file_list(f_out,argc,argv);
+       if (!flist || flist->count == 0) {
+               exit_cleanup(0);
+       }
+
+       send_files(flist,f_out,f_in);
+       report(f_out);
+       io_flush();
+       exit_cleanup(0);
 }
 
 
 static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
 {
-  int pid;
-  int status=0;
-  int recv_pipe[2];
+       int pid;
+       int status=0;
+       int recv_pipe[2];
+       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);
+
+       if (!delete_after) {
+               /* I moved this here from recv_files() to prevent a race condition */
+               if (recurse && delete_mode && !local_name && flist->count>0) {
+                       delete_files(flist);
+               }
+       }
 
-  if (preserve_hard_links)
-    init_hard_links(flist);
+       if (fd_pair(recv_pipe) < 0) {
+               rprintf(FERROR,"pipe failed in do_recv\n");
+               exit_cleanup(RERR_SOCKETIO);
+       }
 
-  if (pipe(recv_pipe) < 0) {
-    fprintf(FERROR,"pipe failed in do_recv\n");
-    exit(1);
-  }
+       if (fd_pair(error_pipe) < 0) {
+               rprintf(FERROR,"error pipe failed in do_recv\n");
+               exit_cleanup(RERR_SOCKETIO);
+       }
   
+       io_flush();
 
-  if ((pid=fork()) == 0) {
-    recv_files(f_in,flist,local_name,recv_pipe[1]);
-    if (preserve_hard_links)
-      do_hard_links(flist);
-    if (verbose > 2)
-      fprintf(FERROR,"receiver read %d\n",read_total());
-    exit_cleanup(0);
-  }
+       if ((pid=do_fork()) == 0) {
+               close(recv_pipe[0]);
+               close(error_pipe[0]);
+               if (f_in != f_out) close(f_out);
 
-  generate_files(f_out,flist,local_name,recv_pipe[0]);
+               /* we can't let two processes write to the socket at one time */
+               io_multiplexing_close();
 
-  waitpid(pid, &status, 0);
+               /* set place to send errors */
+               set_error_fd(error_pipe[1]);
 
-  return status;
+               recv_files(f_in,flist,local_name,recv_pipe[1]);
+               report(f_in);
+
+               io_flush();
+               _exit(0);
+       }
+
+       close(recv_pipe[1]);
+       close(error_pipe[1]);
+       io_close_input(f_in);
+       if (f_in != f_out) close(f_in);
+
+       io_start_buffering(f_out);
+
+       io_set_error_fd(error_pipe[0]);
+
+       generate_files(f_out,flist,local_name,recv_pipe[0]);
+
+       io_flush();
+       wait_process(pid, &status);
+       return status;
 }
 
 
-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;
-  char *dir = NULL;
-  struct file_list *flist;
-  char *local_name=NULL;
-  
-  if (verbose > 2)
-    fprintf(FERROR,"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",dir,strerror(errno));
-      exit_cleanup(1);
-    }    
-  }
-
-  if (delete_mode)
-    recv_exclude_list(STDIN_FILENO);
-
-  flist = recv_file_list(STDIN_FILENO);
-  if (!flist || flist->count == 0) {
-    fprintf(FERROR,"nothing to do\n");
-    exit_cleanup(1);
-  }
-
-  if (argc > 0) {    
-    if (strcmp(dir,".")) {
-      argv[0] += strlen(dir);
-      if (argv[0][0] == '/') argv[0]++;
-    }
-    local_name = get_local_name(flist,argv[0]);
-  }
-
-  status = do_recv(STDIN_FILENO,STDOUT_FILENO,flist,local_name);
-  exit_cleanup(status);
+       int status;
+       struct file_list *flist;
+       char *local_name=NULL;
+       char *dir = NULL;
+       extern int delete_mode;
+       extern int delete_excluded;
+       extern int am_daemon;
+
+       if (verbose > 2)
+               rprintf(FINFO,"server_recv(%d) starting pid=%d\n",argc,(int)getpid());
+       
+       if (argc > 0) {
+               dir = argv[0];
+               argc--;
+               argv++;
+               if (!am_daemon && !push_dir(dir, 0)) {
+                       rprintf(FERROR,"push_dir %s : %s (4)\n",
+                               dir,strerror(errno));
+                       exit_cleanup(RERR_FILESELECT);
+               }    
+       }
+
+       if (delete_mode && !delete_excluded)
+               recv_exclude_list(f_in);
+
+       flist = recv_file_list(f_in);
+       if (!flist) {
+               rprintf(FERROR,"server_recv: recv_file_list error\n");
+               exit_cleanup(RERR_FILESELECT);
+       }
+       
+       if (argc > 0) {    
+               if (strcmp(dir,".")) {
+                       argv[0] += strlen(dir);
+                       if (argv[0][0] == '/') argv[0]++;
+               }
+               local_name = get_local_name(flist,argv[0]);
+       }
+
+       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[])
 {
-  fprintf(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,"-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,"-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,"-I, --ignore-times       don't exclude files that match length and time\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);  
+       extern int cvs_exclude;
+       extern int am_sender;
+       extern int remote_version;
+
+       if (remote_version >= 23)
+               io_start_multiplex_out(f_out);
+
+       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);
 }
 
-enum {OPT_VERSION,OPT_SUFFIX,OPT_SENDER,OPT_SERVER,OPT_EXCLUDE,
-      OPT_EXCLUDE_FROM,OPT_DELETE,OPT_RSYNC_PATH};
-
-static char *short_options = "oblHpguDCtcahvrRIxnSe:B:z";
-
-static struct option long_options[] = {
-  {"version",     0,     0,    OPT_VERSION},
-  {"server",      0,     0,    OPT_SERVER},
-  {"sender",      0,     0,    OPT_SENDER},
-  {"delete",      0,     0,    OPT_DELETE},
-  {"exclude",     1,     0,    OPT_EXCLUDE},
-  {"exclude-from",1,     0,    OPT_EXCLUDE_FROM},
-  {"rsync-path",  1,     0,    OPT_RSYNC_PATH},
-  {"one-file-system",0,  0,    'x'},
-  {"ignore-times",0,     0,    'I'},
-  {"help",        0,     0,    'h'},
-  {"dry-run",     0,     0,    'n'},
-  {"sparse",      0,     0,    'S'},
-  {"cvs-exclude", 0,     0,    'C'},
-  {"archive",     0,     0,    'a'},
-  {"checksum",    0,     0,    'c'},
-  {"backup",      0,     0,    'b'},
-  {"update",      0,     0,    'u'},
-  {"verbose",     0,     0,    'v'},
-  {"recursive",   0,     0,    'r'},
-  {"relative",    0,     0,    'R'},
-  {"devices",     0,     0,    'D'},
-  {"perms",       0,     0,    'p'},
-  {"links",       0,     0,    'l'},
-  {"hard-links",  0,     0,    'H'},
-  {"owner",       0,     0,    'o'},
-  {"group",       0,     0,    'g'},
-  {"times",       0,     0,    't'},
-  {"rsh",         1,     0,    'e'},
-  {"suffix",      1,     0,    OPT_SUFFIX},
-  {"block-size",  1,     0,    'B'},
-  {"compress",   0,     0,    'z'},
-  {0,0,0,0}};
-
-int main(int argc,char *argv[])
+int client_run(int f_in, int f_out, int pid, 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;
-
-    starttime = time(NULL);
-    am_root = (getuid() == 0);
-
-    /* we set a 0 umask so that correct file permissions can be
-       carried across */
-    orig_umask = umask(0);
-
-    while ((opt = getopt_long(argc, argv, 
-                             short_options, long_options, &option_index)) 
-          != -1) {
-      switch (opt) 
-       {
-       case OPT_VERSION:
-         printf("rsync version %s  protocol version %d\n",
-                VERSION,PROTOCOL_VERSION);
-         exit_cleanup(0);
-
-       case OPT_SUFFIX:
-         backup_suffix = optarg;
-         break;
-
-       case OPT_RSYNC_PATH:
-         rsync_path = optarg;
-         break;
-
-       case 'I':
-         ignore_times = 1;
-         break;
-
-       case 'x':
-         one_file_system=1;
-         break;
-
-       case OPT_DELETE:
-         delete_mode = 1;
-         break;
-
-       case OPT_EXCLUDE:
-         add_exclude(optarg);
-         break;
-
-       case OPT_EXCLUDE_FROM:
-         add_exclude_file(optarg,1);
-         break;
-
-       case 'h':
-         usage(FINFO);
-         exit_cleanup(0);
-
-       case 'b':
-         make_backups=1;
-         break;
-
-       case 'n':
-         dry_run=1;
-         break;
-
-       case 'S':
-         sparse_files=1;
-         break;
-
-       case 'C':
-         cvs_exclude=1;
-         break;
-
-       case 'u':
-         update_only=1;
-         break;
-
-       case 'l':
-#if SUPPORT_LINKS
-         preserve_links=1;
-#endif
-         break;
+       struct file_list *flist;
+       int status = 0, status2 = 0;
+       char *local_name = NULL;
+       extern int am_sender;
+       extern int list_only;
+       extern int remote_version;
 
-       case 'H':
-#if SUPPORT_HARD_LINKS
-         preserve_hard_links=1;
-#endif
-         break;
+       if (remote_version >= 23)
+               io_start_multiplex_in(f_in);
 
-       case 'p':
-         preserve_perms=1;
-         break;
+       setup_protocol(f_out,f_in);
+       
+       if (am_sender) {
+               extern int cvs_exclude;
+               extern int delete_mode;
+               extern int delete_excluded;
+               if (cvs_exclude)
+                       add_cvs_excludes();
+               if (delete_mode && !delete_excluded) 
+                       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,"client_run waiting on %d\n",pid);
+                       io_flush();
+                       wait_process(pid, &status);
+               }
+               report(-1);
+               exit_cleanup(status);
+       }
 
-       case 'o':
-         preserve_uid=1;
-         break;
+       if (argc == 0) list_only = 1;
+       
+       send_exclude_list(f_out);
+       
+       flist = recv_file_list(f_in);
+       if (!flist || flist->count == 0) {
+               rprintf(FINFO,"client: 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);
+       
+       if (pid != -1) {
+               if (verbose > 3)
+                       rprintf(FINFO,"client_run2 waiting on %d\n",pid);
+               io_flush();
+               wait_process(pid, &status);
+       }
+       
+       return status | status2;
+}
 
-       case 'g':
-         preserve_gid=1;
-         break;
+static char *find_colon(char *s)
+{
+       char *p, *p2;
 
-       case 'D':
-         preserve_devices=1;
-         break;
+       p = strchr(s,':');
+       if (!p) return NULL;
+       
+       /* now check to see if there is a / in the string before the : - if there is then
+          discard the colon on the assumption that the : is part of a filename */
+       p2 = strchr(s,'/');
+       if (p2 && p2 < p) return NULL;
 
-       case 't':
-         preserve_times=1;
-         break;
+       return p;
+}
 
-       case 'c':
-         always_checksum=1;
-         break;
+static int start_client(int argc, char *argv[])
+{
+       char *p;
+       char *shell_machine = NULL;
+       char *shell_path = NULL;
+       char *shell_user = NULL;
+       int pid, ret;
+       int f_in,f_out;
+       extern int local_server;
+       extern int am_sender;
+       extern char *shell_cmd;
+       extern int rsync_port;
+
+       if (strncasecmp(URL_PREFIX, argv[0], strlen(URL_PREFIX)) == 0) {
+               char *host, *path;
+
+               host = argv[0] + strlen(URL_PREFIX);
+               p = strchr(host,'/');
+               if (p) {
+                       *p = 0;
+                       path = p+1;
+               } else {
+                       path="";
+               }
+               p = strchr(host,':');
+               if (p) {
+                       rsync_port = atoi(p+1);
+                       *p = 0;
+               }
+               return start_socket_client(host, path, argc-1, argv+1);
+       }
 
-       case 'v':
-         verbose++;
-         break;
+       p = find_colon(argv[0]);
+
+       if (p) {
+               if (p[1] == ':') {
+                       *p = 0;
+                       return start_socket_client(argv[0], p+2, argc-1, argv+1);
+               }
+
+               if (argc < 1) {
+                       usage(FERROR);
+                       exit_cleanup(RERR_SYNTAX);
+               }
+
+               am_sender = 0;
+               *p = 0;
+               shell_machine = argv[0];
+               shell_path = p+1;
+               argc--;
+               argv++;
+       } else {
+               am_sender = 1;
+
+               p = find_colon(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 (argc < 2) {
+                       usage(FERROR);
+                       exit_cleanup(RERR_SYNTAX);
+               }
+               
+               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;
+               }
+       }
 
-       case 'a':
-         recurse=1;
-#if SUPPORT_LINKS
-         preserve_links=1;
-#endif
-         preserve_perms=1;
-         preserve_times=1;
-         preserve_gid=1;
-         if (am_root) {
-           preserve_devices=1;
-           preserve_uid=1;
-         }
-         break;
-
-       case OPT_SERVER:
-         am_server = 1;
-         break;
-
-       case OPT_SENDER:
-         if (!am_server) {
-           usage(FERROR);
-           exit_cleanup(1);
-         }
-         sender = 1;
-         break;
-
-       case 'r':
-         recurse = 1;
-         break;
-
-       case 'R':
-         relative_paths = 1;
-         break;
-
-       case 'e':
-         shell_cmd = optarg;
-         break;
-
-       case 'B':
-         block_size = atoi(optarg);
-         break;
-
-        case 'z':
-         do_compression = 1;
-         break;
-
-       default:
-         /* fprintf(FERROR,"bad option -%c\n",opt); */
-         exit_cleanup(1);
-       }
-    }
-
-    while (optind--) {
-      argc--;
-      argv++;
-    }
-
-    signal(SIGCHLD,SIG_IGN);
-    signal(SIGINT,SIGNAL_CAST sig_int);
-    signal(SIGPIPE,SIGNAL_CAST sig_int);
-    signal(SIGHUP,SIGNAL_CAST sig_int);
-
-    if (dry_run)
-      verbose = MAX(verbose,1);
-
-    if (am_server) {
-      setup_protocol(STDOUT_FILENO,STDIN_FILENO);
+       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 (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);
-    }
-
-    if (argc < 2) {
-      usage(FERROR);
-      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 (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);
-    }
+       if (!am_sender && argc > 1) {
+               usage(FERROR);
+               exit_cleanup(RERR_SYNTAX);
+       }
+       
+       pid = do_cmd(shell_cmd,shell_machine,shell_user,shell_path,&f_in,&f_out);
+       
+       ret = client_run(f_in, f_out, pid, argc, argv);
+
+       fflush(stdout);
+       fflush(stderr);
+
+       return ret;
+}
+
+
+static RETSIGTYPE sigusr1_handler(int val) {
+       exit_cleanup(RERR_SIGNAL);
+}
+
+int main(int argc,char *argv[])
+{       
+       extern int am_root;
+       extern int orig_umask;
+       extern int dry_run;
+       extern int am_daemon;
+       extern int am_server;
+
+       signal(SIGUSR1, sigusr1_handler);
+
+       starttime = time(NULL);
+       am_root = (getuid() == 0);
 
-    send_exclude_list(f_out);
+       memset(&stats, 0, sizeof(stats));
 
-    flist = recv_file_list(f_in);
-    if (!flist || flist->count == 0) {
-      fprintf(FERROR,"nothing to do\n");
-      exit_cleanup(0);
-    }
+       if (argc < 2) {
+               usage(FERROR);
+               exit_cleanup(RERR_SYNTAX);
+       }
+
+       /* we set a 0 umask so that correct file permissions can be
+          carried across */
+       orig_umask = (int)umask(0);
+
+       if (!parse_arguments(argc, argv, 1)) {
+               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(SIGTERM,SIGNAL_CAST sig_int);
+
+       /* Initialize push_dir here because on some old systems getcwd
+          (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);
 
-    local_name = get_local_name(flist,argv[0]);
+       if (am_daemon) {
+               return daemon_main();
+       }
 
-    status2 = do_recv(f_in,f_out,flist,local_name);
+       if (argc < 1) {
+               usage(FERROR);
+               exit_cleanup(RERR_SYNTAX);
+       }
 
-    report(f_in);
+       if (dry_run)
+               verbose = MAX(verbose,1);
 
-    waitpid(pid, &status, 0);
+#ifndef SUPPORT_LINKS
+       if (!am_server && preserve_links) {
+               rprintf(FERROR,"ERROR: symbolic links not supported\n");
+               exit_cleanup(RERR_UNSUPPORTED);
+       }
+#endif
 
-    return status | status2;
+       if (am_server) {
+               start_server(STDIN_FILENO, STDOUT_FILENO, argc, argv);
+       }
+
+       return start_client(argc, argv);
 }
+