6ab32eb34
Glenn L McGrath
2002-11-03
Subject
Move data_extract_all_prefix to dpkg, its only used there.
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
archival/dpkg.c +15 -1archival/libunarchive/Makefile.in +0 -1archival/libunarchive/data_extract_all_prefix.c +0 -36include/unarchive.h +0 -1
archival/dpkg.c+15 -1
| @@ -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); | |
archival/libunarchive/Makefile.in+0 -1
| @@ -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 \ | |
| \ | |
archival/libunarchive/data_extract_all_prefix.c+0 -36
| @@ -1,36 +0,0 @@ | |
| - | /* |
| - | * Copyright (C) by Glenn McGrath <[email protected]> |
| - | * |
| - | * 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; |
| - | } |
include/unarchive.h+0 -1
| @@ -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); | |