Cleanup patch by Bernhard Fischer, removing unnecessary includes of

getopt.h, whitespace changes, typos, etc.

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 @@
  */
 
 #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 740e26919..2ce6cfb86 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 0fbe7b8e5..820f03e9b 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 6c665e57a..1e8bd8ad2 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 beb7bd12e..a4db7ca31 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 e8f113bcf..fa48c6fca 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 48b4e2cad..3bd87093e 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 d60cb4db4..50d148692 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>