aboutsummaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorGravatar Denis Vlasenko <vda.linux@googlemail.com>2007-05-26 19:00:18 +0000
committerGravatar Denis Vlasenko <vda.linux@googlemail.com>2007-05-26 19:00:18 +0000
commitb6adbf1be29841501cc49917249e85f273e1df7c (patch)
treee28a5603e6009b2479e949b8b9b4aa0620fed400 /shell
parent5a6aeddfa7262e41802c77f70c9ef88e9c2c2476 (diff)
downloadbusybox-b6adbf1be29841501cc49917249e85f273e1df7c.tar.gz
busybox-b6adbf1be29841501cc49917249e85f273e1df7c.tar.bz2
usage.c: remove reference to busybox.h
*: s/include "busybox.h"/include "libbb.h"
Diffstat (limited to 'shell')
-rw-r--r--shell/ash.c2
-rw-r--r--shell/bbsh.c2
-rw-r--r--shell/hush.c5
-rw-r--r--shell/lash.c5
4 files changed, 9 insertions, 5 deletions
diff --git a/shell/ash.c b/shell/ash.c
index ed46e1c0c..b1d22e5d2 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -53,7 +53,7 @@
#if DEBUG
#define _GNU_SOURCE
#endif
-#include "busybox.h"
+#include "busybox.h" /* for struct bb_applet */
#include <paths.h>
#include <setjmp.h>
#include <fnmatch.h>
diff --git a/shell/bbsh.c b/shell/bbsh.c
index 8f0fb0511..4fd071404 100644
--- a/shell/bbsh.c
+++ b/shell/bbsh.c
@@ -36,7 +36,7 @@
echo `echo hello#comment " woot` and more
*/
-#include "busybox.h"
+#include "libbb.h"
// A single executable, its arguments, and other information we know about it.
#define BBSH_FLAG_EXIT 1
diff --git a/shell/hush.c b/shell/hush.c
index 2e6f286dc..6844f06c2 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -76,12 +76,15 @@
* Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
*/
-#include "busybox.h"
+
#include <glob.h> /* glob, of course */
#include <getopt.h> /* should be pretty obvious */
/* #include <dmalloc.h> */
+
extern char **environ; /* This is in <unistd.h>, but protected with __USE_GNU */
+#include "busybox.h" /* for struct bb_applet */
+
/* If you comment out one of these below, it will be #defined later
* to perform debug printfs to stderr: */
diff --git a/shell/lash.c b/shell/lash.c
index 28449b791..21c95fb1b 100644
--- a/shell/lash.c
+++ b/shell/lash.c
@@ -20,10 +20,11 @@
//For debugging/development on the shell only...
//#define DEBUG_SHELL
-
-#include "busybox.h"
#include <getopt.h>
#include <glob.h>
+
+#include "busybox.h" /* for struct bb_applet */
+
#define expand_t glob_t
/* Always enable for the moment... */