Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
damn, I had implicitly assumed signed characters when writing the
[rsync/rsync.git]
/
main.c
diff --git
a/main.c
b/main.c
index
a088720
..
936fdb9
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-46,6
+46,10
@@
int delete_mode=0;
int one_file_system=0;
int remote_version=0;
int sparse_files=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;
+
extern int csum_length;
int am_server = 0;
extern int csum_length;
int am_server = 0;
@@
-91,7
+95,6
@@
static void server_options(char **args,int *argc)
int ac = *argc;
static char argstr[50];
static char bsize[30];
int ac = *argc;
static char argstr[50];
static char bsize[30];
- static char slength[30];
int i, x;
args[ac++] = "--server";
int i, x;
args[ac++] = "--server";
@@
-135,6
+138,8
@@
static void server_options(char **args,int *argc)
argstr[x++] = 'x';
if (sparse_files)
argstr[x++] = 'S';
argstr[x++] = 'x';
if (sparse_files)
argstr[x++] = 'S';
+ if (do_compression)
+ argstr[x++] = 'z';
argstr[x] = 0;
if (x != 1) args[ac++] = argstr;
argstr[x] = 0;
if (x != 1) args[ac++] = argstr;
@@
-144,11
+149,6
@@
static void server_options(char **args,int *argc)
args[ac++] = bsize;
}
args[ac++] = bsize;
}
- if (csum_length != SUM_LENGTH) {
- sprintf(slength,"--csum-length=%d",csum_length);
- args[ac++] = slength;
- }
-
if (delete_mode)
args[ac++] = "--delete";
if (delete_mode)
args[ac++] = "--delete";
@@
-176,11
+176,20
@@
int do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int *f_out)
args[argc++] = tok;
}
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;
if (user) {
args[argc++] = "-l";
args[argc++] = user;
}
args[argc++] = machine;
+#endif
}
args[argc++] = rsync_path;
}
args[argc++] = rsync_path;
@@
-192,7
+201,10
@@
int do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int *f_out)
p = strrchr(dir,'/');
if (p) {
*p = 0;
p = strrchr(dir,'/');
if (p) {
*p = 0;
- args[argc++] = dir;
+ if (!dir[0])
+ args[argc++] = "/";
+ else
+ args[argc++] = dir;
p++;
} else {
args[argc++] = ".";
p++;
} else {
args[argc++] = ".";
@@
-246,7
+258,7
@@
static char *get_local_name(struct file_list *flist,char *name)
if (!name)
return NULL;
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 {
fprintf(FERROR,"mkdir %s : %s\n",name,strerror(errno));
exit_cleanup(1);
} else {
@@
-282,6
+294,8
@@
void do_server_sender(int argc,char *argv[])
if (strcmp(dir,".")) {
int l = strlen(dir);
if (strcmp(dir,".")) {
int l = strlen(dir);
+ if (strcmp(dir,"/") == 0)
+ l = 0;
for (i=0;i<argc;i++)
argv[i] += l+1;
}
for (i=0;i<argc;i++)
argv[i] += l+1;
}
@@
-293,7
+307,7
@@
void do_server_sender(int argc,char *argv[])
}
}
- 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);
send_files(flist,STDOUT_FILENO,STDIN_FILENO);
report(STDOUT_FILENO);
exit_cleanup(0);
@@
-304,12
+318,19
@@
static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
{
int pid;
int status=0;
{
int pid;
int status=0;
+ int recv_pipe[2];
if (preserve_hard_links)
init_hard_links(flist);
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) {
if ((pid=fork()) == 0) {
- recv_files(f_in,flist,local_name);
+ recv_files(f_in,flist,local_name
,recv_pipe[1]
);
if (preserve_hard_links)
do_hard_links(flist);
if (verbose > 2)
if (preserve_hard_links)
do_hard_links(flist);
if (verbose > 2)
@@
-317,7
+338,7
@@
static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
exit_cleanup(0);
}
exit_cleanup(0);
}
- generate_files(f_out,flist,local_name);
+ generate_files(f_out,flist,local_name
,recv_pipe[0]
);
waitpid(pid, &status, 0);
waitpid(pid, &status, 0);
@@
-396,10
+417,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,"-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," --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");
fprintf(f," --version print version number\n");
fprintf(f,"\n");
@@
-408,9
+429,9
@@
static void usage(FILE *f)
}
enum {OPT_VERSION,OPT_SUFFIX,OPT_SENDER,OPT_SERVER,OPT_EXCLUDE,
}
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 = "oblHpguDCtcahvrIxnSe:B:
z
";
static struct option long_options[] = {
{"version", 0, 0, OPT_VERSION},
static struct option long_options[] = {
{"version", 0, 0, OPT_VERSION},
@@
-420,7
+441,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},
{"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'},
{"one-file-system",0, 0, 'x'},
{"ignore-times",0, 0, 'I'},
{"help", 0, 0, 'h'},
@@
-443,11
+463,12
@@
static struct option long_options[] = {
{"rsh", 1, 0, 'e'},
{"suffix", 1, 0, OPT_SUFFIX},
{"block-size", 1, 0, 'B'},
{"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[])
{
{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;
int opt;
int option_index;
char *shell_cmd = NULL;
@@
-460,8
+481,11
@@
int main(int argc,char *argv[])
char *local_name = NULL;
starttime = time(NULL);
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))
while ((opt = getopt_long(argc, argv,
short_options, long_options, &option_index))
@@
-481,11
+505,6
@@
int main(int argc,char *argv[])
rsync_path = optarg;
break;
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;
case 'I':
ignore_times = 1;
break;
@@
-547,12
+566,7
@@
int main(int argc,char *argv[])
break;
case 'o':
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 'g':
@@
-560,12
+574,7
@@
int main(int argc,char *argv[])
break;
case 'D':
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':
break;
case 't':
@@
-588,10
+597,10
@@
int main(int argc,char *argv[])
preserve_perms=1;
preserve_times=1;
preserve_gid=1;
preserve_perms=1;
preserve_times=1;
preserve_gid=1;
- if (
getuid() == 0
) {
+ if (
am_root
) {
preserve_devices=1;
preserve_uid=1;
preserve_devices=1;
preserve_uid=1;
- }
+ }
break;
case OPT_SERVER:
break;
case OPT_SERVER:
@@
-618,8
+627,12
@@
int main(int argc,char *argv[])
block_size = atoi(optarg);
break;
block_size = atoi(optarg);
break;
+ case 'z':
+ do_compression = 1;
+ break;
+
default:
default:
- fprintf(FERROR,"bad option -%c\n",opt);
+ /* fprintf(FERROR,"bad option -%c\n",opt); */
exit_cleanup(1);
}
}
exit_cleanup(1);
}
}
@@
-638,16
+651,7
@@
int main(int argc,char *argv[])
verbose = MAX(verbose,1);
if (am_server) {
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(FERROR,"protocol version mismatch - is your shell clean?\n");
- exit_cleanup(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);
if (sender) {
recv_exclude_list(STDIN_FILENO);
@@
-717,18
+721,7
@@
int main(int argc,char *argv[])
pid = do_cmd(shell_cmd,shell_machine,shell_user,shell_path,&f_in,&f_out);
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(FERROR,"protocol version mismatch - is your shell clean?\n");
- exit_cleanup(1);
- }
- }
-
- setup_protocol();
+ setup_protocol(f_out,f_in);
if (verbose > 3)
fprintf(FERROR,"parent=%d child=%d sender=%d recurse=%d\n",
if (verbose > 3)
fprintf(FERROR,"parent=%d child=%d sender=%d recurse=%d\n",
@@
-739,7
+732,7
@@
int main(int argc,char *argv[])
add_cvs_excludes();
if (delete_mode)
send_exclude_list(f_out);
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);
if (verbose > 3)
fprintf(FERROR,"file list sent\n");
send_files(flist,f_out,f_in);