History log of /src/bin/sh/error.h |
Revision | | Date | Author | Comments |
1.25 |
| 21-Mar-2023 |
hannken | Use "sigjmp_buf loc" after switch to sigsetjmp()/siglongjmp().
Fixes errors and aborts on sparc at least.
|
1.24 |
| 19-Mar-2023 |
kre | Switch from using _setjmp()/_longjmp() (on BSD systems which aren't SVR4) (and setjmp()/longjmp() elsewhere) to using sigsetjmp()/siglongjmp() everywhere.
NFCI.
|
1.23 |
| 19-Mar-2023 |
kre | Change a few #defines from octal to hex (pdp11 days are long gone). Improve the layout of those definitions at the same time.
NFC.
|
1.22 |
| 04-Feb-2019 |
kre | PR bin/53919
Suppress shell error messages while expanding $ENV (which also causes errors while expanding $PS1 $PS2 and $PS4 to be suppressed as well).
This allows any random garbage that happens to be in ENV to not cause noise when the shell starts (which is effectively all it did).
On a parse error (for any of those vars) we also use "" as the result, which will be a null prompt, and avoid attempting to open any file for ENV.
This does not in any way change what happens for a correctly parsed command substitution (either when it is executed when permitted for one of the prompts, or when it is not (which is always for ENV)) and commands run from those can still produce error output (but shell errors remain suppressed).
|
1.21 |
| 19-Aug-2018 |
kre | PR bin/48875 (is related, and ameliorated, but not exactly "fixed")
Import a whole set of tree evaluation enhancements from FreeBSD.
With these, before forking, the shell predicts (often) when all it will have to do after forking (in the parent) is wait for the child and then exit with the status from the child, and in such a case simply does not fork, but rather allows the child to take over the parent's role.
This turns out to handle the particular test case from PR bin/48875 in such a way that it works as hoped, rather than as it did (the delay there was caused by an extra copy of the shell hanging around waiting for the background child to complete ... and keeping the command substitution stdout open, so the "real" parent had to wait in case more output appeared).
As part of doing this, redirection processing for compound commands gets moved out of evalsubshell() and into a new evalredir(), which allows us to properly handle errors occurring while performing those redirects, and not mishandle (as in simply forget) fd's which had been moved out of the way temporarily.
evaltree() has its degree of recursion reduced by making it loop to handle the subsequent operation: that is instead of (for any binop like ';' '&&' (etc)) where it used to evaltree(node->left); evaltree(node->right); return; it now does (kind of) next = node; while ((node = next) != NULL) { next = NULL;
if (node is a binary op) { evaltree(node->left); if appropriate /* if && test for success, etc */ next = node->right; continue; } /* similar for loops, etc */ } which can be a good saving, as while the left side (now) tends to be (usually) a simple (or simpleish) command, the right side can be many commands (in a command sequence like a; b; c; d; ... the node at the top of the tree will now have "a" as its left node, and the tree for b; c; d; ... as its right node - until now everything was evaluated recursively so it made no difference, and the tree was constructed the other way).
if/while/... statements are done similarly, recurse to evaluate the condition, then if the (or one of the) body parts is to be evaluated, set next to that, and loop (previously it recursed).
There is more to do in this area (particularly in the way that case statements are processed - we can avoid recursion there as well) but that can wait for another day.
While doing all of this we keep much better track of when the shell is just going to exit once the current tree is evaluated (with a new predicate at_eof() to tell us that we have, for sure, reached the end of the input stream, that is, this shell will, for certain, not be reading more command input) and use that info to avoid unneeded forks. For that we also need another new predicate (have_traps()) to determine of there are any caught traps which might occur - if there are, we need to remain to (potentially) handle them, so these optimisations will not occur (to make the issue in PR 48875 appear again, run the same code, but with a trap set to execute some code when a signal (or EXIT) occurs - note that the trap must be set in the appropriate level of sub-shell to have this effect, any caught traps are cleared in a subshell whenever one is created).
There is still work to be done to handle traps properly, whatever weirdness they do (some of which is related to some of this.)
These changes do not need man page updates, but 48875 does - an update to sh.1 will be forthcoming once it is decided what it should say...
Once again, all the heavy lifting for this set of changes comes directly (with thanks) from the FreeBSD shell.
XXX pullup-8 (but not very soon)
|
1.20 |
| 22-Jul-2018 |
kre | NFC: better protect the INTON (etc) macros ( do { } while(0) ) This is just a kind of precaution, none of the uses actually require the extra protection.
|
1.19 |
| 15-Mar-2012 |
joerg | branches: 1.19.32; 1.19.34; Add __printflike attribution to use vprintf and friends with an argument as format string.
|
1.18 |
| 23-Aug-2011 |
christos | branches: 1.18.2; add more gcc printf format attributes
|
1.17 |
| 29-Mar-2008 |
apb | If SHELL_BUILTIN is defined (as will be the case when building external builtins such as the printf command), then hide a few declarations.
This allows the shell to build again, fixing a problem with "error" being declared as a function here, and as a variable in .../usr.bin/printf/printf.c.
|
1.16 |
| 07-Aug-2003 |
agc | Move UCB-licensed code from 4-clause to 3-clause licence.
Patches provided by Joel Baker in PR 22249, verified by myself.
|
1.15 |
| 24-Nov-2002 |
christos | Fixes from David Laight: - ansification - format of output of jobs command (etc) - job identiers %+, %- etc - $? and $(...) - correct quoting of output of set, export -p and readonly -p - differentiation between nornal and 'posix special' builtins - correct behaviour (posix) for errors on builtins and special builtins - builtin printf and kill - set -o debug (if compiled with DEBUG) - cd src obj (as ksh - too useful to do without) - unset -e name, remove non-readonly variable from export list. (so I could unset -e PS1 before running the test shell...)
|
1.14 |
| 04-Feb-2001 |
christos | remove redundant declarations and nexted externs.
|
1.13 |
| 09-Jul-1999 |
christos | compile with WARNS = 2
|
1.12 |
| 28-Jul-1998 |
mycroft | Be more retentive about use of NOTREACHED and noreturn.
|
1.11 |
| 15-Jul-1997 |
christos | Don't re-define setjmp/longjmp in the svr4 case
|
1.10 |
| 04-Jul-1997 |
christos | Fix compiler warnings.
|
1.9 |
| 16-Oct-1996 |
christos | PR/287: Shell does not exit with 126/127 when permission denied/ command not found. Add extra exception type and generalize error handling routines to take that exception type. Use a global variable exerrno to keep the last exec error.
|
1.8 |
| 11-May-1995 |
christos | branches: 1.8.6; Merge in my changes from vangogh, and fix the x=`false`; echo $? == 0 bug.
|
1.7 |
| 21-Mar-1995 |
cgd | convert to new RCS id conventions.
|
1.6 |
| 11-Jun-1994 |
mycroft | Add RCS ids.
|
1.5 |
| 11-May-1994 |
jtc | sync with 4.4lite
|
1.4 |
| 01-Aug-1993 |
mycroft | Add RCS identifiers.
|
1.3 |
| 23-Mar-1993 |
cgd | changed "Id" to "Header" for rcsids
|
1.2 |
| 22-Mar-1993 |
cgd | added rcs ids to all files
|
1.1 |
| 21-Mar-1993 |
cgd | branches: 1.1.1; Initial revision
|
1.1.1.2 |
| 11-May-1994 |
jtc | 44lite code
|
1.1.1.1 |
| 21-Mar-1993 |
cgd | initial import of 386bsd-0.1 sources
|
1.8.6.1 |
| 26-Jan-1997 |
rat | Update /bin/sh from trunk per request of Christos Zoulas. Fixes many bugs.
|
1.18.2.1 |
| 17-Apr-2012 |
yamt | sync with head
|
1.19.34.3 |
| 21-Apr-2020 |
martin | Ooops, restore accidently removed files from merge mishap
|
1.19.34.2 |
| 21-Apr-2020 |
martin | Sync with HEAD
|
1.19.34.1 |
| 10-Jun-2019 |
christos | Sync with HEAD
|
1.19.32.2 |
| 06-Sep-2018 |
pgoyette | Sync with HEAD
Resolve a couple of conflicts (result of the uimin/uimax changes)
|
1.19.32.1 |
| 28-Jul-2018 |
pgoyette | Sync with HEAD
|