X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=shell%2Fash.c;h=713898a9f598459fc59f37168df9f522dd0e1c63;hb=f94637959902b54b2a1c44e3608fa77158856005;hp=80145dae5fc3e7d79b185b72b753d91e4e9d472f;hpb=67285965f3d2c266ee37fec17d339b717752f8b0;p=oweals%2Fbusybox.git diff --git a/shell/ash.c b/shell/ash.c index 80145dae5..713898a9f 100644 --- a/shell/ash.c +++ b/shell/ash.c @@ -5,26 +5,14 @@ * Copyright (c) 1989, 1991, 1993, 1994 * The Regents of the University of California. All rights reserved. * - * Copyright (c) 1997-2003 Herbert Xu + * Copyright (c) 1997-2005 Herbert Xu * was re-ported from NetBSD and debianized. * * * This code is derived from software contributed to Berkeley by * Kenneth Almquist. * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. * * Original BSD copyright notice is retained at the end of this file. */ @@ -33,9 +21,13 @@ * rewrite arith.y to micro stack based cryptic algorithm by * Copyright (c) 2001 Aaron Lehmann * - * Modified by Vladimir Oleynik (c) 2001-2003 to be + * Modified by Paul Mundt (c) 2004 to support + * dynamic variables. + * + * Modified by Vladimir Oleynik (c) 2001-2005 to be * used in busybox and size optimizations, - * support locale, rewrited arith (see notes to this) + * rewrote arith (see notes to this), added locale support, + * rewrote dynamic variables. * */ @@ -52,22 +44,21 @@ */ - #define IFS_BROKEN #define PROFILE 0 +#include "busybox.h" + #ifdef DEBUG #define _GNU_SOURCE #endif #include -#include #include #include #include #include -#include #include #include @@ -86,13 +77,10 @@ #include #include #include -#include -#include - +/*#include */ +#include #include - -#include "busybox.h" #include "pwd_.h" #ifdef CONFIG_ASH_JOB_CONTROL @@ -101,7 +89,7 @@ #undef JOBS #endif -#if JOBS +#if JOBS || defined(CONFIG_ASH_READ_NCHARS) #include #endif @@ -126,7 +114,7 @@ static int *dash_errno; #ifdef CONFIG_ASH_ALIAS -/* $NetBSD: alias.h,v 1.5 2002/11/24 22:35:38 christos Exp $ */ +/* alias.h */ #define ALIASINUSE 1 #define ALIASDEAD 2 @@ -146,12 +134,12 @@ static int unalias(const char *); static void printalias(const struct alias *); #endif -/* $NetBSD: cd.h,v 1.3 2002/11/24 22:35:39 christos Exp $ */ +/* cd.h */ static void setpwd(const char *, int); -/* $NetBSD: error.h,v 1.15 2002/11/24 22:35:39 christos Exp $ */ +/* error.h */ /* @@ -170,7 +158,7 @@ static const char not_found_msg[] = "%s: not found"; * We enclose jmp_buf in a structure so that we can declare pointers to * jump locations. The global variable handler contains the location to * jump to when an exception occurs, and the global variable exception - * contains a code identifying the exeception. To implement nested + * contains a code identifying the exception. To implement nested * exception handlers, the user should save the value of handler on entry * to an inner scope, set handler to point to a jmploc structure for the * inner scope, and restore handler on exit from the scope. @@ -185,8 +173,6 @@ static int exception; static volatile int suppressint; static volatile sig_atomic_t intpending; -static int exerrno; /* Last exec error, error for EXEXEC */ - /* exceptions */ #define EXINT 0 /* SIGINT received */ #define EXERROR 1 /* a generic error */ @@ -208,24 +194,24 @@ static volatile sig_atomic_t pendingsigs; * more fun than worrying about efficiency and portability. :-)) */ -#define barrier() ({ __asm__ __volatile__ ("": : :"memory"); }) +#define xbarrier() ({ __asm__ __volatile__ ("": : :"memory"); }) #define INTOFF \ ({ \ suppressint++; \ - barrier(); \ + xbarrier(); \ 0; \ }) #define SAVEINT(v) ((v) = suppressint) #define RESTOREINT(v) \ ({ \ - barrier(); \ + xbarrier(); \ if ((suppressint = (v)) == 0 && intpending) onint(); \ 0; \ }) #define EXSIGON() \ ({ \ exsig++; \ - barrier(); \ + xbarrier(); \ if (pendingsigs) \ exraise(EXSIG); \ 0; \ @@ -233,11 +219,11 @@ static volatile sig_atomic_t pendingsigs; /* EXSIG is turned off by evalbltin(). */ -static void exraise(int) __attribute__((__noreturn__)); -static void onint(void) __attribute__((__noreturn__)); +static void exraise(int) ATTRIBUTE_NORETURN; +static void onint(void) ATTRIBUTE_NORETURN; -static void error(const char *, ...) __attribute__((__noreturn__)); -static void exerror(int, const char *, ...) __attribute__((__noreturn__)); +static void sh_error(const char *, ...) ATTRIBUTE_NORETURN; +static void exerror(int, const char *, ...) ATTRIBUTE_NORETURN; static void sh_warnx(const char *, ...); @@ -259,30 +245,20 @@ static void forceinton(void) #else #define INTON \ ({ \ - barrier(); \ + xbarrier(); \ if (--suppressint == 0 && intpending) onint(); \ 0; \ }) #define FORCEINTON \ ({ \ - barrier(); \ + xbarrier(); \ suppressint = 0; \ if (intpending) onint(); \ 0; \ }) #endif /* CONFIG_ASH_OPTIMIZE_FOR_SIZE */ -/* - * BSD setjmp saves the signal mask, which violates ANSI C and takes time, - * so we use _setjmp instead. - */ - -#if defined(BSD) && !defined(__SVR4) && !defined(__GLIBC__) -#define setjmp(jmploc) _setjmp(jmploc) -#define longjmp(jmploc, val) _longjmp(jmploc, val) -#endif - -/* $NetBSD: expand.h,v 1.13 2002/11/24 22:35:40 christos Exp $ */ +/* expand.h */ struct strlist { struct strlist *next; @@ -319,7 +295,7 @@ static int casematch(union node *, char *); static void expari(int); #endif -/* $NetBSD: eval.h,v 1.13 2002/11/24 22:35:39 christos Exp $ */ +/* eval.h */ static char *commandname; /* currently executing command */ static struct strlist *cmdenviron; /* environment for builtin command */ @@ -498,7 +474,7 @@ struct funcnode { static void freefunc(struct funcnode *); -/* $NetBSD: parser.h,v 1.15 2002/11/24 22:35:42 christos Exp $ */ +/* parser.h */ /* control characters in argument strings */ #define CTL_FIRST '\201' /* first 'special' character */ @@ -574,7 +550,7 @@ struct parsefile { }; static struct parsefile basepf; /* top level input file */ -static char basebuf[IBUFSIZ]; /* buffer for top level input file */ +#define basebuf bb_common_bufsiz1 /* buffer for top level input file */ static struct parsefile *parsefile = &basepf; /* current input file */ @@ -597,7 +573,7 @@ static void fixredir(union node *, const char *, int); static const char *const *findkwd(const char *); static char *endofname(const char *); -/* $NetBSD: shell.h,v 1.16 2003/01/22 20:36:04 dsl Exp $ */ +/* shell.h */ typedef void *pointer; @@ -620,7 +596,7 @@ static const char homestr[] = "HOME"; #define __builtin_expect(x, expected_value) (x) #endif -#define likely(x) __builtin_expect((x),1) +#define xlikely(x) __builtin_expect((x),1) #define TEOF 0 @@ -699,7 +675,7 @@ static const char *tokname(int tok) return buf; } -/* $NetBSD: machdep.h,v 1.10 2002/10/07 14:26:08 christos Exp $ */ +/* machdep.h */ /* * Most machines require the value returned from malloc to be aligned @@ -750,6 +726,9 @@ static const char *tokname(int tok) #define is_name(c) ((c) == '_' || isalpha((unsigned char)(c))) #define is_in_name(c) ((c) == '_' || isalnum((unsigned char)(c))) +/* C99 say: "char" declaration may be signed or unsigned default */ +#define SC2INT(chr2may_be_negative_int) (int)((signed char)chr2may_be_negative_int) + /* * is_special(c) evaluates to 1 for c in "!#$*-0123456789?@"; 0 otherwise * (assuming ascii char codes, as the original implementation did) @@ -863,7 +842,7 @@ static int SIT(int c, int syntax) return S_I_T[indx][syntax]; } -#else /* USE_SIT_FUNCTION */ +#else /* USE_SIT_FUNCTION */ #define SIT(c, syntax) S_I_T[(int)syntax_index_table[((int)c)+SYNBASE]][syntax] @@ -1164,9 +1143,9 @@ static const char syntax_index_table[258] = { /* 257 127 */ CWORD_CWORD_CWORD_CWORD, }; -#endif /* USE_SIT_FUNCTION */ +#endif /* USE_SIT_FUNCTION */ -/* $NetBSD: alias.c,v 1.11 2002/11/24 22:35:38 christos Exp $ */ +/* alias.c */ #define ATABSIZE 39 @@ -1213,29 +1192,27 @@ static struct nodelist *copynodelist(struct nodelist *); static char *nodesavestr(char *); - -static void evalstring(char *); +static int evalstring(char *, int mask); union node; /* BLETCH for ansi C */ static void evaltree(union node *, int); static void evalbackcmd(union node *, struct backcmd *); -/* in_function returns nonzero if we are currently evaluating a function */ -#define in_function() funcnest static int evalskip; /* set if we are skipping commands */ static int skipcount; /* number of levels to skip */ static int funcnest; /* depth of function calls */ /* reasons for skipping commands (see comment on breakcmd routine) */ -#define SKIPBREAK 1 -#define SKIPCONT 2 -#define SKIPFUNC 3 -#define SKIPFILE 4 +#define SKIPBREAK (1 << 0) +#define SKIPCONT (1 << 1) +#define SKIPFUNC (1 << 2) +#define SKIPFILE (1 << 3) +#define SKIPEVAL (1 << 4) /* * This file was generated by the mkbuiltins program. */ -#ifdef JOBS +#if JOBS static int bgcmd(int, char **); #endif static int breakcmd(int, char **); @@ -1245,11 +1222,17 @@ static int commandcmd(int, char **); #endif static int dotcmd(int, char **); static int evalcmd(int, char **); +#ifdef CONFIG_ASH_BUILTIN_ECHO +static int echocmd(int, char **); +#endif +#ifdef CONFIG_ASH_BUILTIN_TEST +static int testcmd(int, char **); +#endif static int execcmd(int, char **); static int exitcmd(int, char **); static int exportcmd(int, char **); static int falsecmd(int, char **); -#ifdef JOBS +#if JOBS static int fgcmd(int, char **); #endif #ifdef CONFIG_ASH_GETOPTS @@ -1259,7 +1242,7 @@ static int hashcmd(int, char **); #ifndef CONFIG_FEATURE_SH_EXTRA_QUIET static int helpcmd(int argc, char **argv); #endif -#ifdef JOBS +#if JOBS static int jobscmd(int, char **); #endif #ifdef CONFIG_ASH_MATH_SUPPORT @@ -1279,18 +1262,18 @@ static int umaskcmd(int, char **); static int unsetcmd(int, char **); static int waitcmd(int, char **); static int ulimitcmd(int, char **); -#ifdef JOBS +#if JOBS static int killcmd(int, char **); #endif -/* $NetBSD: mail.h,v 1.9 2002/11/24 22:35:40 christos Exp $ */ +/* mail.h */ #ifdef CONFIG_ASH_MAIL static void chkmail(void); static void changemail(const char *); #endif -/* $NetBSD: exec.h,v 1.20 2003/01/22 20:36:04 dsl Exp $ */ +/* exec.h */ /* values of cmdtype */ #define CMDUNKNOWN -1 /* no entry in table for command */ @@ -1304,39 +1287,17 @@ struct builtincmd { /* unsigned flags; */ }; -#ifdef CONFIG_ASH_CMDCMD -# ifdef JOBS -# ifdef CONFIG_ASH_ALIAS -# define COMMANDCMD (builtincmd + 7) -# define EXECCMD (builtincmd + 10) -# else -# define COMMANDCMD (builtincmd + 6) -# define EXECCMD (builtincmd + 9) -# endif -# else /* ! JOBS */ -# ifdef CONFIG_ASH_ALIAS -# define COMMANDCMD (builtincmd + 6) -# define EXECCMD (builtincmd + 9) -# else -# define COMMANDCMD (builtincmd + 5) -# define EXECCMD (builtincmd + 8) -# endif -# endif /* JOBS */ -#else /* ! CONFIG_ASH_CMDCMD */ -# ifdef JOBS -# ifdef CONFIG_ASH_ALIAS -# define EXECCMD (builtincmd + 9) -# else -# define EXECCMD (builtincmd + 8) -# endif -# else /* ! JOBS */ -# ifdef CONFIG_ASH_ALIAS -# define EXECCMD (builtincmd + 8) -# else -# define EXECCMD (builtincmd + 7) -# endif -# endif /* JOBS */ -#endif /* CONFIG_ASH_CMDCMD */ + +#define COMMANDCMD (builtincmd + 5 + \ + 2 * ENABLE_ASH_BUILTIN_TEST + \ + ENABLE_ASH_ALIAS + \ + ENABLE_ASH_JOB_CONTROL) +#define EXECCMD (builtincmd + 7 + \ + 2 * ENABLE_ASH_BUILTIN_TEST + \ + ENABLE_ASH_ALIAS + \ + ENABLE_ASH_JOB_CONTROL + \ + ENABLE_ASH_CMDCMD + \ + ENABLE_ASH_BUILTIN_ECHO) #define BUILTIN_NOSPEC "0" #define BUILTIN_SPECIAL "1" @@ -1349,14 +1310,19 @@ struct builtincmd { #define IS_BUILTIN_SPECIAL(builtincmd) ((builtincmd)->name[0] & 1) #define IS_BUILTIN_REGULAR(builtincmd) ((builtincmd)->name[0] & 2) +#define IS_BUILTIN_ASSIGN(builtincmd) ((builtincmd)->name[0] & 4) static const struct builtincmd builtincmd[] = { { BUILTIN_SPEC_REG ".", dotcmd }, { BUILTIN_SPEC_REG ":", truecmd }, +#ifdef CONFIG_ASH_BUILTIN_TEST + { BUILTIN_REGULAR "[", testcmd }, + { BUILTIN_REGULAR "[[", testcmd }, +#endif #ifdef CONFIG_ASH_ALIAS { BUILTIN_REG_ASSG "alias", aliascmd }, #endif -#ifdef JOBS +#if JOBS { BUILTIN_REGULAR "bg", bgcmd }, #endif { BUILTIN_SPEC_REG "break", breakcmd }, @@ -1366,12 +1332,15 @@ static const struct builtincmd builtincmd[] = { { BUILTIN_REGULAR "command", commandcmd }, #endif { BUILTIN_SPEC_REG "continue", breakcmd }, +#ifdef CONFIG_ASH_BUILTIN_ECHO + { BUILTIN_REGULAR "echo", echocmd }, +#endif { BUILTIN_SPEC_REG "eval", evalcmd }, { BUILTIN_SPEC_REG "exec", execcmd }, { BUILTIN_SPEC_REG "exit", exitcmd }, { BUILTIN_SPEC_REG_ASSG "export", exportcmd }, { BUILTIN_REGULAR "false", falsecmd }, -#ifdef JOBS +#if JOBS { BUILTIN_REGULAR "fg", fgcmd }, #endif #ifdef CONFIG_ASH_GETOPTS @@ -1381,7 +1350,7 @@ static const struct builtincmd builtincmd[] = { #ifndef CONFIG_FEATURE_SH_EXTRA_QUIET { BUILTIN_NOSPEC "help", helpcmd }, #endif -#ifdef JOBS +#if JOBS { BUILTIN_REGULAR "jobs", jobscmd }, { BUILTIN_REGULAR "kill", killcmd }, #endif @@ -1394,7 +1363,11 @@ static const struct builtincmd builtincmd[] = { { BUILTIN_SPEC_REG_ASSG "readonly", exportcmd }, { BUILTIN_SPEC_REG "return", returncmd }, { BUILTIN_SPEC_REG "set", setcmd }, + { BUILTIN_SPEC_REG "source", dotcmd }, { BUILTIN_SPEC_REG "shift", shiftcmd }, +#ifdef CONFIG_ASH_BUILTIN_TEST + { BUILTIN_REGULAR "test", testcmd }, +#endif { BUILTIN_SPEC_REG "times", timescmd }, { BUILTIN_SPEC_REG "trap", trapcmd }, { BUILTIN_REGULAR "true", truecmd }, @@ -1432,7 +1405,7 @@ struct cmdentry { static const char *pathopt; /* set by padvance */ static void shellexec(char **, const char *, int) - __attribute__((__noreturn__)); + ATTRIBUTE_NORETURN; static char *padvance(const char **, const char *); static void find_command(char *, struct cmdentry *, int, const char *); static struct builtincmd *find_builtin(const char *); @@ -1441,15 +1414,32 @@ static void changepath(const char *); static void defun(char *, union node *); static void unsetfunc(const char *); +#ifdef CONFIG_ASH_MATH_SUPPORT_64 +typedef int64_t arith_t; +#define arith_t_type (long long) +#else +typedef long arith_t; +#define arith_t_type (long) +#endif + #ifdef CONFIG_ASH_MATH_SUPPORT -static int dash_arith(const char *); +static arith_t dash_arith(const char *); +static arith_t arith(const char *expr, int *perrcode); +#endif + +#ifdef CONFIG_ASH_RANDOM_SUPPORT +static unsigned long rseed; +static void change_random(const char *); +# ifndef DYNAMIC_VAR +# define DYNAMIC_VAR +# endif #endif -/* $NetBSD: init.h,v 1.9 2002/11/24 22:35:40 christos Exp $ */ +/* init.h */ static void reset(void); -/* $NetBSD: var.h,v 1.21 2003/01/22 20:36:04 dsl Exp $ */ +/* var.h */ /* * Shell variables. @@ -1465,14 +1455,17 @@ static void reset(void); #define VNOFUNC 0x40 /* don't call the callback function */ #define VNOSET 0x80 /* do not set variable - just readonly test */ #define VNOSAVE 0x100 /* when text is on the heap before setvareq */ - +#ifdef DYNAMIC_VAR +# define VDYNAMIC 0x200 /* dynamic variable */ +# else +# define VDYNAMIC 0 +#endif struct var { struct var *next; /* next entry in hash list */ int flags; /* flags are defined above */ const char *text; /* name=value */ - void (*func)(const char *); - /* function to be called when */ + void (*func)(const char *); /* function to be called when */ /* the variable gets set/unset */ }; @@ -1500,6 +1493,7 @@ static void change_lc_all(const char *value); static void change_lc_ctype(const char *value); #endif + #define VTABSIZE 39 static const char defpathvar[] = "PATH=/usr/local/bin:/usr/bin:/sbin:/bin"; @@ -1524,18 +1518,21 @@ static struct var varinit[] = { #endif { 0, VSTRFIXED|VTEXTFIXED, defpathvar, changepath }, - { 0, VSTRFIXED|VTEXTFIXED, "PS1=$ ", 0 }, - { 0, VSTRFIXED|VTEXTFIXED, "PS2=> ", 0 }, - { 0, VSTRFIXED|VTEXTFIXED, "PS4=+ ", 0 }, + { 0, VSTRFIXED|VTEXTFIXED, "PS1=$ ", 0 }, + { 0, VSTRFIXED|VTEXTFIXED, "PS2=> ", 0 }, + { 0, VSTRFIXED|VTEXTFIXED, "PS4=+ ", 0 }, #ifdef CONFIG_ASH_GETOPTS { 0, VSTRFIXED|VTEXTFIXED, "OPTIND=1", getoptsreset }, #endif +#ifdef CONFIG_ASH_RANDOM_SUPPORT + {0, VSTRFIXED|VTEXTFIXED|VUNSET|VDYNAMIC, "RANDOM\0", change_random }, +#endif #ifdef CONFIG_LOCALE_SUPPORT - {0, VSTRFIXED | VTEXTFIXED | VUNSET, "LC_ALL=", change_lc_all}, - {0, VSTRFIXED | VTEXTFIXED | VUNSET, "LC_CTYPE=", change_lc_ctype}, + {0, VSTRFIXED | VTEXTFIXED | VUNSET, "LC_ALL\0", change_lc_all }, + {0, VSTRFIXED | VTEXTFIXED | VUNSET, "LC_CTYPE\0", change_lc_ctype }, #endif #ifdef CONFIG_FEATURE_COMMAND_SAVEHISTORY - {0, VSTRFIXED | VTEXTFIXED | VUNSET, "HISTFILE=", NULL}, + {0, VSTRFIXED | VTEXTFIXED | VUNSET, "HISTFILE\0", NULL }, #endif }; @@ -1551,7 +1548,11 @@ static struct var varinit[] = { #define vps2 (&vps1)[1] #define vps4 (&vps2)[1] #define voptind (&vps4)[1] - +#ifdef CONFIG_ASH_GETOPTS +#define vrandom (&voptind)[1] +#else +#define vrandom (&vps4)[1] +#endif #define defpath (defpathvar + 5) /* @@ -1613,18 +1614,17 @@ static int nullredirs; extern char **environ; -/* $NetBSD: output.h,v 1.16 2002/11/24 22:35:42 christos Exp $ */ +/* output.h */ static void outstr(const char *, FILE *); static void outcslow(int, FILE *); static void flushall(void); -static void flushout(FILE *); +static void flusherr(void); static int out1fmt(const char *, ...) __attribute__((__format__(__printf__,1,2))); static int fmtstr(char *, size_t, const char *, ...) __attribute__((__format__(__printf__,3,4))); -static void xwrite(int, const void *, size_t); static int preverrout_fd; /* save fd2 before print debug if xflag is set. */ @@ -1637,7 +1637,7 @@ static void out1str(const char *p) static void out2str(const char *p) { outstr(p, stderr); - flushout(stderr); + flusherr(); } /* @@ -1691,9 +1691,11 @@ init(void) { char **envp; char ppid[32]; + const char *p; + struct stat st1, st2; initvar(); - for (envp = environ ; *envp ; envp++) { + for (envp = environ ; envp && *envp ; envp++) { if (strchr(*envp, '=')) { setvareq(*envp, VEXPORT|VTEXTFIXED); } @@ -1701,12 +1703,23 @@ init(void) snprintf(ppid, sizeof(ppid), "%d", (int) getppid()); setvar("PPID", ppid, 0); - setpwd(0, 0); + + p = lookupvar("PWD"); + if (p) + if (*p != '/' || stat(p, &st1) || stat(".", &st2) || + st1.st_dev != st2.st_dev || st1.st_ino != st2.st_ino) + p = 0; + setpwd(p, 0); } } /* PEOF (the end of file marker) */ +enum { + INPUT_PUSH_FILE = 1, + INPUT_NOFILE_OK = 2, +}; + /* * The input line number. Input.c just defines this variable, and saves * and restores it when files are pushed and popped. The user of this @@ -1719,7 +1732,6 @@ static int preadbuffer(void); static void pungetc(void); static void pushstring(char *, void *); static void popstring(void); -static void setinputfile(const char *, int); static void setinputfd(int, int); static void setinputstring(char *); static void popfile(void); @@ -1727,7 +1739,7 @@ static void popallfiles(void); static void closescript(void); -/* $NetBSD: jobs.h,v 1.17 2003/01/22 20:36:04 dsl Exp $ */ +/* jobs.h */ /* Mode argument to forkshell. Don't change FORK_FG or FORK_BG. */ @@ -1794,18 +1806,19 @@ static void setjobctl(int); static void showjobs(FILE *, int); #endif -/* $NetBSD: main.h,v 1.9 2002/11/24 22:35:41 christos Exp $ */ +/* main.h */ /* pid of main shell */ static int rootpid; -/* true if we aren't a child of the main shell */ -static int rootshell; +/* shell level: 0 for the main shell, 1 for its children, and so on */ +static int shlvl; +#define rootshell (!shlvl) static void readcmdfile(char *); -static void cmdloop(int); +static int cmdloop(int); -/* $NetBSD: memalloc.h,v 1.13 2003/01/22 20:36:04 dsl Exp $ */ +/* memalloc.h */ struct stackmark { @@ -1846,7 +1859,7 @@ static char *stnputs(const char *, size_t, char *); static char *stputs(const char *, char *); -static inline char *_STPUTC(char c, char *p) { +static inline char *_STPUTC(int c, char *p) { if (p == sstrend) p = growstackstr(); *p++ = c; @@ -1878,7 +1891,7 @@ static inline char *_STPUTC(char c, char *p) { #define ckfree(p) free((pointer)(p)) -/* $NetBSD: mystring.h,v 1.10 2002/11/24 22:35:42 christos Exp $ */ +/* mystring.h */ #define DOLATSTRLEN 4 @@ -1892,7 +1905,7 @@ static char *sstrdup(const char *); #define equal(s1, s2) (strcmp(s1, s2) == 0) #define scopy(s1, s2) ((void)strcpy(s2, s1)) -/* $NetBSD: options.h,v 1.16 2003/01/22 20:36:04 dsl Exp $ */ +/* options.h */ struct shparam { int nparam; /* # of positional parameters (without $0) */ @@ -1918,20 +1931,21 @@ struct shparam { #define aflag optlist[10] #define bflag optlist[11] #define uflag optlist[12] -#define qflag optlist[13] +#define viflag optlist[13] #ifdef DEBUG #define nolog optlist[14] #define debug optlist[15] -#define NOPTS 16 -#else -#define NOPTS 14 #endif -/* $NetBSD: options.c,v 1.33 2003/01/22 20:36:04 dsl Exp $ */ +#ifndef CONFIG_FEATURE_COMMAND_EDITING_VI +#define setvimode(on) viflag = 0 /* forcibly keep the option off */ +#endif + +/* options.c */ -static const char *const optletters_optnames[NOPTS] = { +static const char *const optletters_optnames[] = { "e" "errexit", "f" "noglob", "I" "ignoreeof", @@ -1945,7 +1959,7 @@ static const char *const optletters_optnames[NOPTS] = { "a" "allexport", "b" "notify", "u" "nounset", - "q" "quietprofile", + "\0" "vi", #ifdef DEBUG "\0" "nolog", "\0" "debug", @@ -1955,6 +1969,7 @@ static const char *const optletters_optnames[NOPTS] = { #define optletters(n) optletters_optnames[(n)][0] #define optnames(n) (&optletters_optnames[(n)][1]) +#define NOPTS (sizeof(optletters_optnames)/sizeof(optletters_optnames[0])) static char optlist[NOPTS]; @@ -1976,7 +1991,7 @@ static int shiftcmd(int, char **); static int setcmd(int, char **); static int nextopt(const char *); -/* $NetBSD: redir.h,v 1.14 2002/11/24 22:35:43 christos Exp $ */ +/* redir.h */ /* flags passed to redirect */ #define REDIR_PUSH 01 /* save previous values of file descriptors */ @@ -1989,7 +2004,7 @@ static void clearredir(int); static int copyfd(int, int); static int redirectsafe(union node *, int); -/* $NetBSD: show.h,v 1.6 2003/01/22 20:36:04 dsl Exp $ */ +/* show.h */ #ifdef DEBUG @@ -2002,7 +2017,7 @@ static void trputs(const char *); static void opentrace(void); #endif -/* $NetBSD: trap.h,v 1.16 2002/11/24 22:35:43 christos Exp $ */ +/* trap.h */ /* trap handler commands */ @@ -2016,9 +2031,9 @@ static void clear_traps(void); static void setsignal(int); static void ignoresig(int); static void onsig(int); -static void dotrap(void); +static int dotrap(void); static void setinteractive(int); -static void exitshell(void) __attribute__((__noreturn__)); +static void exitshell(void) ATTRIBUTE_NORETURN; static int decode_signal(const char *, int); /* @@ -2033,7 +2048,6 @@ reset(void) { evalskip = 0; loopnest = 0; - funcnest = 0; } /* from input.c: */ @@ -2239,7 +2253,7 @@ __lookupalias(const char *name) { #endif /* CONFIG_ASH_ALIAS */ -/* $NetBSD: cd.c,v 1.30 2003/01/22 20:36:03 dsl Exp $ */ +/* cd.c */ /* * The cd and pwd commands. @@ -2288,7 +2302,6 @@ cdcmd(int argc, char **argv) else if (dest[0] == '-' && dest[1] == '\0') { dest = bltinlookup("OLDPWD"); flags |= CD_PRINT; - goto step7; } if (!dest) dest = nullstr; @@ -2327,7 +2340,7 @@ docd: break; } } while (path); - error("can't cd to %s", dest); + sh_error("can't cd to %s", dest); /* NOTREACHED */ out: if (flags & CD_PRINT) @@ -2485,7 +2498,7 @@ setpwd(const char *val, int setold) setvar("PWD", dir, VEXPORT); } -/* $NetBSD: error.c,v 1.30 2003/01/22 20:36:03 dsl Exp $ */ +/* error.c */ /* * Errors and exceptions. @@ -2498,7 +2511,7 @@ setpwd(const char *val, int setold) static void exverror(int, const char *, va_list) - __attribute__((__noreturn__)); + ATTRIBUTE_NORETURN; /* * Called to raise an exception. Since C doesn't include exceptions, we @@ -2533,7 +2546,11 @@ onint(void) { int i; intpending = 0; +#if 0 + /* comment by vodz: its strange for me, this programm don`t use other + signal block */ sigsetmask(0); +#endif i = EXSIG; if (gotsig[SIGINT - 1] && !trap[SIGINT]) { if (!(rootshell && iflag)) { @@ -2549,20 +2566,17 @@ onint(void) { static void exvwarning(const char *msg, va_list ap) { - FILE *errs; - const char *name; - const char *fmt; + FILE *errs; - errs = stderr; - name = arg0; - fmt = "%s: "; - if (commandname) { - name = commandname; - fmt = "%s: %d: "; - } - fprintf(errs, fmt, name, startlinno); - vfprintf(errs, msg, ap); - outcslow('\n', errs); + errs = stderr; + fprintf(errs, "%s: ", arg0); + if (commandname) { + const char *fmt = (!iflag || parsefile->fd) ? + "%s: %d: " : "%s: "; + fprintf(errs, fmt, commandname, startlinno); + } + vfprintf(errs, msg, ap); + outcslow('\n', errs); } /* @@ -2591,7 +2605,7 @@ exverror(int cond, const char *msg, va_list ap) static void -error(const char *msg, ...) +sh_error(const char *msg, ...) { va_list ap; @@ -2645,7 +2659,7 @@ errmsg(int e, const char *em) } -/* $NetBSD: eval.c,v 1.71 2003/01/23 03:33:16 rafal Exp $ */ +/* eval.c */ /* * Evaluate a command. @@ -2680,7 +2694,7 @@ static const struct builtincmd bltin = { */ /* - * The eval commmand. + * The eval command. */ static int @@ -2704,7 +2718,8 @@ evalcmd(int argc, char **argv) STPUTC('\0', concat); p = grabstackstr(concat); } - evalstring(p); + evalstring(p, ~SKIPEVAL); + } return exitstatus; } @@ -2714,23 +2729,29 @@ evalcmd(int argc, char **argv) * Execute a command or commands contained in a string. */ -static void -evalstring(char *s) +static int +evalstring(char *s, int mask) { union node *n; struct stackmark smark; + int skip; - setstackmark(&smark); setinputstring(s); + setstackmark(&smark); + skip = 0; while ((n = parsecmd(0)) != NEOF) { evaltree(n, 0); popstackmark(&smark); - if (evalskip) + skip = evalskip; + if (skip) break; } popfile(); - popstackmark(&smark); + + skip &= mask; + evalskip = skip; + return skip; } @@ -2842,10 +2863,15 @@ setstatus: break; } out: - if (pendingsigs) - dotrap(); - if (flags & EV_EXIT || checkexit & exitstatus) + if ((checkexit & exitstatus)) + evalskip |= SKIPEVAL; + else if (pendingsigs && dotrap()) + goto exexit; + + if (flags & EV_EXIT) { +exexit: exraise(EXEXIT); + } } @@ -3060,7 +3086,7 @@ evalpipe(union node *n, int flags) if (lp->next) { if (pipe(pip) < 0) { close(prevfd); - error("Pipe call failed"); + sh_error("Pipe call failed"); } } if (forkshell(jp, lp->n, n->npipe.backgnd) == 0) { @@ -3121,7 +3147,7 @@ evalbackcmd(union node *n, struct backcmd *result) struct job *jp; if (pipe(pip) < 0) - error("Pipe call failed"); + sh_error("Pipe call failed"); jp = makejob(n, 1); if (forkshell(jp, n, FORK_NOJOB) == 0) { FORCEINTON; @@ -3178,7 +3204,20 @@ parse_command_args(char **argv, const char **path) } #endif +static inline int +isassignment(const char *p) +{ + const char *q = endofname(p); + if (p == q) + return 0; + return *q == '='; +} +#ifdef CONFIG_ASH_EXPAND_PRMT +static const char *expandstr(const char *ps); +#else +#define expandstr(s) s +#endif /* * Execute a simple command. @@ -3202,6 +3241,8 @@ evalcommand(union node *cmd, int flags) int cmd_is_exec; int status; char **nargv; + struct builtincmd *bcmd; + int pseudovarflag = 0; /* First expand the arguments. */ TRACE(("evalcommand(0x%lx, %d) called\n", (long)cmd, flags)); @@ -3216,11 +3257,21 @@ evalcommand(union node *cmd, int flags) *arglist.lastp = NULL; argc = 0; + if (cmd->ncmd.args) + { + bcmd = find_builtin(cmd->ncmd.args->narg.text); + pseudovarflag = bcmd && IS_BUILTIN_ASSIGN(bcmd); + } + for (argp = cmd->ncmd.args; argp; argp = argp->narg.next) { struct strlist **spp; spp = arglist.lastp; - expandarg(argp, &arglist, EXP_FULL | EXP_TILDE); + if (pseudovarflag && isassignment(argp->narg.text)) + expandarg(argp, &arglist, EXP_VARTILDE); + else + expandarg(argp, &arglist, EXP_FULL | EXP_TILDE); + for (sp = *spp; sp; sp = sp->next) argc++; } @@ -3263,7 +3314,7 @@ evalcommand(union node *cmd, int flags) const char *p = " %s"; p++; - dprintf(preverrout_fd, p, ps4val()); + dprintf(preverrout_fd, p, expandstr(ps4val())); sp = varlist.list; for(n = 0; n < 2; n++) { @@ -3276,7 +3327,7 @@ evalcommand(union node *cmd, int flags) } sp = arglist.list; } - xwrite(preverrout_fd, "\n", 1); + bb_full_write(preverrout_fd, "\n", 1); } cmd_is_exec = 0; @@ -3293,7 +3344,7 @@ evalcommand(union node *cmd, int flags) find_command(argv[0], &cmdentry, cmd_flag, path); if (cmdentry.cmdtype == CMDUNKNOWN) { status = 127; - flushout(stderr); + flusherr(); goto bail; } @@ -3449,6 +3500,7 @@ evalfun(struct funcnode *func, int argc, char **argv, int flags) localvars = NULL; shellparam.malloc = 0; func->count++; + funcnest++; INTON; shellparam.nparam = argc - 1; shellparam.p = argv + 1; @@ -3456,11 +3508,10 @@ evalfun(struct funcnode *func, int argc, char **argv, int flags) shellparam.optind = 1; shellparam.optoff = -1; #endif - funcnest++; evaltree(&func->n, flags & EV_TESTED); - funcnest--; funcdone: INTOFF; + funcnest--; freefunc(func); poplocalvars(); localvars = savelocalvars; @@ -3468,18 +3519,22 @@ funcdone: shellparam = saveparam; handler = savehandler; INTON; - if (evalskip == SKIPFUNC) { - evalskip = 0; - skipcount = 0; - } + evalskip &= ~SKIPFUNC; return e; } +static inline int +goodname(const char *p) +{ + return !*endofname(p); +} + /* * Search for a command. This is called before we fork so that the * location of the command will be available in the parent as well as - * the child. + * the child. The check for "goodname" is an overly conservative + * check that the name will not be subject to expansion. */ static void @@ -3488,7 +3543,9 @@ prehash(union node *n) struct cmdentry entry; if (n->type == NCMD && n->ncmd.args) - find_command(n->ncmd.args->narg.text, &entry, 0, pathval()); + if (goodname(n->ncmd.args->narg.text)) + find_command(n->ncmd.args->narg.text, &entry, 0, + pathval()); } @@ -3530,7 +3587,7 @@ breakcmd(int argc, char **argv) int n = argc > 1 ? number(argv[1]) : 1; if (n <= 0) - error(illnum, argv[1]); + sh_error(illnum, argv[1]); if (n > loopnest) n = loopnest; if (n > 0) { @@ -3548,19 +3605,12 @@ breakcmd(int argc, char **argv) static int returncmd(int argc, char **argv) { - int ret = argc > 1 ? number(argv[1]) : exitstatus; - - if (funcnest) { - evalskip = SKIPFUNC; - skipcount = 1; - return ret; - } - else { - /* Do what ksh does; skip the rest of the file */ - evalskip = SKIPFILE; - skipcount = 1; - return ret; - } + /* + * If called outside a function, do what ksh does; + * skip the rest of the file. + */ + evalskip = funcnest ? SKIPFUNC : SKIPFILE; + return argv[1] ? number(argv[1]) : exitstatus; } @@ -3591,7 +3641,7 @@ execcmd(int argc, char **argv) } -/* $NetBSD: exec.c,v 1.35 2003/01/22 20:36:04 dsl Exp $ */ +/* exec.c */ /* * When commands are first encountered, they are entered in a hash table. @@ -3637,6 +3687,7 @@ shellexec(char **argv, const char *path, int idx) char *cmdname; int e; char **envp; + int exerrno; clearredir(1); envp = environment(); @@ -3671,6 +3722,7 @@ shellexec(char **argv, const char *path, int idx) exerrno = 2; break; } + exitstatus = exerrno; TRACE(("shellexec failed for %s, errno %d, suppressint %d\n", argv[0], e, suppressint )); exerror(EXEXEC, "%s: %s", argv[0], errmsg(e, E_EXEC)); @@ -3683,33 +3735,13 @@ tryexec(char *cmd, char **argv, char **envp) { int repeated = 0; #ifdef CONFIG_FEATURE_SH_STANDALONE_SHELL - int flg_bb = 0; - char *name = cmd; - -#ifdef CONFIG_FEATURE_SH_APPLETS_ALWAYS_WIN - name = bb_get_last_path_component(name); - if(find_applet_by_name(name) != NULL) - flg_bb = 1; -#else - if(strchr(name, '/') == NULL && find_applet_by_name(name) != NULL) { - flg_bb = 1; - } -#endif - if(flg_bb) { - char **ap; - char **new; - - *argv = name; - if(strcmp(name, "busybox")) { - for (ap = argv; *ap; ap++); - ap = new = xmalloc((ap - argv + 2) * sizeof(char *)); - *ap++ = cmd = "/bin/busybox"; - while ((*ap++ = *argv++)); - argv = new; - repeated++; - } else { - cmd = "/bin/busybox"; - } + if(find_applet_by_name(cmd) != NULL) { + /* re-exec ourselves with the new arguments */ + execve("/proc/self/exe",argv,envp); + /* If proc isn't mounted, try hardcoded path to busybox binary*/ + execve("/bin/busybox",argv,envp); + /* If they called chroot or otherwise made the binary no longer + * executable, fall through */ } #endif @@ -3979,7 +4011,7 @@ loop: readcmdfile(fullname); if ((cmdp = cmdlookup(name, 0)) == NULL || cmdp->cmdtype != CMDFUNCTION) - error("%s not defined in %s", name, fullname); + sh_error("%s not defined in %s", name, fullname); stunalloc(fullname); goto success; } @@ -4117,9 +4149,6 @@ changepath(const char *newval) firstchange = 0; clearcmdentry(firstchange); builtinloc = idx_bltin; -#ifdef CONFIG_FEATURE_COMMAND_EDITING - cmdedit_path_lookup = newval; -#endif } @@ -4416,46 +4445,28 @@ static int commandcmd(int argc, char **argv) { int c; - int default_path = 0; - int verify_only = 0; - int verbose_verify_only = 0; + enum { + VERIFY_BRIEF = 1, + VERIFY_VERBOSE = 2, + } verify = 0; while ((c = nextopt("pvV")) != '\0') - switch (c) { - default: + if (c == 'V') + verify |= VERIFY_VERBOSE; + else if (c == 'v') + verify |= VERIFY_BRIEF; #ifdef DEBUG - fprintf(stderr, -"command: nextopt returned character code 0%o\n", c); - return EX_SOFTWARE; + else if (c != 'p') + abort(); #endif - case 'p': - default_path = 1; - break; - case 'v': - verify_only = 1; - break; - case 'V': - verbose_verify_only = 1; - break; - } - - if (default_path + verify_only + verbose_verify_only > 1 || - !*argptr) { - fprintf(stderr, - "command [-p] command [arg ...]\n" - "command {-v|-V} command\n"); - return EX_USAGE; - } - - if (verify_only || verbose_verify_only) { - return describe_command(*argptr, verbose_verify_only); - } + if (verify) + return describe_command(*argptr, verify - VERIFY_BRIEF); return 0; } #endif -/* $NetBSD: expand.c,v 1.56 2002/11/24 22:35:39 christos Exp $ */ +/* expand.c */ /* * Routines to expand arguments to commands. We have to deal with @@ -4509,12 +4520,12 @@ static void ifsfree(void); static void expandmeta(struct strlist *, int); static int patmatch(char *, const char *); -static int cvtnum(long); +static int cvtnum(arith_t); static size_t esclen(const char *, const char *); static char *scanleft(char *, char *, char *, char *, int, int); static char *scanright(char *, char *, char *, char *, int, int); static void varunset(const char *, const char *, const char *, int) - __attribute__((__noreturn__)); + ATTRIBUTE_NORETURN; #define pmatch(a, b) !fnmatch((a), (b), 0) @@ -4554,7 +4565,7 @@ expandhere(union node *arg, int fd) { herefd = fd; expandarg(arg, (struct arglist *)NULL, 0); - xwrite(fd, stackblock(), expdest - (char *)stackblock()); + bb_full_write(fd, stackblock(), expdest - (char *)stackblock()); } @@ -4576,11 +4587,12 @@ expandarg(union node *arg, struct arglist *arglist, int flag) ifsfirst.next = NULL; ifslastp = NULL; argstr(arg->narg.text, flag); + p = _STPUTC('\0', expdest); + expdest = p - 1; if (arglist == NULL) { return; /* here document expanded */ } - STPUTC('\0', expdest); - p = grabstackstr(expdest); + p = grabstackstr(p); exparg.lastp = &exparg.list; /* * TODO - EXP_REDIR @@ -4783,14 +4795,13 @@ exptilde(char *startp, char *p, int flag) done: *p = '\0'; if (*name == '\0') { - if ((home = lookupvar(homestr)) == NULL) - goto lose; + home = lookupvar(homestr); } else { if ((pw = getpwnam(name)) == NULL) goto lose; home = pw->pw_dir; } - if (*home == '\0') + if (!home || !*home) goto lose; *p = c; startloc = expdest - (char *)stackblock(); @@ -4874,7 +4885,7 @@ expari(int quotes) p--; #ifdef DEBUG if (p < start) { - error("missing CTLARI (shouldn't happen)"); + sh_error("missing CTLARI (shouldn't happen)"); } #endif } @@ -5252,7 +5263,7 @@ memtodest(const char *p, size_t len, int syntax, int quotes) { q = makestrspace(len * 2, q); while (len--) { - int c = *p++; + int c = SC2INT(*p++); if (!c) continue; if (quotes && (SIT(c, syntax) == CCTL || SIT(c, syntax) == CBACK)) @@ -5326,7 +5337,7 @@ numvar: goto param; /* fall through */ case '*': - sep = ifsset() ? ifsval()[0] : ' '; + sep = ifsset() ? SC2INT(ifsval()[0]) : ' '; if (quotes && (SIT(sep, syntax) == CCTL || SIT(sep, syntax) == CBACK)) sepq = 1; param: @@ -5336,9 +5347,12 @@ param: size_t partlen; partlen = strlen(p); - len += partlen; - if (len > partlen && sep) { + + if (!(subtype == VSPLUS || subtype == VSLENGTH)) + memtodest(p, partlen, syntax, quotes); + + if (*ap && sep) { char *q; len++; @@ -5351,9 +5365,6 @@ param: STPUTC(sep, q); expdest = q; } - - if (!(subtype == VSPLUS || subtype == VSLENGTH)) - memtodest(p, partlen, syntax, quotes); } return len; case '0': @@ -5880,12 +5891,16 @@ casematch(union node *pattern, char *val) */ static int -cvtnum(long num) +cvtnum(arith_t num) { int len; expdest = makestrspace(32, expdest); +#ifdef CONFIG_ASH_MATH_SUPPORT_64 + len = fmtstr(expdest, 32, "%lld", (long long) num); +#else len = fmtstr(expdest, 32, "%ld", num); +#endif STADJUST(len, expdest); return len; } @@ -5905,54 +5920,27 @@ varunset(const char *end, const char *var, const char *umsg, int varflags) } else msg = umsg; } - error("%.*s: %s%s", end - var - 1, var, msg, tail); + sh_error("%.*s: %s%s", end - var - 1, var, msg, tail); } -/* $NetBSD: input.c,v 1.37 2002/11/24 22:35:40 christos Exp $ */ +/* input.c */ /* * This implements the input routines used by the parser. */ #define EOF_NLEFT -99 /* value of parsenleft when EOF pushed back */ -#define IBUFSIZ (BUFSIZ + 1) static void pushfile(void); -/* - * Read a line from the script. - */ - -static inline char * -pfgets(char *line, int len) -{ - char *p = line; - int nleft = len; - int c; - - while (--nleft > 0) { - c = pgetc2(); - if (c == PEOF) { - if (p == line) - return NULL; - break; - } - *p++ = c; - if (c == '\n') - break; - } - *p = '\0'; - return line; -} - - /* * Read a character from the script, returning PEOF on end of file. * Nul characters in the input are silently discarded. */ -#define pgetc_as_macro() (--parsenleft >= 0? *parsenextc++ : preadbuffer()) + +#define pgetc_as_macro() (--parsenleft >= 0? SC2INT(*parsenextc++) : preadbuffer()) #ifdef CONFIG_ASH_OPTIMIZE_FOR_SIZE #define pgetc_macro() pgetc() @@ -5991,12 +5979,48 @@ static inline int pgetc2(void) } #endif +/* + * Read a line from the script. + */ + +static inline char * +pfgets(char *line, int len) +{ + char *p = line; + int nleft = len; + int c; + + while (--nleft > 0) { + c = pgetc2(); + if (c == PEOF) { + if (p == line) + return NULL; + break; + } + *p++ = c; + if (c == '\n') + break; + } + *p = '\0'; + return line; +} + + #ifdef CONFIG_FEATURE_COMMAND_EDITING +#ifdef CONFIG_ASH_EXPAND_PRMT +static char *cmdedit_prompt; +#else static const char *cmdedit_prompt; +#endif static inline void putprompt(const char *s) { +#ifdef CONFIG_ASH_EXPAND_PRMT + free(cmdedit_prompt); + cmdedit_prompt = bb_xstrdup(s); +#else cmdedit_prompt = s; +#endif } #else static inline void putprompt(const char *s) @@ -6017,13 +6041,21 @@ retry: if (!iflag || parsefile->fd) nr = safe_read(parsefile->fd, buf, BUFSIZ - 1); else { +#ifdef CONFIG_FEATURE_COMMAND_TAB_COMPLETION + cmdedit_path_lookup = pathval(); +#endif nr = cmdedit_read_input((char *) cmdedit_prompt, buf); if(nr == 0) { /* Ctrl+C presend */ - raise(SIGINT); + if(trap[SIGINT]) { + buf[0] = '\n'; + buf[1] = 0; + raise(SIGINT); + return 1; + } goto retry; } - if(nr < 0) { + if(nr < 0 && errno == 0) { /* Ctrl+D presend */ nr = 0; } @@ -6060,7 +6092,7 @@ retry: int preadbuffer(void) { - char *p, *q; + char *q; int more; char savec; @@ -6073,45 +6105,48 @@ preadbuffer(void) #endif popstring(); if (--parsenleft >= 0) - return (*parsenextc++); + return SC2INT(*parsenextc++); } if (parsenleft == EOF_NLEFT || parsefile->buf == NULL) return PEOF; flushall(); + more = parselleft; + if (more <= 0) { again: - if (parselleft <= 0) { - if ((parselleft = preadfd()) <= 0) { + if ((more = preadfd()) <= 0) { parselleft = parsenleft = EOF_NLEFT; return PEOF; } } - q = p = parsenextc; + q = parsenextc; /* delete nul characters */ - for (more = 1; more;) { - switch (*p) { - case '\0': - p++; /* Skip nul */ - goto check; + for (;;) { + int c; - case '\n': - parsenleft = q - parsenextc; - more = 0; /* Stop processing here */ - break; + more--; + c = *q; + if (!c) + memmove(q, q + 1, more); + else { + q++; + if (c == '\n') { + parsenleft = q - parsenextc - 1; + break; + } } - *q++ = *p++; -check: - if (--parselleft <= 0 && more) { + if (more <= 0) { parsenleft = q - parsenextc - 1; if (parsenleft < 0) goto again; - more = 0; + break; } } + parselleft = more; savec = *q; *q = '\0'; @@ -6122,7 +6157,7 @@ check: *q = savec; - return *parsenextc++; + return SC2INT(*parsenextc++); } /* @@ -6204,24 +6239,29 @@ popstring(void) * old input onto the stack first. */ -void -setinputfile(const char *fname, int push) +static int +setinputfile(const char *fname, int flags) { int fd; int fd2; INTOFF; - if ((fd = open(fname, O_RDONLY)) < 0) - error("Can't open %s", fname); + if ((fd = open(fname, O_RDONLY)) < 0) { + if (flags & INPUT_NOFILE_OK) + goto out; + sh_error("Can't open %s", fname); + } if (fd < 10) { fd2 = copyfd(fd, 10); close(fd); if (fd2 < 0) - error("Out of file descriptors"); + sh_error("Out of file descriptors"); fd = fd2; } - setinputfd(fd, push); + setinputfd(fd, flags & INPUT_PUSH_FILE); +out: INTON; + return fd; } @@ -6335,7 +6375,7 @@ closescript(void) } } -/* $NetBSD: jobs.c,v 1.56 2002/11/25 12:13:03 agc Exp $ */ +/* jobs.c */ /* mode flags for set_curjob */ #define CUR_DELETE 2 @@ -6410,14 +6450,14 @@ set_curjob(struct job *jp, unsigned mode) put after all stopped jobs. */ do { jp1 = *jpp; -#ifdef JOBS +#if JOBS if (!jp1 || jp1->state != JOBSTOPPED) #endif break; jpp = &jp1->prev_job; } while (1); /* FALLTHROUGH */ -#ifdef JOBS +#if JOBS case CUR_STOPPED: #endif /* newly stopped job - becomes curjob */ @@ -6506,7 +6546,7 @@ killcmd(int argc, char **argv) if (argc <= 1) { usage: - error( + sh_error( "Usage: kill [-s sigspec | -signum | -sigspec] [pid | job]... or\n" "kill -l [exitstatus]" ); @@ -6529,7 +6569,7 @@ usage: case 's': signo = decode_signal(optionarg, 1); if (signo < 0) { - error( + sh_error( "invalid signal number or name: %s", optionarg ); @@ -6563,7 +6603,7 @@ usage: if (name) out1fmt(snlfmt, name); else - error("invalid signal number or exit status: %s", *argptr); + sh_error("invalid signal number or exit status: %s", *argptr); return 0; } @@ -6572,10 +6612,12 @@ usage: if (**argv == '%') { jp = getjob(*argv, 0); pid = -jp->ps[0].pid; - } else - pid = number(*argv); + } else { + pid = **argv == '-' ? + -number(*argv + 1) : number(*argv); + } if (kill(pid, signo) != 0) { - sh_warnx("%m\n"); + sh_warnx("(%d) - %m", pid); i = 1; } } while (*++argv); @@ -6592,7 +6634,7 @@ jobno(const struct job *jp) } #endif -#ifdef JOBS +#if JOBS static int fgcmd(int argc, char **argv) { @@ -6975,7 +7017,7 @@ gotit: #endif return jp; err: - error(err_msg, name); + sh_error(err_msg, name); } @@ -7045,7 +7087,7 @@ growjobtab(void) jq--; #define joff(p) ((struct job *)((char *)(p) + l)) #define jmove(p) (p) = (void *)((char *)(p) + offset) - if (likely(joff(jp)->ps == &jq->ps0)) + if (xlikely(joff(jp)->ps == &jq->ps0)) jmove(joff(jp)->ps); if (joff(jp)->prev_job) jmove(joff(jp)->prev_job); @@ -7087,18 +7129,18 @@ growjobtab(void) static inline void forkchild(struct job *jp, union node *n, int mode) { - int wasroot; + int oldlvl; TRACE(("Child shell %d\n", getpid())); - wasroot = rootshell; - rootshell = 0; + oldlvl = shlvl; + shlvl++; closescript(); clear_traps(); #if JOBS /* do job control only in root shell */ jobctl = 0; - if (mode != FORK_NOJOB && jp->jobctl && wasroot) { + if (mode != FORK_NOJOB && jp->jobctl && !oldlvl) { pid_t pgrp; if (jp->nprocs == 0) @@ -7118,11 +7160,11 @@ forkchild(struct job *jp, union node *n, int mode) ignoresig(SIGQUIT); if (jp->nprocs == 0) { close(0); - if (open(_PATH_DEVNULL, O_RDONLY) != 0) - error("Can't open %s", _PATH_DEVNULL); + if (open(bb_dev_null, O_RDONLY) != 0) + sh_error("Can't open %s", bb_dev_null); } } - if (wasroot && iflag) { + if (!oldlvl && iflag) { setsignal(SIGINT); setsignal(SIGQUIT); setsignal(SIGTERM); @@ -7180,7 +7222,7 @@ forkshell(struct job *jp, union node *n, int mode) TRACE(("Fork failed, errno=%d", errno)); if (jp) freejob(jp); - error("Cannot fork"); + sh_error("Cannot fork"); } if (pid == 0) forkchild(jp, n, mode); @@ -7200,7 +7242,7 @@ forkshell(struct job *jp, union node *n, int mode) * the interactive program catches interrupts, the user doesn't want * these interrupts to also abort the loop. The approach we take here * is to have the shell ignore interrupt signals while waiting for a - * forground process to terminate, and then send itself an interrupt + * foreground process to terminate, and then send itself an interrupt * signal if the child process was terminated by an interrupt signal. * Unfortunately, some programs want to do a bit of cleanup and then * exit on interrupt; unless these processes terminate themselves by @@ -7320,7 +7362,7 @@ dowait(int block, struct job *job) } if (sp->status == -1) state = JOBRUNNING; -#ifdef JOBS +#if JOBS if (state == JOBRUNNING) continue; if (WIFSTOPPED(sp->status)) { @@ -7332,7 +7374,7 @@ dowait(int block, struct job *job) if (thisjob) goto gotjob; } -#ifdef JOBS +#if JOBS if (!WIFSTOPPED(status)) #endif @@ -7346,7 +7388,7 @@ gotjob: if (thisjob->state != state) { TRACE(("Job %d: changing state from %d to %d\n", jobno(thisjob), thisjob->state, state)); thisjob->state = state; -#ifdef JOBS +#if JOBS if (state == JOBSTOPPED) { set_curjob(thisjob, CUR_STOPPED); } @@ -7425,6 +7467,8 @@ cmdtxt(union node *n) const char *p; char s[2]; + if (!n) + return; switch (n->type) { default: #if DEBUG @@ -7588,11 +7632,10 @@ cmdputs(const char *s) char *nextc; int subtype = 0; int quoted = 0; - static const char *const vstype[16] = { - nullstr, "}", "-", "+", "?", "=", - "#", "##", "%", "%%" + static const char vstype[VSTYPE + 1][4] = { + "", "}", "-", "+", "?", "=", + "%", "%%", "#", "##" }; - nextc = makestrspace((strlen(s) + 1) * 8, cmdnextc); p = s; while ((c = *p++) != 0) { @@ -7614,14 +7657,10 @@ cmdputs(const char *s) goto dostr; break; case CTLENDVAR: + str = "\"}" + !(quoted & 1); quoted >>= 1; subtype = 0; - if (quoted & 1) { - str = "\"}"; - goto dostr; - } - c = '}'; - break; + goto dostr; case CTLBACKQ: str = "$(...)"; goto dostr; @@ -7643,13 +7682,13 @@ cmdputs(const char *s) case '=': if (subtype == 0) break; + if ((subtype & VSTYPE) != VSNORMAL) + quoted <<= 1; str = vstype[subtype & VSTYPE]; if (subtype & VSNUL) c = ':'; else - c = *str++; - if (c != '}') - quoted <<= 1; + goto checkstr; break; case '\'': case '\\': @@ -7664,6 +7703,7 @@ cmdputs(const char *s) break; } USTPUTC(c, nextc); +checkstr: if (!str) continue; dostr: @@ -7696,7 +7736,7 @@ static void xtcsetpgrp(int fd, pid_t pgrp) { if (tcsetpgrp(fd, pgrp)) - error("Cannot set tty process group (%m)"); + sh_error("Cannot set tty process group (%m)"); } #endif /* JOBS */ @@ -7728,7 +7768,7 @@ getstatus(struct job *job) { } #ifdef CONFIG_ASH_MAIL -/* $NetBSD: mail.c,v 1.15 2002/11/24 22:35:40 christos Exp $ */ +/* mail.c */ /* * Routines to check for mail. (Perhaps make part of main.c?) @@ -7799,7 +7839,7 @@ changemail(const char *val) #endif /* CONFIG_ASH_MAIL */ -/* $NetBSD: main.c,v 1.46 2002/12/11 19:12:18 christos Exp $ */ +/* main.c */ #if PROFILE @@ -7836,28 +7876,16 @@ ash_main(int argc, char **argv) #endif state = 0; if (setjmp(jmploc.loc)) { - int status; int e; + int s; reset(); e = exception; - switch (exception) { - case EXEXEC: - status = exerrno; - break; - - case EXERROR: - status = 2; - break; - - default: - status = exitstatus; - break; - } - exitstatus = status; - - if (e == EXEXIT || state == 0 || iflag == 0 || ! rootshell) + if (e == EXERROR) + exitstatus = 2; + s = state; + if (e == EXEXIT || s == 0 || iflag == 0 || shlvl) exitshell(); if (e == EXINT) { @@ -7865,11 +7893,11 @@ ash_main(int argc, char **argv) } popstackmark(&smark); FORCEINTON; /* enable interrupts */ - if (state == 1) + if (s == 1) goto state1; - else if (state == 2) + else if (s == 2) goto state2; - else if (state == 3) + else if (s == 3) goto state3; else goto state4; @@ -7880,7 +7908,10 @@ ash_main(int argc, char **argv) trputs("Shell args: "); trargs(argv); #endif rootpid = getpid(); - rootshell = 1; + +#ifdef CONFIG_ASH_RANDOM_SUPPORT + rseed = rootpid + ((time_t)time((time_t *)0)); +#endif init(); setstackmark(&smark); procargs(argc, argv); @@ -7922,7 +7953,7 @@ state2: state3: state = 4; if (minusc) - evalstring(minusc); + evalstring(minusc, 0); if (sflag || minusc == NULL) { #ifdef CONFIG_FEATURE_COMMAND_SAVEHISTORY @@ -7955,7 +7986,7 @@ state4: /* XXX ??? - why isn't this before the "if" statement */ * loop; it turns on prompting if the shell is interactive. */ -static void +static int cmdloop(int top) { union node *n; @@ -7965,9 +7996,9 @@ cmdloop(int top) TRACE(("cmdloop(%d) called\n", top)); for (;;) { + int skip; + setstackmark(&smark); - if (pendingsigs) - dotrap(); #if JOBS if (jobctl) showjobs(stderr, SHOW_CHANGED); @@ -7990,17 +8021,21 @@ cmdloop(int top) out2str("\nUse \"exit\" to leave shell.\n"); } numeof++; - } else if (n != NULL && nflag == 0) { + } else if (nflag == 0) { job_warning = (job_warning == 2) ? 1 : 0; numeof = 0; evaltree(n, 0); } popstackmark(&smark); - if (evalskip) { + skip = evalskip; + + if (skip) { evalskip = 0; - break; + return skip & SKIPEVAL; } } + + return 0; } @@ -8011,31 +8046,16 @@ cmdloop(int top) static void read_profile(const char *name) { - int fd; - int xflag_set = 0; - int vflag_set = 0; + int skip; - INTOFF; - if ((fd = open(name, O_RDONLY)) >= 0) - setinputfd(fd, 1); - INTON; - if (fd < 0) + if (setinputfile(name, INPUT_PUSH_FILE | INPUT_NOFILE_OK) < 0) return; - /* -q turns off -x and -v just when executing init files */ - if (qflag) { - if (xflag) - xflag = 0, xflag_set = 1; - if (vflag) - vflag = 0, vflag_set = 1; - } - cmdloop(0); - if (qflag) { - if (xflag_set) - xflag = 1; - if (vflag_set) - vflag = 1; - } + + skip = cmdloop(0); popfile(); + + if (skip) + exitshell(); } @@ -8046,14 +8066,7 @@ read_profile(const char *name) static void readcmdfile(char *name) { - int fd; - - INTOFF; - if ((fd = open(name, O_RDONLY)) >= 0) - setinputfd(fd, 1); - else - error("Can't open %s", name); - INTON; + setinputfile(name, INPUT_PUSH_FILE); cmdloop(0); popfile(); } @@ -8087,28 +8100,43 @@ find_dot_file(char *name) } /* not found in the PATH */ - error(not_found_msg, name); + sh_error(not_found_msg, name); /* NOTREACHED */ } -int -dotcmd(int argc, char **argv) +static int dotcmd(int argc, char **argv) { - exitstatus = 0; + struct strlist *sp; + volatile struct shparam saveparam; + int status = 0; + + for (sp = cmdenviron; sp; sp = sp->next) + setvareq(bb_xstrdup(sp->text), VSTRFIXED | VTEXTFIXED); - if (argc >= 2) { /* That's what SVR2 does */ + if (argc >= 2) { /* That's what SVR2 does */ char *fullname; - struct stackmark smark; - setstackmark(&smark); fullname = find_dot_file(argv[1]); - setinputfile(fullname, 1); + + if (argc > 2) { + saveparam = shellparam; + shellparam.malloc = 0; + shellparam.nparam = argc - 2; + shellparam.p = argv + 2; + }; + + setinputfile(fullname, INPUT_PUSH_FILE); commandname = fullname; cmdloop(0); popfile(); - popstackmark(&smark); + + if (argc > 2) { + freeparam(&shellparam); + shellparam = saveparam; + }; + status = exitstatus; } - return exitstatus; + return status; } @@ -8123,7 +8151,23 @@ exitcmd(int argc, char **argv) /* NOTREACHED */ } -/* $NetBSD: memalloc.c,v 1.27 2003/01/22 20:36:04 dsl Exp $ */ +#ifdef CONFIG_ASH_BUILTIN_ECHO +static int +echocmd(int argc, char **argv) +{ + return bb_echo(argc, argv); +} +#endif + +#ifdef CONFIG_ASH_BUILTIN_TEST +static int +testcmd(int argc, char **argv) +{ + return bb_test(argc, argv); +} +#endif + +/* memalloc.c */ /* * Same for malloc, realloc, but returns an error when out of space. @@ -8134,7 +8178,7 @@ ckrealloc(pointer p, size_t nbytes) { p = realloc(p, nbytes); if (p == NULL) - error(bb_msg_memory_exhausted); + sh_error(bb_msg_memory_exhausted); return p; } @@ -8153,7 +8197,7 @@ savestr(const char *s) { char *p = strdup(s); if (!p) - error(bb_msg_memory_exhausted); + sh_error(bb_msg_memory_exhausted); return p; } @@ -8185,7 +8229,7 @@ stalloc(size_t nbytes) blocksize = MINSIZE; len = sizeof(struct stack_block) - MINSIZE + blocksize; if (len < blocksize) - error(bb_msg_memory_exhausted); + sh_error(bb_msg_memory_exhausted); INTOFF; sp = ckmalloc(len); sp->prev = stackp; @@ -8263,7 +8307,7 @@ growstackblock(void) newlen = stacknleft * 2; if (newlen < stacknleft) - error(bb_msg_memory_exhausted); + sh_error(bb_msg_memory_exhausted); if (newlen < 128) newlen += 128; @@ -8340,7 +8384,7 @@ growstackstr(void) { size_t len = stackblocksize(); if (herefd >= 0 && len >= 1024) { - xwrite(herefd, stackblock(), len); + bb_full_write(herefd, stackblock(), len); return stackblock(); } growstackblock(); @@ -8383,7 +8427,7 @@ stputs(const char *s, char *p) return stnputs(s, strlen(s), p); } -/* $NetBSD: mystring.c,v 1.15 2002/11/24 22:35:42 christos Exp $ */ +/* mystring.c */ /* * String functions. @@ -8417,7 +8461,7 @@ number(const char *s) { if (! is_number(s)) - error(illnum, s); + sh_error(illnum, s); return atoi(s); } @@ -8742,7 +8786,7 @@ procargs(int argc, char **argv) xminusc = minusc; if (*xargv == NULL) { if (xminusc) - error("-c requires an argument"); + sh_error(bb_msg_requires_arg, "-c"); sflag = 1; } if (iflag == 2 && sflag == 1 && isatty(0) && isatty(1)) @@ -8789,6 +8833,7 @@ optschanged(void) #endif setinteractive(iflag); setjobctl(mflag); + setvimode(viflag); } static inline void @@ -8807,7 +8852,7 @@ minus_o(char *name, int val) optlist[i] = val; return; } - error("Illegal option -o %s", name); + sh_error("Illegal option -o %s", name); } } @@ -8875,7 +8920,7 @@ setoption(int flag, int val) optlist[i] = val; return; } - error("Illegal option -%c", flag); + sh_error("Illegal option -%c", flag); /* NOTREACHED */ } @@ -8941,7 +8986,7 @@ shiftcmd(int argc, char **argv) if (argc > 1) n = number(argv[1]); if (n > shellparam.nparam) - error("can't shift that many"); + sh_error("can't shift that many"); INTOFF; shellparam.nparam -= n; for (ap1 = shellparam.p ; --n >= 0 ; ap1++) { @@ -9005,6 +9050,27 @@ static void change_lc_ctype(const char *value) #endif +#ifdef CONFIG_ASH_RANDOM_SUPPORT +/* Roughly copied from bash.. */ +static void change_random(const char *value) +{ + if(value == NULL) { + /* "get", generate */ + char buf[16]; + + rseed = rseed * 1103515245 + 12345; + sprintf(buf, "%d", (unsigned int)((rseed & 32767))); + /* set without recursion */ + setvar(vrandom.text, buf, VNOFUNC); + vrandom.flags &= ~VNOFUNC; + } else { + /* set/reset */ + rseed = strtoul(value, (char **)NULL, 10); + } +} +#endif + + #ifdef CONFIG_ASH_GETOPTS static int getopts(char *optstr, char *optvar, char **optfirst, int *param_optind, int *optoff) @@ -9108,7 +9174,7 @@ getoptscmd(int argc, char **argv) char **optbase; if (argc < 3) - error("Usage: getopts optstring var [arg]"); + sh_error("Usage: getopts optstring var [arg]"); else if (argc == 3) { optbase = shellparam.p; if (shellparam.optind > shellparam.nparam + 1) { @@ -9158,13 +9224,13 @@ nextopt(const char *optstring) c = *p++; for (q = optstring ; *q != c ; ) { if (*q == '\0') - error("Illegal option -%c", c); + sh_error("Illegal option -%c", c); if (*++q == ':') q++; } if (*++q == ':') { if (*p == '\0' && (p = *argptr++) == NULL) - error("No arg for -%c option", c); + sh_error("No arg for -%c option", c); optionarg = p; p = NULL; } @@ -9173,7 +9239,7 @@ nextopt(const char *optstring) } -/* $NetBSD: output.c,v 1.27 2002/11/24 22:35:42 christos Exp $ */ +/* output.c */ void outstr(const char *p, FILE *file) @@ -9193,10 +9259,10 @@ flushall(void) } void -flushout(FILE *dest) +flusherr(void) { INTOFF; - fflush(dest); + fflush(stderr); INTON; } @@ -9240,22 +9306,8 @@ fmtstr(char *outbuf, size_t length, const char *fmt, ...) } -/* - * Version of write which resumes after a signal is caught. - */ - -static void -xwrite(int fd, const void *p, size_t n) -{ - ssize_t i; - - do { - i = bb_full_write(fd, p, n); - } while (i < 0 && errno == EINTR); -} - -/* $NetBSD: parser.c,v 1.54 2002/11/24 22:35:42 christos Exp $ */ +/* parser.c */ /* @@ -9290,25 +9342,11 @@ static int readtoken(void); static int xxreadtoken(void); static int readtoken1(int firstc, int syntax, char *eofmark, int striptabs); static int noexpand(char *); -static void synexpect(int) __attribute__((__noreturn__)); -static void synerror(const char *) __attribute__((__noreturn__)); +static void synexpect(int) ATTRIBUTE_NORETURN; +static void synerror(const char *) ATTRIBUTE_NORETURN; static void setprompt(int); -static inline int -goodname(const char *p) -{ - return !*endofname(p); -} - -static inline int -isassignment(const char *p) -{ - const char *q = endofname(p); - if (p == q) - return 0; - return *q == '='; -} /* @@ -9835,7 +9873,6 @@ parseheredoc(void) while (here) { if (needprompt) { setprompt(2); - needprompt = 0; } readtoken1(pgetc(), here->here->type == NHERE? SQSYNTAX : DQSYNTAX, here->eofmark, here->striptabs); @@ -9968,7 +10005,6 @@ static int xxreadtoken() } if (needprompt) { setprompt(2); - needprompt = 0; } startlinno = plinno; for (;;) { /* until token or start of word found */ @@ -10036,7 +10072,6 @@ xxreadtoken(void) } if (needprompt) { setprompt(2); - needprompt = 0; } startlinno = plinno; for (;;) { /* until token or start of word found */ @@ -10122,15 +10157,15 @@ readtoken1(int firstc, int syntax, char *eofmark, int striptabs) char *out; int len; char line[EOFMARKLEN + 1]; - struct nodelist *bqlist; - int quotef; - int dblquote; - int varnest; /* levels of variables expansion */ - int arinest; /* levels of arithmetic expansion */ - int parenlevel; /* levels of parens in arithmetic */ - int dqvarnest; /* levels of variables expansion within double quotes */ - int oldstyle; - int prevsyntax; /* syntax before arithmetic */ + struct nodelist *bqlist = 0; + int quotef = 0; + int dblquote = 0; + int varnest = 0; /* levels of variables expansion */ + int arinest = 0; /* levels of arithmetic expansion */ + int parenlevel = 0; /* levels of parens in arithmetic */ + int dqvarnest = 0; /* levels of variables expansion within double quotes */ + int oldstyle = 0; + int prevsyntax = 0; /* syntax before arithmetic */ #if __GNUC__ /* Avoid longjmp clobbering */ (void) &out; @@ -10189,13 +10224,11 @@ readtoken1(int firstc, int syntax, char *eofmark, int striptabs) if (doprompt) setprompt(2); } else { - if ( - dblquote && + if (dblquote && c != '\\' && c != '`' && c != '$' && ( c != '"' || - eofmark != NULL - ) + eofmark != NULL) ) { USTPUTC(CTLESC, out); USTPUTC('\\', out); @@ -10555,7 +10588,7 @@ parsebackq: { struct jmploc jmploc; struct jmploc *volatile savehandler; size_t savelen; - int saveprompt; + int saveprompt = 0; #ifdef __GNUC__ (void) &saveprompt; #endif @@ -10592,7 +10625,6 @@ parsebackq: { for (;;) { if (needprompt) { setprompt(2); - needprompt = 0; } switch (pc = pgetc()) { case '`': @@ -10755,7 +10787,7 @@ noexpand(char *text) * more letters, underscores, and digits). */ -char * +static char * endofname(const char *name) { char *p; @@ -10792,7 +10824,7 @@ static void synexpect(int token) static void synerror(const char *msg) { - error("Syntax error: %s", msg); + sh_error("Syntax error: %s", msg); /* NOTREACHED */ } @@ -10802,9 +10834,35 @@ synerror(const char *msg) * should be added here. */ +#ifdef CONFIG_ASH_EXPAND_PRMT +static const char * +expandstr(const char *ps) +{ + union node n; + + /* XXX Fix (char *) cast. */ + setinputstring((char *)ps); + readtoken1(pgetc(), DQSYNTAX, nullstr, 0); + popfile(); + + n.narg.type = NARG; + n.narg.next = NULL; + n.narg.text = wordtext; + n.narg.backquote = backquotelist; + + expandarg(&n, NULL, 0); + return stackblock(); +} +#endif + static void setprompt(int whichprompt) { const char *prompt; +#ifdef CONFIG_ASH_EXPAND_PRMT + struct stackmark smark; +#endif + + needprompt = 0; switch (whichprompt) { case 1: @@ -10816,7 +10874,14 @@ static void setprompt(int whichprompt) default: /* 0 */ prompt = nullstr; } - putprompt(prompt); +#ifdef CONFIG_ASH_EXPAND_PRMT + setstackmark(&smark); + stalloc(stackblocksize()); +#endif + putprompt(expandstr(prompt)); +#ifdef CONFIG_ASH_EXPAND_PRMT + popstackmark(&smark); +#endif } @@ -10827,7 +10892,7 @@ static const char *const *findkwd(const char *s) sizeof(const char *), pstrcmp); } -/* $NetBSD: redir.c,v 1.27 2002/11/24 22:35:42 christos Exp $ */ +/* redir.c */ /* * Code for dealing with input/output redirection. @@ -10911,11 +10976,11 @@ openhere(union node *redir) size_t len = 0; if (pipe(pip) < 0) - error("Pipe call failed"); + sh_error("Pipe call failed"); if (redir->type == NHERE) { len = strlen(redir->nhere.doc->narg.text); if (len <= PIPESIZE) { - xwrite(pip[1], redir->nhere.doc->narg.text, len); + bb_full_write(pip[1], redir->nhere.doc->narg.text, len); goto out; } } @@ -10929,7 +10994,7 @@ openhere(union node *redir) #endif signal(SIGPIPE, SIG_DFL); if (redir->type == NHERE) - xwrite(pip[1], redir->nhere.doc->narg.text, len); + bb_full_write(pip[1], redir->nhere.doc->narg.text, len); else expandhere(redir->nhere.doc, pip[1]); _exit(0); @@ -10992,9 +11057,9 @@ openredirect(union node *redir) return f; ecreate: - error("cannot create %s: %s", fname, errmsg(errno, E_CREAT)); + sh_error("cannot create %s: %s", fname, errmsg(errno, E_CREAT)); eopen: - error("cannot open %s: %s", fname, errmsg(errno, E_OPEN)); + sh_error("cannot open %s: %s", fname, errmsg(errno, E_OPEN)); } static inline void @@ -11068,7 +11133,7 @@ redirect(union node *redir, int flags) if (i != EBADF) { close(newfd); errno = i; - error("%d: %m", fd); + sh_error("%d: %m", fd); /* NOTREACHED */ } } else { @@ -11151,7 +11216,7 @@ copyfd(int from, int to) if (errno == EMFILE) return EMPTY; else - error("%d: %m", from); + sh_error("%d: %m", from); } return newfd; } @@ -11177,7 +11242,7 @@ redirectsafe(union node *redir, int flags) return err; } -/* $NetBSD: show.c,v 1.24 2003/01/22 20:36:04 dsl Exp $ */ +/* show.c */ #ifdef DEBUG static void shtree(union node *, int, char *, FILE*); @@ -11524,7 +11589,7 @@ opentrace(void) #endif /* DEBUG */ -/* $NetBSD: trap.c,v 1.28 2002/11/24 22:35:43 christos Exp $ */ +/* trap.c */ /* * Sigmode records the current value of the signal handlers for the various @@ -11573,7 +11638,7 @@ trapcmd(int argc, char **argv) action = *ap++; while (*ap) { if ((signo = decode_signal(*ap, 0)) < 0) - error("%s: bad trap", *ap); + sh_error("%s: bad trap", *ap); INTOFF; if (action) { if (action[0] == '-' && action[1] == '\0') @@ -11738,23 +11803,34 @@ onsig(int signo) * handlers while we are executing a trap handler. */ -void +int dotrap(void) { char *p; char *q; + int i; int savestatus; + int skip = 0; savestatus = exitstatus; - q = gotsig; - while (pendingsigs = 0, barrier(), (p = memchr(q, 1, NSIG - 1))) { - *p = 0; - p = trap[p - q + 1]; + pendingsigs = 0; + xbarrier(); + + for (i = 0, q = gotsig; i < NSIG - 1; i++, q++) { + if (!*q) + continue; + *q = 0; + + p = trap[i + 1]; if (!p) continue; - evalstring(p); + skip = evalstring(p, SKIPEVAL); exitstatus = savestatus; + if (skip) + break; } + + return skip; } @@ -11780,8 +11856,9 @@ setinteractive(int on) if(!do_banner) { out1fmt( - "\n\n" BB_BANNER " Built-in shell (ash)\n" - "Enter 'help' for a list of built-in commands.\n\n"); + "\n\n%s Built-in shell (ash)\n" + "Enter 'help' for a list of built-in commands.\n\n", + BB_BANNER); do_banner++; } } @@ -11839,14 +11916,17 @@ exitshell(void) status = exitstatus; TRACE(("pid %d, exitshell(%d)\n", getpid(), status)); if (setjmp(loc.loc)) { + if (exception == EXEXIT) + _exit(exitstatus); goto out; } handler = &loc; - if ((p = trap[0]) != NULL && *p != '\0') { + if ((p = trap[0])) { trap[0] = NULL; - evalstring(p); + evalstring(p, 0); } flushall(); + setjobctl(0); #ifdef CONFIG_FEATURE_COMMAND_SAVEHISTORY if (iflag && rootshell) { const char *hp = lookupvar("HISTFILE"); @@ -11868,7 +11948,7 @@ static int decode_signal(const char *string, int minsig) return name ? signo : -1; } -/* $NetBSD: var.c,v 1.32 2003/01/22 20:36:04 dsl Exp $ */ +/* var.c */ static struct var *vartab[VTABSIZE]; @@ -11876,7 +11956,7 @@ static int vpcmp(const void *, const void *); static struct var **findvar(struct var **, const char *); /* - * Initialize the varable symbol tables and import the environment + * Initialize the variable symbol tables and import the environment */ @@ -11924,7 +12004,7 @@ setvar(const char *name, const char *val, int flags) p = strchrnul(q, '='); namelen = p - name; if (!namelen || p != q) - error("%.*s: bad variable name", namelen, name); + sh_error("%.*s: bad variable name", namelen, name); vallen = 0; if (val == NULL) { flags |= VUNSET; @@ -11933,9 +12013,8 @@ setvar(const char *name, const char *val, int flags) } INTOFF; p = mempcpy(nameeq = ckmalloc(namelen + vallen + 2), name, namelen); - *p++ = '\0'; - if (vallen) { - p[-1] = '='; + if (val) { + *p++ = '='; p = mempcpy(p, val, vallen); } *p = '\0'; @@ -11961,10 +12040,13 @@ setvareq(char *s, int flags) flags |= (VEXPORT & (((unsigned) (1 - aflag)) - 1)); vp = *findvar(vpp, s); if (vp) { - if (vp->flags & VREADONLY) { + if ((vp->flags & (VREADONLY|VDYNAMIC)) == VREADONLY) { + const char *n; + if (flags & VNOSAVE) free(s); - error("%.*s: is read only", strchrnul(s, '=') - s, s); + n = vp->text; + sh_error("%.*s: is read only", strchrnul(n, '=') - n, n); } if (flags & VNOSET) @@ -12021,9 +12103,21 @@ lookupvar(const char *name) { struct var *v; - if ((v = *findvar(hashvar(name), name)) && !(v->flags & VUNSET)) { - return strchrnul(v->text, '=') + 1; + if ((v = *findvar(hashvar(name), name))) { +#ifdef DYNAMIC_VAR + /* + * Dynamic variables are implemented roughly the same way they are + * in bash. Namely, they're "special" so long as they aren't unset. + * As soon as they're unset, they're no longer dynamic, and dynamic + * lookup will no longer happen at that point. -- PFM. + */ + if((v->flags & VDYNAMIC)) + (*v->func)(NULL); +#endif + if(!(v->flags & VUNSET)) + return strchrnul(v->text, '=') + 1; } + return NULL; } @@ -12298,6 +12392,9 @@ unsetvar(const char *s) retval = 1; if (flags & VREADONLY) goto out; +#ifdef DYNAMIC_VAR + vp->flags &= ~VDYNAMIC; +#endif if (flags & VUNSET) goto ok; if ((flags & VSTRFIXED) == 0) { @@ -12379,7 +12476,7 @@ findvar(struct var **vpp, const char *name) } return vpp; } -/* $NetBSD: setmode.c,v 1.29 2003/01/15 23:58:03 kleink Exp $ */ +/* setmode.c */ #include @@ -12414,21 +12511,21 @@ static int timescmd(int ac, char **av) } #ifdef CONFIG_ASH_MATH_SUPPORT -static int +static arith_t dash_arith(const char *s) { - long result; + arith_t result; int errcode = 0; INTOFF; result = arith(s, &errcode); if (errcode < 0) { if (errcode == -3) - error("exponent less than 0"); + sh_error("exponent less than 0"); else if (errcode == -2) - error("divide by zero"); + sh_error("divide by zero"); else if (errcode == -5) - error("expression recursion loop detected"); + sh_error("expression recursion loop detected"); else synerror(s); } @@ -12449,11 +12546,11 @@ static int letcmd(int argc, char **argv) { char **ap; - long i; + arith_t i; ap = argv + 1; if(!*ap) - error("expression expected"); + sh_error("expression expected"); for (ap = argv + 1; *ap; ap++) { i = dash_arith(*ap); } @@ -12462,10 +12559,10 @@ letcmd(int argc, char **argv) } #endif /* CONFIG_ASH_MATH_SUPPORT */ -/* $NetBSD: miscbltin.c,v 1.31 2002/11/24 22:35:41 christos Exp $ */ +/* miscbltin.c */ /* - * Miscelaneous builtins. + * Miscellaneous builtins. */ #undef rflag @@ -12497,27 +12594,125 @@ readcmd(int argc, char **argv) int startword; int status; int i; +#if defined(CONFIG_ASH_READ_NCHARS) + int nch_flag = 0; + int nchars = 0; + int silent = 0; + struct termios tty, old_tty; +#endif +#if defined(CONFIG_ASH_READ_TIMEOUT) + fd_set set; + struct timeval ts; + + ts.tv_sec = ts.tv_usec = 0; +#endif rflag = 0; prompt = NULL; - while ((i = nextopt("p:r")) != '\0') { - if (i == 'p') +#if defined(CONFIG_ASH_READ_NCHARS) && defined(CONFIG_ASH_READ_TIMEOUT) + while ((i = nextopt("p:rt:n:s")) != '\0') +#elif defined(CONFIG_ASH_READ_NCHARS) + while ((i = nextopt("p:rn:s")) != '\0') +#elif defined(CONFIG_ASH_READ_TIMEOUT) + while ((i = nextopt("p:rt:")) != '\0') +#else + while ((i = nextopt("p:r")) != '\0') +#endif + { + switch(i) { + case 'p': prompt = optionarg; - else + break; +#if defined(CONFIG_ASH_READ_NCHARS) + case 'n': + nchars = strtol(optionarg, &p, 10); + if (*p) + sh_error("invalid count"); + nch_flag = (nchars > 0); + break; + case 's': + silent = 1; + break; +#endif +#if defined(CONFIG_ASH_READ_TIMEOUT) + case 't': + ts.tv_sec = strtol(optionarg, &p, 10); + ts.tv_usec = 0; + if (*p == '.') { + char *p2; + if (*++p) { + int scale; + ts.tv_usec = strtol(p, &p2, 10); + if (*p2) + sh_error("invalid timeout"); + scale = p2 - p; + /* normalize to usec */ + if (scale > 6) + sh_error("invalid timeout"); + while (scale++ < 6) + ts.tv_usec *= 10; + } + } else if (*p) { + sh_error("invalid timeout"); + } + if ( ! ts.tv_sec && ! ts.tv_usec) + sh_error("invalid timeout"); + break; +#endif + case 'r': rflag = 1; + break; + default: + break; + } } if (prompt && isatty(0)) { out2str(prompt); } if (*(ap = argptr) == NULL) - error("arg count"); + sh_error("arg count"); if ((ifs = bltinlookup("IFS")) == NULL) ifs = defifs; +#if defined(CONFIG_ASH_READ_NCHARS) + if (nch_flag || silent) { + tcgetattr(0, &tty); + old_tty = tty; + if (nch_flag) { + tty.c_lflag &= ~ICANON; + tty.c_cc[VMIN] = nchars; + } + if (silent) { + tty.c_lflag &= ~(ECHO|ECHOK|ECHONL); + + } + tcsetattr(0, TCSANOW, &tty); + } +#endif +#if defined(CONFIG_ASH_READ_TIMEOUT) + if (ts.tv_sec || ts.tv_usec) { + FD_ZERO (&set); + FD_SET (0, &set); + + i = select (FD_SETSIZE, &set, NULL, NULL, &ts); + if (!i) { +#if defined(CONFIG_ASH_READ_NCHARS) + if (nch_flag) + tcsetattr(0, TCSANOW, &old_tty); +#endif + return 1; + } + } +#endif status = 0; startword = 1; backslash = 0; STARTSTACKSTR(p); - for (;;) { +#if defined(CONFIG_ASH_READ_NCHARS) + while (!nch_flag || nchars--) +#else + for (;;) +#endif + { if (read(0, &c, 1) != 1) { status = 1; break; @@ -12551,6 +12746,11 @@ put: STPUTC(c, p); } } +#if defined(CONFIG_ASH_READ_NCHARS) + if (nch_flag || silent) + tcsetattr(0, TCSANOW, &old_tty); +#endif + STACKSTRNUL(p); /* Remove trailing blanks */ while ((char *)stackblock() <= --p && strchr(ifs, *p) != NULL) @@ -12613,14 +12813,14 @@ static int umaskcmd(int argc, char **argv) mask = 0; do { if (*ap >= '8' || *ap < '0') - error(illnum, argv[1]); + sh_error(illnum, argv[1]); mask = (mask << 3) + (*ap - '0'); } while (*++ap != '\0'); umask(mask); } else { mask = ~mask & 0777; if (!bb_parse_mode(ap, &mask)) { - error("Illegal mode: %s", ap); + sh_error("Illegal mode: %s", ap); } umask(~mask & 0777); } @@ -12713,7 +12913,41 @@ ulimitcmd(int argc, char **argv) struct rlimit limit; what = 'f'; - while ((optc = nextopt("HSatfdsmcnplvw")) != '\0') + while ((optc = nextopt("HSa" +#ifdef RLIMIT_CPU + "t" +#endif +#ifdef RLIMIT_FSIZE + "f" +#endif +#ifdef RLIMIT_DATA + "d" +#endif +#ifdef RLIMIT_STACK + "s" +#endif +#ifdef RLIMIT_CORE + "c" +#endif +#ifdef RLIMIT_RSS + "m" +#endif +#ifdef RLIMIT_MEMLOCK + "l" +#endif +#ifdef RLIMIT_NPROC + "p" +#endif +#ifdef RLIMIT_NOFILE + "n" +#endif +#ifdef RLIMIT_AS + "v" +#endif +#ifdef RLIMIT_LOCKS + "w" +#endif + )) != '\0') switch (optc) { case 'H': how = HARD; @@ -12736,7 +12970,7 @@ ulimitcmd(int argc, char **argv) char *p = *argptr; if (all || argptr[1]) - error("too many arguments"); + sh_error("too many arguments"); if (strncmp(p, "unlimited\n", 9) == 0) val = RLIM_INFINITY; else { @@ -12749,7 +12983,7 @@ ulimitcmd(int argc, char **argv) break; } if (c) - error("bad number"); + sh_error("bad number"); val *= l->factor; } } @@ -12769,7 +13003,7 @@ ulimitcmd(int argc, char **argv) if (how & SOFT) limit.rlim_cur = val; if (setrlimit(l->cmd, &limit) < 0) - error("error setting limit (%m)"); + sh_error("error setting limit (%m)"); } else { printlim(how, &limit, l); } @@ -12803,14 +13037,14 @@ ulimitcmd(int argc, char **argv) /* This is my infix parser/evaluator. It is optimized for size, intended * as a replacement for yacc-based parsers. However, it may well be faster - * than a comparable parser writen in yacc. The supported operators are + * than a comparable parser written in yacc. The supported operators are * listed in #defines below. Parens, order of operations, and error handling - * are supported. This code is threadsafe. The exact expression format should + * are supported. This code is thread safe. The exact expression format should * be that which POSIX specifies for shells. */ /* The code uses a simple two-stack algorithm. See * http://www.onthenet.com.au/~grahamis/int2008/week02/lect02.html - * for a detailed explaination of the infix-to-postfix algorithm on which + * for a detailed explanation of the infix-to-postfix algorithm on which * this is based (this code differs in that it applies operators immediately * to the stack instead of adding them to a queue to end up with an * expression). */ @@ -12840,7 +13074,7 @@ ulimitcmd(int argc, char **argv) * parens and then checking that all binary ops and right parens are * preceded by a valid expression (NUM_TOKEN). * - * Note: It may be desireable to replace Aaron's test for whitespace with + * Note: It may be desirable to replace Aaron's test for whitespace with * ctype's isspace() if it is used by another busybox applet or if additional * whitespace chars should be considered. Look below the "#include"s for a * precompiler test. @@ -12866,7 +13100,7 @@ ulimitcmd(int argc, char **argv) * - realize comma separated - expr, expr * - realise ++expr --expr expr++ expr-- * - realise expr ? expr : expr (but, second expr calculate always) - * - allow hexdecimal and octal numbers + * - allow hexadecimal and octal numbers * - was restored loses XOR operator * - remove one goto label, added three ;-) * - protect $((num num)) as true zero expr (Manuel`s error) @@ -12881,7 +13115,7 @@ ulimitcmd(int argc, char **argv) typedef unsigned char operator; /* An operator's token id is a bit of a bitfield. The lower 5 bits are the - * precedence, and 3 high bits are an ID unique accross operators of that + * precedence, and 3 high bits are an ID unique across operators of that * precedence. The ID portion is so that multiple operators can have the * same precedence, ensuring that the leftmost one is evaluated first. * Consider * and /. */ @@ -12986,11 +13220,11 @@ static inline int is_right_associativity(operator prec) typedef struct ARITCH_VAR_NUM { - long val; - long contidional_second_val; + arith_t val; + arith_t contidional_second_val; char contidional_second_val_initialized; char *var; /* if NULL then is regular number, - else is varable name */ + else is variable name */ } v_n_t; @@ -13044,9 +13278,8 @@ static int arith_lookup_val(v_n_t *t) static inline int arith_apply(operator op, v_n_t *numstack, v_n_t **numstackptr) { - long numptr_val; v_n_t *numptr_m1; - long rez; + arith_t numptr_val, rez; int ret_arith_lookup_val; if (NUMPTR == numstack) goto err; /* There is no operator that can work @@ -13149,7 +13382,7 @@ arith_apply(operator op, v_n_t *numstack, v_n_t **numstackptr) if(numptr_val < 0) return -3; /* exponent less than 0 */ else { - long c = 1; + arith_t c = 1; if(numptr_val) while(numptr_val--) @@ -13172,7 +13405,11 @@ arith_apply(operator op, v_n_t *numstack, v_n_t **numstackptr) goto err; } /* save to shell variable */ - sprintf(buf, "%ld", rez); +#ifdef CONFIG_ASH_MATH_SUPPORT_64 + snprintf(buf, sizeof(buf), "%lld", arith_t_type rez); +#else + snprintf(buf, sizeof(buf), "%ld", arith_t_type rez); +#endif setvar(numptr_m1->var, buf, 0); /* after saving, make previous value for v++ or v-- */ if(op == TOK_POST_INC) @@ -13235,7 +13472,7 @@ static const char op_tokens[] = { #define endexpression &op_tokens[sizeof(op_tokens)-7] -extern long arith (const char *expr, int *perrcode) +static arith_t arith (const char *expr, int *perrcode) { register char arithval; /* Current character under analysis */ operator lasttok, op; @@ -13248,7 +13485,7 @@ extern long arith (const char *expr, int *perrcode) /* Stack of integers */ /* The proof that there can be no more than strlen(startbuf)/2+1 integers - * in any given correct or incorrect expression is left as an excersize to + * in any given correct or incorrect expression is left as an exercise to * the reader. */ v_n_t *numstack = alloca(((datasizes)/2)*sizeof(v_n_t)), *numstackptr = numstack; @@ -13298,7 +13535,7 @@ extern long arith (const char *expr, int *perrcode) goto prologue; } if((p = endofname(expr)) != expr) { - int var_name_size = (p-expr) + 1; /* trailing zero */ + size_t var_name_size = (p-expr) + 1; /* trailing zero */ numstackptr->var = alloca(var_name_size); safe_strncpy(numstackptr->var, expr, var_name_size); @@ -13310,7 +13547,11 @@ extern long arith (const char *expr, int *perrcode) continue; } else if (is_digit(arithval)) { numstackptr->var = NULL; +#ifdef CONFIG_ASH_MATH_SUPPORT_64 + numstackptr->val = strtoll(expr, (char **) &expr, 0); +#else numstackptr->val = strtol(expr, (char **) &expr, 0); +#endif goto num; } for(p = op_tokens; ; p++) { @@ -13442,11 +13683,7 @@ int main(int argc, char **argv) * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * - * 3. - * - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. *