emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow multiple shells to be enabled.

Browse Source
This commit is contained in:
Matt Kraai
2001-08-01 17:21:35 +00:00
parent 0034443140
commit 2d91deba45
21 changed files with 225 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
shell/ash.c
View File

@@ -7638,7 +7638,7 @@ static void procargs (int, char **);
*/
int
shell_main(argc, argv)
ash_main(argc, argv)
int argc;
char **argv;
{
@@ -12874,7 +12874,7 @@ findvar(struct var **vpp, const char *name)
/*
* Copyright (c) 1999 Herbert Xu <herbert@debian.org>
* This file contains code for the times builtin.
* $Id: ash.c,v 1.15 2001/07/31 21:38:23 andersen Exp $
* $Id: ash.c,v 1.16 2001/08/01 17:21:33 kraai Exp $
*/
static int timescmd (int argc, char **argv)
{

8
shell/hush.c
View File

@@ -112,7 +112,7 @@
#else
#define applet_name "hush"
#include "standalone.h"
#define shell_main main
#define hush_main main
#undef BB_FEATURE_SH_FANCY_PROMPT
#endif
@@ -2562,7 +2562,7 @@ static void setup_job_control()
tcsetpgrp(shell_terminal, shell_pgrp);
}
int shell_main(int argc, char **argv)
int hush_main(int argc, char **argv)
{
int opt;
FILE *input;
@@ -2572,8 +2572,8 @@ int shell_main(int argc, char **argv)
global_argc = argc;
global_argv = argv;
/* (re?) initialize globals. Sometimes shell_main() ends up calling
* shell_main(), therefore we cannot rely on the BSS to zero out this
/* (re?) initialize globals. Sometimes hush_main() ends up calling
* hush_main(), therefore we cannot rely on the BSS to zero out this
* stuff. Reset these to 0 every time. */
ifs = NULL;
/* map[] is taken care of with call to update_ifs_map() */

2
shell/lash.c
View File

@@ -1545,7 +1545,7 @@ static void setup_job_control()
tcsetpgrp(shell_terminal, shell_pgrp);
}
int shell_main(int argc_l, char **argv_l)
int lash_main(int argc_l, char **argv_l)
{
int opt, interactive=FALSE;
FILE *input = stdin;

4
shell/msh.c
View File

@@ -143,7 +143,7 @@ static int newfile(char *s);
static char *findeq(char *cp);
static char *cclass(char *p, int sub);
static void initarea(void);
extern int shell_main(int argc, char **argv);
extern int msh_main(int argc, char **argv);
struct brkcon {
@@ -692,7 +692,7 @@ static char * current_prompt;
*/
extern int shell_main(int argc, char **argv)
extern int msh_main(int argc, char **argv)
{
register int f;
register char *s;