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
Don't use __attribute__((__unused__)) on HP-UX w/o gcc.
[rsync/rsync.git]
/
flist.c
diff --git
a/flist.c
b/flist.c
index
077e42c
..
bd7ad16
100644
(file)
--- a/
flist.c
+++ b/
flist.c
@@
-211,6
+211,8
@@
int link_stat(const char *path, STRUCT_STAT * buffer)
*/
static int check_exclude_file(char *fname, int is_dir, int exclude_level)
{
*/
static int check_exclude_file(char *fname, int is_dir, int exclude_level)
{
+ int rc;
+
#if 0 /* This currently never happens, so avoid a useless compare. */
if (exclude_level == NO_EXCLUDES)
return 0;
#if 0 /* This currently never happens, so avoid a useless compare. */
if (exclude_level == NO_EXCLUDES)
return 0;
@@
-227,14
+229,15
@@
static int check_exclude_file(char *fname, int is_dir, int exclude_level)
}
}
if (server_exclude_list.head
}
}
if (server_exclude_list.head
-
&& check_exclude(&server_exclude_list, fname, is_dir)
)
+
&& check_exclude(&server_exclude_list, fname, is_dir) < 0
)
return 1;
if (exclude_level != ALL_EXCLUDES)
return 0;
return 1;
if (exclude_level != ALL_EXCLUDES)
return 0;
- if (exclude_list.head && check_exclude(&exclude_list, fname, is_dir))
- return 1;
+ if (exclude_list.head
+ && (rc = check_exclude(&exclude_list, fname, is_dir)) != 0)
+ return rc < 0;
if (local_exclude_list.head
if (local_exclude_list.head
- && check_exclude(&local_exclude_list, fname, is_dir))
+ && check_exclude(&local_exclude_list, fname, is_dir)
< 0
)
return 1;
return 0;
}
return 1;
return 0;
}