emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup patch by Bernhard Fischer, removing unnecessary includes of

Browse Source 
getopt.h, whitespace changes, typos, etc.
This commit is contained in:
Rob Landley 2005-09-11 01:05:30 +00:00
parent db289b258d
commit b7128c6236
23 changed files with 20 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
archival/ar.c
View File

@ -27,7 +27,6 @@
*/ */
#include <fcntl.h> #include <fcntl.h>
#include <getopt.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>

3
archival/bunzip2.c
View File

@ -6,7 +6,6 @@
*/ */
#include <fcntl.h> #include <fcntl.h>
#include <getopt.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -35,7 +34,7 @@ int bunzip2_main(int argc, char **argv)
src_fd = STDIN_FILENO; src_fd = STDIN_FILENO;
filename = 0; filename = 0;
} }
/* if called as bzcat force the stdout flag */ /* if called as bzcat force the stdout flag */
if ((opt & BUNZIP2_OPT_STDOUT) || bb_applet_name[2] == 'c') if ((opt & BUNZIP2_OPT_STDOUT) || bb_applet_name[2] == 'c')
filename = 0; filename = 0;

17
archival/cpio.c
View File

@ -24,20 +24,19 @@
* *
*/ */
#include <fcntl.h> #include <fcntl.h>
#include <getopt.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include "unarchive.h" #include "unarchive.h"
#include "busybox.h" #include "busybox.h"
#define CPIO_OPT_EXTRACT 0x01 #define CPIO_OPT_EXTRACT 0x01
#define CPIO_OPT_TEST 0x02 #define CPIO_OPT_TEST 0x02
#define CPIO_OPT_UNCONDITIONAL 0x04 #define CPIO_OPT_UNCONDITIONAL 0x04
#define CPIO_OPT_VERBOSE 0x08 #define CPIO_OPT_VERBOSE 0x08
#define CPIO_OPT_FILE 0x10 #define CPIO_OPT_FILE 0x10
#define CPIO_OPT_CREATE_LEADING_DIR 0x20 #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) 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 (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) { if (opt & CPIO_OPT_EXTRACT) {
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; 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->src_fd = bb_xopen(cpio_filename, O_RDONLY);
archive_handle->seek = seek_by_jump; archive_handle->seek = seek_by_jump;
} }

1
archival/dpkg_deb.c
View File

@ -18,7 +18,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <getopt.h>
#include "unarchive.h" #include "unarchive.h"
#include "busybox.h" #include "busybox.h"

1
archival/gunzip.c
View File

@ -63,7 +63,6 @@ static char *license_msg[] = {
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <getopt.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>

1
archival/libunarchive/unpack_ar_archive.c
View File

@ -16,7 +16,6 @@
#include <fcntl.h> #include <fcntl.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <getopt.h>
#include "unarchive.h" #include "unarchive.h"
#include "busybox.h" #include "busybox.h"

1
archival/uncompress.c
View File

@ -20,7 +20,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <getopt.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>

1
archival/unzip.c
View File

@ -38,7 +38,6 @@
*/ */
#include <fcntl.h> #include <fcntl.h>
#include <getopt.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>

2
console-tools/setconsole.c
View File

@ -24,7 +24,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <fcntl.h> #include <fcntl.h>
#include <stdio.h> #include <stdio.h>
#include <getopt.h> #include <getopt.h> /* struct option */
#include "busybox.h" #include "busybox.h"

1
coreutils/cut.c
View File

@ -23,7 +23,6 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <getopt.h>
#include <unistd.h> #include <unistd.h>
#include <string.h> #include <string.h>
#include <limits.h> #include <limits.h>

1
coreutils/date.c
View File

@ -29,7 +29,6 @@
#include <time.h> #include <time.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <getopt.h>
#include "busybox.h" #include "busybox.h"

1
coreutils/dos2unix.c
View File

@ -28,7 +28,6 @@
*/ */
#include <string.h> #include <string.h>
#include <getopt.h>
#include <unistd.h> #include <unistd.h>
#include <stdint.h> #include <stdint.h>
#include <fcntl.h> #include <fcntl.h>

2
coreutils/env.c
View File

@ -47,7 +47,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <errno.h> #include <errno.h>
#include <unistd.h> #include <unistd.h>
#include <getopt.h> #include <getopt.h> /* struct option */
#include "busybox.h" #include "busybox.h"

2
coreutils/install.c
View File

@ -23,10 +23,10 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include <errno.h> #include <errno.h>
#include <getopt.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <getopt.h> /* struct option */
#include "busybox.h" #include "busybox.h"
#include "libcoreutils/coreutils.h" #include "libcoreutils/coreutils.h"

2
coreutils/ls.c
View File

@ -60,7 +60,7 @@ enum {
#include <fcntl.h> #include <fcntl.h>
#include <signal.h> #include <signal.h>
#include <termios.h> #include <termios.h>
#include <getopt.h> #include <getopt.h> /* struct option */
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/sysmacros.h> /* major() and minor() */ #include <sys/sysmacros.h> /* major() and minor() */
#include "busybox.h" #include "busybox.h"

2
coreutils/mkdir.c
View File

@ -31,7 +31,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <getopt.h> #include <getopt.h> /* struct option */
#include "busybox.h" #include "busybox.h"
static const struct option mkdir_long_options[] = { static const struct option mkdir_long_options[] = {

2
coreutils/mv.c
View File

@ -31,7 +31,7 @@
#include <dirent.h> #include <dirent.h>
#include <errno.h> #include <errno.h>
#include <stdlib.h> #include <stdlib.h>
#include <getopt.h> #include <getopt.h> /* struct option */
#include "busybox.h" #include "busybox.h"
#include "libcoreutils/coreutils.h" #include "libcoreutils/coreutils.h"

2
coreutils/stat.c
View File

@ -30,7 +30,7 @@
#include <grp.h> #include <grp.h>
#include <sys/vfs.h> #include <sys/vfs.h>
#include <time.h> #include <time.h>
#include <getopt.h> #include <getopt.h> /* optind */
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/statfs.h> #include <sys/statfs.h>
#include <sys/statvfs.h> #include <sys/statvfs.h>

1
coreutils/sum.c
View File

@ -18,7 +18,6 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#include <getopt.h>
#include "busybox.h" #include "busybox.h"

2
coreutils/uudecode.c
View File

@ -24,7 +24,7 @@
#include <stdio.h> #include <stdio.h>
#include <errno.h> #include <errno.h>
#include <getopt.h> #include <getopt.h> /* optind */
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>

1
coreutils/uuencode.c
View File

@ -19,7 +19,6 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include <getopt.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>

7
debianutils/readlink.c
View File

@ -43,8 +43,6 @@ int readlink_main(int argc, char **argv)
RESERVE_CONFIG_BUFFER(resolved_path, PATH_MAX); RESERVE_CONFIG_BUFFER(resolved_path, PATH_MAX);
#endif #endif
/* no options, no getopt */
if (optind + 1 != argc) if (optind + 1 != argc)
bb_show_usage(); bb_show_usage();
@ -58,9 +56,8 @@ int readlink_main(int argc, char **argv)
if (!buf) if (!buf)
return EXIT_FAILURE; return EXIT_FAILURE;
puts(buf); puts(buf);
#ifdef CONFIG_FEATURE_CLEAN_UP
free(buf); if (ENABLE_FEATURE_CLEAN_UP) free(buf);
#endif
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }

2
debianutils/start_stop_daemon.c
View File

@ -16,7 +16,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <dirent.h> #include <dirent.h>
#include <unistd.h> #include <unistd.h>
#include <getopt.h> #include <getopt.h> /* struct option */
#include "busybox.h" #include "busybox.h"
#include "pwd_.h" #include "pwd_.h"