diff options
author | Tim Kientzle <kientzle@gmail.com> | 2010-04-11 14:08:36 -0400 |
---|---|---|
committer | Tim Kientzle <kientzle@gmail.com> | 2010-04-11 14:08:36 -0400 |
commit | 7a2b46a89ad69a7a8265ab6c36a3b7aa7a1a63a6 (patch) | |
tree | 4ff93e6fd67a8440deac3cf8e3ba008bedbf0bea /libarchive_fe | |
parent | 30a01e4b5aa1f4dd0b13b1c68431609c9844e5df (diff) | |
download | libarchive-7a2b46a89ad69a7a8265ab6c36a3b7aa7a1a63a6.tar.gz |
Improve the testing of tar -X and try to correctly handle some odd cases.
Here are some of the cases currently handled
(assuming test.tar contains a single entry "file1"):
$ tar xf test.tar file1
Extracts file1 with no error.
$ tar xf test.tar file1 file2
Extracts file1, error because file2 was requested but not found.
$ tar xf test.tar file1 'file2*'
Extracts file1, error because 'file2*' pattern matched no entries.
$ tar xf test.tar file1 file1
Extracts file1 with no error
$ tar xf test.tar file1 'file*'
Extracts file1 with no error
$ tar xf test.tar --exclude=file1
Does not extract file1, no error.
$ tar xf test.tar --exclude=file1 file1
Does not extract file1, no error.
$ tar xf test.tar --exclude=file2 file1
Extracts file1, no error.
SVN-Revision: 2229
Diffstat (limited to 'libarchive_fe')
-rw-r--r-- | libarchive_fe/matching.c | 55 |
1 files changed, 26 insertions, 29 deletions
diff --git a/libarchive_fe/matching.c b/libarchive_fe/matching.c index f774ac77..b2aba022 100644 --- a/libarchive_fe/matching.c +++ b/libarchive_fe/matching.c @@ -156,40 +156,41 @@ lafe_excluded(struct lafe_matching *matching, const char *pathname) if (matching == NULL) return (0); + /* Mark off any unmatched inclusions. */ + /* In particular, if a filename does appear in the archive and + * is explicitly included and excluded, then we don't report + * it as missing even though we don't extract it. + */ + matched = NULL; + for (match = matching->inclusions; match != NULL; match = match->next){ + if (match->matches == 0 + && match_inclusion(match, pathname)) { + matching->inclusions_unmatched_count--; + match->matches++; + matched = match; + } + } + /* Exclusions take priority */ for (match = matching->exclusions; match != NULL; match = match->next){ if (match_exclusion(match, pathname)) return (1); } - /* Then check for inclusions */ - matched = NULL; + /* It's not excluded and we found an inclusion above, so it's included. */ + if (matched != NULL) + return (0); + + + /* We didn't find an unmatched inclusion, check the remaining ones. */ for (match = matching->inclusions; match != NULL; match = match->next){ - if (match_inclusion(match, pathname)) { - /* - * If this pattern has never been matched, - * then we're done. - */ - if (match->matches == 0) { - match->matches++; - matching->inclusions_unmatched_count--; - return (0); - } - /* - * Otherwise, remember the match but keep checking - * in case we can tick off an unmatched pattern. - */ - matched = match; + /* We looked at previously-unmatched inclusions already. */ + if (match->matches > 0 + && match_inclusion(match, pathname)) { + match->matches++; + return (0); } } - /* - * We didn't find a pattern that had never been matched, but - * we did find a match, so count it and exit. - */ - if (matched != NULL) { - matched->matches++; - return (0); - } /* If there were inclusions, default is to exclude. */ if (matching->inclusions != NULL) @@ -219,11 +220,7 @@ match_exclusion(struct match *match, const char *pathname) static int match_inclusion(struct match *match, const char *pathname) { -#if 0 - return (lafe_pathmatch(match->pattern, pathname, 0)); -#else return (lafe_pathmatch(match->pattern, pathname, PATHMATCH_NO_ANCHOR_END)); -#endif } void |