aboutsummaryrefslogtreecommitdiff
path: root/shell/msh.c
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2001-10-24 05:00:29 +0000
committerEric Andersen <andersen@codepoet.org>2001-10-24 05:00:29 +0000
commitbdfd0d78bc44e73d693510e70087857785b3b521 (patch)
tree153a573095afac8d8d0ea857759ecabd77fb28b7 /shell/msh.c
parent9260fc5552a3ee52eb95823aa6689d52a1ffd33c (diff)
downloadbusybox-w32-bdfd0d78bc44e73d693510e70087857785b3b521.tar.gz
busybox-w32-bdfd0d78bc44e73d693510e70087857785b3b521.tar.bz2
busybox-w32-bdfd0d78bc44e73d693510e70087857785b3b521.zip
Major rework of the directory structure and the entire build system.
-Erik
Diffstat (limited to 'shell/msh.c')
-rw-r--r--shell/msh.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/shell/msh.c b/shell/msh.c
index 5c4ec1019..a2f98c837 100644
--- a/shell/msh.c
+++ b/shell/msh.c
@@ -681,7 +681,7 @@ static void * brktop;
681static void * brkaddr; 681static void * brkaddr;
682 682
683 683
684#ifdef BB_FEATURE_COMMAND_EDITING 684#ifdef CONFIG_FEATURE_COMMAND_EDITING
685static char * current_prompt; 685static char * current_prompt;
686#endif 686#endif
687 687
@@ -732,7 +732,7 @@ extern int msh_main(int argc, char **argv)
732 setval(ifs, " \t\n"); 732 setval(ifs, " \t\n");
733 733
734 prompt = lookup("PS1"); 734 prompt = lookup("PS1");
735#ifdef BB_FEATURE_SH_FANCY_PROMPT 735#ifdef CONFIG_FEATURE_SH_FANCY_PROMPT
736 if (prompt->value == null) 736 if (prompt->value == null)
737#endif 737#endif
738 setval(prompt, "$ "); 738 setval(prompt, "$ ");
@@ -741,7 +741,7 @@ extern int msh_main(int argc, char **argv)
741 prompt->status &= ~EXPORT; 741 prompt->status &= ~EXPORT;
742 } 742 }
743 cprompt = lookup("PS2"); 743 cprompt = lookup("PS2");
744#ifdef BB_FEATURE_SH_FANCY_PROMPT 744#ifdef CONFIG_FEATURE_SH_FANCY_PROMPT
745 if (cprompt->value == null) 745 if (cprompt->value == null)
746#endif 746#endif
747 setval(cprompt, "> "); 747 setval(cprompt, "> ");
@@ -801,7 +801,7 @@ extern int msh_main(int argc, char **argv)
801 PUSHIO(afile, 0, iof); 801 PUSHIO(afile, 0, iof);
802 if (isatty(0) && isatty(1) && !cflag) { 802 if (isatty(0) && isatty(1) && !cflag) {
803 interactive++; 803 interactive++;
804#ifndef BB_FEATURE_SH_EXTRA_QUIET 804#ifndef CONFIG_FEATURE_SH_EXTRA_QUIET
805 printf( "\n\n" BB_BANNER " Built-in shell (msh)\n"); 805 printf( "\n\n" BB_BANNER " Built-in shell (msh)\n");
806 printf( "Enter 'help' for a list of built-in commands.\n\n"); 806 printf( "Enter 'help' for a list of built-in commands.\n\n");
807#endif 807#endif
@@ -835,7 +835,7 @@ extern int msh_main(int argc, char **argv)
835 835
836 for (;;) { 836 for (;;) {
837 if (interactive && e.iop <= iostack) { 837 if (interactive && e.iop <= iostack) {
838#ifdef BB_FEATURE_COMMAND_EDITING 838#ifdef CONFIG_FEATURE_COMMAND_EDITING
839 current_prompt=prompt->value; 839 current_prompt=prompt->value;
840#else 840#else
841 prs(prompt->value); 841 prs(prompt->value);
@@ -2171,7 +2171,7 @@ loop:
2171 startl = 1; 2171 startl = 1;
2172 if (multiline || cf & CONTIN) { 2172 if (multiline || cf & CONTIN) {
2173 if (interactive && e.iop <= iostack) { 2173 if (interactive && e.iop <= iostack) {
2174#ifdef BB_FEATURE_COMMAND_EDITING 2174#ifdef CONFIG_FEATURE_COMMAND_EDITING
2175 current_prompt=cprompt->value; 2175 current_prompt=cprompt->value;
2176#else 2176#else
2177 prs(cprompt->value); 2177 prs(cprompt->value);
@@ -2224,7 +2224,7 @@ register int c, c1;
2224 return(YYERRCODE); 2224 return(YYERRCODE);
2225 } 2225 }
2226 if (interactive && c == '\n' && e.iop <= iostack) { 2226 if (interactive && c == '\n' && e.iop <= iostack) {
2227#ifdef BB_FEATURE_COMMAND_EDITING 2227#ifdef CONFIG_FEATURE_COMMAND_EDITING
2228 current_prompt=cprompt->value; 2228 current_prompt=cprompt->value;
2229#else 2229#else
2230 prs(cprompt->value); 2230 prs(cprompt->value);
@@ -2838,9 +2838,9 @@ char *c, **v, **envp;
2838 register char *sp, *tp; 2838 register char *sp, *tp;
2839 int eacces = 0, asis = 0; 2839 int eacces = 0, asis = 0;
2840 2840
2841#ifdef BB_FEATURE_SH_STANDALONE_SHELL 2841#ifdef CONFIG_FEATURE_SH_STANDALONE_SHELL
2842 char *name = c; 2842 char *name = c;
2843#ifdef BB_FEATURE_SH_APPLETS_ALWAYS_WIN 2843#ifdef CONFIG_FEATURE_SH_APPLETS_ALWAYS_WIN
2844 name = get_last_path_component(name); 2844 name = get_last_path_component(name);
2845#endif 2845#endif
2846 optind = 1; 2846 optind = 1;
@@ -2960,7 +2960,7 @@ static int dohelp()
2960 col = 0; 2960 col = 0;
2961 } 2961 }
2962 } 2962 }
2963#ifdef BB_FEATURE_SH_STANDALONE_SHELL 2963#ifdef CONFIG_FEATURE_SH_STANDALONE_SHELL
2964 { 2964 {
2965 int i; 2965 int i;
2966 const struct BB_applet *applet; 2966 const struct BB_applet *applet;
@@ -4256,7 +4256,7 @@ readc()
4256 if (multiline) 4256 if (multiline)
4257 return e.iop->prev = 0; 4257 return e.iop->prev = 0;
4258 if (interactive && e.iop == iostack+1) { 4258 if (interactive && e.iop == iostack+1) {
4259#ifdef BB_FEATURE_COMMAND_EDITING 4259#ifdef CONFIG_FEATURE_COMMAND_EDITING
4260 current_prompt=prompt->value; 4260 current_prompt=prompt->value;
4261#else 4261#else
4262 prs(prompt->value); 4262 prs(prompt->value);
@@ -4462,7 +4462,7 @@ register struct ioarg *ap;
4462 return *bp->bufp++ & 0177; 4462 return *bp->bufp++ & 0177;
4463 } 4463 }
4464 4464
4465#ifdef BB_FEATURE_COMMAND_EDITING 4465#ifdef CONFIG_FEATURE_COMMAND_EDITING
4466 if (interactive) { 4466 if (interactive) {
4467 static char mycommand[BUFSIZ]; 4467 static char mycommand[BUFSIZ];
4468 static int position = 0, size = 0; 4468 static int position = 0, size = 0;
@@ -4721,7 +4721,7 @@ int ec;
4721 e.iobase = e.iop; 4721 e.iobase = e.iop;
4722 for (;;) { 4722 for (;;) {
4723 if (interactive && e.iop <= iostack) { 4723 if (interactive && e.iop <= iostack) {
4724#ifdef BB_FEATURE_COMMAND_EDITING 4724#ifdef CONFIG_FEATURE_COMMAND_EDITING
4725 current_prompt=cprompt->value; 4725 current_prompt=cprompt->value;
4726#else 4726#else
4727 prs(cprompt->value); 4727 prs(cprompt->value);
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-17 08:43:11 +0000