mirror of
https://github.com/sheumann/hush.git
synced 2024-09-12 00:55:11 +00:00
ash,hush: add TODO for rare build failure
*: remove some redundant includes
This commit is contained in:
parent
1689840672
commit
61befda93b
@ -8,7 +8,6 @@
|
|||||||
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
|
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <signal.h> /* For FEATURE_DD_SIGNAL_HANDLING */
|
|
||||||
#include "libbb.h"
|
#include "libbb.h"
|
||||||
|
|
||||||
/* This is a NOEXEC applet. Be very careful! */
|
/* This is a NOEXEC applet. Be very careful! */
|
||||||
|
@ -11,7 +11,6 @@
|
|||||||
/* http://www.opengroup.org/onlinepubs/007904975/utilities/tee.html */
|
/* http://www.opengroup.org/onlinepubs/007904975/utilities/tee.html */
|
||||||
|
|
||||||
#include "libbb.h"
|
#include "libbb.h"
|
||||||
#include <signal.h>
|
|
||||||
|
|
||||||
int tee_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
int tee_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
||||||
int tee_main(int argc, char **argv)
|
int tee_main(int argc, char **argv)
|
||||||
|
@ -8,8 +8,6 @@
|
|||||||
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
|
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <termios.h>
|
|
||||||
|
|
||||||
#include "libbb.h"
|
#include "libbb.h"
|
||||||
|
|
||||||
/* do nothing signal handler */
|
/* do nothing signal handler */
|
||||||
|
@ -7,7 +7,6 @@
|
|||||||
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
|
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <termios.h>
|
|
||||||
#include "libbb.h"
|
#include "libbb.h"
|
||||||
|
|
||||||
struct speed_map {
|
struct speed_map {
|
||||||
|
@ -21,7 +21,6 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <termios.h>
|
|
||||||
#include <arpa/telnet.h>
|
#include <arpa/telnet.h>
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
#include "libbb.h"
|
#include "libbb.h"
|
||||||
|
@ -644,8 +644,6 @@ static void clearmems(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
#if ENABLE_FEATURE_USE_TERMIOS
|
#if ENABLE_FEATURE_USE_TERMIOS
|
||||||
#include <termios.h>
|
|
||||||
#include <signal.h>
|
|
||||||
|
|
||||||
static void reset_term(void)
|
static void reset_term(void)
|
||||||
{
|
{
|
||||||
|
14
shell/ash.c
14
shell/ash.c
@ -53,11 +53,21 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "busybox.h" /* for applet_names */
|
#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 <paths.h>
|
||||||
#include <setjmp.h>
|
#include <setjmp.h>
|
||||||
#include <fnmatch.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
|
#endif
|
||||||
|
|
||||||
#ifndef PIPE_BUF
|
#ifndef PIPE_BUF
|
||||||
|
13
shell/hush.c
13
shell/hush.c
@ -67,6 +67,8 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "busybox.h" /* for APPLET_IS_NOFORK/NOEXEC */
|
#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 <glob.h>
|
||||||
/* #include <dmalloc.h> */
|
/* #include <dmalloc.h> */
|
||||||
#if ENABLE_HUSH_CASE
|
#if ENABLE_HUSH_CASE
|
||||||
@ -75,6 +77,17 @@
|
|||||||
|
|
||||||
#define HUSH_VER_STR "0.91"
|
#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
|
#if !BB_MMU && ENABLE_HUSH_TICK
|
||||||
//#undef ENABLE_HUSH_TICK
|
//#undef ENABLE_HUSH_TICK
|
||||||
//#define ENABLE_HUSH_TICK 0
|
//#define ENABLE_HUSH_TICK 0
|
||||||
|
@ -15,10 +15,6 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "libbb.h"
|
#include "libbb.h"
|
||||||
#if ENABLE_FEATURE_USE_TERMIOS
|
|
||||||
#include <termios.h>
|
|
||||||
#endif /* FEATURE_USE_TERMIOS */
|
|
||||||
|
|
||||||
|
|
||||||
#if ENABLE_FEATURE_USE_TERMIOS
|
#if ENABLE_FEATURE_USE_TERMIOS
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user