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;
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;
+int numeric_ids = 0;
+
extern int csum_length;
int am_server = 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 (copy_links)
+ argstr[x++] = 'L';
+ if (whole_file)
+ argstr[x++] = 'W';
if (preserve_hard_links)
argstr[x++] = 'H';
if (preserve_uid)
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 (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)
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;
server_options(args,&argc);
if (path && *path) {
- char *dir = strdup(path);
+ 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++] = ".";
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");
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;
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);
}
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--;
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_cleanup(0);
{
int pid;
int status=0;
+ int recv_pipe[2];
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 (pipe(recv_pipe) < 0) {
+ fprintf(FERROR,"pipe failed in do_recv\n");
+ exit(1);
+ }
+
+
+ if ((pid=do_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);
+ generate_files(f_out,flist,local_name,recv_pipe[0]);
waitpid(pid, &status, 0);
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);
}
}
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,"-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");
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");
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_NUMERIC_IDS,OPT_RSYNC_PATH};
-static char *short_options = "oblHpguDCtcahvrIxnSe:B:";
+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},
- {"csum-length", 1, 0, OPT_CSUM_LENGTH},
{"one-file-system",0, 0, 'x'},
{"ignore-times",0, 0, 'I'},
{"help", 0, 0, 'h'},
{"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'},
+ {"copy-links", 0, 0, 'L'},
+ {"whole-file", 0, 0, 'W'},
{"hard-links", 0, 0, 'H'},
{"owner", 0, 0, 'o'},
{"group", 0, 0, 'g'},
{"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, status2;
+ int pid, status = 0, status2 = 0;
int opt;
int option_index;
char *shell_cmd = NULL;
struct file_list *flist;
char *local_name = NULL;
+ signal(SIGUSR1, sigusr1_handler);
+
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))
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;
delete_mode = 1;
break;
+ case OPT_NUMERIC_IDS:
+ numeric_ids = 1;
+ break;
+
case OPT_EXCLUDE:
add_exclude(optarg);
break;
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;
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':
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':
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:
recurse = 1;
break;
+ case 'R':
+ relative_paths = 1;
+ break;
+
case 'e':
shell_cmd = optarg;
break;
block_size = atoi(optarg);
break;
+ case 'T':
+ tmpdir = 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);
}
}
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);
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);
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);
return status | status2;
}
+
git.samba.org / rsync.git / blobdiff