int verbose = 0;
int always_checksum = 0;
time_t starttime;
-off_t total_size = 0;
+int64 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;
int do_compression=0;
int am_root=0;
int orig_umask=0;
+int relative_paths=0;
+int numeric_ids = 0;
+int force_delete = 0;
+int io_timeout = 0;
+int io_error = 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;
+ int64 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;
}
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
}
int ac = *argc;
static char argstr[50];
static char bsize[30];
+ static char iotime[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)
args[ac++] = bsize;
}
+ if (io_timeout) {
+ sprintf(iotime,"--timeout=%d",io_timeout);
+ args[ac++] = iotime;
+ }
+
+ if (strcmp(backup_suffix, BACKUP_SUFFIX)) {
+ args[ac++] = "--suffix";
+ args[ac++] = backup_suffix;
+ }
+
if (delete_mode)
args[ac++] = "--delete";
+ if (force_delete)
+ args[ac++] = "--force";
+
+ 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,*dir=NULL;
if (!local_server) {
if (!cmd)
server_options(args,&argc);
- if (path && *path) {
- char *dir = strdup(path);
- p = strrchr(dir,'/');
- if (p) {
- *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;
if (verbose > 3) {
- fprintf(FERROR,"cmd=");
+ fprintf(FINFO,"cmd=");
for (i=0;i<argc;i++)
- fprintf(FERROR,"%s ",args[i]);
- fprintf(FERROR,"\n");
+ fprintf(FINFO,"%s ",args[i]);
+ fprintf(FINFO,"\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;
return NULL;
if (mkdir(name,0777 & ~orig_umask) != 0) {
- fprintf(FERROR,"mkdir %s : %s\n",name,strerror(errno));
+ 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);
}
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());
+ fprintf(FINFO,"server_sender starting pid=%d\n",(int)getpid());
- if (chdir(dir) != 0) {
- fprintf(FERROR,"chdir %s: %s\n",dir,strerror(errno));
- exit_cleanup(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);
- for (i=0;i<argc;i++)
- argv[i] += l+1;
+ int l = strlen(dir);
+ if (strcmp(dir,"/") == 0)
+ l = 0;
+ for (i=0;i<argc;i++)
+ argv[i] += l+1;
}
if (argc == 0 && recurse) {
- argc=1;
- argv--;
- argv[0] = ".";
+ argc=1;
+ argv--;
+ argv[0] = ".";
}
}
- 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());
+ fprintf(FINFO,"receiver read %ld\n",(long)read_total());
exit_cleanup(0);
}
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());
+ fprintf(FINFO,"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\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)
}
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);
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," --force force deletion of directories even if not empty\n");
+ fprintf(f," --numeric-ids don't map uid/gid values by user/group name\n");
+ fprintf(f," --timeout TIME set IO timeout in seconds\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");
}
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,
+ OPT_FORCE,OPT_TIMEOUT};
-static char *short_options = "oblHpguDCtcahvrIxnSe: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},
+ {"force", 0, 0, OPT_FORCE},
+ {"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},
{"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'},
+ {"timeout", 1, 0, OPT_TIMEOUT},
+ {"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);
/* 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))
delete_mode = 1;
break;
+ case OPT_FORCE:
+ force_delete = 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;
recurse = 1;
break;
+ case 'R':
+ relative_paths = 1;
+ break;
+
case 'e':
shell_cmd = optarg;
break;
block_size = atoi(optarg);
break;
+ case OPT_TIMEOUT:
+ io_timeout = atoi(optarg);
+ break;
+
+ case 'T':
+ tmpdir = optarg;
+ break;
+
case 'z':
do_compression = 1;
break;
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);
}
if (verbose > 3) {
- fprintf(FERROR,"cmd=%s machine=%s user=%s path=%s\n",
+ fprintf(FINFO,"cmd=%s machine=%s user=%s path=%s\n",
shell_cmd?shell_cmd:"",
shell_machine?shell_machine:"",
shell_user?shell_user:"",
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",
+ fprintf(FINFO,"parent=%d child=%d sender=%d recurse=%d\n",
(int)getpid(),pid,sender,recurse);
if (sender) {
send_exclude_list(f_out);
flist = send_file_list(f_out,argc,argv);
if (verbose > 3)
- fprintf(FERROR,"file list sent\n");
+ fprintf(FINFO,"file list sent\n");
send_files(flist,f_out,f_in);
if (verbose > 3)
- fprintf(FERROR,"waiting on %d\n",pid);
+ fprintf(FINFO,"waiting on %d\n",pid);
waitpid(pid, &status, 0);
report(-1);
exit_cleanup(status);
flist = recv_file_list(f_in);
if (!flist || flist->count == 0) {
- fprintf(FERROR,"nothing to do\n");
+ fprintf(FINFO,"nothing to do\n");
exit_cleanup(0);
}
return status | status2;
}
+
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff