int remote_version=0;
int sparse_files=0;
int do_compression=0;
+int am_root=0;
+int orig_umask=0;
extern int csum_length;
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[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;
p = strrchr(dir,'/');
if (p) {
*p = 0;
- args[argc++] = dir;
+ if (!dir[0])
+ args[argc++] = "/";
+ else
+ args[argc++] = dir;
p++;
} else {
args[argc++] = ".";
if (!name)
return NULL;
- if (mkdir(name,0777) != 0) {
+ if (mkdir(name,0777 & ~orig_umask) != 0) {
fprintf(FERROR,"mkdir %s : %s\n",name,strerror(errno));
exit_cleanup(1);
} else {
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);
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};
-static char *short_options = "oblHpguDCtcahvrIxnSe:B:";
+static char *short_options = "oblHpguDCtcahvrIxnSe:B:z";
static struct option long_options[] = {
{"version", 0, 0, OPT_VERSION},
{"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;
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))
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:
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);
}
}
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);