summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn L McGrath2002-11-03 11:57:10 +0000
committerGlenn L McGrath2002-11-03 11:57:10 +0000
commit6ab32eb34ca6e0023bc7ab7f6ece9321116e091f (patch)
tree9c85cc19ea413e758efd1466c44997a110282c61
parentb8e556e5f54f2848bf1ad246189cb2bf44b643bd (diff)
downloadbusybox-6ab32eb34ca6e0023bc7ab7f6ece9321116e091f.zip
busybox-6ab32eb34ca6e0023bc7ab7f6ece9321116e091f.tar.gz
Move data_extract_all_prefix to dpkg, its only used there.
-rw-r--r--archival/dpkg.c16
-rw-r--r--archival/libunarchive/Makefile.in1
-rw-r--r--archival/libunarchive/data_extract_all_prefix.c36
-rw-r--r--include/unarchive.h1
4 files changed, 15 insertions, 39 deletions
diff --git a/archival/dpkg.c b/archival/dpkg.c
index df89447..f921c43 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -1341,7 +1341,21 @@ static archive_handle_t *deb_extract(const char *filename, const char *ar_name,
return(ar_archive->sub_archive);
}
-void unpack_package(deb_file_t *deb_file)
+static void data_extract_all_prefix(archive_handle_t *archive_handle)
+{
+ char *name_ptr = archive_handle->file_header->name;
+
+ name_ptr += strspn(name_ptr, "./");
+ if (name_ptr[0] != '\0') {
+ archive_handle->file_header->name = xmalloc(strlen(archive_handle->buffer) + 2 + strlen(name_ptr));
+ strcpy(archive_handle->file_header->name, archive_handle->buffer);
+ strcat(archive_handle->file_header->name, name_ptr);
+ data_extract_all(archive_handle);
+ }
+ return;
+}
+
+static void unpack_package(deb_file_t *deb_file)
{
const char *package_name = name_hashtable[package_hashtable[deb_file->package]->name];
const unsigned int status_num = search_status_hashtable(package_name);
diff --git a/archival/libunarchive/Makefile.in b/archival/libunarchive/Makefile.in
index 65d4a31..4320777 100644
--- a/archival/libunarchive/Makefile.in
+++ b/archival/libunarchive/Makefile.in
@@ -26,7 +26,6 @@ LIBUNARCHIVE-y:= \
\
data_skip.o \
data_extract_all.o \
- data_extract_all_prefix.o \
data_extract_to_stdout.o \
data_extract_to_buffer.o \
\
diff --git a/archival/libunarchive/data_extract_all_prefix.c b/archival/libunarchive/data_extract_all_prefix.c
deleted file mode 100644
index 53f6b8a..0000000
--- a/archival/libunarchive/data_extract_all_prefix.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) by Glenn McGrath <bug1@optushome.com.au>
- *
- * 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 <string.h>
-
-#include "libbb.h"
-#include "unarchive.h"
-
-extern void data_extract_all_prefix(archive_handle_t *archive_handle)
-{
- char *name_ptr = archive_handle->file_header->name;
-
- name_ptr += strspn(name_ptr, "./");
- if (name_ptr[0] != '\0') {
- archive_handle->file_header->name = xmalloc(strlen(archive_handle->buffer) + 2 + strlen(name_ptr));
- strcpy(archive_handle->file_header->name, archive_handle->buffer);
- strcat(archive_handle->file_header->name, name_ptr);
- data_extract_all(archive_handle);
- }
- return;
-}
diff --git a/include/unarchive.h b/include/unarchive.h
index 56df5da..7926dcc 100644
--- a/include/unarchive.h
+++ b/include/unarchive.h
@@ -76,7 +76,6 @@ extern void unpack_ar_archive(archive_handle_t *ar_archive);
extern void data_skip(archive_handle_t *archive_handle);
extern void data_extract_all(archive_handle_t *archive_handle);
-extern void data_extract_all_prefix(archive_handle_t *archive_handle);
extern void data_extract_to_stdout(archive_handle_t *archive_handle);
extern void data_extract_to_buffer(archive_handle_t *archive_handle);