X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/e3cd198f8ea1ca022c222e7ed949658eaf6cddc9..7796395a0aaa485ef4aa6e2dea1023ee3a273d36:/main.c diff --git a/main.c b/main.c index 88d28d70..ec408185 100644 --- a/main.c +++ b/main.c @@ -26,6 +26,7 @@ off_t total_size = 0; int block_size=BLOCK_SIZE; char *backup_suffix = BACKUP_SUFFIX; +char *tmpdir = NULL; static char *rsync_path = RSYNC_NAME; @@ -52,26 +53,27 @@ int do_compression=0; int am_root=0; int orig_umask=0; int relative_paths=0; +int numeric_ids = 0; extern int csum_length; int am_server = 0; -static int sender = 0; +static int sender; int recurse = 0; static void usage(FILE *f); static void report(int f) { - int in,out,tsize; + off_t 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_longint(f,read_total()); + write_longint(f,write_total()); + write_longint(f,total_size); write_flush(f); return; } @@ -79,17 +81,24 @@ static void report(int f) if (sender) { in = read_total(); out = write_total(); - tsize = (int)total_size; + tsize = total_size; } else { - in = read_int(f); - out = read_int(f); - tsize = read_int(f); + in = read_longint(f); + out = read_longint(f); + tsize = read_longint(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)); +#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 } @@ -158,9 +167,22 @@ 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; } @@ -205,23 +227,10 @@ static int do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int *f server_options(args,&argc); - if (path && *path) { - 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++] = "."; + + if (path && *path) + args[argc++] = path; args[argc] = NULL; @@ -291,31 +300,31 @@ static char *get_local_name(struct file_list *flist,char *name) void do_server_sender(int argc,char *argv[]) { int i; - char *dir = argv[0]; struct file_list *flist; + char *dir = argv[0]; if (verbose > 2) fprintf(FERROR,"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); + fprintf(FERROR,"chdir %s: %s (3)\n",dir,strerror(errno)); + exit_cleanup(1); } argc--; argv++; if (strcmp(dir,".")) { - int l = strlen(dir); - if (strcmp(dir,"/") == 0) - l = 0; - for (i=0;i 2) - fprintf(FERROR,"receiver read %d\n",read_total()); + fprintf(FERROR,"receiver read %ld\n",(long)read_total()); exit_cleanup(0); } @@ -359,21 +368,22 @@ 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[]) { int status; - char *dir = NULL; struct file_list *flist; char *local_name=NULL; + char *dir = 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); - } + 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) @@ -386,11 +396,11 @@ void do_server_recv(int argc,char *argv[]) } if (argc > 0) { - if (strcmp(dir,".")) { - argv[0] += strlen(dir); - if (argv[0][0] == '/') argv[0]++; - } - local_name = get_local_name(flist,argv[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); @@ -429,7 +439,9 @@ static void usage(FILE *f) 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"); @@ -442,15 +454,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 = "oblLWHpguDCtcahvrRIxnSe: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}, @@ -479,6 +492,7 @@ 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}}; @@ -500,11 +514,6 @@ int main(int argc,char *argv[]) struct file_list *flist; char *local_name = NULL; -#ifdef SETPGRP_VOID - setpgrp(); -#else - setpgrp(0,0); -#endif signal(SIGUSR1, sigusr1_handler); starttime = time(NULL); @@ -512,7 +521,7 @@ int main(int argc,char *argv[]) /* we set a 0 umask so that correct file permissions can be carried across */ - orig_umask = umask(0); + orig_umask = (int)umask(0); while ((opt = getopt_long(argc, argv, short_options, long_options, &option_index)) @@ -544,6 +553,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; @@ -667,6 +680,10 @@ int main(int argc,char *argv[]) block_size = atoi(optarg); break; + case 'T': + tmpdir = optarg; + break; + case 'z': do_compression = 1; break;