← Commit list

833d4e7f8

Denys Vlasenko

2010-11-03

FAILED Duration: 279s

Subject

rename archival/libunarchive -> archival/libarchive; move bz/ into it

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

Makefile+1 -1

@@ -464,7 +464,7 @@ core-y := \

	libs-y := \
	archival/ \
-	archival/libunarchive/ \
+	archival/libarchive/ \
	console-tools/ \
	coreutils/ \
	coreutils/libcoreutils/ \

archival/Kbuild.src+1 -1

@@ -4,7 +4,7 @@
	#
	# Licensed under GPLv2, see file LICENSE in this source tree.

-	libs-y += libunarchive/
+	libs-y += libarchive/

	lib-y:=

archival/ar.c+1 -1

@@ -18,7 +18,7 @@
	*/

	#include "libbb.h"
-	#include "unarchive.h"
+	#include "archive.h"
	#include "ar.h"

	#if ENABLE_FEATURE_AR_CREATE

archival/bbunzip.c+1 -1

@@ -5,7 +5,7 @@
	* Licensed under GPLv2 or later, see file LICENSE in this source tree.
	*/
	#include "libbb.h"
-	#include "unarchive.h"
+	#include "archive.h"

	enum {
	OPT_STDOUT = 1 << 0,

archival/bzip2.c+7 -7

@@ -8,7 +8,7 @@
	*/

	#include "libbb.h"
-	#include "unarchive.h"
+	#include "archive.h"

	#define CONFIG_BZIP2_FEATURE_SPEED 1

@@ -33,14 +33,14 @@
	/* Takes ~300 bytes, detects corruption caused by bad RAM etc */
	#define BZ_LIGHT_DEBUG 0

-	#include "bz/bzlib.h"
+	#include "libarchive/bz/bzlib.h"

-	#include "bz/bzlib_private.h"
+	#include "libarchive/bz/bzlib_private.h"

-	#include "bz/blocksort.c"
-	#include "bz/bzlib.c"
-	#include "bz/compress.c"
-	#include "bz/huffman.c"
+	#include "libarchive/bz/blocksort.c"
+	#include "libarchive/bz/bzlib.c"
+	#include "libarchive/bz/compress.c"
+	#include "libarchive/bz/huffman.c"

	/* No point in being shy and having very small buffer here.
	* bzip2 internal buffers are much bigger anyway, hundreds of kbytes.

archival/cpio.c+1 -1

@@ -12,7 +12,7 @@
	*
	*/
	#include "libbb.h"
-	#include "unarchive.h"
+	#include "archive.h"

	/* GNU cpio 2.9 --help (abridged):

archival/dpkg.c+1 -1

@@ -30,7 +30,7 @@

	#include "libbb.h"
	#include <fnmatch.h>
-	#include "unarchive.h"
+	#include "archive.h"

	/* note: if you vary hash_prime sizes be aware,
	* 1) tweaking these will have a big effect on how much memory this program uses.

archival/dpkg_deb.c+1 -1

@@ -5,7 +5,7 @@
	* Licensed under GPLv2 or later, see file LICENSE in this source tree.
	*/
	#include "libbb.h"
-	#include "unarchive.h"
+	#include "archive.h"

	#define DPKG_DEB_OPT_CONTENTS 1
	#define DPKG_DEB_OPT_CONTROL 2

archival/gzip.c+1 -1

@@ -40,7 +40,7 @@ aa: 85.1% -- replaced with aa.gz
	*/

	#include "libbb.h"
-	#include "unarchive.h"
+	#include "archive.h"


	/* ===========================================================================

?+0 -0

archival/libunarchive/data_align.c → archival/libarchive/data_align.c+1 -1

@@ -4,7 +4,7 @@
	*/

	#include "libbb.h"
-	#include "unarchive.h"
+	#include "archive.h"

	void FAST_FUNC data_align(archive_handle_t *archive_handle, unsigned boundary)
	{

archival/libunarchive/data_extract_all.c → archival/libarchive/data_extract_all.c+1 -1

@@ -4,7 +4,7 @@
	*/

	#include "libbb.h"
-	#include "unarchive.h"
+	#include "archive.h"

	void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
	{

archival/libunarchive/data_extract_to_command.c → archival/libarchive/data_extract_to_command.c+1 -1

@@ -4,7 +4,7 @@
	*/

	#include "libbb.h"
-	#include "unarchive.h"
+	#include "archive.h"

	enum {
	//TAR_FILETYPE,

archival/libunarchive/data_extract_to_stdout.c → archival/libarchive/data_extract_to_stdout.c+1 -1

@@ -4,7 +4,7 @@
	*/

	#include "libbb.h"
-	#include "unarchive.h"
+	#include "archive.h"

	void FAST_FUNC data_extract_to_stdout(archive_handle_t *archive_handle)
	{

archival/libunarchive/data_skip.c → archival/libarchive/data_skip.c+1 -1

@@ -4,7 +4,7 @@
	*/

	#include "libbb.h"
-	#include "unarchive.h"
+	#include "archive.h"

	void FAST_FUNC data_skip(archive_handle_t *archive_handle)
	{

archival/libunarchive/decompress_bunzip2.c → archival/libarchive/decompress_bunzip2.c+1 -1

@@ -40,7 +40,7 @@
	*/

	#include "libbb.h"
-	#include "unarchive.h"
+	#include "archive.h"

	/* Constants for Huffman coding */
	#define MAX_GROUPS 6

archival/libunarchive/decompress_uncompress.c → archival/libarchive/decompress_uncompress.c+1 -1

@@ -25,7 +25,7 @@
	*/

	#include "libbb.h"
-	#include "unarchive.h"
+	#include "archive.h"


	/* Default input buffer size */

archival/libunarchive/decompress_unlzma.c → archival/libarchive/decompress_unlzma.c+1 -1

@@ -9,7 +9,7 @@
	* Licensed under GPLv2 or later, see file LICENSE in this source tree.
	*/
	#include "libbb.h"
-	#include "unarchive.h"
+	#include "archive.h"

	#if ENABLE_FEATURE_LZMA_FAST
	# define speed_inline ALWAYS_INLINE

archival/libunarchive/decompress_unxz.c → archival/libarchive/decompress_unxz.c+1 -1

@@ -10,7 +10,7 @@
	* Licensed under GPLv2, see file LICENSE in this source tree.
	*/
	#include "libbb.h"
-	#include "unarchive.h"
+	#include "archive.h"

	#define XZ_FUNC FAST_FUNC
	#define XZ_EXTERN static

archival/libunarchive/decompress_unzip.c → archival/libarchive/decompress_unzip.c+1 -1

@@ -35,7 +35,7 @@

	#include <setjmp.h>
	#include "libbb.h"
-	#include "unarchive.h"
+	#include "archive.h"

	typedef struct huft_t {
	unsigned char e; /* number of extra bits or operation */

archival/libunarchive/filter_accept_all.c → archival/libarchive/filter_accept_all.c+1 -1

@@ -6,7 +6,7 @@
	*/

	#include "libbb.h"
-	#include "unarchive.h"
+	#include "archive.h"

	/* Accept any non-null name, its not really a filter at all */
	char FAST_FUNC filter_accept_all(archive_handle_t *archive_handle)

archival/libunarchive/filter_accept_list.c → archival/libarchive/filter_accept_list.c+1 -1

@@ -6,7 +6,7 @@
	*/

	#include "libbb.h"
-	#include "unarchive.h"
+	#include "archive.h"

	/*
	* Accept names that are in the accept list, ignoring reject list.

archival/libunarchive/filter_accept_list_reassign.c → archival/libarchive/filter_accept_list_reassign.c+1 -1

@@ -6,7 +6,7 @@
	*/

	#include "libbb.h"
-	#include "unarchive.h"
+	#include "archive.h"

	/* Built and used only if ENABLE_DPKG \|\| ENABLE_DPKG_DEB */

archival/libunarchive/filter_accept_reject_list.c → archival/libarchive/filter_accept_reject_list.c+1 -1

@@ -6,7 +6,7 @@
	*/

	#include "libbb.h"
-	#include "unarchive.h"
+	#include "archive.h"

	/*
	* Accept names that are in the accept list and not in the reject list

archival/libunarchive/find_list_entry.c → archival/libarchive/find_list_entry.c+1 -1

@@ -7,7 +7,7 @@

	#include <fnmatch.h>
	#include "libbb.h"
-	#include "unarchive.h"
+	#include "archive.h"

	/* Find a string in a shell pattern list */
	const llist_t* FAST_FUNC find_list_entry(const llist_t list, const char filename)

archival/libunarchive/get_header_ar.c → archival/libarchive/get_header_ar.c+1 -1

@@ -5,7 +5,7 @@
	*/

	#include "libbb.h"
-	#include "unarchive.h"
+	#include "archive.h"
	#include "ar.h"

	static unsigned read_num(const char *str, int base)

archival/libunarchive/get_header_cpio.c → archival/libarchive/get_header_cpio.c+1 -1

@@ -5,7 +5,7 @@
	*/

	#include "libbb.h"
-	#include "unarchive.h"
+	#include "archive.h"

	typedef struct hardlinks_t {
	struct hardlinks_t *next;

archival/libunarchive/get_header_tar.c → archival/libarchive/get_header_tar.c+1 -1

@@ -12,7 +12,7 @@
	*/

	#include "libbb.h"
-	#include "unarchive.h"
+	#include "archive.h"

	typedef uint32_t aliased_uint32_t FIX_ALIASING;
	typedef off_t aliased_off_t FIX_ALIASING;

archival/libunarchive/get_header_tar_bz2.c → archival/libarchive/get_header_tar_bz2.c+1 -1

@@ -4,7 +4,7 @@
	*/

	#include "libbb.h"
-	#include "unarchive.h"
+	#include "archive.h"

	char FAST_FUNC get_header_tar_bz2(archive_handle_t *archive_handle)
	{

archival/libunarchive/get_header_tar_gz.c → archival/libarchive/get_header_tar_gz.c+1 -1

@@ -4,7 +4,7 @@
	*/

	#include "libbb.h"
-	#include "unarchive.h"
+	#include "archive.h"

	char FAST_FUNC get_header_tar_gz(archive_handle_t *archive_handle)
	{

archival/libunarchive/get_header_tar_lzma.c → archival/libarchive/get_header_tar_lzma.c+1 -1

@@ -7,7 +7,7 @@
	*/

	#include "libbb.h"
-	#include "unarchive.h"
+	#include "archive.h"

	char FAST_FUNC get_header_tar_lzma(archive_handle_t *archive_handle)
	{

archival/libunarchive/header_list.c → archival/libarchive/header_list.c+1 -1

@@ -3,7 +3,7 @@
	* Licensed under GPLv2 or later, see file LICENSE in this source tree.
	*/
	#include "libbb.h"
-	#include "unarchive.h"
+	#include "archive.h"

	void FAST_FUNC header_list(const file_header_t *file_header)
	{

archival/libunarchive/header_skip.c → archival/libarchive/header_skip.c+1 -1

@@ -3,7 +3,7 @@
	* Licensed under GPLv2 or later, see file LICENSE in this source tree.
	*/
	#include "libbb.h"
-	#include "unarchive.h"
+	#include "archive.h"

	void FAST_FUNC header_skip(const file_header_t *file_header UNUSED_PARAM)
	{

archival/libunarchive/header_verbose_list.c → archival/libarchive/header_verbose_list.c+1 -1

@@ -4,7 +4,7 @@
	*/

	#include "libbb.h"
-	#include "unarchive.h"
+	#include "archive.h"

	void FAST_FUNC header_verbose_list(const file_header_t *file_header)
	{

archival/libunarchive/init_handle.c → archival/libarchive/init_handle.c+1 -1

@@ -4,7 +4,7 @@
	*/

	#include "libbb.h"
-	#include "unarchive.h"
+	#include "archive.h"

	archive_handle_t* FAST_FUNC init_handle(void)
	{

?+0 -0

archival/libunarchive/open_transformer.c → archival/libarchive/open_transformer.c+2 -2

@@ -4,12 +4,12 @@
	*/

	#include "libbb.h"
-	#include "unarchive.h"
+	#include "archive.h"

	/* transformer(), more than meets the eye */
	/*
	* On MMU machine, the transform_prog is removed by macro magic
-	* in include/unarchive.h. On NOMMU, transformer is removed.
+	* in include/archive.h. On NOMMU, transformer is removed.
	*/
	void FAST_FUNC open_transformer(int fd,
	IF_DESKTOP(long long) int FAST_FUNC (*transformer)(int src_fd, int dst_fd),

archival/libunarchive/seek_by_jump.c → archival/libarchive/seek_by_jump.c+1 -1

@@ -4,7 +4,7 @@
	*/

	#include "libbb.h"
-	#include "unarchive.h"
+	#include "archive.h"

	void FAST_FUNC seek_by_jump(int fd, off_t amount)
	{

archival/libunarchive/seek_by_read.c → archival/libarchive/seek_by_read.c+1 -1

@@ -4,7 +4,7 @@
	*/

	#include "libbb.h"
-	#include "unarchive.h"
+	#include "archive.h"

	/* 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.

archival/libunarchive/unpack_ar_archive.c → archival/libarchive/unpack_ar_archive.c+1 -1

@@ -4,7 +4,7 @@
	*/

	#include "libbb.h"
-	#include "unarchive.h"
+	#include "archive.h"
	#include "ar.h"

	void FAST_FUNC unpack_ar_archive(archive_handle_t *ar_archive)

?+0 -0

archival/lzop.c+1 -1

@@ -26,7 +26,7 @@
	*/

	#include "libbb.h"
-	#include "unarchive.h"
+	#include "archive.h"
	#include "liblzo_interface.h"

	/* lzo-2.03/src/lzo_ptr.h */

archival/rpm.c+1 -1

@@ -8,7 +8,7 @@
	*/

	#include "libbb.h"
-	#include "unarchive.h"
+	#include "archive.h"
	#include "rpm.h"

	#define RPM_CHAR_TYPE 1

archival/rpm2cpio.c+1 -1

@@ -7,7 +7,7 @@
	* Licensed under GPLv2 or later, see file LICENSE in this source tree.
	*/
	#include "libbb.h"
-	#include "unarchive.h"
+	#include "archive.h"
	#include "rpm.h"

	enum { rpm_fd = STDIN_FILENO };

archival/tar.c+1 -1

@@ -25,7 +25,7 @@

	#include <fnmatch.h>
	#include "libbb.h"
-	#include "unarchive.h"
+	#include "archive.h"
	/* FIXME: Stop using this non-standard feature */
	#ifndef FNM_LEADING_DIR
	# define FNM_LEADING_DIR 0

archival/unzip.c+1 -1

@@ -20,7 +20,7 @@
	*/

	#include "libbb.h"
-	#include "unarchive.h"
+	#include "archive.h"

	enum {
	#if BB_BIG_ENDIAN

docs/keep_data_small.txt+1 -1

@@ -59,7 +59,7 @@ wait
	Example 1

	One example how to reduce global data usage is in
-	archival/libunarchive/decompress_unzip.c:
+	archival/libarchive/decompress_unzip.c:

	/* This is somewhat complex-looking arrangement, but it allows
	* to place decompressor state either in bss or in

?+0 -0

libbb/appletlib.c+1 -1

@@ -66,7 +66,7 @@ static const char usage_messages[] ALIGN1 = UNPACKED_USAGE;
	#if ENABLE_FEATURE_COMPRESS_USAGE

	static const char packed_usage[] ALIGN1 = { PACKED_USAGE };
-	# include "unarchive.h"
+	# include "archive.h"
	static const char *unpack_usage_messages(void)
	{
	char *outbuf = NULL;

libbb/read_printf.c+1 -1

@@ -15,7 +15,7 @@
	)

	#if ZIPPED
-	# include "unarchive.h"
+	# include "archive.h"
	#endif

miscutils/bbconfig.c+1 -1

@@ -4,7 +4,7 @@
	#include "libbb.h"
	#include "bbconfigopts.h"
	#if ENABLE_FEATURE_COMPRESS_BBCONFIG
-	# include "unarchive.h"
+	# include "archive.h"
	# include "bbconfigopts_bz2.h"
	#endif

procps/smemcap.c+1 -1

@@ -20,7 +20,7 @@
	//config: a memory usage statistic tool.

	#include "libbb.h"
-	#include "unarchive.h"
+	#include "archive.h"

	struct fileblock {
	struct fileblock *next;

scripts/Makefile.IMA+2 -2

@@ -85,8 +85,8 @@ lib-y:=
	include archival/Kbuild
	lib-all-y += $(patsubst %,archival/%,$(sort $(lib-y)))
	lib-y:=
-	include archival/libunarchive/Kbuild
-	lib-all-y += $(patsubst %,archival/libunarchive/%,$(sort $(lib-y)))
+	include archival/libarchive/Kbuild
+	lib-all-y += $(patsubst %,archival/libarchive/%,$(sort $(lib-y)))
	lib-y:=
	include applets/Kbuild
	lib-all-y += $(patsubst %,applets/%,$(sort $(lib-y)))