* Minix shell port for busybox
*
* This version of the Minix shell was adapted for use in busybox
- * by Erik Andersen <andersee@debian.org>
+ * by Erik Andersen <andersen@codepoet.org>
+ *
+ * - backtick expansion did not work properly
+ * Jonas Holmberg <jonas.holmberg@axis.com>
+ * Robert Schwebel <r.schwebel@pengutronix.de>
+ * Erik Andersen <andersen@codepoet.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#define LINELIM 2100
#define NPUSH 8 /* limit to input nesting */
+#undef NOFILE
#define NOFILE 20 /* Number of open files */
#define NUFILE 10 /* Number of user-accessible files */
#define FDBASE 10 /* First file usable by Shell */
/*
* other functions
*/
-static int (*inbuilt(char *s ))(void);
+static int(*inbuilt(char *s))(struct op *);
+
static char *rexecve (char *c , char **v, char **envp );
static char *space (int n );
static char *strsave (char *s, int a );
static char *evalstr (char *cp, int f );
static char *putn (int n );
-static char *itoa (unsigned u, int n );
+static char *itoa (int n );
static char *unquote (char *as );
static struct var *lookup (char *n );
static int rlookup (char *n );
/* an input generator's state */
struct io {
- int (*iofn)();
+ int (*iofn)(struct ioarg *, struct io *);
struct ioarg *argp;
int peekc;
char prev; /* previous character read by readc() */
static void gethere (void);
static void markhere (char *s, struct ioword *iop );
static int herein (char *hname, int xdoll );
-static int run (struct ioarg *argp, int (*f)());
+static int run (struct ioarg *argp, int (*f)(struct ioarg *));
/*
* IO functions
/*
* IO control
*/
-static void pushio (struct ioarg *argp, int (*fn)());
+static void pushio (struct ioarg *argp, int (*f)(struct ioarg *));
static int remap (int fd );
static int openpipe (int *pv );
static void closepipe (int *pv );
static struct op **find1case (struct op *t, char *w );
static struct op *findcase (struct op *t, char *w );
static void brkset(struct brkcon *bc );
-static int dolabel(void);
-static int dohelp(void);
+static int dolabel(struct op *t );
+static int dohelp(struct op *t );
static int dochdir(struct op *t );
static int doshift(struct op *t );
static int dologin(struct op *t );
static int doeval(struct op *t );
static int dotrap(struct op *t );
static int getsig(char *s );
-static void setsig (int n, void (*f)());
+static void setsig (int n, sighandler_t f);
static int getn(char *as );
static int dobreak(struct op *t );
static int docontinue(struct op *t );
static int doexit(struct op *t );
static int doexport(struct op *t );
static int doreadonly(struct op *t );
-static void rdexp (char **wp, void (*f)(), int key);
+static void rdexp (char **wp, void (*f)(struct var *), int key);
static void badid(char *s );
static int doset(struct op *t );
static void varput (char *s, int out );
-static int dotimes(void);
+static int dotimes(struct op *t );
static int expand (char *cp, struct wdblock **wbp, int f );
static char *blank(int f );
static int dollar(int quoted );
static void glob2 (char *i, char *j );
static void glob3 (char *i, char *j, char *k );
static void readhere (char **name, char *s, int ec );
-static void pushio(struct ioarg *argp, int (*fn)());
+static void pushio (struct ioarg *argp, int (*f)(struct ioarg *));
static int xxchar(struct ioarg *ap );
struct here {
struct builtincmd {
const char *name;
- int (*builtinfunc)();
+ int (*builtinfunc)(struct op *t);
};
static const struct builtincmd builtincmds[] = {
{".", dodot},
static struct env e ={line, iostack, iostack-1, (xint *)NULL, FDBASE, (struct env *)NULL};
static void (*qflag)(int) = SIG_IGN;
static char shellname[] = "/bin/sh";
-static char search[] = ":/bin:/usr/bin";
static int startl;
static int peeksym;
static int nlseen;
static char * current_prompt;
#endif
-
/* -------- sh.c -------- */
/*
* shell
register char *s;
int cflag;
char *name, **ap;
- int (*iof)();
+ int (*iof)(struct ioarg *);
initarea();
if ((ap = environ) != NULL) {
setval(homedir, "/");
export(homedir);
- setval(lookup("$"), itoa(getpid(), 5));
+ setval(lookup("$"), putn(getpid()));
path = lookup("PATH");
- if (path->value == null)
- setval(path, search);
+ if (path->value == null) {
+ if (geteuid() == 0)
+ setval(path, "/sbin:/bin:/usr/sbin:/usr/bin");
+ else
+ setval(path, "/bin:/usr/bin");
+ }
export(path);
ifs = lookup("IFS");
#endif
}
onecommand();
+ /* Ensure that getenv("PATH") stays current */
+ setenv("PATH", path->value, 1);
}
}
cp = m;
for (c='a'; c<='z'; c++)
- if (flag[c])
+ if (flag[(int)c])
*cp++ = c;
*cp = 0;
setval(lookup("-"), m);
putn(n)
register int n;
{
- return(itoa(n, -1));
+ return(itoa(n));
}
static char *
-itoa(u, n)
-register unsigned u;
-int n;
+itoa(n)
+register int n;
{
- register char *cp;
static char s[20];
- int m;
-
- m = 0;
- if (n < 0 && (int) u < 0) {
- m++;
- u = -u;
- }
- cp = s+sizeof(s);
- *--cp = 0;
- do {
- *--cp = u%10 + '0';
- u /= 10;
- } while (--n > 0 || u);
- if (m)
- *--cp = '-';
- return(cp);
+ snprintf(s, sizeof(s), "%u", n);
+ return(s);
}
static void
-next(f)
-int f;
+next(int f)
{
PUSHIO(afile, f, filechar);
}
switch(t->type) {
case TPAREN:
+ rv = execute(t->left, pin, pout, 0);
+ break;
+
case TCOM:
{
int child;
forkexec( register struct op *t, int *pin, int *pout, int act, char **wp, int *pforked)
{
int i, rv;
- int (*shcom)() = NULL;
+ int (*shcom)(struct op *) = NULL;
register int f;
char *cp = NULL;
struct ioword **iopp;
#ifdef CONFIG_FEATURE_SH_STANDALONE_SHELL
char *name = c;
#ifdef CONFIG_FEATURE_SH_APPLETS_ALWAYS_WIN
- name = get_last_path_component(name);
+ name = bb_get_last_path_component(name);
#endif
optind = 1;
if (find_applet_by_name(name)) {
*v = e.linep;
tp = *--v;
*v = e.linep;
- execve("/bin/sh", v, envp);
+ execve(shellname, v, envp);
*v = tp;
return("no Shell");
case ENOMEM:
- return("program too big");
+ return((char*)bb_msg_memory_exhausted);
case E2BIG:
return("argument list too long");
* applied to stream `arg'.
*/
static int
-run(argp, f)
-struct ioarg *argp;
-int (*f)();
+run(struct ioarg *argp, int (*f)(struct ioarg *))
{
struct op *otree;
struct wdblock *swdlist;
* built-in commands: doX
*/
-static int dohelp()
+static int dohelp(struct op *t )
{
int col;
const struct builtincmd *x;
-static int
-dolabel()
+static int dolabel(struct op *t )
{
return(0);
}
}
static void
-setsig( register int n, void (*f)(int))
+setsig( register int n, sighandler_t f)
{
if (n == 0)
return;
return(0);
}
-static void
-rdexp(wp, f, key)
-register char **wp;
-void (*f)();
-int key;
+static void rdexp (char **wp, void (*f)(struct var *), int key)
{
if (*wp != NULL) {
for (; *wp != NULL; wp++) {
* Copyright (c) 1999 Herbert Xu <herbert@debian.org>
* This file contains code for the times builtin.
*/
-static int dotimes ()
+static int dotimes(struct op *t )
{
struct tms buf;
long int clk_tck = sysconf(_SC_CLK_TCK);
}
-static int (*inbuilt(char *s))()
+static int(*inbuilt(char *s))(struct op *)
{
const struct builtincmd *bp;
if (strcmp(bp->name, s) == 0)
return(bp->builtinfunc);
- return((int(*)())NULL);
+ return(NULL);
}
/* -------- eval.c -------- */
*/
static int
subgetc(ec, quoted)
-register int ec;
+register char ec;
int quoted;
{
register char c;
/*
* Run the command in `...` and read its output.
*/
+
static int
grave(quoted)
int quoted;
{
- register int i;
char *cp;
+ register int i;
+ int j;
int pf[2];
+ static char child_cmd[LINELIM];
+ char *src;
+ char *dest;
+ int count;
+ int ignore;
+ int ignore_once;
+ char *argument_list[4];
#if __GNUC__
/* Avoid longjmp clobbering */
(void) &cp;
#endif
+
for (cp = e.iop->argp->aword; *cp != '`'; cp++)
if (*cp == 0) {
err("no closing `");
return(0);
}
+
+ /* string copy with dollar expansion */
+ src = e.iop->argp->aword;
+ dest = child_cmd;
+ count = 0;
+ ignore = 0;
+ ignore_once = 0;
+ while ((*src != '`') && (count < LINELIM)) {
+ if (*src == '\'')
+ ignore = !ignore;
+ if (*src == '\\')
+ ignore_once = 1;
+ if (*src == '$' && !ignore && !ignore_once) {
+ struct var *vp;
+ char var_name[LINELIM];
+ char alt_value[LINELIM];
+ int var_index = 0;
+ int alt_index = 0;
+ char operator = 0;
+ int braces = 0;
+ char *value;
+
+ src++;
+ if (*src == '{') {
+ braces = 1;
+ src++;
+ }
+
+ var_name[var_index++] = *src++;
+ while (isalnum(*src))
+ var_name[var_index++] = *src++;
+ var_name[var_index] = 0;
+
+ if (braces) {
+ switch (*src) {
+ case '}':
+ break;
+ case '-':
+ case '=':
+ case '+':
+ case '?':
+ operator = *src;
+ break;
+ default:
+ err("unclosed ${\n");
+ return(0);
+ }
+ if (operator) {
+ src++;
+ while (*src && (*src != '}')) {
+ alt_value[alt_index++] = *src++;
+ }
+ alt_value[alt_index] = 0;
+ if (*src != '}') {
+ err("unclosed ${\n");
+ return(0);
+ }
+ }
+ src++;
+ }
+
+ vp = lookup(var_name);
+ if (vp->value != null)
+ value = (operator == '+')? alt_value : vp->value;
+ else if (operator == '?') {
+ err(alt_value);
+ return(0);
+ } else if (alt_index && (operator != '+')) {
+ value = alt_value;
+ if (operator == '=')
+ setval(vp, value);
+ } else
+ continue;
+
+ while (*value && (count < LINELIM)) {
+ *dest++ = *value++;
+ count++;
+ }
+ } else {
+ *dest++ = *src++;
+ count++;
+ ignore_once = 0;
+ }
+ }
+ *dest = '\0';
+
if (openpipe(pf) < 0)
return(0);
- if ((i = vfork()) == -1) {
+ while ((i = vfork()) == -1 && errno == EAGAIN)
+ ;
+ if (i < 0) {
closepipe(pf);
- err("try again");
+ err((char*)bb_msg_memory_exhausted);
return(0);
}
if (i != 0) {
+ waitpid(i, NULL, 0);
e.iop->argp->aword = ++cp;
close(pf[1]);
- PUSHIO(afile, remap(pf[0]), quoted? qgravechar: gravechar);
+ PUSHIO(afile, remap(pf[0]), (int(*)(struct ioarg *))((quoted)? qgravechar: gravechar));
return(1);
}
- *cp = 0;
/* allow trapped signals */
- for (i=0; i<=_NSIG; i++)
- if (ourtrap[i] && signal(i, SIG_IGN) != SIG_IGN)
- signal(i, SIG_DFL);
+ /* XXX - Maybe this signal stuff should go as well? */
+ for (j=0; j<=_NSIG; j++)
+ if (ourtrap[j] && signal(j, SIG_IGN) != SIG_IGN)
+ signal(j, SIG_DFL);
+
dup2(pf[1], 1);
closepipe(pf);
- flag['e'] = 0;
- flag['v'] = 0;
- flag['n'] = 0;
- cp = strsave(e.iop->argp->aword, 0);
- areanum = 1;
- freehere(areanum);
- freearea(areanum); /* free old space */
- e.oenv = NULL;
- e.iop = (e.iobase = iostack) - 1;
- unquote(cp);
- interactive = 0;
- PUSHIO(aword, cp, nlchar);
- onecommand();
- exit(1);
+
+ argument_list[0] = shellname;
+ argument_list[1] = "-c";
+ argument_list[2] = child_cmd;
+ argument_list[3] = 0;
+
+ prs(rexecve(argument_list[0], argument_list, makenv()));
+ _exit(1);
}
+
static char *
unquote(as)
register char *as;
return(c);
}
c = readc();
- if (ec != '\'' && e.iop->task != XGRAVE) {
+ if ((ec != '\'') && (ec != '`') && (e.iop->task != XGRAVE)) {
if(c == '\\') {
c = readc();
if (c == '\n' && ec != '\"')
}
static void
-pushio(argp, fn)
-struct ioarg *argp;
-int (*fn)();
+pushio(struct ioarg *argp, int (*fn)(struct ioarg *))
{
if (++e.iop >= &iostack[NPUSH]) {
e.iop--;
gflg++;
return;
}
- e.iop->iofn = fn;
+ e.iop->iofn = (int (*)(struct ioarg *, struct io *))fn;
if (argp->afid != AFID_NOBUF)
e.iop->argp = argp;
e.iop->nlcount = 0;
if (fn == filechar || fn == linechar)
e.iop->task = XIO;
- else if (fn == gravechar || fn == qgravechar)
+ else if (fn == (int(*)(struct ioarg *))gravechar || fn == (int(*)(struct ioarg *))qgravechar)
e.iop->task = XGRAVE;
else
e.iop->task = XOTHER;
}
#ifdef CONFIG_FEATURE_COMMAND_EDITING
- if (interactive) {
+ if (interactive && isatty(ap->afile)) {
static char mycommand[BUFSIZ];
static int position = 0, size = 0;
prn(u)
unsigned u;
{
- prs(itoa(u, 0));
+ prs(itoa(u));
}
static void
if (newenv(setjmp(errpt = ev)) != 0)
unlink(tname);
else {
- pushio(e.iop->argp, e.iop->iofn);
+ pushio(e.iop->argp, (int(*)(struct ioarg *))e.iop->iofn);
e.iobase = e.iop;
for (;;) {
if (interactive && e.iop <= iostack) {
projects / oweals / busybox.git / blobdiff