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
When writing to a daemon with read only = false and uid = root and -g,
[rsync/rsync.git]
/
receiver.c
diff --git
a/receiver.c
b/receiver.c
index
0533fff
..
890fadd
100644
(file)
--- a/
receiver.c
+++ b/
receiver.c
@@
-109,11
+109,12
@@
static void delete_files(struct file_list *flist)
struct file_list *local_file_list;
int i, j;
char *name;
struct file_list *local_file_list;
int i, j;
char *name;
+ extern int module_id;
if (cvs_exclude)
add_cvs_excludes();
if (cvs_exclude)
add_cvs_excludes();
- if (io_error) {
+ if (io_error
&& !lp_ignore_errors(module_id)
) {
rprintf(FINFO,"IO error encountered - skipping file deletion\n");
return;
}
rprintf(FINFO,"IO error encountered - skipping file deletion\n");
return;
}
@@
-302,14
+303,18
@@
int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
int phase=0;
int recv_ok;
extern struct stats stats;
int phase=0;
int recv_ok;
extern struct stats stats;
+ extern int preserve_perms;
+ extern int delete_after;
struct stats initial_stats;
if (verbose > 2) {
rprintf(FINFO,"recv_files(%d) starting\n",flist->count);
}
struct stats initial_stats;
if (verbose > 2) {
rprintf(FINFO,"recv_files(%d) starting\n",flist->count);
}
- if (recurse && delete_mode && !local_name && flist->count>0) {
- delete_files(flist);
+ if (!delete_after) {
+ if (recurse && delete_mode && !local_name && flist->count>0) {
+ delete_files(flist);
+ }
}
while (1) {
}
while (1) {
@@
-358,14
+363,14
@@
int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
fnamecmp = fname;
/* open the file */
fnamecmp = fname;
/* open the file */
- fd1 =
open(fnamecmp,O_RDONLY
);
+ fd1 =
do_open(fnamecmp, O_RDONLY, 0
);
if ((fd1 == -1) && (compare_dest != NULL)) {
/* try the file at compare_dest instead */
slprintf(fnamecmpbuf,MAXPATHLEN,"%s/%s",
compare_dest,fname);
fnamecmp = fnamecmpbuf;
if ((fd1 == -1) && (compare_dest != NULL)) {
/* try the file at compare_dest instead */
slprintf(fnamecmpbuf,MAXPATHLEN,"%s/%s",
compare_dest,fname);
fnamecmp = fnamecmpbuf;
- fd1 =
open(fnamecmp,O_RDONLY
);
+ fd1 =
do_open(fnamecmp, O_RDONLY, 0
);
}
if (fd1 != -1 && do_fstat(fd1,&st) != 0) {
}
if (fd1 != -1 && do_fstat(fd1,&st) != 0) {
@@
-382,6
+387,13
@@
int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
continue;
}
continue;
}
+ if (fd1 != -1 && !preserve_perms) {
+ /* if the file exists already and we aren't perserving
+ presmissions then act as though the remote end sent
+ us the file permissions we already have */
+ file->mode = st.st_mode;
+ }
+
if (fd1 != -1 && st.st_size > 0) {
buf = map_file(fd1,st.st_size);
if (verbose > 2)
if (fd1 != -1 && st.st_size > 0) {
buf = map_file(fd1,st.st_size);
if (verbose > 2)
@@
-417,6
+429,9
@@
int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
fd2 = do_open(fnametmp,O_WRONLY|O_CREAT|O_EXCL,
file->mode & INITACCESSPERMS);
fd2 = do_open(fnametmp,O_WRONLY|O_CREAT|O_EXCL,
file->mode & INITACCESSPERMS);
+ /* in most cases parent directories will already exist
+ because their information should have been previously
+ transferred, but that may not be the case with -R */
if (fd2 == -1 && relative_paths && errno == ENOENT &&
create_directory_path(fnametmp) == 0) {
fd2 = do_open(fnametmp,O_WRONLY|O_CREAT|O_EXCL,
if (fd2 == -1 && relative_paths && errno == ENOENT &&
create_directory_path(fnametmp) == 0) {
fd2 = do_open(fnametmp,O_WRONLY|O_CREAT|O_EXCL,
@@
-466,6
+481,12
@@
int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
}
}
}
}
+ if (delete_after) {
+ if (recurse && delete_mode && !local_name && flist->count>0) {
+ delete_files(flist);
+ }
+ }
+
if (preserve_hard_links)
do_hard_links(flist);
if (preserve_hard_links)
do_hard_links(flist);
@@
-474,7
+495,7
@@
int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
for (i = 0; i < flist->count; i++) {
file = flist->files[i];
if (!file->basename || !S_ISDIR(file->mode)) continue;
for (i = 0; i < flist->count; i++) {
file = flist->files[i];
if (!file->basename || !S_ISDIR(file->mode)) continue;
- recv_generator(f_name(file),flist,i,-1);
+ recv_generator(
local_name?local_name:
f_name(file),flist,i,-1);
}
if (verbose > 2)
}
if (verbose > 2)