summaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorRob Landley2006-08-09 20:56:23 +0000
committerRob Landley2006-08-09 20:56:23 +0000
commit519d7df930d2ac14b7a833c0255a4a5abd5a329b (patch)
treead8d4242826335c7e418648d60d82a55095f11e1 /libbb
parente55a73c7a89d9437bda82d317ee980989a5949db (diff)
downloadbusybox-519d7df930d2ac14b7a833c0255a4a5abd5a329b.zip
busybox-519d7df930d2ac14b7a833c0255a4a5abd5a329b.tar.gz
Another whack at scripts/individual. Now builds 212 applets.
Diffstat (limited to 'libbb')
-rw-r--r--libbb/messages.c8
-rw-r--r--libbb/xfuncs.c2
2 files changed, 6 insertions, 4 deletions
diff --git a/libbb/messages.c b/libbb/messages.c
index 2feb6a9..b675505 100644
--- a/libbb/messages.c
+++ b/libbb/messages.c
@@ -9,12 +9,14 @@
#ifdef L_full_version
#ifndef BB_EXTRA_VERSION
-#define LIBBB_BANNER "BusyBox's library v" BB_VER " (" BB_BT ")"
+#define BANNER "BusyBox v" BB_VER " (" BB_BT ")"
#else
-#define LIBBB_BANNER "BusyBox's library v" BB_VER " (" BB_EXTRA_VERSION ")"
+#define BANNER "BusyBox v" BB_VER " (" BB_EXTRA_VERSION ")"
#endif
- const char * const libbb_msg_full_version = LIBBB_BANNER;
+const char BB_BANNER[]=BANNER;
+const char * const bb_msg_full_version = BANNER " multi-call binary";
#endif
+
#ifdef L_memory_exhausted
const char * const bb_msg_memory_exhausted = "memory exhausted";
#endif
diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c
index cfb1c29..4d81fdc 100644
--- a/libbb/xfuncs.c
+++ b/libbb/xfuncs.c
@@ -208,7 +208,7 @@ pid_t spawn(char **argv)
{
static int failed;
pid_t pid;
- void *app = find_applet_by_name(argv[0]);
+ void *app = ENABLE_FEATURE_SH_STANDALONE_SHELL ? find_applet_by_name(argv[0]) : 0;
// Be nice to nommu machines.
failed = 0;