Reorganise unarchiving functions, more code re-use, only does single pass(no more linked lists), basis for supporting a cpio (and cheaper untar) applet, but cpio applet isnt included in this.

It effects ar, dpkg-deb applets only

1 files changed, 11 insertions, 13 deletions

diff --git a/Makefile b/Makefile
index f8e60443e..03feb6306 100644
--- a/Makefile
+++ b/Makefile
@@ -236,19 +236,17 @@ endif
     
 LIBBB	  = libbb
 LIBBB_LIB = libbb.a
-LIBBB_CSRC= append_archive_list.c add_from_archive_list.c ask_confirmation.c \
-chomp.c concat_path_file.c copy_file.c copy_file_chunk.c create_path.c \
-daemon.c deb_extract.c device_open.c error_msg.c error_msg_and_die.c \
-extract_archive.c fgets_str.c find_mount_point.c find_pid_by_name.c \
-find_root_device.c full_read.c full_write.c get_ar_headers.c get_console.c \
-get_last_path_component.c get_line_from_file.c get_tar_headers.c \
-get_tar_gz_headers.c gz_open.c human_readable.c isdirectory.c kernel_version.c \
-loop.c mode_string.c module_syscalls.c mtab.c mtab_file.c my_getgrnam.c \
-my_getgrgid.c my_getpwnam.c my_getpwnamegid.c my_getpwuid.c parse_mode.c \
-parse_number.c perror_msg.c perror_msg_and_die.c print_file.c \
-process_escape_sequence.c read_package_field.c recursive_action.c safe_read.c \
-safe_strncpy.c syscalls.c syslog_msg_with_name.c time_string.c \
-trim.c unzip.c vdprintf.c verror_msg.c vperror_msg.c wfopen.c xfuncs.c \
+LIBBB_CSRC= ask_confirmation.c chomp.c concat_path_file.c copy_file.c \
+copy_file_chunk.c create_path.c daemon.c device_open.c error_msg.c \
+error_msg_and_die.c fgets_str.c find_mount_point.c find_pid_by_name.c \
+find_root_device.c full_read.c full_write.c get_console.c \
+get_last_path_component.c get_line_from_file.c gz_open.c human_readable.c \
+isdirectory.c kernel_version.c loop.c mode_string.c module_syscalls.c mtab.c \
+mtab_file.c my_getgrnam.c my_getgrgid.c my_getpwnam.c my_getpwnamegid.c \
+my_getpwuid.c parse_mode.c parse_number.c perror_msg.c perror_msg_and_die.c \
+print_file.c process_escape_sequence.c read_package_field.c recursive_action.c \
+safe_read.c safe_strncpy.c syscalls.c syslog_msg_with_name.c time_string.c \
+trim.c unarchive.c unzip.c vdprintf.c verror_msg.c vperror_msg.c wfopen.c xfuncs.c \
 xgetcwd.c xreadlink.c xregcomp.c interface.c remove_file.c last_char_is.c \
 copyfd.c vherror_msg.c herror_msg.c herror_msg_and_die.c xgethostbyname.c
 LIBBB_OBJS=$(patsubst %.c,$(LIBBB)/%.o, $(LIBBB_CSRC))