X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/c6e7fcb42bc87660ece8d4dc9a1b10bd1fb7b0c5..6dd1782c42ed166c03ba5ac5a033cf1061167510:/main.c diff --git a/main.c b/main.c index 038a2d2c..d289a58a 100644 --- a/main.c +++ b/main.c @@ -47,6 +47,9 @@ 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; @@ -93,7 +96,6 @@ 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"; @@ -133,10 +135,14 @@ static void server_options(char **args,int *argc) 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; @@ -146,11 +152,6 @@ static void server_options(char **args,int *argc) args[ac++] = bsize; } - if (csum_length != SUM_LENGTH) { - sprintf(slength,"--csum-length=%d",csum_length); - args[ac++] = slength; - } - if (delete_mode) args[ac++] = "--delete"; @@ -178,11 +179,20 @@ int do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int *f_out) 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; + } +#else if (user) { args[argc++] = "-l"; args[argc++] = user; } args[argc++] = machine; +#endif } args[argc++] = rsync_path; @@ -192,9 +202,12 @@ int do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int *f_out) if (path && *path) { char *dir = strdup(path); p = strrchr(dir,'/'); - if (p) { + if (p && !relative_paths) { *p = 0; - args[argc++] = dir; + if (!dir[0]) + args[argc++] = "/"; + else + args[argc++] = dir; p++; } else { args[argc++] = "."; @@ -230,7 +243,7 @@ static char *get_local_name(struct file_list *flist,char *name) if (stat(name,&st) == 0) { if (S_ISDIR(st.st_mode)) { if (chdir(name) != 0) { - fprintf(FERROR,"chdir %s : %s\n",name,strerror(errno)); + fprintf(FERROR,"chdir %s : %s (1)\n",name,strerror(errno)); exit_cleanup(1); } return NULL; @@ -248,15 +261,15 @@ static char *get_local_name(struct file_list *flist,char *name) if (!name) return NULL; - if (mkdir(name,0777) != 0) { - fprintf(FERROR,"mkdir %s : %s\n",name,strerror(errno)); + 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\n",name,strerror(errno)); + fprintf(FERROR,"chdir %s : %s (2)\n",name,strerror(errno)); exit_cleanup(1); } @@ -275,8 +288,8 @@ void do_server_sender(int argc,char *argv[]) if (verbose > 2) fprintf(FERROR,"server_sender starting pid=%d\n",(int)getpid()); - if (chdir(dir) != 0) { - fprintf(FERROR,"chdir %s: %s\n",dir,strerror(errno)); + if (!relative_paths && chdir(dir) != 0) { + fprintf(FERROR,"chdir %s: %s (3)\n",dir,strerror(errno)); exit_cleanup(1); } argc--; @@ -284,6 +297,8 @@ void do_server_sender(int argc,char *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()); exit_cleanup(0); @@ -349,7 +362,7 @@ void do_server_recv(int argc,char *argv[]) argc--; argv++; if (chdir(dir) != 0) { - fprintf(FERROR,"chdir %s : %s\n",dir,strerror(errno)); + fprintf(FERROR,"chdir %s : %s (4)\n",dir,strerror(errno)); exit_cleanup(1); } } @@ -387,6 +400,7 @@ static void usage(FILE *f) 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"); @@ -405,10 +419,10 @@ static void usage(FILE *f) 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," --csum-length LENGTH set the checksum length\n"); fprintf(f," --version print version number\n"); fprintf(f,"\n"); @@ -417,9 +431,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_CSUM_LENGTH}; + OPT_EXCLUDE_FROM,OPT_DELETE,OPT_RSYNC_PATH}; -static char *short_options = "oblHpguDCtcahvrIxnSe:B:"; +static char *short_options = "oblHpguDCtcahvrRIxnSe:B:z"; static struct option long_options[] = { {"version", 0, 0, OPT_VERSION}, @@ -429,7 +443,6 @@ 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'}, @@ -442,6 +455,7 @@ static struct option long_options[] = { {"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'}, @@ -452,11 +466,12 @@ static struct option long_options[] = { {"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 pid, status, status2; + int pid, status = 0, status2 = 0; int opt; int option_index; char *shell_cmd = NULL; @@ -469,8 +484,11 @@ int main(int argc,char *argv[]) char *local_name = NULL; starttime = time(NULL); + am_root = (getuid() == 0); - checksum_init(); + /* 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)) @@ -490,11 +508,6 @@ 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; @@ -556,12 +569,7 @@ int main(int argc,char *argv[]) break; case 'o': - if (getuid() == 0) { - preserve_uid=1; - } else { - fprintf(FERROR,"-o only allowed for root\n"); - exit_cleanup(1); - } + preserve_uid=1; break; case 'g': @@ -569,12 +577,7 @@ int main(int argc,char *argv[]) break; case 'D': - if (getuid() == 0) { - preserve_devices=1; - } else { - fprintf(FERROR,"-D only allowed for root\n"); - exit_cleanup(1); - } + preserve_devices=1; break; case 't': @@ -597,10 +600,10 @@ int main(int argc,char *argv[]) preserve_perms=1; preserve_times=1; preserve_gid=1; - if (getuid() == 0) { + if (am_root) { preserve_devices=1; preserve_uid=1; - } + } break; case OPT_SERVER: @@ -619,6 +622,10 @@ int main(int argc,char *argv[]) recurse = 1; break; + case 'R': + relative_paths = 1; + break; + case 'e': shell_cmd = optarg; break; @@ -627,8 +634,12 @@ int main(int argc,char *argv[]) block_size = atoi(optarg); break; + case 'z': + do_compression = 1; + break; + default: - fprintf(FERROR,"bad option -%c\n",opt); + /* fprintf(FERROR,"bad option -%c\n",opt); */ exit_cleanup(1); } } @@ -719,6 +730,11 @@ 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", (int)getpid(),pid,sender,recurse); @@ -728,7 +744,7 @@ int main(int argc,char *argv[]) add_cvs_excludes(); if (delete_mode) send_exclude_list(f_out); - flist = send_file_list(f_out,recurse,argc,argv); + flist = send_file_list(f_out,argc,argv); if (verbose > 3) fprintf(FERROR,"file list sent\n"); send_files(flist,f_out,f_in);