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
Only refer to S_ISVTX if S_ISVTX is defined.
[rsync/rsync.git]
/
flist.c
diff --git
a/flist.c
b/flist.c
index
1dee24c
..
93148e6
100644
(file)
--- a/
flist.c
+++ b/
flist.c
@@
-660,8
+660,10
@@
struct file_struct *make_file(int f, char *fname, struct string_area **ap,
if (readlink_stat(fname, &st, linkbuf) != 0) {
int save_errno = errno;
if (readlink_stat(fname, &st, linkbuf) != 0) {
int save_errno = errno;
- if ((errno == ENOENT) && copy_links && !noexcludes) {
- /* symlink pointing nowhere, see if excluded */
+ if ((errno == ENOENT) && !noexcludes) {
+ /* either symlink pointing nowhere or file that
+ * was removed during rsync run; see if excluded
+ * before reporting an error */
memset((char *) &st, 0, sizeof(st));
if (check_exclude_file(f, fname, &st)) {
/* file is excluded anyway, ignore silently */
memset((char *) &st, 0, sizeof(st));
if (check_exclude_file(f, fname, &st)) {
/* file is excluded anyway, ignore silently */
@@
-1195,7
+1197,7
@@
void free_file(struct file_struct *file)
/*
* allocate a new file list
*/
/*
* allocate a new file list
*/
-struct file_list *flist_new()
+struct file_list *flist_new(
void
)
{
struct file_list *flist;
{
struct file_list *flist;