diff options
author | Rob Landley <rob@landley.net> | 2006-08-09 20:56:23 +0000 |
---|---|---|
committer | Rob Landley <rob@landley.net> | 2006-08-09 20:56:23 +0000 |
commit | 519d7df930d2ac14b7a833c0255a4a5abd5a329b (patch) | |
tree | ad8d4242826335c7e418648d60d82a55095f11e1 /libbb | |
parent | e55a73c7a89d9437bda82d317ee980989a5949db (diff) | |
download | busybox-w32-519d7df930d2ac14b7a833c0255a4a5abd5a329b.tar.gz busybox-w32-519d7df930d2ac14b7a833c0255a4a5abd5a329b.tar.bz2 busybox-w32-519d7df930d2ac14b7a833c0255a4a5abd5a329b.zip |
Another whack at scripts/individual. Now builds 212 applets.
Diffstat (limited to 'libbb')
-rw-r--r-- | libbb/messages.c | 8 | ||||
-rw-r--r-- | libbb/xfuncs.c | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/libbb/messages.c b/libbb/messages.c index 2feb6a970..b6755058e 100644 --- a/libbb/messages.c +++ b/libbb/messages.c | |||
@@ -9,12 +9,14 @@ | |||
9 | 9 | ||
10 | #ifdef L_full_version | 10 | #ifdef L_full_version |
11 | #ifndef BB_EXTRA_VERSION | 11 | #ifndef BB_EXTRA_VERSION |
12 | #define LIBBB_BANNER "BusyBox's library v" BB_VER " (" BB_BT ")" | 12 | #define BANNER "BusyBox v" BB_VER " (" BB_BT ")" |
13 | #else | 13 | #else |
14 | #define LIBBB_BANNER "BusyBox's library v" BB_VER " (" BB_EXTRA_VERSION ")" | 14 | #define BANNER "BusyBox v" BB_VER " (" BB_EXTRA_VERSION ")" |
15 | #endif | 15 | #endif |
16 | const char * const libbb_msg_full_version = LIBBB_BANNER; | 16 | const char BB_BANNER[]=BANNER; |
17 | const char * const bb_msg_full_version = BANNER " multi-call binary"; | ||
17 | #endif | 18 | #endif |
19 | |||
18 | #ifdef L_memory_exhausted | 20 | #ifdef L_memory_exhausted |
19 | const char * const bb_msg_memory_exhausted = "memory exhausted"; | 21 | const char * const bb_msg_memory_exhausted = "memory exhausted"; |
20 | #endif | 22 | #endif |
diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c index cfb1c29ac..4d81fdc28 100644 --- a/libbb/xfuncs.c +++ b/libbb/xfuncs.c | |||
@@ -208,7 +208,7 @@ pid_t spawn(char **argv) | |||
208 | { | 208 | { |
209 | static int failed; | 209 | static int failed; |
210 | pid_t pid; | 210 | pid_t pid; |
211 | void *app = find_applet_by_name(argv[0]); | 211 | void *app = ENABLE_FEATURE_SH_STANDALONE_SHELL ? find_applet_by_name(argv[0]) : 0; |
212 | 212 | ||
213 | // Be nice to nommu machines. | 213 | // Be nice to nommu machines. |
214 | failed = 0; | 214 | failed = 0; |