diff options
| author | Denis Vlasenko | 2008-11-25 01:36:03 +0000 |
|---|---|---|
| committer | Denis Vlasenko | 2008-11-25 01:36:03 +0000 |
| commit | 61befda93b2ed2458c8db50d2d03cff453d36565 (patch) | |
| tree | d8d9c76401d87b183bd99e7c2e82d6b6cd79f564 /shell | |
| parent | 16898406724b99ec61d16b38393137bddd6ecc25 (diff) | |
| download | busybox-61befda93b2ed2458c8db50d2d03cff453d36565.zip busybox-61befda93b2ed2458c8db50d2d03cff453d36565.tar.gz | |
ash,hush: add TODO for rare build failure
*: remove some redundant includes
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ash.c | 14 | ||||
| -rw-r--r-- | shell/hush.c | 13 |
2 files changed, 25 insertions, 2 deletions
diff --git a/shell/ash.c b/shell/ash.c index 55a79a7..66bfa67 100644 --- a/shell/ash.c +++ b/shell/ash.c @@ -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 diff --git a/shell/hush.c b/shell/hush.c index 4212729..eafcbb4 100644 --- a/shell/hush.c +++ b/shell/hush.c @@ -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 |