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 delete_mode=0;
int one_file_system=0;
int remote_version=0;
-int csum_length=SUM_LENGTH;
+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 ac = *argc;
static char argstr[50];
static char bsize[30];
- static char slength[30];
int i, x;
args[ac++] = "--server";
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++] = '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;
args[ac++] = bsize;
}
- if (csum_length != SUM_LENGTH) {
- sprintf(slength,"--csum-length=%d",csum_length);
- args[ac++] = slength;
- }
-
if (delete_mode)
args[ac++] = "--delete";
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;
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++] = ".";
args[argc] = NULL;
if (verbose > 3) {
- fprintf(stderr,"cmd=");
+ fprintf(FERROR,"cmd=");
for (i=0;i<argc;i++)
- fprintf(stderr,"%s ",args[i]);
- fprintf(stderr,"\n");
+ fprintf(FERROR,"%s ",args[i]);
+ fprintf(FERROR,"\n");
}
return piped_child(args,f_in,f_out);
if (stat(name,&st) == 0) {
if (S_ISDIR(st.st_mode)) {
if (chdir(name) != 0) {
- fprintf(stderr,"chdir %s : %s\n",name,strerror(errno));
- exit(1);
+ fprintf(FERROR,"chdir %s : %s (1)\n",name,strerror(errno));
+ exit_cleanup(1);
}
return NULL;
}
if (flist->count > 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;
}
if (!name)
return NULL;
- if (mkdir(name,0777) != 0) {
- fprintf(stderr,"mkdir %s : %s\n",name,strerror(errno));
- exit(1);
+ if (mkdir(name,0777 & ~orig_umask) != 0) {
+ fprintf(FERROR,"mkdir %s : %s (1)\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 (2)\n",name,strerror(errno));
+ exit_cleanup(1);
}
return NULL;
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);
+ if (!relative_paths && chdir(dir) != 0) {
+ 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<argc;i++)
argv[i] += l+1;
}
}
- flist = send_file_list(STDOUT_FILENO,recurse,argc,argv);
+ flist = send_file_list(STDOUT_FILENO,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;
+ int recv_pipe[2];
+
+ if (preserve_hard_links)
+ init_hard_links(flist);
+
+ if (pipe(recv_pipe) < 0) {
+ fprintf(FERROR,"pipe failed in do_recv\n");
+ exit(1);
+ }
+
+
+ if ((pid=fork()) == 0) {
+ recv_files(f_in,flist,local_name,recv_pipe[1]);
+ if (verbose > 2)
+ fprintf(FERROR,"receiver read %d\n",read_total());
+ exit_cleanup(0);
+ }
+
+ generate_files(f_out,flist,local_name,recv_pipe[0]);
+
+ 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 (4)\n",dir,strerror(errno));
+ exit_cleanup(1);
}
}
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) {
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);
}
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,"-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");
}
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 = "oblpguDCtcahvrIxne:B:";
+static char *short_options = "oblHpguDCtcahvrRIxnSe:B:z";
static struct option long_options[] = {
{"version", 0, 0, OPT_VERSION},
{"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'},
{"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 pid, status, pid2, status2;
+ int pid, status = 0, status2 = 0;
int opt;
int option_index;
char *shell_cmd = NULL;
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))
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;
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;
break;
case 'h':
- usage(stdout);
- exit(0);
+ usage(FINFO);
+ exit_cleanup(0);
case 'b':
make_backups=1;
dry_run=1;
break;
+ case 'S':
+ sparse_files=1;
+ break;
+
case 'C':
cvs_exclude=1;
break;
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;
break;
case 'o':
- if (getuid() == 0) {
- preserve_uid=1;
- } else {
- fprintf(stderr,"-o only allowed for root\n");
- exit(1);
- }
+ preserve_uid=1;
break;
case 'g':
break;
case 'D':
- if (getuid() == 0) {
- preserve_devices=1;
- } else {
- fprintf(stderr,"-D only allowed for root\n");
- exit(1);
- }
+ preserve_devices=1;
break;
case 't':
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:
case OPT_SENDER:
if (!am_server) {
- usage(stderr);
- exit(1);
+ usage(FERROR);
+ exit_cleanup(1);
}
sender = 1;
break;
recurse = 1;
break;
+ case 'R':
+ relative_paths = 1;
+ break;
+
case 'e':
shell_cmd = optarg;
break;
block_size = atoi(optarg);
break;
+ case 'z':
+ do_compression = 1;
+ break;
+
default:
- fprintf(stderr,"bad option -%c\n",opt);
- exit(1);
+ /* fprintf(FERROR,"bad option -%c\n",opt); */
+ exit_cleanup(1);
}
}
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) {
- remote_version = read_int(STDIN_FILENO);
- if (remote_version < MIN_PROTOCOL_VERSION ||
- remote_version > MAX_PROTOCOL_VERSION) {
- fprintf(stderr,"protocol version mismatch - is your shell clean?\n");
- exit(1);
- }
- write_int(STDOUT_FILENO,PROTOCOL_VERSION);
- write_flush(STDOUT_FILENO);
-
- setup_protocol();
+ setup_protocol(STDOUT_FILENO,STDIN_FILENO);
if (sender) {
recv_exclude_list(STDIN_FILENO);
} 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],':');
}
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);
- write_int(f_out,PROTOCOL_VERSION);
- write_flush(f_out);
- {
- remote_version = read_int(f_in);
- if (remote_version < MIN_PROTOCOL_VERSION ||
- remote_version > MAX_PROTOCOL_VERSION) {
- fprintf(stderr,"protocol version mismatch - is your shell clean?\n");
- exit(1);
- }
- }
+ setup_protocol(f_out,f_in);
- setup_protocol();
+#if HAVE_SETLINEBUF
+ setlinebuf(FINFO);
+ setlinebuf(FERROR);
+#endif
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) {
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(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);
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff