From ae314ad8180bbd1127834d299bfa761f566eac8c Mon Sep 17 00:00:00 2001 From: Michihiro NAKAJIMA Date: Sun, 12 Feb 2012 22:41:47 +0900 Subject: 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. --- libarchive_fe/matching.c | 76 ------------------------------------------------ libarchive_fe/matching.h | 38 ------------------------ 2 files changed, 114 deletions(-) delete mode 100644 libarchive_fe/matching.c delete mode 100644 libarchive_fe/matching.h (limited to 'libarchive_fe') diff --git a/libarchive_fe/matching.c b/libarchive_fe/matching.c deleted file mode 100644 index f416eae7..00000000 --- a/libarchive_fe/matching.c +++ /dev/null @@ -1,76 +0,0 @@ -/*- - * Copyright (c) 2003-2007 Tim Kientzle - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include "lafe_platform.h" -__FBSDID("$FreeBSD: src/usr.bin/cpio/matching.c,v 1.2 2008/06/21 02:20:20 kientzle Exp $"); - -#ifdef HAVE_ERRNO_H -#include -#endif - -#include "archive.h" -#include "err.h" -#include "line_reader.h" -#include "matching.h" - -/* - * Utility functions to manage exclusion/inclusion patterns - */ - -int -lafe_exclude_from_file(struct archive *matching, const char *pathname) -{ - struct lafe_line_reader *lr; - const char *p; - int ret = 0; - - lr = lafe_line_reader(pathname, 0); - while ((p = lafe_line_reader_next(lr)) != NULL) { - ret = archive_match_exclude_pattern(matching, p); - if (ret == ARCHIVE_FATAL) - lafe_errc(1, errno, "Out of memory"); - } - lafe_line_reader_free(lr); - return (ret); -} - -int -lafe_include_from_file(struct archive *matching, const char *pathname, - int nullSeparator) -{ - struct lafe_line_reader *lr; - const char *p; - int ret = 0; - - lr = lafe_line_reader(pathname, nullSeparator); - while ((p = lafe_line_reader_next(lr)) != NULL) { - ret = archive_match_include_pattern(matching, p); - if (ret == ARCHIVE_FATAL) - lafe_errc(1, errno, "Out of memory"); - } - lafe_line_reader_free(lr); - return (ret); -} - diff --git a/libarchive_fe/matching.h b/libarchive_fe/matching.h deleted file mode 100644 index 4c174a84..00000000 --- a/libarchive_fe/matching.h +++ /dev/null @@ -1,38 +0,0 @@ -/*- - * Copyright (c) 2003-2007 Tim Kientzle - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer - * in this position and unchanged. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ - */ - -#ifndef MATCHING_H -#define MATCHING_H - -#include "archive.h" - -int lafe_exclude_from_file(struct archive *, const char *pathname); -int lafe_include_from_file(struct archive *, - const char *pathname, int nullSeparator); - -#endif -- cgit v1.2.1