diff options
Diffstat (limited to 'archival/libunarchive')
| -rw-r--r-- | archival/libunarchive/archive_xread_all_eof.c | 2 | ||||
| -rw-r--r-- | archival/libunarchive/data_align.c | 2 | ||||
| -rw-r--r-- | archival/libunarchive/data_extract_to_stdout.c | 1 | ||||
| -rw-r--r-- | archival/libunarchive/decompress_uncompress.c | 3 | ||||
| -rw-r--r-- | archival/libunarchive/filter_accept_all.c | 2 | ||||
| -rw-r--r-- | archival/libunarchive/filter_accept_list.c | 2 | ||||
| -rw-r--r-- | archival/libunarchive/filter_accept_reject_list.c | 2 | ||||
| -rw-r--r-- | archival/libunarchive/find_list_entry.c | 2 | ||||
| -rw-r--r-- | archival/libunarchive/get_header_tar_lzma.c | 1 | ||||
| -rw-r--r-- | archival/libunarchive/header_list.c | 2 | ||||
| -rw-r--r-- | archival/libunarchive/header_skip.c | 2 | ||||
| -rw-r--r-- | archival/libunarchive/open_transformer.c | 4 | ||||
| -rw-r--r-- | archival/libunarchive/seek_by_read.c | 4 | ||||
| -rw-r--r-- | archival/libunarchive/unpack_ar_archive.c | 6 |
14 files changed, 13 insertions, 22 deletions
diff --git a/archival/libunarchive/archive_xread_all_eof.c b/archival/libunarchive/archive_xread_all_eof.c index 007f68c6d..7e082ab1d 100644 --- a/archival/libunarchive/archive_xread_all_eof.c +++ b/archival/libunarchive/archive_xread_all_eof.c @@ -3,8 +3,8 @@ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ -#include "unarchive.h" #include "libbb.h" +#include "unarchive.h" ssize_t archive_xread_all_eof(archive_handle_t *archive_handle, unsigned char *buf, size_t count) diff --git a/archival/libunarchive/data_align.c b/archival/libunarchive/data_align.c index 946c94d0d..9803199e0 100644 --- a/archival/libunarchive/data_align.c +++ b/archival/libunarchive/data_align.c @@ -3,7 +3,7 @@ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ -#include <sys/types.h> +//#include <sys/types.h> #include "libbb.h" #include "unarchive.h" diff --git a/archival/libunarchive/data_extract_to_stdout.c b/archival/libunarchive/data_extract_to_stdout.c index d87a4a595..c8895ed65 100644 --- a/archival/libunarchive/data_extract_to_stdout.c +++ b/archival/libunarchive/data_extract_to_stdout.c @@ -3,6 +3,7 @@ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ +#include "libbb.h" #include "unarchive.h" void data_extract_to_stdout(archive_handle_t *archive_handle) diff --git a/archival/libunarchive/decompress_uncompress.c b/archival/libunarchive/decompress_uncompress.c index a1d7fd67c..ba73f1132 100644 --- a/archival/libunarchive/decompress_uncompress.c +++ b/archival/libunarchive/decompress_uncompress.c @@ -26,9 +26,6 @@ * [... History snipped ...] * */ -#include <stdio.h> -#include <string.h> -#include <unistd.h> /* Default input buffer size */ #define IBUFSIZ 2048 diff --git a/archival/libunarchive/filter_accept_all.c b/archival/libunarchive/filter_accept_all.c index 5c991cac4..47d771e43 100644 --- a/archival/libunarchive/filter_accept_all.c +++ b/archival/libunarchive/filter_accept_all.c @@ -5,7 +5,7 @@ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ -#include <stdlib.h> +#include "libbb.h" #include "unarchive.h" /* Accept any non-null name, its not really a filter at all */ diff --git a/archival/libunarchive/filter_accept_list.c b/archival/libunarchive/filter_accept_list.c index cfc1b0c58..6e571ad4e 100644 --- a/archival/libunarchive/filter_accept_list.c +++ b/archival/libunarchive/filter_accept_list.c @@ -5,7 +5,7 @@ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ -#include <stdlib.h> +#include "libbb.h" #include "unarchive.h" /* diff --git a/archival/libunarchive/filter_accept_reject_list.c b/archival/libunarchive/filter_accept_reject_list.c index 79da350b6..bf983b5e8 100644 --- a/archival/libunarchive/filter_accept_reject_list.c +++ b/archival/libunarchive/filter_accept_reject_list.c @@ -5,7 +5,7 @@ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ -#include <stdlib.h> +#include "libbb.h" #include "unarchive.h" /* diff --git a/archival/libunarchive/find_list_entry.c b/archival/libunarchive/find_list_entry.c index d1afc72ce..f2741039d 100644 --- a/archival/libunarchive/find_list_entry.c +++ b/archival/libunarchive/find_list_entry.c @@ -6,7 +6,7 @@ */ #include <fnmatch.h> -#include <stdlib.h> +#include "libbb.h" #include "unarchive.h" /* Find a string in a shell pattern list */ diff --git a/archival/libunarchive/get_header_tar_lzma.c b/archival/libunarchive/get_header_tar_lzma.c index 06b8daa0f..5c02767de 100644 --- a/archival/libunarchive/get_header_tar_lzma.c +++ b/archival/libunarchive/get_header_tar_lzma.c @@ -6,6 +6,7 @@ * Licensed under GPL v2, see file LICENSE in this tarball for details. */ +#include "libbb.h" #include "unarchive.h" char get_header_tar_lzma(archive_handle_t * archive_handle) diff --git a/archival/libunarchive/header_list.c b/archival/libunarchive/header_list.c index fb461a68e..8cb8f40d9 100644 --- a/archival/libunarchive/header_list.c +++ b/archival/libunarchive/header_list.c @@ -2,7 +2,7 @@ /* * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ -#include <stdio.h> +#include "libbb.h" #include "unarchive.h" void header_list(const file_header_t *file_header) diff --git a/archival/libunarchive/header_skip.c b/archival/libunarchive/header_skip.c index 53242e011..ef2172bb3 100644 --- a/archival/libunarchive/header_skip.c +++ b/archival/libunarchive/header_skip.c @@ -2,7 +2,7 @@ /* * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ -#include <stdio.h> +#include "libbb.h" #include "unarchive.h" void header_skip(const file_header_t *file_header ATTRIBUTE_UNUSED) diff --git a/archival/libunarchive/open_transformer.c b/archival/libunarchive/open_transformer.c index 58a89b918..0ee080621 100644 --- a/archival/libunarchive/open_transformer.c +++ b/archival/libunarchive/open_transformer.c @@ -3,11 +3,7 @@ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ -#include <stdlib.h> -#include <unistd.h> - #include "libbb.h" - #include "unarchive.h" /* transformer(), more than meets the eye */ diff --git a/archival/libunarchive/seek_by_read.c b/archival/libunarchive/seek_by_read.c index e46af4842..452d82d10 100644 --- a/archival/libunarchive/seek_by_read.c +++ b/archival/libunarchive/seek_by_read.c @@ -3,10 +3,8 @@ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ -#include <stdlib.h> - -#include "unarchive.h" #include "libbb.h" +#include "unarchive.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. diff --git a/archival/libunarchive/unpack_ar_archive.c b/archival/libunarchive/unpack_ar_archive.c index 6a84ae811..fc1820b97 100644 --- a/archival/libunarchive/unpack_ar_archive.c +++ b/archival/libunarchive/unpack_ar_archive.c @@ -2,11 +2,9 @@ /* * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ -#include <fcntl.h> -#include <stdlib.h> -#include <string.h> -#include "unarchive.h" + #include "libbb.h" +#include "unarchive.h" void unpack_ar_archive(archive_handle_t *ar_archive) { |