*: tidy up usage of char **environ

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

diff --git a/archival/libunarchive/filter_accept_list_reassign.c b/archival/libunarchive/filter_accept_list_reassign.c
index a09f564a31c672d5d6b22f2f42a426adc11fb873..969dd1e3ef08122f3ff148f22823c24673c34c3f 100644 (file)
--- a/archival/libunarchive/filter_accept_list_reassign.c
+++ b/archival/libunarchive/filter_accept_list_reassign.c
@@ -1,34 +1,19 @@
+/* vi: set sw=4 ts=4: */
 /*
  *  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.
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
 #include "libbb.h"
 #include "unarchive.h"
 
 /*
- *     Reassign the subarchive metadata parser based on the filename extension
- *  e.g. if its a .tar.gz modify archive_handle->sub_archive to process a .tar.gz
- *       or if its a .tar.bz2 make archive_handle->sub_archive handle that
+ * Reassign the subarchive metadata parser based on the filename extension
+ * e.g. if its a .tar.gz modify archive_handle->sub_archive to process a .tar.gz
+ * or if its a .tar.bz2 make archive_handle->sub_archive handle that
  */
-extern char filter_accept_list_reassign(archive_handle_t *archive_handle)
+char filter_accept_list_reassign(archive_handle_t *archive_handle)
 {
        /* Check the file entry is in the accept list */
        if (find_list_entry(archive_handle->accept, archive_handle->file_header->name)) {
@@ -38,22 +23,22 @@ extern char filter_accept_list_reassign(archive_handle_t *archive_handle)
                name_ptr = strrchr(archive_handle->file_header->name, '.');
 
                /* Modify the subarchive handler based on the extension */
-#ifdef CONFIG_FEATURE_DEB_TAR_GZ
+#if ENABLE_FEATURE_DEB_TAR_GZ
                if (strcmp(name_ptr, ".gz") == 0) {
                        archive_handle->action_data_subarchive = get_header_tar_gz;
-                       return(EXIT_SUCCESS);
+                       return EXIT_SUCCESS;
                }
 #endif
-#ifdef CONFIG_FEATURE_DEB_TAR_BZ2
+#if ENABLE_FEATURE_DEB_TAR_BZ2
                if (strcmp(name_ptr, ".bz2") == 0) {
                        archive_handle->action_data_subarchive = get_header_tar_bz2;
-                       return(EXIT_SUCCESS);
+                       return EXIT_SUCCESS;
                }
 #endif
                if (ENABLE_FEATURE_DEB_TAR_LZMA && !strcmp(name_ptr, ".lzma")) {
                        archive_handle->action_data_subarchive = get_header_tar_lzma;
-                       return(EXIT_SUCCESS);
+                       return EXIT_SUCCESS;
                }
        }
-       return(EXIT_FAILURE);
+       return EXIT_FAILURE;
 }