aboutsummaryrefslogtreecommitdiff
path: root/archival
diff options
context:
space:
mode:
Diffstat (limited to 'archival')
-rw-r--r--archival/ar.c1
-rw-r--r--archival/bunzip2.c3
-rw-r--r--archival/cpio.c17
-rw-r--r--archival/dpkg_deb.c1
-rw-r--r--archival/gunzip.c1
-rw-r--r--archival/libunarchive/unpack_ar_archive.c1
-rw-r--r--archival/uncompress.c1
-rw-r--r--archival/unzip.c1
8 files changed, 9 insertions, 17 deletions
diff --git a/archival/ar.c b/archival/ar.c
index 21096d712..411a25e0a 100644
--- a/archival/ar.c
+++ b/archival/ar.c
@@ -27,7 +27,6 @@
27 */ 27 */
28 28
29#include <fcntl.h> 29#include <fcntl.h>
30#include <getopt.h>
31#include <stdio.h> 30#include <stdio.h>
32#include <stdlib.h> 31#include <stdlib.h>
33#include <string.h> 32#include <string.h>
diff --git a/archival/bunzip2.c b/archival/bunzip2.c
index 740e26919..2ce6cfb86 100644
--- a/archival/bunzip2.c
+++ b/archival/bunzip2.c
@@ -6,7 +6,6 @@
6 */ 6 */
7 7
8#include <fcntl.h> 8#include <fcntl.h>
9#include <getopt.h>
10#include <stdio.h> 9#include <stdio.h>
11#include <stdlib.h> 10#include <stdlib.h>
12#include <string.h> 11#include <string.h>
@@ -35,7 +34,7 @@ int bunzip2_main(int argc, char **argv)
35 src_fd = STDIN_FILENO; 34 src_fd = STDIN_FILENO;
36 filename = 0; 35 filename = 0;
37 } 36 }
38 37
39 /* if called as bzcat force the stdout flag */ 38 /* if called as bzcat force the stdout flag */
40 if ((opt & BUNZIP2_OPT_STDOUT) || bb_applet_name[2] == 'c') 39 if ((opt & BUNZIP2_OPT_STDOUT) || bb_applet_name[2] == 'c')
41 filename = 0; 40 filename = 0;
diff --git a/archival/cpio.c b/archival/cpio.c
index 0fbe7b8e5..820f03e9b 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -24,20 +24,19 @@
24 * 24 *
25 */ 25 */
26#include <fcntl.h> 26#include <fcntl.h>
27#include <getopt.h>
28#include <stdlib.h> 27#include <stdlib.h>
29#include <string.h> 28#include <string.h>
30#include <unistd.h> 29#include <unistd.h>
31#include "unarchive.h" 30#include "unarchive.h"
32#include "busybox.h" 31#include "busybox.h"
33 32
34#define CPIO_OPT_EXTRACT 0x01 33#define CPIO_OPT_EXTRACT 0x01
35#define CPIO_OPT_TEST 0x02 34#define CPIO_OPT_TEST 0x02
36#define CPIO_OPT_UNCONDITIONAL 0x04 35#define CPIO_OPT_UNCONDITIONAL 0x04
37#define CPIO_OPT_VERBOSE 0x08 36#define CPIO_OPT_VERBOSE 0x08
38#define CPIO_OPT_FILE 0x10 37#define CPIO_OPT_FILE 0x10
39#define CPIO_OPT_CREATE_LEADING_DIR 0x20 38#define CPIO_OPT_CREATE_LEADING_DIR 0x20
40#define CPIO_OPT_PRESERVE_MTIME 0x40 39#define CPIO_OPT_PRESERVE_MTIME 0x40
41 40
42extern int cpio_main(int argc, char **argv) 41extern int cpio_main(int argc, char **argv)
43{ 42{
@@ -59,7 +58,7 @@ extern int cpio_main(int argc, char **argv)
59 } 58 }
60 59
61 if (opt & CPIO_OPT_TEST) { 60 if (opt & CPIO_OPT_TEST) {
62 /* if both extract and test option are given, ignore extract option */ 61 /* if both extract and test options are given, ignore extract option */
63 if (opt & CPIO_OPT_EXTRACT) { 62 if (opt & CPIO_OPT_EXTRACT) {
64 opt &= ~CPIO_OPT_EXTRACT; 63 opt &= ~CPIO_OPT_EXTRACT;
65 } 64 }
@@ -79,7 +78,7 @@ extern int cpio_main(int argc, char **argv)
79 archive_handle->action_header = header_list; 78 archive_handle->action_header = header_list;
80 } 79 }
81 } 80 }
82 if (cpio_filename) { /* CPIO_OPT_FILE */ 81 if (cpio_filename) { /* CPIO_OPT_FILE */
83 archive_handle->src_fd = bb_xopen(cpio_filename, O_RDONLY); 82 archive_handle->src_fd = bb_xopen(cpio_filename, O_RDONLY);
84 archive_handle->seek = seek_by_jump; 83 archive_handle->seek = seek_by_jump;
85 } 84 }
diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c
index 6c665e57a..1e8bd8ad2 100644
--- a/archival/dpkg_deb.c
+++ b/archival/dpkg_deb.c
@@ -18,7 +18,6 @@
18#include <stdlib.h> 18#include <stdlib.h>
19#include <string.h> 19#include <string.h>
20#include <unistd.h> 20#include <unistd.h>
21#include <getopt.h>
22 21
23#include "unarchive.h" 22#include "unarchive.h"
24#include "busybox.h" 23#include "busybox.h"
diff --git a/archival/gunzip.c b/archival/gunzip.c
index beb7bd12e..a4db7ca31 100644
--- a/archival/gunzip.c
+++ b/archival/gunzip.c
@@ -63,7 +63,6 @@ static char *license_msg[] = {
63#include <stdlib.h> 63#include <stdlib.h>
64#include <string.h> 64#include <string.h>
65#include <unistd.h> 65#include <unistd.h>
66#include <getopt.h>
67#include <sys/types.h> 66#include <sys/types.h>
68#include <sys/stat.h> 67#include <sys/stat.h>
69#include <fcntl.h> 68#include <fcntl.h>
diff --git a/archival/libunarchive/unpack_ar_archive.c b/archival/libunarchive/unpack_ar_archive.c
index e8f113bcf..fa48c6fca 100644
--- a/archival/libunarchive/unpack_ar_archive.c
+++ b/archival/libunarchive/unpack_ar_archive.c
@@ -16,7 +16,6 @@
16#include <fcntl.h> 16#include <fcntl.h>
17#include <stdlib.h> 17#include <stdlib.h>
18#include <string.h> 18#include <string.h>
19#include <getopt.h>
20#include "unarchive.h" 19#include "unarchive.h"
21#include "busybox.h" 20#include "busybox.h"
22 21
diff --git a/archival/uncompress.c b/archival/uncompress.c
index 48b4e2cad..3bd87093e 100644
--- a/archival/uncompress.c
+++ b/archival/uncompress.c
@@ -20,7 +20,6 @@
20#include <stdlib.h> 20#include <stdlib.h>
21#include <string.h> 21#include <string.h>
22#include <unistd.h> 22#include <unistd.h>
23#include <getopt.h>
24#include <sys/types.h> 23#include <sys/types.h>
25#include <sys/stat.h> 24#include <sys/stat.h>
26#include <fcntl.h> 25#include <fcntl.h>
diff --git a/archival/unzip.c b/archival/unzip.c
index d60cb4db4..50d148692 100644
--- a/archival/unzip.c
+++ b/archival/unzip.c
@@ -38,7 +38,6 @@
38 */ 38 */
39 39
40#include <fcntl.h> 40#include <fcntl.h>
41#include <getopt.h>
42#include <stdlib.h> 41#include <stdlib.h>
43#include <string.h> 42#include <string.h>
44#include <unistd.h> 43#include <unistd.h>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-04-05 10:05:16 +0000