X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/aa7ed2014183d671b61b785d1eb68fde9f6f48ec..3ba62a830825f5e1e1f70a8ec1f85abeaadc3f1f:/main.c diff --git a/main.c b/main.c index 246a6ac2..23a465c8 100644 --- a/main.c +++ b/main.c @@ -26,10 +26,13 @@ off_t total_size = 0; int block_size=BLOCK_SIZE; char *backup_suffix = BACKUP_SUFFIX; +char *tmpdir = NULL; static char *rsync_path = RSYNC_NAME; int make_backups = 0; +int whole_file = 0; +int copy_links = 0; int preserve_links = 0; int preserve_hard_links = 0; int preserve_perms = 0; @@ -50,6 +53,7 @@ int do_compression=0; int am_root=0; int orig_umask=0; int relative_paths=0; +int numeric_ids = 0; extern int csum_length; @@ -115,6 +119,10 @@ static void server_options(char **args,int *argc) argstr[x++] = 'n'; if (preserve_links) argstr[x++] = 'l'; + if (copy_links) + argstr[x++] = 'L'; + if (whole_file) + argstr[x++] = 'W'; if (preserve_hard_links) argstr[x++] = 'H'; if (preserve_uid) @@ -152,19 +160,32 @@ static void server_options(char **args,int *argc) args[ac++] = bsize; } + if (strcmp(backup_suffix, BACKUP_SUFFIX)) { + args[ac++] = "--suffix"; + args[ac++] = backup_suffix; + } + if (delete_mode) args[ac++] = "--delete"; + if (numeric_ids) + args[ac++] = "--numeric-ids"; + + if (tmpdir) { + args[ac++] = "--temp-dir"; + args[ac++] = tmpdir; + } + *argc = ac; } -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; + int i,argc=0, ret; + char *tok,*p,*dir=NULL; if (!local_server) { if (!cmd) @@ -200,7 +221,7 @@ int do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int *f_out) server_options(args,&argc); if (path && *path) { - char *dir = strdup(path); + dir = strdup(path); p = strrchr(dir,'/'); if (p && !relative_paths) { *p = 0; @@ -226,7 +247,10 @@ int do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int *f_out) fprintf(FERROR,"\n"); } - return piped_child(args,f_in,f_out); + ret = piped_child(args,f_in,f_out); + if (dir) free(dir); + + return ret; oom: out_of_memory("do_cmd"); @@ -332,10 +356,8 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name) } - if ((pid=fork()) == 0) { + if ((pid=do_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); @@ -406,6 +428,7 @@ 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,"-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"); @@ -414,13 +437,16 @@ static void usage(FILE *f) 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," --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"); @@ -433,15 +459,16 @@ 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_NUMERIC_IDS,OPT_RSYNC_PATH}; -static char *short_options = "oblHpguDCtcahvrRIxnSe:B:z"; +static char *short_options = "oblLWHpguDCtcahvrRIxnSe:B:T: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}, + {"numeric-ids", 0, 0, OPT_NUMERIC_IDS}, {"exclude", 1, 0, OPT_EXCLUDE}, {"exclude-from",1, 0, OPT_EXCLUDE_FROM}, {"rsync-path", 1, 0, OPT_RSYNC_PATH}, @@ -461,6 +488,8 @@ static struct option long_options[] = { {"devices", 0, 0, 'D'}, {"perms", 0, 0, 'p'}, {"links", 0, 0, 'l'}, + {"copy-links", 0, 0, 'L'}, + {"whole-file", 0, 0, 'W'}, {"hard-links", 0, 0, 'H'}, {"owner", 0, 0, 'o'}, {"group", 0, 0, 'g'}, @@ -468,9 +497,14 @@ static struct option long_options[] = { {"rsh", 1, 0, 'e'}, {"suffix", 1, 0, OPT_SUFFIX}, {"block-size", 1, 0, 'B'}, + {"temp-dir", 1, 0, 'T'}, {"compress", 0, 0, 'z'}, {0,0,0,0}}; +RETSIGTYPE sigusr1_handler(int val) { + exit_cleanup(1); +} + int main(int argc,char *argv[]) { int pid, status = 0, status2 = 0; @@ -485,6 +519,8 @@ int main(int argc,char *argv[]) struct file_list *flist; char *local_name = NULL; + signal(SIGUSR1, sigusr1_handler); + starttime = time(NULL); am_root = (getuid() == 0); @@ -522,6 +558,10 @@ int main(int argc,char *argv[]) delete_mode = 1; break; + case OPT_NUMERIC_IDS: + numeric_ids = 1; + break; + case OPT_EXCLUDE: add_exclude(optarg); break; @@ -555,14 +595,23 @@ int main(int argc,char *argv[]) break; case 'l': -#if SUPPORT_LINKS preserve_links=1; -#endif + break; + + case 'L': + copy_links=1; + break; + + case 'W': + whole_file=1; break; case 'H': #if SUPPORT_HARD_LINKS preserve_hard_links=1; +#else + fprintf(FERROR,"ERROR: hard links not supported on this platform\n"); + exit_cleanup(1); #endif break; @@ -636,6 +685,10 @@ int main(int argc,char *argv[]) block_size = atoi(optarg); break; + case 'T': + tmpdir = optarg; + break; + case 'z': do_compression = 1; break; @@ -659,6 +712,13 @@ int main(int argc,char *argv[]) if (dry_run) verbose = MAX(verbose,1); +#ifndef SUPPORT_LINKS + if (!am_server && preserve_links) { + fprintf(FERROR,"ERROR: symbolic links not supported\n"); + exit_cleanup(1); + } +#endif + if (am_server) { setup_protocol(STDOUT_FILENO,STDIN_FILENO); @@ -732,8 +792,10 @@ int main(int argc,char *argv[]) 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", @@ -773,3 +835,4 @@ int main(int argc,char *argv[]) return status | status2; } +