diff options
| author | Michihiro NAKAJIMA <ggcueroad@gmail.com> | 2012-02-12 22:41:47 +0900 |
|---|---|---|
| committer | Michihiro NAKAJIMA <ggcueroad@gmail.com> | 2012-02-12 22:41:47 +0900 |
| commit | ae314ad8180bbd1127834d299bfa761f566eac8c (patch) | |
| tree | 5ffea4ff68225b79f5494906bb76f74fdc87725f /cpio/cpio.c | |
| parent | 75d9a70fc8ee5d4687f0ecd4186587cd281faa36 (diff) | |
| download | libarchive-ae314ad8180bbd1127834d299bfa761f566eac8c.tar.gz | |
Introduce archive_match_exclude_pattern_from_file(_w) and
archive_match_include_pattern_from_file(_w) reading exclusion/inclusion
patterns from a file. And so retire lafe_exclude_from_file() and
lafe_include_from_file because we can use new APIs instead.
Diffstat (limited to 'cpio/cpio.c')
| -rw-r--r-- | cpio/cpio.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/cpio/cpio.c b/cpio/cpio.c index 8acfae22..717476e2 100644 --- a/cpio/cpio.c +++ b/cpio/cpio.c @@ -82,7 +82,6 @@ __FBSDID("$FreeBSD: src/usr.bin/cpio/cpio.c,v 1.15 2008/12/06 07:30:40 kientzle #include "cpio.h" #include "err.h" #include "line_reader.h" -#include "matching.h" /* Fixed size of uname/gname caches. */ #define name_cache_size 101 @@ -219,8 +218,11 @@ main(int argc, char *argv[]) cpio->extract_flags &= ~ARCHIVE_EXTRACT_NO_AUTODIR; break; case 'E': /* NetBSD/OpenBSD */ - lafe_include_from_file(cpio->matching, - cpio->argument, cpio->option_null); + if (archive_match_include_pattern_from_file( + cpio->matching, cpio->argument, + cpio->option_null) != ARCHIVE_OK) + lafe_errc(1, 0, "Error : %s", + archive_error_string(cpio->matching)); break; case 'F': /* NetBSD/OpenBSD/GNU cpio */ cpio->filename = cpio->argument; |