61befda93
Denis Vlasenko
2008-11-25
Subject
ash,hush: add TODO for rare build failure *: remove some redundant includes
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
coreutils/dd.c +0 -1coreutils/tee.c +0 -1libbb/bb_askpass.c +0 -2libbb/speed_table.c +0 -1networking/telnet.c +0 -1procps/top.c +0 -2shell/ash.c +12 -2shell/hush.c +13 -0util-linux/more.c +0 -4
coreutils/dd.c+0 -1
| @@ -8,7 +8,6 @@ | |
| * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. | |
| */ | |
| - | #include <signal.h> /* For FEATURE_DD_SIGNAL_HANDLING */ |
| #include "libbb.h" | |
| /* This is a NOEXEC applet. Be very careful! */ | |
coreutils/tee.c+0 -1
| @@ -11,7 +11,6 @@ | |
| /* http://www.opengroup.org/onlinepubs/007904975/utilities/tee.html */ | |
| #include "libbb.h" | |
| - | #include <signal.h> |
| int tee_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; | |
| int tee_main(int argc, char **argv) | |
libbb/bb_askpass.c+0 -2
| @@ -8,8 +8,6 @@ | |
| * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. | |
| */ | |
| - | #include <termios.h> |
| - | |
| #include "libbb.h" | |
| /* do nothing signal handler */ | |
libbb/speed_table.c+0 -1
| @@ -7,7 +7,6 @@ | |
| * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. | |
| */ | |
| - | #include <termios.h> |
| #include "libbb.h" | |
| struct speed_map { | |
networking/telnet.c+0 -1
| @@ -21,7 +21,6 @@ | |
| * | |
| */ | |
| - | #include <termios.h> |
| #include <arpa/telnet.h> | |
| #include <netinet/in.h> | |
| #include "libbb.h" | |
procps/top.c+0 -2
| @@ -644,8 +644,6 @@ static void clearmems(void) | |
| } | |
| #if ENABLE_FEATURE_USE_TERMIOS | |
| - | #include <termios.h> |
| - | #include <signal.h> |
| static void reset_term(void) | |
| { | |
shell/ash.c+12 -2
| @@ -53,11 +53,21 @@ | |
| #endif | |
| #include "busybox.h" /* for applet_names */ | |
| + | //TODO: pull in some .h and find out do we have SINGLE_APPLET_MAIN? |
| + | //#include "applet_tables.h" doesn't work |
| #include <paths.h> | |
| #include <setjmp.h> | |
| #include <fnmatch.h> | |
| - | #if JOBS || ENABLE_ASH_READ_NCHARS |
| - | #include <termios.h> |
| + | |
| + | #if defined SINGLE_APPLET_MAIN |
| + | /* STANDALONE does not make sense, and won't compile */ |
| + | #undef CONFIG_FEATURE_SH_STANDALONE |
| + | #undef ENABLE_FEATURE_SH_STANDALONE |
| + | #undef USE_FEATURE_SH_STANDALONE |
| + | #undef SKIP_FEATURE_SH_STANDALONE(...) |
| + | #define ENABLE_FEATURE_SH_STANDALONE 0 |
| + | #define USE_FEATURE_SH_STANDALONE(...) |
| + | #define SKIP_FEATURE_SH_STANDALONE(...) __VA_ARGS__ |
| #endif | |
| #ifndef PIPE_BUF | |
shell/hush.c+13 -0
| @@ -67,6 +67,8 @@ | |
| */ | |
| #include "busybox.h" /* for APPLET_IS_NOFORK/NOEXEC */ | |
| + | //TODO: pull in some .h and find out do we have SINGLE_APPLET_MAIN? |
| + | //#include "applet_tables.h" doesn't work |
| #include <glob.h> | |
| /* #include <dmalloc.h> */ | |
| #if ENABLE_HUSH_CASE | |
| @@ -75,6 +77,17 @@ | |
| #define HUSH_VER_STR "0.91" | |
| + | #if defined SINGLE_APPLET_MAIN |
| + | /* STANDALONE does not make sense, and won't compile */ |
| + | #undef CONFIG_FEATURE_SH_STANDALONE |
| + | #undef ENABLE_FEATURE_SH_STANDALONE |
| + | #undef USE_FEATURE_SH_STANDALONE |
| + | #define SKIP_FEATURE_SH_STANDALONE(...) __VA_ARGS__ |
| + | #define ENABLE_FEATURE_SH_STANDALONE 0 |
| + | #define USE_FEATURE_SH_STANDALONE(...) |
| + | #define SKIP_FEATURE_SH_STANDALONE(...) __VA_ARGS__ |
| + | #endif |
| + | |
| #if !BB_MMU && ENABLE_HUSH_TICK | |
| //#undef ENABLE_HUSH_TICK | |
| //#define ENABLE_HUSH_TICK 0 | |
util-linux/more.c+0 -4
| @@ -15,10 +15,6 @@ | |
| */ | |
| #include "libbb.h" | |
| - | #if ENABLE_FEATURE_USE_TERMIOS |
| - | #include <termios.h> |
| - | #endif /* FEATURE_USE_TERMIOS */ |
| - | |
| #if ENABLE_FEATURE_USE_TERMIOS | |