Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
950ab32
)
*** empty log message ***
author
Andrew Tridgell
<tridge@samba.org>
Tue, 13 Jan 1998 19:19:48 +0000
(19:19 +0000)
committer
Andrew Tridgell
<tridge@samba.org>
Tue, 13 Jan 1998 19:19:48 +0000
(19:19 +0000)
rsync.c
patch
|
blob
|
blame
|
history
diff --git
a/rsync.c
b/rsync.c
index
3eb6467
..
ea15ac8
100644
(file)
--- a/
rsync.c
+++ b/
rsync.c
@@
-811,20
+811,24
@@
int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
if (errno == EXDEV) {
/* rename failed on cross-filesystem link.
Copy the file instead. */
if (errno == EXDEV) {
/* rename failed on cross-filesystem link.
Copy the file instead. */
- if (copy_file(fnametmp,fname, file->mode))
+ if (copy_file(fnametmp,fname, file->mode))
{
fprintf(FERROR,"copy %s -> %s : %s\n",
fnametmp,fname,strerror(errno));
fprintf(FERROR,"copy %s -> %s : %s\n",
fnametmp,fname,strerror(errno));
+ } else {
+ set_perms(fname,file,NULL,0);
+ }
unlink(fnametmp);
} else {
fprintf(FERROR,"rename %s -> %s : %s\n",
fnametmp,fname,strerror(errno));
unlink(fnametmp);
}
unlink(fnametmp);
} else {
fprintf(FERROR,"rename %s -> %s : %s\n",
fnametmp,fname,strerror(errno));
unlink(fnametmp);
}
+ } else {
+ set_perms(fname,file,NULL,0);
}
cleanup_fname = NULL;
}
cleanup_fname = NULL;
- set_perms(fname,file,NULL,0);
if (!recv_ok) {
if (verbose > 1)
if (!recv_ok) {
if (verbose > 1)