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.

1 files changed, 5 insertions, 2 deletions

diff --git a/tar/read.c b/tar/read.c
index 4fa6a547..676ea0aa 100644
--- a/tar/read.c
+++ b/tar/read.c
@@ -166,8 +166,11 @@ read_archive(struct bsdtar *bsdtar, char mode, struct archive *writer)
 	}
 
 	if (bsdtar->names_from_file != NULL)
-		lafe_include_from_file(bsdtar->matching,
-		    bsdtar->names_from_file, bsdtar->option_null);
+		if (archive_match_include_pattern_from_file(
+		    bsdtar->matching, bsdtar->names_from_file,
+		    bsdtar->option_null) != ARCHIVE_OK)
+			lafe_errc(1, 0, "Error inclusion pattern: %s",
+			    archive_error_string(bsdtar->matching));
 
 	a = archive_read_new();
 	if (bsdtar->compress_program != NULL)