X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/58d433ab3cbf7dd3010a0944dc579756dfd89ad7..dc5ddbccace1f4f37d57ce5d961117effc28a356:/main.c diff --git a/main.c b/main.c index 721fdbb7..a0887202 100644 --- a/main.c +++ b/main.c @@ -31,6 +31,7 @@ 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; @@ -43,6 +44,9 @@ 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; +extern int csum_length; int am_server = 0; static int sender = 0; @@ -87,6 +91,7 @@ static void server_options(char **args,int *argc) int ac = *argc; static char argstr[50]; static char bsize[30]; + static char slength[30]; int i, x; args[ac++] = "--server"; @@ -106,6 +111,8 @@ static void server_options(char **args,int *argc) 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) @@ -126,6 +133,8 @@ static void server_options(char **args,int *argc) argstr[x++] = 'I'; if (one_file_system) argstr[x++] = 'x'; + if (sparse_files) + argstr[x++] = 'S'; argstr[x] = 0; if (x != 1) args[ac++] = argstr; @@ -134,6 +143,11 @@ static void server_options(char **args,int *argc) sprintf(bsize,"-B%d",block_size); args[ac++] = bsize; } + + if (csum_length != SUM_LENGTH) { + sprintf(slength,"--csum-length=%d",csum_length); + args[ac++] = slength; + } if (delete_mode) args[ac++] = "--delete"; @@ -191,10 +205,10 @@ int do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int *f_out) args[argc] = NULL; if (verbose > 3) { - fprintf(stderr,"cmd="); + fprintf(FERROR,"cmd="); for (i=0;icount > 1) { - fprintf(stderr,"ERROR: destination must be a directory when copying more than 1 file\n"); - exit(1); + fprintf(FERROR,"ERROR: destination must be a directory when copying more than 1 file\n"); + exit_cleanup(1); } return name; } @@ -233,15 +247,15 @@ static char *get_local_name(struct file_list *flist,char *name) return NULL; if (mkdir(name,0777) != 0) { - fprintf(stderr,"mkdir %s : %s\n",name,strerror(errno)); - exit(1); + fprintf(FERROR,"mkdir %s : %s\n",name,strerror(errno)); + exit_cleanup(1); } else { - fprintf(am_server?stderr:stdout,"created directory %s\n",name); + fprintf(FINFO,"created directory %s\n",name); } if (chdir(name) != 0) { - fprintf(stderr,"chdir %s : %s\n",name,strerror(errno)); - exit(1); + fprintf(FERROR,"chdir %s : %s\n",name,strerror(errno)); + exit_cleanup(1); } return NULL; @@ -257,11 +271,11 @@ void do_server_sender(int argc,char *argv[]) struct file_list *flist; if (verbose > 2) - fprintf(stderr,"server_sender starting pid=%d\n",(int)getpid()); + fprintf(FERROR,"server_sender starting pid=%d\n",(int)getpid()); if (chdir(dir) != 0) { - fprintf(stderr,"chdir %s: %s\n",dir,strerror(errno)); - exit(1); + fprintf(FERROR,"chdir %s: %s\n",dir,strerror(errno)); + exit_cleanup(1); } argc--; argv++; @@ -282,28 +296,52 @@ void do_server_sender(int argc,char *argv[]) flist = send_file_list(STDOUT_FILENO,recurse,argc,argv); send_files(flist,STDOUT_FILENO,STDIN_FILENO); report(STDOUT_FILENO); - exit(0); + 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; + + if (preserve_hard_links) + init_hard_links(flist); + + if ((pid=fork()) == 0) { + recv_files(f_in,flist,local_name); + if (preserve_hard_links) + do_hard_links(flist); + if (verbose > 2) + fprintf(FERROR,"receiver read %d\n",read_total()); + exit_cleanup(0); + } + + generate_files(f_out,flist,local_name); + + waitpid(pid, &status, 0); + + return status; +} + void do_server_recv(int argc,char *argv[]) { - int pid,status; + int status; char *dir = NULL; struct file_list *flist; char *local_name=NULL; if (verbose > 2) - fprintf(stderr,"server_recv(%d) starting pid=%d\n",argc,(int)getpid()); + 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(stderr,"chdir %s : %s\n",dir,strerror(errno)); - exit(1); + fprintf(FERROR,"chdir %s : %s\n",dir,strerror(errno)); + exit_cleanup(1); } } @@ -312,8 +350,8 @@ void do_server_recv(int argc,char *argv[]) flist = recv_file_list(STDIN_FILENO); if (!flist || flist->count == 0) { - fprintf(stderr,"nothing to do\n"); - exit(1); + fprintf(FERROR,"nothing to do\n"); + exit_cleanup(1); } if (argc > 0) { @@ -324,17 +362,8 @@ void do_server_recv(int argc,char *argv[]) local_name = get_local_name(flist,argv[0]); } - if ((pid=fork()) == 0) { - recv_files(STDIN_FILENO,flist,local_name); - if (verbose > 2) - fprintf(stderr,"receiver read %d\n",read_total()); - exit(0); - } - - generate_files(STDOUT_FILENO,flist,local_name); - - waitpid(pid, &status, 0); - exit(status); + status = do_recv(STDIN_FILENO,STDOUT_FILENO,flist,local_name); + exit_cleanup(status); } @@ -352,11 +381,13 @@ static void usage(FILE *f) 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"); @@ -368,6 +399,7 @@ static void usage(FILE *f) 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," --csum-length LENGTH set the checksum length\n"); fprintf(f," --version print version number\n"); fprintf(f,"\n"); @@ -376,9 +408,9 @@ static void usage(FILE *f) } enum {OPT_VERSION,OPT_SUFFIX,OPT_SENDER,OPT_SERVER,OPT_EXCLUDE, - OPT_EXCLUDE_FROM,OPT_DELETE,OPT_RSYNC_PATH}; + OPT_EXCLUDE_FROM,OPT_DELETE,OPT_RSYNC_PATH,OPT_CSUM_LENGTH}; -static char *short_options = "oblpguDCtcahvrIxne:B:"; +static char *short_options = "oblHpguDCtcahvrIxnSe:B:"; static struct option long_options[] = { {"version", 0, 0, OPT_VERSION}, @@ -388,10 +420,12 @@ static struct option long_options[] = { {"exclude", 1, 0, OPT_EXCLUDE}, {"exclude-from",1, 0, OPT_EXCLUDE_FROM}, {"rsync-path", 1, 0, OPT_RSYNC_PATH}, + {"csum-length", 1, 0, OPT_CSUM_LENGTH}, {"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'}, @@ -402,6 +436,7 @@ static struct option long_options[] = { {"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'}, @@ -412,7 +447,7 @@ static struct option long_options[] = { int main(int argc,char *argv[]) { - int pid, status, pid2, status2; + int pid, status, status2; int opt; int option_index; char *shell_cmd = NULL; @@ -426,6 +461,8 @@ int main(int argc,char *argv[]) starttime = time(NULL); + checksum_init(); + while ((opt = getopt_long(argc, argv, short_options, long_options, &option_index)) != -1) { @@ -434,7 +471,7 @@ int main(int argc,char *argv[]) case OPT_VERSION: printf("rsync version %s protocol version %d\n", VERSION,PROTOCOL_VERSION); - exit(0); + exit_cleanup(0); case OPT_SUFFIX: backup_suffix = optarg; @@ -444,6 +481,11 @@ int main(int argc,char *argv[]) rsync_path = optarg; break; + case OPT_CSUM_LENGTH: + csum_length = atoi(optarg); + csum_length = MIN(csum_length,SUM_LENGTH); + break; + case 'I': ignore_times = 1; break; @@ -465,8 +507,8 @@ int main(int argc,char *argv[]) break; case 'h': - usage(stdout); - exit(0); + usage(FINFO); + exit_cleanup(0); case 'b': make_backups=1; @@ -476,6 +518,10 @@ int main(int argc,char *argv[]) dry_run=1; break; + case 'S': + sparse_files=1; + break; + case 'C': cvs_exclude=1; break; @@ -484,11 +530,17 @@ int main(int argc,char *argv[]) update_only=1; break; -#if SUPPORT_LINKS case 'l': +#if SUPPORT_LINKS preserve_links=1; +#endif break; + + case 'H': +#if SUPPORT_HARD_LINKS + preserve_hard_links=1; #endif + break; case 'p': preserve_perms=1; @@ -498,8 +550,8 @@ int main(int argc,char *argv[]) if (getuid() == 0) { preserve_uid=1; } else { - fprintf(stderr,"-o only allowed for root\n"); - exit(1); + fprintf(FERROR,"-o only allowed for root\n"); + exit_cleanup(1); } break; @@ -511,8 +563,8 @@ int main(int argc,char *argv[]) if (getuid() == 0) { preserve_devices=1; } else { - fprintf(stderr,"-D only allowed for root\n"); - exit(1); + fprintf(FERROR,"-D only allowed for root\n"); + exit_cleanup(1); } break; @@ -548,8 +600,8 @@ int main(int argc,char *argv[]) case OPT_SENDER: if (!am_server) { - usage(stderr); - exit(1); + usage(FERROR); + exit_cleanup(1); } sender = 1; break; @@ -567,8 +619,8 @@ int main(int argc,char *argv[]) break; default: - fprintf(stderr,"bad option -%c\n",opt); - exit(1); + fprintf(FERROR,"bad option -%c\n",opt); + exit_cleanup(1); } } @@ -577,18 +629,25 @@ int main(int argc,char *argv[]) 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) { - int version = read_int(STDIN_FILENO); - if (version != PROTOCOL_VERSION) { - fprintf(stderr,"protocol version mismatch %d %d\n", - version,PROTOCOL_VERSION); - exit(1); + remote_version = read_int(STDIN_FILENO); + if (remote_version < MIN_PROTOCOL_VERSION || + remote_version > MAX_PROTOCOL_VERSION) { + fprintf(FERROR,"protocol version mismatch - is your shell clean?\n"); + exit_cleanup(1); } write_int(STDOUT_FILENO,PROTOCOL_VERSION); write_flush(STDOUT_FILENO); + + setup_protocol(); if (sender) { recv_exclude_list(STDIN_FILENO); @@ -598,12 +657,12 @@ int main(int argc,char *argv[]) } else { do_server_recv(argc,argv); } - exit(0); + exit_cleanup(0); } if (argc < 2) { - usage(stderr); - exit(1); + usage(FERROR); + exit_cleanup(1); } p = strchr(argv[0],':'); @@ -644,20 +703,16 @@ int main(int argc,char *argv[]) } if (verbose > 3) { - fprintf(stderr,"cmd=%s machine=%s user=%s path=%s\n", + 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:""); } - signal(SIGCHLD,SIG_IGN); - signal(SIGINT,SIGNAL_CAST sig_int); - signal(SIGPIPE,SIGNAL_CAST sig_int); - if (!sender && argc != 1) { - usage(stderr); - exit(1); + usage(FERROR); + exit_cleanup(1); } pid = do_cmd(shell_cmd,shell_machine,shell_user,shell_path,&f_in,&f_out); @@ -665,15 +720,18 @@ int main(int argc,char *argv[]) write_int(f_out,PROTOCOL_VERSION); write_flush(f_out); { - int version = read_int(f_in); - if (version != PROTOCOL_VERSION) { - fprintf(stderr,"protocol version mismatch\n"); - exit(1); + remote_version = read_int(f_in); + if (remote_version < MIN_PROTOCOL_VERSION || + remote_version > MAX_PROTOCOL_VERSION) { + fprintf(FERROR,"protocol version mismatch - is your shell clean?\n"); + exit_cleanup(1); } } + setup_protocol(); + if (verbose > 3) - fprintf(stderr,"parent=%d child=%d sender=%d recurse=%d\n", + fprintf(FERROR,"parent=%d child=%d sender=%d recurse=%d\n", (int)getpid(),pid,sender,recurse); if (sender) { @@ -683,35 +741,26 @@ int main(int argc,char *argv[]) send_exclude_list(f_out); flist = send_file_list(f_out,recurse,argc,argv); if (verbose > 3) - fprintf(stderr,"file list sent\n"); + fprintf(FERROR,"file list sent\n"); send_files(flist,f_out,f_in); if (verbose > 3) - fprintf(stderr,"waiting on %d\n",pid); + fprintf(FERROR,"waiting on %d\n",pid); waitpid(pid, &status, 0); report(-1); - exit(status); + exit_cleanup(status); } send_exclude_list(f_out); flist = recv_file_list(f_in); if (!flist || flist->count == 0) { - fprintf(stderr,"nothing to do\n"); - exit(0); + fprintf(FERROR,"nothing to do\n"); + exit_cleanup(0); } local_name = get_local_name(flist,argv[0]); - if ((pid2=fork()) == 0) { - recv_files(f_in,flist,local_name); - if (verbose > 1) - fprintf(stderr,"receiver read %d\n",read_total()); - exit(0); - } - - generate_files(f_out,flist,local_name); - - waitpid(pid2, &status2, 0); + status2 = do_recv(f_in,f_out,flist,local_name); report(f_in);