Rob Landley's new micro-bunzip version 3. Rob writes:

[oweals/busybox.git] / archival / libunarchive / filter_accept_reject_list.c

diff --git a/archival/libunarchive/filter_accept_reject_list.c b/archival/libunarchive/filter_accept_reject_list.c
index 21fecf12055092e6b026a2acd7ca35dfb928045b..657f7a0bde4ea6023d396bdfe9d06b024ff8bfee 100644 (file)
--- a/archival/libunarchive/filter_accept_reject_list.c
+++ b/archival/libunarchive/filter_accept_reject_list.c
@@ -1,22 +1,42 @@
+/*
+ *  Copyright (C) 2002 by Glenn McGrath
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
 #include <fnmatch.h>
 #include <stdlib.h>
+
 #include "unarchive.h"
 
 /*
- * Accept names that are in the accept list
+ * Accept names that are in the accept list and not in the reject list
  */
-extern char filter_accept_reject_list(const llist_t *accept_list, const llist_t *reject_list, const char *key)
+extern char filter_accept_reject_list(archive_handle_t *archive_handle)
 {
-       const llist_t *accept_entry = find_list_entry(accept_list, key);
-       const llist_t *reject_entry = find_list_entry(reject_list, key);
+       const char *key = archive_handle->file_header->name;
+       const llist_t *accept_entry = find_list_entry(archive_handle->accept, key);
+       const llist_t *reject_entry = find_list_entry(archive_handle->reject, key);
 
-       /* Fail if an accept list was specified and the key wasnt in there */
-       if (accept_list && (accept_entry == NULL)) {
+       /* If the key is in a reject list fail */
+       if (reject_entry) {
                return(EXIT_FAILURE);
        }
 
-       /* If the key is in a reject list fail */
-       if (reject_entry) {
+       /* Fail if an accept list was specified and the key wasnt in there */
+       if (archive_handle->accept && (accept_entry == NULL)) {
                return(EXIT_FAILURE);
        }