aboutsummaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-06-02 20:56:16 +0000
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-06-02 20:56:16 +0000
commite15d7573a1263fb364d1678c3a46be47a8b5e5ea (patch)
tree09e7b482b38ac571a01e936fb91df16dd1eeef42 /shell
parentecae66ac16338d8cddb55e1782ebd8c5f670ff53 (diff)
downloadbusybox-e15d7573a1263fb364d1678c3a46be47a8b5e5ea.tar.gz
- move #include busybox.h to the very top so we pull in the config
and eventual platform specific includes in early.
Diffstat (limited to 'shell')
-rw-r--r--shell/ash.c7
-rw-r--r--shell/cmdedit.c3
-rw-r--r--shell/hush.c3
-rw-r--r--shell/lash.c2
-rw-r--r--shell/msh.c2
5 files changed, 8 insertions, 9 deletions
diff --git a/shell/ash.c b/shell/ash.c
index c8ccf19b5..5cdd7f006 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -44,11 +44,12 @@
*/
-
#define IFS_BROKEN
#define PROFILE 0
+#include "busybox.h"
+
#ifdef DEBUG
#define _GNU_SOURCE
#endif
@@ -76,12 +77,10 @@
#include <paths.h>
#include <setjmp.h>
#include <signal.h>
-#include <stdint.h>
+/*#include <stdint.h>*/
#include <time.h>
#include <fnmatch.h>
-
-#include "busybox.h"
#include "pwd_.h"
#ifdef CONFIG_ASH_JOB_CONTROL
diff --git a/shell/cmdedit.c b/shell/cmdedit.c
index d0e642250..8b5b2b942 100644
--- a/shell/cmdedit.c
+++ b/shell/cmdedit.c
@@ -31,6 +31,7 @@
*/
+#include "busybox.h"
#include <stdio.h>
#include <errno.h>
#include <unistd.h>
@@ -41,8 +42,6 @@
#include <signal.h>
#include <limits.h>
-#include "busybox.h"
-
#include "../shell/cmdedit.h"
diff --git a/shell/hush.c b/shell/hush.c
index 0a46d125a..e3707380d 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -77,6 +77,8 @@
*
* Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
*/
+
+#include "busybox.h"
#include <ctype.h> /* isalpha, isdigit */
#include <unistd.h> /* getpid */
#include <stdlib.h> /* getenv, atoi */
@@ -97,7 +99,6 @@
/* #define DEBUG_SHELL */
#if 1
-#include "busybox.h"
#include "cmdedit.h"
#else
#define bb_applet_name "hush"
diff --git a/shell/lash.c b/shell/lash.c
index 8e8d45ae9..54408c97e 100644
--- a/shell/lash.c
+++ b/shell/lash.c
@@ -21,6 +21,7 @@
//#define DEBUG_SHELL
+#include "busybox.h"
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
@@ -33,7 +34,6 @@
#include <unistd.h>
#include <getopt.h>
#include <termios.h>
-#include "busybox.h"
#include "cmdedit.h"
#ifdef CONFIG_LOCALE_SUPPORT
diff --git a/shell/msh.c b/shell/msh.c
index e47af795e..8bc769b6e 100644
--- a/shell/msh.c
+++ b/shell/msh.c
@@ -27,6 +27,7 @@
* Original copyright notice is retained at the end of this file.
*/
+#include "busybox.h"
#include <ctype.h>
#include <dirent.h>
#include <errno.h>
@@ -46,7 +47,6 @@
#include <sys/wait.h>
#include "cmdedit.h"
-#include "busybox.h"
/* Conditional use of "register" keyword */