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
Tidied up a few things in preparation for changes.
[rsync/rsync.git]
/
generator.c
diff --git
a/generator.c
b/generator.c
index
0e51def
..
2fd90e3
100644
(file)
--- a/
generator.c
+++ b/
generator.c
@@
-30,6
+30,9
@@
extern int preserve_links;
extern int am_root;
extern int preserve_devices;
extern int preserve_hard_links;
extern int am_root;
extern int preserve_devices;
extern int preserve_hard_links;
+extern int preserve_perms;
+extern int preserve_uid;
+extern int preserve_gid;
extern int update_only;
extern int opt_ignore_existing;
extern int csum_length;
extern int update_only;
extern int opt_ignore_existing;
extern int csum_length;
@@
-50,18
+53,15
@@
static int skip_file(char *fname,
return 0;
}
if (link_dest) {
return 0;
}
if (link_dest) {
- extern int preserve_perms;
- extern int preserve_uid;
- extern int preserve_gid;
-
if (preserve_perms
if (preserve_perms
-
&& (st->st_mode & ~_S_IFMT) != (file->mode & ~_S_IFMT))
+ && (st->st_mode & ~_S_IFMT) != (file->mode & ~_S_IFMT))
return 0;
return 0;
- if (preserve_uid && st->st_uid != file->uid)
+ if (
am_root &&
preserve_uid && st->st_uid != file->uid)
return 0;
return 0;
- if (preserve_gid && st->st_gid != file->gid)
+ if (preserve_gid && file->gid != (gid_t)-1
+ && st->st_gid != file->gid)
return 0;
}
return 0;
}
@@
-270,14
+270,13
@@
void recv_generator(char *fname, struct file_list *flist, int i, int f_out)
{
int fd;
STRUCT_STAT st;
{
int fd;
STRUCT_STAT st;
- struct map_struct *buf;
+ struct map_struct *
map
buf;
int statret;
struct file_struct *file = flist->files[i];
char *fnamecmp;
char fnamecmpbuf[MAXPATHLEN];
extern char *compare_dest;
extern int list_only;
int statret;
struct file_struct *file = flist->files[i];
char *fnamecmp;
char fnamecmpbuf[MAXPATHLEN];
extern char *compare_dest;
extern int list_only;
- extern int preserve_perms;
extern int only_existing;
extern int orig_umask;
extern int only_existing;
extern int orig_umask;
@@
-506,11
+505,10
@@
void recv_generator(char *fname, struct file_list *flist, int i, int f_out)
return;
}
return;
}
- if (st.st_size > 0) {
- buf = map_file(fd,st.st_size);
- } else {
- buf = NULL;
- }
+ if (st.st_size > 0)
+ mapbuf = map_file(fd,st.st_size);
+ else
+ mapbuf = NULL;
if (verbose > 3)
rprintf(FINFO,"gen mapped %s of size %.0f\n",fnamecmp,(double)st.st_size);
if (verbose > 3)
rprintf(FINFO,"gen mapped %s of size %.0f\n",fnamecmp,(double)st.st_size);
@@
-519,10
+517,10
@@
void recv_generator(char *fname, struct file_list *flist, int i, int f_out)
rprintf(FINFO, "generating and sending sums for %d\n", i);
write_int(f_out,i);
rprintf(FINFO, "generating and sending sums for %d\n", i);
write_int(f_out,i);
- generate_and_send_sums(buf, st.st_size, f_out);
+ generate_and_send_sums(
map
buf, st.st_size, f_out);
close(fd);
close(fd);
- if (
buf) unmap_file(
buf);
+ if (
mapbuf) unmap_file(map
buf);
}
}
@@
-531,7
+529,7
@@
void generate_files(int f,struct file_list *flist,char *local_name,int f_recv)
{
int i;
int phase=0;
{
int i;
int phase=0;
- char buf[MAXPATHLEN];
+ char
f
buf[MAXPATHLEN];
if (verbose > 2)
rprintf(FINFO,"generator starting pid=%d count=%d\n",
if (verbose > 2)
rprintf(FINFO,"generator starting pid=%d count=%d\n",
@@
-564,7
+562,7
@@
void generate_files(int f,struct file_list *flist,char *local_name,int f_recv)
}
recv_generator(local_name? local_name
}
recv_generator(local_name? local_name
- : f_name_to(file,
buf, sizeof
buf), flist, i, f);
+ : f_name_to(file,
fbuf,sizeof f
buf), flist, i, f);
file->mode = saved_mode;
}
file->mode = saved_mode;
}
@@
-583,7
+581,7
@@
void generate_files(int f,struct file_list *flist,char *local_name,int f_recv)
for (i = read_int(f_recv); i != -1; i = read_int(f_recv)) {
struct file_struct *file = flist->files[i];
recv_generator(local_name? local_name
for (i = read_int(f_recv); i != -1; i = read_int(f_recv)) {
struct file_struct *file = flist->files[i];
recv_generator(local_name? local_name
- : f_name_to(file,
buf, sizeof
buf), flist, i, f);
+ : f_name_to(file,
fbuf,sizeof f
buf), flist, i, f);
}
phase++;
}
phase++;