emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- remove unneeded include, use shorter boilerplate while at it and also

Browse Source 
shrink filter_accept_reject_list() a tiny bit while at it.
   text    data     bss     dec     hex filename
     59       0       0      59      3b filter_accept_reject_list.o
     62       0       0      62      3e filter_accept_reject_list.o.orig
This commit is contained in:
Bernhard Reutner-Fischer 2006-04-13 13:32:16 +00:00
parent c2cb0f32b4
commit 6b4377f333
4 changed files with 17 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
archival/libunarchive/filter_accept_all.c
View File

@ -1,24 +1,11 @@
/* vi: set sw=4 ts=4: */
/* /*
* Copyright (C) 2002 by Glenn McGrath * Copyright (C) 2002 by Glenn McGrath
* *
* This program is free software; you can redistribute it and/or modify * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
* 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 <stdlib.h>
#include "unarchive.h" #include "unarchive.h"
/* Accept any non-null name, its not really a filter at all */ /* Accept any non-null name, its not really a filter at all */

19
archival/libunarchive/filter_accept_list.c
View File

@ -1,24 +1,11 @@
/* vi: set sw=4 ts=4: */
/* /*
* Copyright (C) 2002 by Glenn McGrath * Copyright (C) 2002 by Glenn McGrath
* *
* This program is free software; you can redistribute it and/or modify * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
* 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 <stdlib.h>
#include "unarchive.h" #include "unarchive.h"
/* /*

24
archival/libunarchive/filter_accept_reject_list.c
View File

@ -1,24 +1,11 @@
/* vi: set sw=4 ts=4: */
/* /*
* Copyright (C) 2002 by Glenn McGrath * Copyright (C) 2002 by Glenn McGrath
* *
* This program is free software; you can redistribute it and/or modify * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
* 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 <stdlib.h>
#include "unarchive.h" #include "unarchive.h"
/* /*
@ -27,16 +14,17 @@
char filter_accept_reject_list(archive_handle_t *archive_handle) char filter_accept_reject_list(archive_handle_t *archive_handle)
{ {
const char *key = archive_handle->file_header->name; 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); const llist_t *reject_entry = find_list_entry(archive_handle->reject, key);
const llist_t *accept_entry;
/* If the key is in a reject list fail */ /* If the key is in a reject list fail */
if (reject_entry) { if (reject_entry) {
return(EXIT_FAILURE); return(EXIT_FAILURE);
} }
accept_entry = find_list_entry(archive_handle->accept, key);
/* Fail if an accept list was specified and the key wasnt in there */ /* Fail if an accept list was specified and the key wasnt in there */
if (archive_handle->accept && (accept_entry == NULL)) { if ((accept_entry == NULL) && archive_handle->accept) {
return(EXIT_FAILURE); return(EXIT_FAILURE);
} }

18
archival/libunarchive/find_list_entry.c
View File

@ -1,28 +1,20 @@
/* vi: set sw=4 ts=4: */
/* /*
* This program is free software; you can redistribute it and/or modify * Copyright (C) 2002 by Glenn McGrath
* 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, * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
* 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 <fnmatch.h>
#include <stdlib.h> #include <stdlib.h>
#include "unarchive.h" #include "unarchive.h"
/* Find a string in a list */
const llist_t *find_list_entry(const llist_t *list, const char *filename) const llist_t *find_list_entry(const llist_t *list, const char *filename)
{ {
while (list) { while (list) {
if (fnmatch(list->data, filename, 0) == 0) { if (fnmatch(list->data, filename, 0) == 0) {
return(list); return (list);
} }
list = list->link; list = list->link;
} }