summaryrefslogtreecommitdiff
path: root/archival
diff options
context:
space:
mode:
authorRob Landley2005-09-11 01:05:30 +0000
committerRob Landley2005-09-11 01:05:30 +0000
commitb7128c6236ac9b4d5d69ad95d509498f38df0dd6 (patch)
tree0358a910b954c6c7fdcaddf389693a0c2e96ef70 /archival
parentdb289b258de53bdcea7d671f854aafbb490321df (diff)
downloadbusybox-b7128c6236ac9b4d5d69ad95d509498f38df0dd6.zip
busybox-b7128c6236ac9b4d5d69ad95d509498f38df0dd6.tar.gz
Cleanup patch by Bernhard Fischer, removing unnecessary includes of
getopt.h, whitespace changes, typos, etc.
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 21096d7..411a25e 100644
--- a/archival/ar.c
+++ b/archival/ar.c
@@ -27,7 +27,6 @@
*/
#include <fcntl.h>
-#include <getopt.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/archival/bunzip2.c b/archival/bunzip2.c
index 740e269..2ce6cfb 100644
--- a/archival/bunzip2.c
+++ b/archival/bunzip2.c
@@ -6,7 +6,6 @@
*/
#include <fcntl.h>
-#include <getopt.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -35,7 +34,7 @@ int bunzip2_main(int argc, char **argv)
src_fd = STDIN_FILENO;
filename = 0;
}
-
+
/* if called as bzcat force the stdout flag */
if ((opt & BUNZIP2_OPT_STDOUT) || bb_applet_name[2] == 'c')
filename = 0;
diff --git a/archival/cpio.c b/archival/cpio.c
index 0fbe7b8..820f03e 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -24,20 +24,19 @@
*
*/
#include <fcntl.h>
-#include <getopt.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include "unarchive.h"
#include "busybox.h"
-#define CPIO_OPT_EXTRACT 0x01
-#define CPIO_OPT_TEST 0x02
-#define CPIO_OPT_UNCONDITIONAL 0x04
-#define CPIO_OPT_VERBOSE 0x08
-#define CPIO_OPT_FILE 0x10
+#define CPIO_OPT_EXTRACT 0x01
+#define CPIO_OPT_TEST 0x02
+#define CPIO_OPT_UNCONDITIONAL 0x04
+#define CPIO_OPT_VERBOSE 0x08
+#define CPIO_OPT_FILE 0x10
#define CPIO_OPT_CREATE_LEADING_DIR 0x20
-#define CPIO_OPT_PRESERVE_MTIME 0x40
+#define CPIO_OPT_PRESERVE_MTIME 0x40
extern int cpio_main(int argc, char **argv)
{
@@ -59,7 +58,7 @@ extern int cpio_main(int argc, char **argv)
}
if (opt & CPIO_OPT_TEST) {
- /* if both extract and test option are given, ignore extract option */
+ /* if both extract and test options are given, ignore extract option */
if (opt & CPIO_OPT_EXTRACT) {
opt &= ~CPIO_OPT_EXTRACT;
}
@@ -79,7 +78,7 @@ extern int cpio_main(int argc, char **argv)
archive_handle->action_header = header_list;
}
}
- if (cpio_filename) { /* CPIO_OPT_FILE */
+ if (cpio_filename) { /* CPIO_OPT_FILE */
archive_handle->src_fd = bb_xopen(cpio_filename, O_RDONLY);
archive_handle->seek = seek_by_jump;
}
diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c
index 6c665e5..1e8bd8a 100644
--- a/archival/dpkg_deb.c
+++ b/archival/dpkg_deb.c
@@ -18,7 +18,6 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include <getopt.h>
#include "unarchive.h"
#include "busybox.h"
diff --git a/archival/gunzip.c b/archival/gunzip.c
index beb7bd1..a4db7ca 100644
--- a/archival/gunzip.c
+++ b/archival/gunzip.c
@@ -63,7 +63,6 @@ static char *license_msg[] = {
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include <getopt.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
diff --git a/archival/libunarchive/unpack_ar_archive.c b/archival/libunarchive/unpack_ar_archive.c
index e8f113b..fa48c6f 100644
--- a/archival/libunarchive/unpack_ar_archive.c
+++ b/archival/libunarchive/unpack_ar_archive.c
@@ -16,7 +16,6 @@
#include <fcntl.h>
#include <stdlib.h>
#include <string.h>
-#include <getopt.h>
#include "unarchive.h"
#include "busybox.h"
diff --git a/archival/uncompress.c b/archival/uncompress.c
index 48b4e2c..3bd8709 100644
--- a/archival/uncompress.c
+++ b/archival/uncompress.c
@@ -20,7 +20,6 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include <getopt.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
diff --git a/archival/unzip.c b/archival/unzip.c
index d60cb4d..50d1486 100644
--- a/archival/unzip.c
+++ b/archival/unzip.c
@@ -38,7 +38,6 @@
*/
#include <fcntl.h>
-#include <getopt.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>