mirror/rsync
1
0
Fork 0
mirror of https://github.com/RsyncProject/rsync.git synced 2026-04-04 22:44:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Restore the old include behavior where a command-line include could

Browse Source 
override a .cvsignore exclude.
This commit is contained in:
Wayne Davison
2004-04-22 22:17:15 +00:00
parent f89e890b87
commit 9fdb334e85
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
exclude.c
View File

@@ -215,7 +215,8 @@ static void report_exclude_result(char const *name,
/*
* Return true if file NAME is defined to be excluded by the specified
* exclude list.
* exclude list. Returns -1 for an exclude, 1 for an include, and 0 if
* no match.
*/
int check_exclude(struct exclude_list_struct *listp, char *name, int name_is_dir)
{
@@ -225,7 +226,7 @@ int check_exclude(struct exclude_list_struct *listp, char *name, int name_is_dir
if (check_one_exclude(name, ent, name_is_dir)) {
report_exclude_result(name, ent, name_is_dir,
listp->debug_type);
return !ent->include;
return ent->include ? 1 : -1;
}
}

11
flist.c
View File

@@ -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)
{
int rc;
#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
&& 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;
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
&& check_exclude(&local_exclude_list, fname, is_dir))
&& check_exclude(&local_exclude_list, fname, is_dir) < 0)
return 1;
return 0;
}

2
util.c
View File

@@ -476,7 +476,7 @@ static int exclude_server_path(char *arg)
if (server_exclude_list.head) {
for (s = arg; (s = strchr(s, '/')) != NULL; ) {
*s = '\0';
if (check_exclude(&server_exclude_list, arg, 1)) {
if (check_exclude(&server_exclude_list, arg, 1) < 0) {
/* We must leave arg truncated! */
return 1;
}