aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Config.h128
-rw-r--r--cmdedit.c16
-rw-r--r--lash.c6
-rw-r--r--sh.c6
-rw-r--r--shell/cmdedit.c16
-rw-r--r--shell/lash.c6
6 files changed, 94 insertions, 84 deletions
diff --git a/Config.h b/Config.h
index e015b00b5..d664df199 100644
--- a/Config.h
+++ b/Config.h
@@ -240,7 +240,7 @@
240#define BB_FEATURE_SORT_REVERSE 240#define BB_FEATURE_SORT_REVERSE
241// 241//
242// Enable command line editing in the shell. 242// Enable command line editing in the shell.
243// Only relevant if BB_SH is enabled. 243// Only relevant if BB_SH is enabled. On by default.
244#define BB_FEATURE_COMMAND_EDITING 244#define BB_FEATURE_COMMAND_EDITING
245// 245//
246// Enable tab completion in the shell. This is now working quite nicely. 246// Enable tab completion in the shell. This is now working quite nicely.
@@ -252,9 +252,9 @@
252// 252//
253//Allow the shell to invoke all the compiled in BusyBox applets as if they 253//Allow the shell to invoke all the compiled in BusyBox applets as if they
254//were shell builtins. Nice for staticly linking an emergency rescue shell, 254//were shell builtins. Nice for staticly linking an emergency rescue shell,
255//among other things. 255//among other things. Off by default.
256// Only relevant if BB_SH is enabled. 256// Only relevant if BB_SH is enabled.
257#define BB_FEATURE_SH_STANDALONE_SHELL 257//#define BB_FEATURE_SH_STANDALONE_SHELL
258// 258//
259//When this is enabled, busybox shell applets can be called using full path 259//When this is enabled, busybox shell applets can be called using full path
260//names. This causes applets (i.e., most busybox commands) to override 260//names. This causes applets (i.e., most busybox commands) to override
@@ -262,14 +262,15 @@
262//will use BusyBox cat even if /bin/cat exists on the filesystem and is _not_ 262//will use BusyBox cat even if /bin/cat exists on the filesystem and is _not_
263//busybox. Some systems want this, others do not. Choose wisely. :-) This 263//busybox. Some systems want this, others do not. Choose wisely. :-) This
264//only has meaning when BB_FEATURE_SH_STANDALONE_SHELL is enabled. 264//only has meaning when BB_FEATURE_SH_STANDALONE_SHELL is enabled.
265// Only relevant if BB_SH is enabled. 265// Only relevant if BB_SH is enabled. Off by default.
266#define BB_FEATURE_SH_APPLETS_ALWAYS_WIN 266//#define BB_FEATURE_SH_APPLETS_ALWAYS_WIN
267// 267//
268// Some deeply embedded systems don't have usernames or even hostnames, 268// Some deeply embedded systems don't have usernames or even hostnames,
269// and the default prompt can look rather hideous on them. Uncomment 269// and the default prompt can look rather hideous on them. Uncomment
270// this option for a simpler, path-only prompt (which was the default until 270// this option for a simpler, path-only prompt (which was the default until
271// around BusyBox-0.48): 271// around BusyBox-0.48). On by default.
272#define BB_FEATURE_SIMPLE_PROMPT 272// Only relevant if BB_SH is enabled.
273#define BB_FEATURE_SH_SIMPLE_PROMPT
273// 274//
274//Turn on extra fbset options 275//Turn on extra fbset options
275//#define BB_FEATURE_FBSET_FANCY 276//#define BB_FEATURE_FBSET_FANCY
@@ -345,96 +346,105 @@
345// mere mortals so leave this stuff alone. 346// mere mortals so leave this stuff alone.
346// 347//
347#if defined BB_MOUNT || defined BB_UMOUNT || defined BB_DF 348#if defined BB_MOUNT || defined BB_UMOUNT || defined BB_DF
348#ifdef BB_FEATURE_MOUNT_MTAB_SUPPORT 349 #ifdef BB_FEATURE_MOUNT_MTAB_SUPPORT
349#define BB_MTAB 350 #define BB_MTAB
350#endif 351 #endif
351#else 352#else
352#undef BB_MTAB 353 #undef BB_MTAB
353#endif 354#endif
354// 355//
355#if defined BB_FEATURE_COMMAND_EDITING && defined BB_SH 356#if defined BB_SH
356#define BB_CMDEDIT 357 #if defined BB_FEATURE_COMMAND_EDITING
358 #define BB_CMDEDIT
359 #ifndef BB_FEATURE_USE_TERMIOS
360 #define BB_FEATURE_USE_TERMIOS
361 #endif
362 #else
363 #undef BB_FEATURE_COMMAND_EDITING
364 #undef BB_FEATURE_COMMAND_TAB_COMPLETION
365 #undef BB_FEATURE_COMMAND_USERNAME_COMPLETION
366 #define BB_FEATURE_SH_SIMPLE_PROMPT
367 #endif
368#else
369 #undef BB_FEATURE_COMMAND_EDITING
370 #undef BB_FEATURE_SH_APPLETS_ALWAYS_WIN
371 #undef BB_FEATURE_SH_STANDALONE_SHELL
372 #undef BB_FEATURE_SH_SIMPLE_PROMPT
357#endif 373#endif
358// 374//
359#ifdef BB_KILLALL 375#ifdef BB_KILLALL
360#ifndef BB_KILL 376 #ifndef BB_KILL
361#define BB_KILL 377 #define BB_KILL
362#endif 378 #endif
363#endif 379#endif
364// 380//
365#ifndef BB_INIT 381#ifndef BB_INIT
366#undef BB_LINUXRC 382 #undef BB_LINUXRC
367#undef BB_FEATURE_LINUXRC 383 #undef BB_FEATURE_LINUXRC
368#endif 384#endif
369// 385//
370#ifdef BB_GZIP 386#ifdef BB_GZIP
371#ifndef BB_GUNZIP 387 #ifndef BB_GUNZIP
372#define BB_GUNZIP 388 #define BB_GUNZIP
373#endif 389 #endif
374#endif 390#endif
375// 391//
376#ifdef BB_DPKG 392#ifdef BB_DPKG
377#ifndef BB_DPKG_DEB 393 #ifndef BB_DPKG_DEB
378#define BB_DPKG_DEB 394 #define BB_DPKG_DEB
379#endif 395 #endif
380#endif 396#endif
381// 397//
382#ifdef BB_DPKG_DEB 398#ifdef BB_DPKG_DEB
383#ifndef BB_AR 399 #ifndef BB_AR
384#define BB_AR 400 #define BB_AR
385#endif 401 #endif
386#ifndef BB_TAR 402 #ifndef BB_TAR
387#define BB_TAR 403 #define BB_TAR
388#endif 404 #endif
389#ifndef BB_FEATURE_TAR_GZIP 405 #ifndef BB_FEATURE_TAR_GZIP
390#define BB_FEATURE_TAR_GZIP 406 #define BB_FEATURE_TAR_GZIP
391#endif 407 #endif
392#endif 408#endif
393// 409//
394#ifdef BB_TAR 410#ifdef BB_TAR
395#ifdef BB_FEATURE_TAR_GZIP 411 #ifdef BB_FEATURE_TAR_GZIP
396#ifndef BB_GUNZIP 412 #ifndef BB_GUNZIP
397#define BB_GUNZIP 413 #define BB_GUNZIP
398#endif 414 #endif
399#endif 415 #endif
400#endif 416#endif
401// 417//
402#if defined BB_MOUNT && defined BB_FEATURE_NFSMOUNT 418#if defined BB_MOUNT && defined BB_FEATURE_NFSMOUNT
403#define BB_NFSMOUNT 419 #define BB_NFSMOUNT
404#endif
405//
406#if defined BB_FEATURE_COMMAND_EDITING
407#ifndef BB_FEATURE_USE_TERMIOS
408#define BB_FEATURE_USE_TERMIOS
409#endif
410#endif 420#endif
411// 421//
412#if defined BB_IFCONFIG 422#if defined BB_IFCONFIG
413#ifdef BB_FEATURE_IFCONFIG_STATUS 423 #ifdef BB_FEATURE_IFCONFIG_STATUS
414#define BB_INTERFACE 424 #define BB_INTERFACE
415#endif 425 #endif
416#else 426#else
417#undef BB_INTERFACE 427 #undef BB_INTERFACE
418#endif 428#endif
419// 429//
420#if defined BB_FEATURE_AUTOWIDTH 430#if defined BB_FEATURE_AUTOWIDTH
421#ifndef BB_FEATURE_USE_TERMIOS 431 #ifndef BB_FEATURE_USE_TERMIOS
422#define BB_FEATURE_USE_TERMIOS 432 #define BB_FEATURE_USE_TERMIOS
423#endif 433 #endif
424#endif 434#endif
425// 435//
426#if defined BB_INSMOD || defined BB_LSMOD 436#if defined BB_INSMOD || defined BB_LSMOD
427#if ! defined BB_FEATURE_NEW_MODULE_INTERFACE && ! defined BB_FEATURE_OLD_MODULE_INTERFACE 437 #if ! defined BB_FEATURE_NEW_MODULE_INTERFACE && ! defined BB_FEATURE_OLD_MODULE_INTERFACE
428#define BB_FEATURE_NEW_MODULE_INTERFACE 438 #define BB_FEATURE_NEW_MODULE_INTERFACE
429#endif 439 #endif
430#endif 440#endif
431// 441//
432#ifdef BB_SYSLOGD 442#ifdef BB_SYSLOGD
433#if defined BB_FEATURE_IPC_SYSLOG 443 #if defined BB_FEATURE_IPC_SYSLOG
434#define BB_LOGREAD 444 #define BB_LOGREAD
435#endif 445 #endif
436#endif 446#endif
437// 447//
438#if defined BB_DOS2UNIX 448#if defined BB_DOS2UNIX
439#define BB_UNIX2DOS 449 #define BB_UNIX2DOS
440#endif 450#endif
diff --git a/cmdedit.c b/cmdedit.c
index 1b5cbbfab..7f403b44f 100644
--- a/cmdedit.c
+++ b/cmdedit.c
@@ -55,7 +55,7 @@
55#define BB_FEATURE_COMMAND_TAB_COMPLETION 55#define BB_FEATURE_COMMAND_TAB_COMPLETION
56#define BB_FEATURE_COMMAND_USERNAME_COMPLETION 56#define BB_FEATURE_COMMAND_USERNAME_COMPLETION
57#define BB_FEATURE_NONPRINTABLE_INVERSE_PUT 57#define BB_FEATURE_NONPRINTABLE_INVERSE_PUT
58#undef BB_FEATURE_SIMPLE_PROMPT 58#undef BB_FEATURE_SH_SIMPLE_PROMPT
59#define BB_FEATURE_CLEAN_UP 59#define BB_FEATURE_CLEAN_UP
60 60
61#define D(x) x 61#define D(x) x
@@ -80,7 +80,7 @@
80#undef BB_FEATURE_COMMAND_USERNAME_COMPLETION 80#undef BB_FEATURE_COMMAND_USERNAME_COMPLETION
81#endif 81#endif
82 82
83#if defined(BB_FEATURE_COMMAND_USERNAME_COMPLETION) || !defined(BB_FEATURE_SIMPLE_PROMPT) 83#if defined(BB_FEATURE_COMMAND_USERNAME_COMPLETION) || !defined(BB_FEATURE_SH_SIMPLE_PROMPT)
84#define BB_FEATURE_GETUSERNAME_AND_HOMEDIR 84#define BB_FEATURE_GETUSERNAME_AND_HOMEDIR
85#endif 85#endif
86 86
@@ -178,7 +178,7 @@ static int cursor; /* required global for signal handler */
178static int len; /* --- "" - - "" - -"- --""-- --""--- */ 178static int len; /* --- "" - - "" - -"- --""-- --""--- */
179static char *command_ps; /* --- "" - - "" - -"- --""-- --""--- */ 179static char *command_ps; /* --- "" - - "" - -"- --""-- --""--- */
180static 180static
181#ifdef BB_FEATURE_SIMPLE_PROMPT 181#ifdef BB_FEATURE_SH_SIMPLE_PROMPT
182 const 182 const
183#endif 183#endif
184char *cmdedit_prompt; /* --- "" - - "" - -"- --""-- --""--- */ 184char *cmdedit_prompt; /* --- "" - - "" - -"- --""-- --""--- */
@@ -193,7 +193,7 @@ static char *home_pwd_buf = "";
193static int my_euid; 193static int my_euid;
194#endif 194#endif
195 195
196#ifndef BB_FEATURE_SIMPLE_PROMPT 196#ifndef BB_FEATURE_SH_SIMPLE_PROMPT
197static char *hostname_buf = ""; 197static char *hostname_buf = "";
198static int num_ok_lines = 1; 198static int num_ok_lines = 1;
199#endif 199#endif
@@ -362,7 +362,7 @@ static void put_prompt(void)
362 cursor = 0; 362 cursor = 0;
363} 363}
364 364
365#ifdef BB_FEATURE_SIMPLE_PROMPT 365#ifdef BB_FEATURE_SH_SIMPLE_PROMPT
366static void parse_prompt(const char *prmt_ptr) 366static void parse_prompt(const char *prmt_ptr)
367{ 367{
368 cmdedit_prompt = prmt_ptr; 368 cmdedit_prompt = prmt_ptr;
@@ -1510,7 +1510,7 @@ extern void cmdedit_read_input(char *prompt, char command[BUFSIZ])
1510 history_counter++; 1510 history_counter++;
1511 } 1511 }
1512 } 1512 }
1513#if !defined(BB_FEATURE_SIMPLE_PROMPT) 1513#if !defined(BB_FEATURE_SH_SIMPLE_PROMPT)
1514 num_ok_lines++; 1514 num_ok_lines++;
1515#endif 1515#endif
1516 } 1516 }
@@ -1519,7 +1519,7 @@ extern void cmdedit_read_input(char *prompt, char command[BUFSIZ])
1519#if defined(BB_FEATURE_CLEAN_UP) && defined(BB_FEATURE_COMMAND_TAB_COMPLETION) 1519#if defined(BB_FEATURE_CLEAN_UP) && defined(BB_FEATURE_COMMAND_TAB_COMPLETION)
1520 input_tab(0); /* strong free */ 1520 input_tab(0); /* strong free */
1521#endif 1521#endif
1522#if !defined(BB_FEATURE_SIMPLE_PROMPT) 1522#if !defined(BB_FEATURE_SH_SIMPLE_PROMPT)
1523 free(cmdedit_prompt); 1523 free(cmdedit_prompt);
1524#endif 1524#endif
1525 return; 1525 return;
@@ -1551,7 +1551,7 @@ int main(int argc, char **argv)
1551{ 1551{
1552 char buff[BUFSIZ]; 1552 char buff[BUFSIZ];
1553 char *prompt = 1553 char *prompt =
1554#if !defined(BB_FEATURE_SIMPLE_PROMPT) 1554#if !defined(BB_FEATURE_SH_SIMPLE_PROMPT)
1555 "\\[\\033[32;1m\\]\\u@\\[\\x1b[33;1m\\]\\h:\ 1555 "\\[\\033[32;1m\\]\\u@\\[\\x1b[33;1m\\]\\h:\
1556\\[\\033[34;1m\\]\\w\\[\\033[35;1m\\] \ 1556\\[\\033[34;1m\\]\\w\\[\\033[35;1m\\] \
1557\\!\\[\\e[36;1m\\]\\$ \\[\\E[0m\\]"; 1557\\!\\[\\e[36;1m\\]\\$ \\[\\E[0m\\]";
diff --git a/lash.c b/lash.c
index 49fb6b536..dcec14aba 100644
--- a/lash.c
+++ b/lash.c
@@ -440,7 +440,7 @@ static int builtin_export(struct child_prog *child)
440 res = putenv(v); 440 res = putenv(v);
441 if (res) 441 if (res)
442 fprintf(stderr, "export: %m\n"); 442 fprintf(stderr, "export: %m\n");
443#ifndef BB_FEATURE_SIMPLE_PROMPT 443#ifndef BB_FEATURE_SH_SIMPLE_PROMPT
444 if (strncmp(v, "PS1=", 4)==0) 444 if (strncmp(v, "PS1=", 4)==0)
445 PS1 = getenv("PS1"); 445 PS1 = getenv("PS1");
446 else if (strncmp(v, "PS2=", 4)==0) 446 else if (strncmp(v, "PS2=", 4)==0)
@@ -805,7 +805,7 @@ static void restore_redirects(int squirrel[])
805 805
806static inline void cmdedit_set_initial_prompt(void) 806static inline void cmdedit_set_initial_prompt(void)
807{ 807{
808#ifdef BB_FEATURE_SIMPLE_PROMPT 808#ifdef BB_FEATURE_SH_SIMPLE_PROMPT
809 PS1 = NULL; 809 PS1 = NULL;
810 PS2 = "> "; 810 PS2 = "> ";
811#else 811#else
@@ -821,7 +821,7 @@ static inline void cmdedit_set_initial_prompt(void)
821 821
822static inline void setup_prompt_string(char **prompt_str) 822static inline void setup_prompt_string(char **prompt_str)
823{ 823{
824#ifdef BB_FEATURE_SIMPLE_PROMPT 824#ifdef BB_FEATURE_SH_SIMPLE_PROMPT
825 /* Set up the prompt */ 825 /* Set up the prompt */
826 if (shell_context == 0) { 826 if (shell_context == 0) {
827 if (PS1) 827 if (PS1)
diff --git a/sh.c b/sh.c
index 49fb6b536..dcec14aba 100644
--- a/sh.c
+++ b/sh.c
@@ -440,7 +440,7 @@ static int builtin_export(struct child_prog *child)
440 res = putenv(v); 440 res = putenv(v);
441 if (res) 441 if (res)
442 fprintf(stderr, "export: %m\n"); 442 fprintf(stderr, "export: %m\n");
443#ifndef BB_FEATURE_SIMPLE_PROMPT 443#ifndef BB_FEATURE_SH_SIMPLE_PROMPT
444 if (strncmp(v, "PS1=", 4)==0) 444 if (strncmp(v, "PS1=", 4)==0)
445 PS1 = getenv("PS1"); 445 PS1 = getenv("PS1");
446 else if (strncmp(v, "PS2=", 4)==0) 446 else if (strncmp(v, "PS2=", 4)==0)
@@ -805,7 +805,7 @@ static void restore_redirects(int squirrel[])
805 805
806static inline void cmdedit_set_initial_prompt(void) 806static inline void cmdedit_set_initial_prompt(void)
807{ 807{
808#ifdef BB_FEATURE_SIMPLE_PROMPT 808#ifdef BB_FEATURE_SH_SIMPLE_PROMPT
809 PS1 = NULL; 809 PS1 = NULL;
810 PS2 = "> "; 810 PS2 = "> ";
811#else 811#else
@@ -821,7 +821,7 @@ static inline void cmdedit_set_initial_prompt(void)
821 821
822static inline void setup_prompt_string(char **prompt_str) 822static inline void setup_prompt_string(char **prompt_str)
823{ 823{
824#ifdef BB_FEATURE_SIMPLE_PROMPT 824#ifdef BB_FEATURE_SH_SIMPLE_PROMPT
825 /* Set up the prompt */ 825 /* Set up the prompt */
826 if (shell_context == 0) { 826 if (shell_context == 0) {
827 if (PS1) 827 if (PS1)
diff --git a/shell/cmdedit.c b/shell/cmdedit.c
index 1b5cbbfab..7f403b44f 100644
--- a/shell/cmdedit.c
+++ b/shell/cmdedit.c
@@ -55,7 +55,7 @@
55#define BB_FEATURE_COMMAND_TAB_COMPLETION 55#define BB_FEATURE_COMMAND_TAB_COMPLETION
56#define BB_FEATURE_COMMAND_USERNAME_COMPLETION 56#define BB_FEATURE_COMMAND_USERNAME_COMPLETION
57#define BB_FEATURE_NONPRINTABLE_INVERSE_PUT 57#define BB_FEATURE_NONPRINTABLE_INVERSE_PUT
58#undef BB_FEATURE_SIMPLE_PROMPT 58#undef BB_FEATURE_SH_SIMPLE_PROMPT
59#define BB_FEATURE_CLEAN_UP 59#define BB_FEATURE_CLEAN_UP
60 60
61#define D(x) x 61#define D(x) x
@@ -80,7 +80,7 @@
80#undef BB_FEATURE_COMMAND_USERNAME_COMPLETION 80#undef BB_FEATURE_COMMAND_USERNAME_COMPLETION
81#endif 81#endif
82 82
83#if defined(BB_FEATURE_COMMAND_USERNAME_COMPLETION) || !defined(BB_FEATURE_SIMPLE_PROMPT) 83#if defined(BB_FEATURE_COMMAND_USERNAME_COMPLETION) || !defined(BB_FEATURE_SH_SIMPLE_PROMPT)
84#define BB_FEATURE_GETUSERNAME_AND_HOMEDIR 84#define BB_FEATURE_GETUSERNAME_AND_HOMEDIR
85#endif 85#endif
86 86
@@ -178,7 +178,7 @@ static int cursor; /* required global for signal handler */
178static int len; /* --- "" - - "" - -"- --""-- --""--- */ 178static int len; /* --- "" - - "" - -"- --""-- --""--- */
179static char *command_ps; /* --- "" - - "" - -"- --""-- --""--- */ 179static char *command_ps; /* --- "" - - "" - -"- --""-- --""--- */
180static 180static
181#ifdef BB_FEATURE_SIMPLE_PROMPT 181#ifdef BB_FEATURE_SH_SIMPLE_PROMPT
182 const 182 const
183#endif 183#endif
184char *cmdedit_prompt; /* --- "" - - "" - -"- --""-- --""--- */ 184char *cmdedit_prompt; /* --- "" - - "" - -"- --""-- --""--- */
@@ -193,7 +193,7 @@ static char *home_pwd_buf = "";
193static int my_euid; 193static int my_euid;
194#endif 194#endif
195 195
196#ifndef BB_FEATURE_SIMPLE_PROMPT 196#ifndef BB_FEATURE_SH_SIMPLE_PROMPT
197static char *hostname_buf = ""; 197static char *hostname_buf = "";
198static int num_ok_lines = 1; 198static int num_ok_lines = 1;
199#endif 199#endif
@@ -362,7 +362,7 @@ static void put_prompt(void)
362 cursor = 0; 362 cursor = 0;
363} 363}
364 364
365#ifdef BB_FEATURE_SIMPLE_PROMPT 365#ifdef BB_FEATURE_SH_SIMPLE_PROMPT
366static void parse_prompt(const char *prmt_ptr) 366static void parse_prompt(const char *prmt_ptr)
367{ 367{
368 cmdedit_prompt = prmt_ptr; 368 cmdedit_prompt = prmt_ptr;
@@ -1510,7 +1510,7 @@ extern void cmdedit_read_input(char *prompt, char command[BUFSIZ])
1510 history_counter++; 1510 history_counter++;
1511 } 1511 }
1512 } 1512 }
1513#if !defined(BB_FEATURE_SIMPLE_PROMPT) 1513#if !defined(BB_FEATURE_SH_SIMPLE_PROMPT)
1514 num_ok_lines++; 1514 num_ok_lines++;
1515#endif 1515#endif
1516 } 1516 }
@@ -1519,7 +1519,7 @@ extern void cmdedit_read_input(char *prompt, char command[BUFSIZ])
1519#if defined(BB_FEATURE_CLEAN_UP) && defined(BB_FEATURE_COMMAND_TAB_COMPLETION) 1519#if defined(BB_FEATURE_CLEAN_UP) && defined(BB_FEATURE_COMMAND_TAB_COMPLETION)
1520 input_tab(0); /* strong free */ 1520 input_tab(0); /* strong free */
1521#endif 1521#endif
1522#if !defined(BB_FEATURE_SIMPLE_PROMPT) 1522#if !defined(BB_FEATURE_SH_SIMPLE_PROMPT)
1523 free(cmdedit_prompt); 1523 free(cmdedit_prompt);
1524#endif 1524#endif
1525 return; 1525 return;
@@ -1551,7 +1551,7 @@ int main(int argc, char **argv)
1551{ 1551{
1552 char buff[BUFSIZ]; 1552 char buff[BUFSIZ];
1553 char *prompt = 1553 char *prompt =
1554#if !defined(BB_FEATURE_SIMPLE_PROMPT) 1554#if !defined(BB_FEATURE_SH_SIMPLE_PROMPT)
1555 "\\[\\033[32;1m\\]\\u@\\[\\x1b[33;1m\\]\\h:\ 1555 "\\[\\033[32;1m\\]\\u@\\[\\x1b[33;1m\\]\\h:\
1556\\[\\033[34;1m\\]\\w\\[\\033[35;1m\\] \ 1556\\[\\033[34;1m\\]\\w\\[\\033[35;1m\\] \
1557\\!\\[\\e[36;1m\\]\\$ \\[\\E[0m\\]"; 1557\\!\\[\\e[36;1m\\]\\$ \\[\\E[0m\\]";
diff --git a/shell/lash.c b/shell/lash.c
index 49fb6b536..dcec14aba 100644
--- a/shell/lash.c
+++ b/shell/lash.c
@@ -440,7 +440,7 @@ static int builtin_export(struct child_prog *child)
440 res = putenv(v); 440 res = putenv(v);
441 if (res) 441 if (res)
442 fprintf(stderr, "export: %m\n"); 442 fprintf(stderr, "export: %m\n");
443#ifndef BB_FEATURE_SIMPLE_PROMPT 443#ifndef BB_FEATURE_SH_SIMPLE_PROMPT
444 if (strncmp(v, "PS1=", 4)==0) 444 if (strncmp(v, "PS1=", 4)==0)
445 PS1 = getenv("PS1"); 445 PS1 = getenv("PS1");
446 else if (strncmp(v, "PS2=", 4)==0) 446 else if (strncmp(v, "PS2=", 4)==0)
@@ -805,7 +805,7 @@ static void restore_redirects(int squirrel[])
805 805
806static inline void cmdedit_set_initial_prompt(void) 806static inline void cmdedit_set_initial_prompt(void)
807{ 807{
808#ifdef BB_FEATURE_SIMPLE_PROMPT 808#ifdef BB_FEATURE_SH_SIMPLE_PROMPT
809 PS1 = NULL; 809 PS1 = NULL;
810 PS2 = "> "; 810 PS2 = "> ";
811#else 811#else
@@ -821,7 +821,7 @@ static inline void cmdedit_set_initial_prompt(void)
821 821
822static inline void setup_prompt_string(char **prompt_str) 822static inline void setup_prompt_string(char **prompt_str)
823{ 823{
824#ifdef BB_FEATURE_SIMPLE_PROMPT 824#ifdef BB_FEATURE_SH_SIMPLE_PROMPT
825 /* Set up the prompt */ 825 /* Set up the prompt */
826 if (shell_context == 0) { 826 if (shell_context == 0) {
827 if (PS1) 827 if (PS1)
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-28 01:48:11 +0000