rename archive.h to bb_archive.h. no code changes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
parent
45f0a1156d
commit
d184a728cf
@ -28,7 +28,7 @@
|
|||||||
//usage: "\n -v Verbose"
|
//usage: "\n -v Verbose"
|
||||||
|
|
||||||
#include "libbb.h"
|
#include "libbb.h"
|
||||||
#include "archive.h"
|
#include "bb_archive.h"
|
||||||
#include "ar.h"
|
#include "ar.h"
|
||||||
|
|
||||||
#if ENABLE_FEATURE_AR_CREATE
|
#if ENABLE_FEATURE_AR_CREATE
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
|
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
|
||||||
*/
|
*/
|
||||||
#include "libbb.h"
|
#include "libbb.h"
|
||||||
#include "archive.h"
|
#include "bb_archive.h"
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
OPT_STDOUT = 1 << 0,
|
OPT_STDOUT = 1 << 0,
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
//usage: "\n -f Force"
|
//usage: "\n -f Force"
|
||||||
|
|
||||||
#include "libbb.h"
|
#include "libbb.h"
|
||||||
#include "archive.h"
|
#include "bb_archive.h"
|
||||||
|
|
||||||
#define CONFIG_BZIP2_FAST 1
|
#define CONFIG_BZIP2_FAST 1
|
||||||
|
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
#include "libbb.h"
|
#include "libbb.h"
|
||||||
#include "archive.h"
|
#include "bb_archive.h"
|
||||||
|
|
||||||
//usage:#define cpio_trivial_usage
|
//usage:#define cpio_trivial_usage
|
||||||
//usage: "[-dmvu] [-F FILE]" IF_FEATURE_CPIO_O(" [-H newc]")
|
//usage: "[-dmvu] [-F FILE]" IF_FEATURE_CPIO_O(" [-H newc]")
|
||||||
|
@ -57,7 +57,7 @@
|
|||||||
|
|
||||||
#include "libbb.h"
|
#include "libbb.h"
|
||||||
#include <fnmatch.h>
|
#include <fnmatch.h>
|
||||||
#include "archive.h"
|
#include "bb_archive.h"
|
||||||
|
|
||||||
/* note: if you vary hash_prime sizes be aware,
|
/* note: if you vary hash_prime sizes be aware,
|
||||||
* 1) tweaking these will have a big effect on how much memory this program uses.
|
* 1) tweaking these will have a big effect on how much memory this program uses.
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
//usage: "$ dpkg-deb -X ./busybox_0.48-1_i386.deb /tmp\n"
|
//usage: "$ dpkg-deb -X ./busybox_0.48-1_i386.deb /tmp\n"
|
||||||
|
|
||||||
#include "libbb.h"
|
#include "libbb.h"
|
||||||
#include "archive.h"
|
#include "bb_archive.h"
|
||||||
|
|
||||||
#define DPKG_DEB_OPT_CONTENTS 1
|
#define DPKG_DEB_OPT_CONTENTS 1
|
||||||
#define DPKG_DEB_OPT_CONTROL 2
|
#define DPKG_DEB_OPT_CONTROL 2
|
||||||
|
@ -55,7 +55,7 @@ aa: 85.1% -- replaced with aa.gz
|
|||||||
//usage: "-rw-rw-r-- 1 andersen andersen 554058 Apr 14 17:49 /tmp/busybox.tar.gz\n"
|
//usage: "-rw-rw-r-- 1 andersen andersen 554058 Apr 14 17:49 /tmp/busybox.tar.gz\n"
|
||||||
|
|
||||||
#include "libbb.h"
|
#include "libbb.h"
|
||||||
#include "archive.h"
|
#include "bb_archive.h"
|
||||||
|
|
||||||
|
|
||||||
/* ===========================================================================
|
/* ===========================================================================
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "libbb.h"
|
#include "libbb.h"
|
||||||
#include "archive.h"
|
#include "bb_archive.h"
|
||||||
|
|
||||||
void FAST_FUNC data_align(archive_handle_t *archive_handle, unsigned boundary)
|
void FAST_FUNC data_align(archive_handle_t *archive_handle, unsigned boundary)
|
||||||
{
|
{
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "libbb.h"
|
#include "libbb.h"
|
||||||
#include "archive.h"
|
#include "bb_archive.h"
|
||||||
|
|
||||||
void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
|
void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
|
||||||
{
|
{
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "libbb.h"
|
#include "libbb.h"
|
||||||
#include "archive.h"
|
#include "bb_archive.h"
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
//TAR_FILETYPE,
|
//TAR_FILETYPE,
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "libbb.h"
|
#include "libbb.h"
|
||||||
#include "archive.h"
|
#include "bb_archive.h"
|
||||||
|
|
||||||
void FAST_FUNC data_extract_to_stdout(archive_handle_t *archive_handle)
|
void FAST_FUNC data_extract_to_stdout(archive_handle_t *archive_handle)
|
||||||
{
|
{
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "libbb.h"
|
#include "libbb.h"
|
||||||
#include "archive.h"
|
#include "bb_archive.h"
|
||||||
|
|
||||||
void FAST_FUNC data_skip(archive_handle_t *archive_handle)
|
void FAST_FUNC data_skip(archive_handle_t *archive_handle)
|
||||||
{
|
{
|
||||||
|
@ -40,7 +40,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "libbb.h"
|
#include "libbb.h"
|
||||||
#include "archive.h"
|
#include "bb_archive.h"
|
||||||
|
|
||||||
/* Constants for Huffman coding */
|
/* Constants for Huffman coding */
|
||||||
#define MAX_GROUPS 6
|
#define MAX_GROUPS 6
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "libbb.h"
|
#include "libbb.h"
|
||||||
#include "archive.h"
|
#include "bb_archive.h"
|
||||||
|
|
||||||
|
|
||||||
/* Default input buffer size */
|
/* Default input buffer size */
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
|
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
|
||||||
*/
|
*/
|
||||||
#include "libbb.h"
|
#include "libbb.h"
|
||||||
#include "archive.h"
|
#include "bb_archive.h"
|
||||||
|
|
||||||
#if ENABLE_FEATURE_LZMA_FAST
|
#if ENABLE_FEATURE_LZMA_FAST
|
||||||
# define speed_inline ALWAYS_INLINE
|
# define speed_inline ALWAYS_INLINE
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
* Licensed under GPLv2, see file LICENSE in this source tree.
|
* Licensed under GPLv2, see file LICENSE in this source tree.
|
||||||
*/
|
*/
|
||||||
#include "libbb.h"
|
#include "libbb.h"
|
||||||
#include "archive.h"
|
#include "bb_archive.h"
|
||||||
|
|
||||||
#define XZ_FUNC FAST_FUNC
|
#define XZ_FUNC FAST_FUNC
|
||||||
#define XZ_EXTERN static
|
#define XZ_EXTERN static
|
||||||
|
@ -35,7 +35,7 @@
|
|||||||
|
|
||||||
#include <setjmp.h>
|
#include <setjmp.h>
|
||||||
#include "libbb.h"
|
#include "libbb.h"
|
||||||
#include "archive.h"
|
#include "bb_archive.h"
|
||||||
|
|
||||||
typedef struct huft_t {
|
typedef struct huft_t {
|
||||||
unsigned char e; /* number of extra bits or operation */
|
unsigned char e; /* number of extra bits or operation */
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "libbb.h"
|
#include "libbb.h"
|
||||||
#include "archive.h"
|
#include "bb_archive.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 */
|
||||||
char FAST_FUNC filter_accept_all(archive_handle_t *archive_handle)
|
char FAST_FUNC filter_accept_all(archive_handle_t *archive_handle)
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "libbb.h"
|
#include "libbb.h"
|
||||||
#include "archive.h"
|
#include "bb_archive.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Accept names that are in the accept list, ignoring reject list.
|
* Accept names that are in the accept list, ignoring reject list.
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "libbb.h"
|
#include "libbb.h"
|
||||||
#include "archive.h"
|
#include "bb_archive.h"
|
||||||
|
|
||||||
/* Built and used only if ENABLE_DPKG || ENABLE_DPKG_DEB */
|
/* Built and used only if ENABLE_DPKG || ENABLE_DPKG_DEB */
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "libbb.h"
|
#include "libbb.h"
|
||||||
#include "archive.h"
|
#include "bb_archive.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Accept names that are in the accept list and not in the reject list
|
* Accept names that are in the accept list and not in the reject list
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
|
|
||||||
#include <fnmatch.h>
|
#include <fnmatch.h>
|
||||||
#include "libbb.h"
|
#include "libbb.h"
|
||||||
#include "archive.h"
|
#include "bb_archive.h"
|
||||||
|
|
||||||
/* Find a string in a shell pattern list */
|
/* Find a string in a shell pattern list */
|
||||||
const llist_t* FAST_FUNC find_list_entry(const llist_t *list, const char *filename)
|
const llist_t* FAST_FUNC find_list_entry(const llist_t *list, const char *filename)
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "libbb.h"
|
#include "libbb.h"
|
||||||
#include "archive.h"
|
#include "bb_archive.h"
|
||||||
#include "ar.h"
|
#include "ar.h"
|
||||||
|
|
||||||
static unsigned read_num(const char *str, int base)
|
static unsigned read_num(const char *str, int base)
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "libbb.h"
|
#include "libbb.h"
|
||||||
#include "archive.h"
|
#include "bb_archive.h"
|
||||||
|
|
||||||
typedef struct hardlinks_t {
|
typedef struct hardlinks_t {
|
||||||
struct hardlinks_t *next;
|
struct hardlinks_t *next;
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "libbb.h"
|
#include "libbb.h"
|
||||||
#include "archive.h"
|
#include "bb_archive.h"
|
||||||
|
|
||||||
typedef uint32_t aliased_uint32_t FIX_ALIASING;
|
typedef uint32_t aliased_uint32_t FIX_ALIASING;
|
||||||
typedef off_t aliased_off_t FIX_ALIASING;
|
typedef off_t aliased_off_t FIX_ALIASING;
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "libbb.h"
|
#include "libbb.h"
|
||||||
#include "archive.h"
|
#include "bb_archive.h"
|
||||||
|
|
||||||
char FAST_FUNC get_header_tar_bz2(archive_handle_t *archive_handle)
|
char FAST_FUNC get_header_tar_bz2(archive_handle_t *archive_handle)
|
||||||
{
|
{
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "libbb.h"
|
#include "libbb.h"
|
||||||
#include "archive.h"
|
#include "bb_archive.h"
|
||||||
|
|
||||||
char FAST_FUNC get_header_tar_gz(archive_handle_t *archive_handle)
|
char FAST_FUNC get_header_tar_gz(archive_handle_t *archive_handle)
|
||||||
{
|
{
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "libbb.h"
|
#include "libbb.h"
|
||||||
#include "archive.h"
|
#include "bb_archive.h"
|
||||||
|
|
||||||
char FAST_FUNC get_header_tar_lzma(archive_handle_t *archive_handle)
|
char FAST_FUNC get_header_tar_lzma(archive_handle_t *archive_handle)
|
||||||
{
|
{
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
|
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
|
||||||
*/
|
*/
|
||||||
#include "libbb.h"
|
#include "libbb.h"
|
||||||
#include "archive.h"
|
#include "bb_archive.h"
|
||||||
|
|
||||||
void FAST_FUNC header_list(const file_header_t *file_header)
|
void FAST_FUNC header_list(const file_header_t *file_header)
|
||||||
{
|
{
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
|
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
|
||||||
*/
|
*/
|
||||||
#include "libbb.h"
|
#include "libbb.h"
|
||||||
#include "archive.h"
|
#include "bb_archive.h"
|
||||||
|
|
||||||
void FAST_FUNC header_skip(const file_header_t *file_header UNUSED_PARAM)
|
void FAST_FUNC header_skip(const file_header_t *file_header UNUSED_PARAM)
|
||||||
{
|
{
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "libbb.h"
|
#include "libbb.h"
|
||||||
#include "archive.h"
|
#include "bb_archive.h"
|
||||||
|
|
||||||
void FAST_FUNC header_verbose_list(const file_header_t *file_header)
|
void FAST_FUNC header_verbose_list(const file_header_t *file_header)
|
||||||
{
|
{
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "libbb.h"
|
#include "libbb.h"
|
||||||
#include "archive.h"
|
#include "bb_archive.h"
|
||||||
|
|
||||||
archive_handle_t* FAST_FUNC init_handle(void)
|
archive_handle_t* FAST_FUNC init_handle(void)
|
||||||
{
|
{
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "libbb.h"
|
#include "libbb.h"
|
||||||
#include "archive.h"
|
#include "bb_archive.h"
|
||||||
|
|
||||||
/* transformer(), more than meets the eye */
|
/* transformer(), more than meets the eye */
|
||||||
/*
|
/*
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "libbb.h"
|
#include "libbb.h"
|
||||||
#include "archive.h"
|
#include "bb_archive.h"
|
||||||
|
|
||||||
void FAST_FUNC seek_by_jump(int fd, off_t amount)
|
void FAST_FUNC seek_by_jump(int fd, off_t amount)
|
||||||
{
|
{
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "libbb.h"
|
#include "libbb.h"
|
||||||
#include "archive.h"
|
#include "bb_archive.h"
|
||||||
|
|
||||||
/* If we are reading through a pipe, or from stdin then we can't lseek,
|
/* If we are reading through a pipe, or from stdin then we can't lseek,
|
||||||
* we must read and discard the data to skip over it.
|
* we must read and discard the data to skip over it.
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "libbb.h"
|
#include "libbb.h"
|
||||||
#include "archive.h"
|
#include "bb_archive.h"
|
||||||
#include "ar.h"
|
#include "ar.h"
|
||||||
|
|
||||||
void FAST_FUNC unpack_ar_archive(archive_handle_t *ar_archive)
|
void FAST_FUNC unpack_ar_archive(archive_handle_t *ar_archive)
|
||||||
|
@ -51,7 +51,7 @@
|
|||||||
//usage: "\n -F Don't store or verify checksum"
|
//usage: "\n -F Don't store or verify checksum"
|
||||||
|
|
||||||
#include "libbb.h"
|
#include "libbb.h"
|
||||||
#include "archive.h"
|
#include "bb_archive.h"
|
||||||
#include "liblzo_interface.h"
|
#include "liblzo_interface.h"
|
||||||
|
|
||||||
/* lzo-2.03/src/lzo_ptr.h */
|
/* lzo-2.03/src/lzo_ptr.h */
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
//usage: "\n -c List config files"
|
//usage: "\n -c List config files"
|
||||||
|
|
||||||
#include "libbb.h"
|
#include "libbb.h"
|
||||||
#include "archive.h"
|
#include "bb_archive.h"
|
||||||
#include "rpm.h"
|
#include "rpm.h"
|
||||||
|
|
||||||
#define RPM_CHAR_TYPE 1
|
#define RPM_CHAR_TYPE 1
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
//usage: "Output a cpio archive of the rpm file"
|
//usage: "Output a cpio archive of the rpm file"
|
||||||
|
|
||||||
#include "libbb.h"
|
#include "libbb.h"
|
||||||
#include "archive.h"
|
#include "bb_archive.h"
|
||||||
#include "rpm.h"
|
#include "rpm.h"
|
||||||
|
|
||||||
enum { rpm_fd = STDIN_FILENO };
|
enum { rpm_fd = STDIN_FILENO };
|
||||||
|
@ -44,7 +44,7 @@
|
|||||||
|
|
||||||
#include <fnmatch.h>
|
#include <fnmatch.h>
|
||||||
#include "libbb.h"
|
#include "libbb.h"
|
||||||
#include "archive.h"
|
#include "bb_archive.h"
|
||||||
/* FIXME: Stop using this non-standard feature */
|
/* FIXME: Stop using this non-standard feature */
|
||||||
#ifndef FNM_LEADING_DIR
|
#ifndef FNM_LEADING_DIR
|
||||||
# define FNM_LEADING_DIR 0
|
# define FNM_LEADING_DIR 0
|
||||||
|
@ -32,7 +32,7 @@
|
|||||||
//usage: "\n -d DIR Extract files into DIR"
|
//usage: "\n -d DIR Extract files into DIR"
|
||||||
|
|
||||||
#include "libbb.h"
|
#include "libbb.h"
|
||||||
#include "archive.h"
|
#include "bb_archive.h"
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
#if BB_BIG_ENDIAN
|
#if BB_BIG_ENDIAN
|
||||||
|
@ -62,7 +62,7 @@ static const char usage_messages[] ALIGN1 = UNPACKED_USAGE;
|
|||||||
#if ENABLE_FEATURE_COMPRESS_USAGE
|
#if ENABLE_FEATURE_COMPRESS_USAGE
|
||||||
|
|
||||||
static const char packed_usage[] ALIGN1 = { PACKED_USAGE };
|
static const char packed_usage[] ALIGN1 = { PACKED_USAGE };
|
||||||
# include "archive.h"
|
# include "bb_archive.h"
|
||||||
static const char *unpack_usage_messages(void)
|
static const char *unpack_usage_messages(void)
|
||||||
{
|
{
|
||||||
char *outbuf = NULL;
|
char *outbuf = NULL;
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
)
|
)
|
||||||
|
|
||||||
#if ZIPPED
|
#if ZIPPED
|
||||||
# include "archive.h"
|
# include "bb_archive.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
#include "libbb.h"
|
#include "libbb.h"
|
||||||
#include "bbconfigopts.h"
|
#include "bbconfigopts.h"
|
||||||
#if ENABLE_FEATURE_COMPRESS_BBCONFIG
|
#if ENABLE_FEATURE_COMPRESS_BBCONFIG
|
||||||
# include "archive.h"
|
# include "bb_archive.h"
|
||||||
# include "bbconfigopts_bz2.h"
|
# include "bbconfigopts_bz2.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
//config: a memory usage statistic tool.
|
//config: a memory usage statistic tool.
|
||||||
|
|
||||||
#include "libbb.h"
|
#include "libbb.h"
|
||||||
#include "archive.h"
|
#include "bb_archive.h"
|
||||||
|
|
||||||
struct fileblock {
|
struct fileblock {
|
||||||
struct fileblock *next;
|
struct fileblock *next;
|
||||||
|
Loading…
Reference in New Issue
Block a user