Module Name: src
Committed By: kre
Date: Sun Aug 19 23:50:27 UTC 2018
Modified Files:
src/bin/sh: error.h eval.c input.c input.h main.c parser.c trap.c
trap.h
Log Message:
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)
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/bin/sh/error.h src/bin/sh/input.h
cvs rdiff -u -r1.158 -r1.159 src/bin/sh/eval.c
cvs rdiff -u -r1.62 -r1.63 src/bin/sh/input.c
cvs rdiff -u -r1.74 -r1.75 src/bin/sh/main.c
cvs rdiff -u -r1.149 -r1.150 src/bin/sh/parser.c
cvs rdiff -u -r1.44 -r1.45 src/bin/sh/trap.c
cvs rdiff -u -r1.22 -r1.23 src/bin/sh/trap.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sh/error.h
diff -u src/bin/sh/error.h:1.20 src/bin/sh/error.h:1.21
--- src/bin/sh/error.h:1.20 Sun Jul 22 20:37:52 2018
+++ src/bin/sh/error.h Sun Aug 19 23:50:27 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: error.h,v 1.20 2018/07/22 20:37:52 kre Exp $ */
+/* $NetBSD: error.h,v 1.21 2018/08/19 23:50:27 kre Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -70,6 +70,7 @@ extern int exerrno; /* error for EXEXEC
#define EXERROR 1 /* a generic error */
#define EXSHELLPROC 2 /* execute a shell procedure */
#define EXEXEC 3 /* command execution failed */
+#define EXEXIT 4 /* shell wants to exit(exitstatus) */
/*
Index: src/bin/sh/input.h
diff -u src/bin/sh/input.h:1.20 src/bin/sh/input.h:1.21
--- src/bin/sh/input.h:1.20 Fri Jun 30 23:02:56 2017
+++ src/bin/sh/input.h Sun Aug 19 23:50:27 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: input.h,v 1.20 2017/06/30 23:02:56 kre Exp $ */
+/* $NetBSD: input.h,v 1.21 2018/08/19 23:50:27 kre Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -53,6 +53,7 @@ struct parsefile;
char *pfgets(char *, int);
int pgetc(void);
int preadbuffer(void);
+int at_eof(void);
void pungetc(void);
void pushstring(const char *, int, struct alias *);
void popstring(void);
Index: src/bin/sh/eval.c
diff -u src/bin/sh/eval.c:1.158 src/bin/sh/eval.c:1.159
--- src/bin/sh/eval.c:1.158 Sun Aug 19 11:16:13 2018
+++ src/bin/sh/eval.c Sun Aug 19 23:50:27 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: eval.c,v 1.158 2018/08/19 11:16:13 kre Exp $ */
+/* $NetBSD: eval.c,v 1.159 2018/08/19 23:50:27 kre Exp $ */
/*-
* Copyright (c) 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)eval.c 8.9 (Berkeley) 6/8/95";
#else
-__RCSID("$NetBSD: eval.c,v 1.158 2018/08/19 11:16:13 kre Exp $");
+__RCSID("$NetBSD: eval.c,v 1.159 2018/08/19 23:50:27 kre Exp $");
#endif
#endif /* not lint */
@@ -114,6 +114,7 @@ STATIC void evalfor(union node *, int);
STATIC void evalcase(union node *, int);
STATIC void evalsubshell(union node *, int);
STATIC void expredir(union node *);
+STATIC void evalredir(union node *, int);
STATIC void evalpipe(union node *);
STATIC void evalcommand(union node *, int, struct backcmd *);
STATIC void prehash(union node *);
@@ -214,18 +215,33 @@ evalstring(char *s, int flag)
{
union node *n;
struct stackmark smark;
+ int last;
+ int any;
+
+ last = flag & EV_EXIT;
+ flag &= ~EV_EXIT;
setstackmark(&smark);
setinputstring(s, 1, line_number);
+ any = 0; /* to determine if exitstatus will have been set */
while ((n = parsecmd(0)) != NEOF) {
XTRACE(DBG_EVAL, ("evalstring: "), showtree(n));
- if (n && nflag == 0)
- evaltree(n, flag);
+ if (n && nflag == 0) {
+ if (last && at_eof())
+ evaltree(n, flag | EV_EXIT);
+ else
+ evaltree(n, flag);
+ any = 1;
+ }
popstackmark(&smark);
}
popfile();
popstackmark(&smark);
+ if (!any)
+ exitstatus = 0;
+ if (last)
+ exraise(EXEXIT);
}
@@ -240,6 +256,8 @@ evaltree(union node *n, int flags)
{
bool do_etest;
int sflags = flags & ~EV_EXIT;
+ union node *next;
+ struct stackmark smark;
do_etest = false;
if (n == NULL || nflag) {
@@ -247,119 +265,114 @@ evaltree(union node *n, int flags)
n == NULL ? "NULL" : "-n"));
if (nflag == 0)
exitstatus = 0;
- goto out;
+ goto out2;
}
+
+ setstackmark(&smark);
+ do {
#ifndef SMALL
- displayhist = 1; /* show history substitutions done with fc */
+ displayhist = 1; /* show history substitutions done with fc */
#endif
- CTRACE(DBG_EVAL, ("pid %d, evaltree(%p: %s(%d), %#x) called\n",
- getpid(), n, NODETYPENAME(n->type), n->type, flags));
- switch (n->type) {
- case NSEMI:
- evaltree(n->nbinary.ch1, flags & EV_TESTED);
- if (nflag || evalskip)
- goto out;
- evaltree(n->nbinary.ch2, flags);
- break;
- case NAND:
- evaltree(n->nbinary.ch1, EV_TESTED);
- if (nflag || evalskip || exitstatus != 0)
- goto out;
- evaltree(n->nbinary.ch2, flags);
- break;
- case NOR:
- evaltree(n->nbinary.ch1, EV_TESTED);
- if (nflag || evalskip || exitstatus == 0)
- goto out;
- evaltree(n->nbinary.ch2, flags);
- break;
- case NREDIR:
- expredir(n->nredir.redirect);
- if (xflag && n->nredir.redirect) {
- union node *rn;
-
- outxstr(expandstr(ps4val(), line_number));
- outxstr("using redirections:");
- for (rn = n->nredir.redirect; rn; rn = rn->nfile.next)
- (void) outredir(outx, rn, ' ');
- outxstr(" do\n");
- flushout(outx);
- }
- redirect(n->nredir.redirect, REDIR_PUSH | REDIR_KEEP);
- evaltree(n->nredir.n, flags);
- popredir();
- if (xflag && n->nredir.redirect) {
- outxstr(expandstr(ps4val(), line_number));
- outxstr("done\n");
- flushout(outx);
+ next = NULL;
+ CTRACE(DBG_EVAL, ("pid %d, evaltree(%p: %s(%d), %#x) called\n",
+ getpid(), n, NODETYPENAME(n->type), n->type, flags));
+ switch (n->type) {
+ case NSEMI:
+ evaltree(n->nbinary.ch1, sflags);
+ if (nflag || evalskip)
+ goto out1;
+ next = n->nbinary.ch2;
+ break;
+ case NAND:
+ evaltree(n->nbinary.ch1, EV_TESTED);
+ if (nflag || evalskip || exitstatus != 0)
+ goto out1;
+ next = n->nbinary.ch2;
+ break;
+ case NOR:
+ evaltree(n->nbinary.ch1, EV_TESTED);
+ if (nflag || evalskip || exitstatus == 0)
+ goto out1;
+ next = n->nbinary.ch2;
+ break;
+ case NREDIR:
+ evalredir(n, flags);
+ break;
+ case NSUBSHELL:
+ evalsubshell(n, flags);
+ do_etest = !(flags & EV_TESTED);
+ break;
+ case NBACKGND:
+ evalsubshell(n, flags);
+ break;
+ case NIF: {
+ evaltree(n->nif.test, EV_TESTED);
+ if (nflag || evalskip)
+ goto out1;
+ if (exitstatus == 0)
+ next = n->nif.ifpart;
+ else if (n->nif.elsepart)
+ next = n->nif.elsepart;
+ else
+ exitstatus = 0;
+ break;
}
- break;
- case NSUBSHELL:
- evalsubshell(n, flags);
- do_etest = !(flags & EV_TESTED);
- break;
- case NBACKGND:
- evalsubshell(n, flags);
- break;
- case NIF: {
- evaltree(n->nif.test, EV_TESTED);
- if (nflag || evalskip)
- goto out;
- if (exitstatus == 0)
- evaltree(n->nif.ifpart, flags);
- else if (n->nif.elsepart)
- evaltree(n->nif.elsepart, flags);
- else
+ case NWHILE:
+ case NUNTIL:
+ evalloop(n, sflags);
+ break;
+ case NFOR:
+ evalfor(n, sflags);
+ break;
+ case NCASE:
+ evalcase(n, sflags);
+ break;
+ case NDEFUN:
+ CTRACE(DBG_EVAL, ("Defining fn %s @%d%s\n",
+ n->narg.text, n->narg.lineno,
+ fnline1 ? " LINENO=1" : ""));
+ defun(n->narg.text, n->narg.next, n->narg.lineno);
exitstatus = 0;
- break;
- }
- case NWHILE:
- case NUNTIL:
- evalloop(n, sflags);
- break;
- case NFOR:
- evalfor(n, sflags);
- break;
- case NCASE:
- evalcase(n, sflags);
- break;
- case NDEFUN:
- CTRACE(DBG_EVAL, ("Defining fn %s @%d%s\n", n->narg.text,
- n->narg.lineno, fnline1 ? " LINENO=1" : ""));
- defun(n->narg.text, n->narg.next, n->narg.lineno);
- exitstatus = 0;
- break;
- case NNOT:
- evaltree(n->nnot.com, EV_TESTED);
- exitstatus = !exitstatus;
- break;
- case NDNOT:
- evaltree(n->nnot.com, EV_TESTED);
- if (exitstatus != 0)
- exitstatus = 1;
- break;
- case NPIPE:
- evalpipe(n);
- do_etest = !(flags & EV_TESTED);
- break;
- case NCMD:
- evalcommand(n, flags, NULL);
- do_etest = !(flags & EV_TESTED);
- break;
- default:
+ break;
+ case NNOT:
+ evaltree(n->nnot.com, EV_TESTED);
+ exitstatus = !exitstatus;
+ break;
+ case NDNOT:
+ evaltree(n->nnot.com, EV_TESTED);
+ if (exitstatus != 0)
+ exitstatus = 1;
+ break;
+ case NPIPE:
+ evalpipe(n);
+ do_etest = !(flags & EV_TESTED);
+ break;
+ case NCMD:
+ evalcommand(n, flags, NULL);
+ do_etest = !(flags & EV_TESTED);
+ break;
+ default:
#ifdef NODETYPENAME
- out1fmt("Node type = %d(%s)\n", n->type, NODETYPENAME(n->type));
+ out1fmt("Node type = %d(%s)\n",
+ n->type, NODETYPENAME(n->type));
#else
- out1fmt("Node type = %d\n", n->type);
+ out1fmt("Node type = %d\n", n->type);
#endif
- flushout(&output);
- break;
- }
- out:
+ flushout(&output);
+ break;
+ }
+ n = next;
+ popstackmark(&smark);
+ } while(n != NULL);
+ out1:
+ popstackmark(&smark);
+ out2:
if (pendingsigs)
dotrap();
- if ((flags & EV_EXIT) != 0 || (eflag && exitstatus != 0 && do_etest))
+ if (eflag && exitstatus != 0 && do_etest)
exitshell(exitstatus);
+ if (flags & EV_EXIT)
+ exraise(EXEXIT);
}
@@ -509,7 +522,7 @@ evalcase(union node *n, int flags)
STATIC void
evalsubshell(union node *n, int flags)
{
- struct job *jp;
+ struct job *jp= NULL;
int backgnd = (n->type == NBACKGND);
expredir(n->nredir.redirect);
@@ -520,24 +533,29 @@ evalsubshell(union node *n, int flags)
outxstr("using redirections:");
for (rn = n->nredir.redirect; rn; rn = rn->nfile.next)
(void) outredir(outx, rn, ' ');
- outxstr(" do subshell\n");
+ outxstr(" do subshell ("/*)*/);
+ if (backgnd)
+ outxstr(/*(*/") &");
+ outxc('\n');
flushout(outx);
}
- INTOFF;
- jp = makejob(n, 1);
- if (forkshell(jp, n, backgnd ? FORK_BG : FORK_FG) == 0) {
+ if ((!backgnd && flags & EV_EXIT && !have_traps()) ||
+ forkshell(jp = makejob(n, 1), n, backgnd?FORK_BG:FORK_FG) == 0) {
INTON;
if (backgnd)
flags &=~ EV_TESTED;
redirect(n->nredir.redirect, REDIR_KEEP);
- /* never returns */
- evaltree(n->nredir.n, flags | EV_EXIT);
- }
- exitstatus = backgnd ? 0 : waitforjob(jp);
- INTON;
+ evaltree(n->nredir.n, flags | EV_EXIT); /* never returns */
+ } else if (!backgnd) {
+ INTOFF;
+ exitstatus = waitforjob(jp);
+ INTON;
+ } else
+ exitstatus = 0;
+
if (!backgnd && xflag && n->nredir.redirect) {
outxstr(expandstr(ps4val(), line_number));
- outxstr("done subshell\n");
+ outxstr(/*(*/") done subshell\n");
flushout(outx);
}
}
@@ -577,6 +595,67 @@ expredir(union node *n)
}
}
+/*
+ * Perform redirections for a compound command, and then do it (and restore)
+ */
+STATIC void
+evalredir(union node *n, int flags)
+{
+ struct jmploc jmploc;
+ struct jmploc * const savehandler = handler;
+ volatile int in_redirect = 1;
+ const char * volatile PS4 = NULL;
+
+ expredir(n->nredir.redirect);
+
+ if (xflag && n->nredir.redirect) {
+ union node *rn;
+
+ outxstr(PS4 = expandstr(ps4val(), line_number));
+ outxstr("using redirections:");
+ for (rn = n->nredir.redirect; rn != NULL; rn = rn->nfile.next)
+ (void) outredir(outx, rn, ' ');
+ outxstr(" do {\n"); /* } */
+ flushout(outx);
+ }
+
+ if (setjmp(jmploc.loc)) {
+ int e;
+
+ handler = savehandler;
+ e = exception;
+ popredir();
+ if (xflag && n->nredir.redirect) {
+ outxstr(PS4);
+ /* { */ outxstr("} failed\n");
+ flushout(outx);
+ }
+ if (e == EXERROR || e == EXEXEC) {
+ if (in_redirect) {
+ exitstatus = 2;
+ return;
+ }
+ }
+ longjmp(handler->loc, 1);
+ } else {
+ INTOFF;
+ handler = &jmploc;
+ redirect(n->nredir.redirect, REDIR_PUSH | REDIR_KEEP);
+ in_redirect = 0;
+ INTON;
+ evaltree(n->nredir.n, flags);
+ }
+ INTOFF;
+ handler = savehandler;
+ popredir();
+ INTON;
+
+ if (xflag && n->nredir.redirect) {
+ outxstr(PS4);
+ /* { */ outxstr("} done\n");
+ flushout(outx);
+ }
+}
/*
@@ -609,10 +688,11 @@ evalpipe(union node *n)
if (sh_pipe(pip) < 0) {
if (prevfd >= 0)
close(prevfd);
- error("Pipe call failed");
+ error("Pipe call failed: %s", strerror(errno));
}
}
- if (forkshell(jp, lp->n, n->npipe.backgnd ? FORK_BG : FORK_FG) == 0) {
+ if (forkshell(jp, lp->n,
+ n->npipe.backgnd ? FORK_BG : FORK_FG) == 0) {
INTON;
if (prevfd > 0)
movefd(prevfd, 0);
@@ -628,9 +708,11 @@ evalpipe(union node *n)
close(pip[1]);
}
if (n->npipe.backgnd == 0) {
+ INTOFF;
exitstatus = waitforjob(jp);
CTRACE(DBG_EVAL, ("evalpipe: job done exit status %d\n",
exitstatus));
+ INTON;
} else
exitstatus = 0;
INTON;
@@ -650,16 +732,18 @@ evalbackcmd(union node *n, struct backcm
{
int pip[2];
struct job *jp;
- struct stackmark smark; /* unnecessary */
+ struct stackmark smark; /* unnecessary (because we fork) */
- setstackmark(&smark);
result->fd = -1;
result->buf = NULL;
result->nleft = 0;
result->jp = NULL;
- if (nflag || n == NULL) {
+
+ if (nflag || n == NULL)
goto out;
- }
+
+ setstackmark(&smark);
+
#ifdef notyet
/*
* For now we disable executing builtins in the same
@@ -668,7 +752,7 @@ evalbackcmd(union node *n, struct backcm
* supposed only to affect subshells. eg. echo "`cd /`"
*/
if (n->type == NCMD) {
- exitstatus = oexitstatus;
+ exitstatus = oexitstatus; /* XXX o... no longer exists */
evalcommand(n, EV_BACKCMD, result);
} else
#endif
@@ -690,8 +774,8 @@ evalbackcmd(union node *n, struct backcm
result->jp = jp;
INTON;
}
- out:
popstackmark(&smark);
+ out:
CTRACE(DBG_EVAL, ("evalbackcmd done: fd=%d buf=0x%x nleft=%d jp=0x%x\n",
result->fd, result->buf, result->nleft, result->jp));
}
@@ -1040,6 +1124,7 @@ evalcommand(union node *cmd, int flgs, s
#endif
if (forkshell(jp, cmd, mode) != 0)
goto parent; /* at end of routine */
+ flags |= EV_EXIT;
FORCEINTON;
#ifdef DO_SHAREDVFORK
}
@@ -1057,10 +1142,13 @@ evalcommand(union node *cmd, int flgs, s
/* This is the child process if a fork occurred. */
/* Execute the command. */
switch (cmdentry.cmdtype) {
+ volatile int saved;
+
case CMDFUNCTION:
VXTRACE(DBG_EVAL, ("Shell function%s: ",vforked?" VF":""),
trargs(argv));
- redirect(cmd->ncmd.redirect, REDIR_PUSH);
+ redirect(cmd->ncmd.redirect, saved =
+ !(flags & EV_EXIT) || have_traps() ? REDIR_PUSH : 0);
saveparam = shellparam;
shellparam.malloc = 0;
shellparam.reset = 1;
@@ -1080,6 +1168,8 @@ evalcommand(union node *cmd, int flgs, s
freeparam(&shellparam);
shellparam = saveparam;
}
+ if (saved)
+ popredir();;
unreffunc(cmdentry.u.func);
poplocalvars();
localvars = savelocalvars;
@@ -1108,7 +1198,8 @@ evalcommand(union node *cmd, int flgs, s
/* stop shell blowing its stack */
if (++funcnest > 1000)
error("too many nested function calls");
- evaltree(getfuncnode(cmdentry.u.func), flags & EV_TESTED);
+ evaltree(getfuncnode(cmdentry.u.func),
+ flags & (EV_TESTED|EV_EXIT));
funcnest--;
INTOFF;
unreffunc(cmdentry.u.func);
@@ -1119,7 +1210,8 @@ evalcommand(union node *cmd, int flgs, s
freeparam(&shellparam);
shellparam = saveparam;
handler = savehandler;
- popredir();
+ if (saved)
+ popredir();
INTON;
if (evalskip == SKIPFUNC) {
evalskip = SKIPNONE;
@@ -1175,8 +1267,12 @@ evalcommand(union node *cmd, int flgs, s
exitstatus = cmdentry.u.bltin(argc, argv);
} else {
e = exception;
- exitstatus = e == EXINT ? SIGINT + 128 :
- e == EXEXEC ? exerrno : 2;
+ if (e == EXINT)
+ exitstatus = SIGINT + 128;
+ else if (e == EXEXEC)
+ exitstatus = exerrno;
+ else if (e != EXEXIT)
+ exitstatus = 2;
}
handler = savehandler;
flushall();
Index: src/bin/sh/input.c
diff -u src/bin/sh/input.c:1.62 src/bin/sh/input.c:1.63
--- src/bin/sh/input.c:1.62 Sat Aug 19 21:13:11 2017
+++ src/bin/sh/input.c Sun Aug 19 23:50:27 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: input.c,v 1.62 2017/08/19 21:13:11 kre Exp $ */
+/* $NetBSD: input.c,v 1.63 2018/08/19 23:50:27 kre Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)input.c 8.3 (Berkeley) 6/9/95";
#else
-__RCSID("$NetBSD: input.c,v 1.62 2017/08/19 21:13:11 kre Exp $");
+__RCSID("$NetBSD: input.c,v 1.63 2018/08/19 23:50:27 kre Exp $");
#endif
#endif /* not lint */
@@ -331,6 +331,45 @@ preadbuffer(void)
}
/*
+ * Test whether we have reached EOF on input stream.
+ * Return true only if certain (without attempting a read).
+ *
+ * Note the similarity to the opening section of preadbuffer()
+ */
+int
+at_eof(void)
+{
+ struct strpush *sp = parsefile->strpush;
+
+ if (parsenleft > 0) /* more chars are in the buffer */
+ return 0;
+
+ while (sp != NULL) {
+ /*
+ * If any pushed string has any remaining data,
+ * then we are not at EOF (simulating popstring())
+ */
+ if (sp->prevnleft > 0)
+ return 0;
+ sp = sp->prev;
+ }
+
+ /*
+ * If we reached real EOF and pushed it back,
+ * or if we are just processing a string (not reading a file)
+ * then there is no more. Note that if a file pushes a
+ * string, the file's ->buf remains present.
+ */
+ if (parsenleft == EOF_NLEFT || parsefile->buf == NULL)
+ return 1;
+
+ /*
+ * In other cases, there might be more
+ */
+ return 0;
+}
+
+/*
* Undo the last call to pgetc. Only one character may be pushed back.
* PEOF may be pushed back.
*/
Index: src/bin/sh/main.c
diff -u src/bin/sh/main.c:1.74 src/bin/sh/main.c:1.75
--- src/bin/sh/main.c:1.74 Sun Aug 19 11:16:13 2018
+++ src/bin/sh/main.c Sun Aug 19 23:50:27 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.74 2018/08/19 11:16:13 kre Exp $ */
+/* $NetBSD: main.c,v 1.75 2018/08/19 23:50:27 kre Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1991, 19
#if 0
static char sccsid[] = "@(#)main.c 8.7 (Berkeley) 7/19/95";
#else
-__RCSID("$NetBSD: main.c,v 1.74 2018/08/19 11:16:13 kre Exp $");
+__RCSID("$NetBSD: main.c,v 1.75 2018/08/19 23:50:27 kre Exp $");
#endif
#endif /* not lint */
@@ -150,7 +150,8 @@ main(int argc, char **argv)
}
if (exception != EXSHELLPROC) {
- if (state == 0 || iflag == 0 || ! rootshell)
+ if (state == 0 || iflag == 0 || ! rootshell ||
+ exception == EXEXIT)
exitshell(exitstatus);
}
reset();
@@ -234,7 +235,7 @@ state3:
}
if (minusc)
- evalstring(minusc, 0);
+ evalstring(minusc, sflag ? 0 : EV_EXIT);
if (sflag || minusc == NULL) {
state4: /* XXX ??? - why isn't this before the "if" statement */
Index: src/bin/sh/parser.c
diff -u src/bin/sh/parser.c:1.149 src/bin/sh/parser.c:1.150
--- src/bin/sh/parser.c:1.149 Sun Jul 22 23:07:48 2018
+++ src/bin/sh/parser.c Sun Aug 19 23:50:27 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: parser.c,v 1.149 2018/07/22 23:07:48 kre Exp $ */
+/* $NetBSD: parser.c,v 1.150 2018/08/19 23:50:27 kre Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)parser.c 8.7 (Berkeley) 5/16/95";
#else
-__RCSID("$NetBSD: parser.c,v 1.149 2018/07/22 23:07:48 kre Exp $");
+__RCSID("$NetBSD: parser.c,v 1.150 2018/08/19 23:50:27 kre Exp $");
#endif
#endif /* not lint */
@@ -179,7 +179,7 @@ parsecmd(int interact)
STATIC union node *
list(int nlflag)
{
- union node *n1, *n2, *n3;
+ union node *ntop, *n1, *n2, *n3;
int tok;
CTRACE(DBG_PARSE, ("list(%d): entered @%d\n",nlflag,plinno));
@@ -187,7 +187,7 @@ list(int nlflag)
checkkwd = 2;
if (nlflag == 0 && tokendlist[peektoken()])
return NULL;
- n1 = NULL;
+ ntop = n1 = NULL;
for (;;) {
n2 = andor();
tok = readtoken();
@@ -205,14 +205,22 @@ list(int nlflag)
}
}
- if (n1 != NULL) {
+ if (ntop == NULL)
+ ntop = n2;
+ else if (n1 == NULL) {
+ n1 = stalloc(sizeof(struct nbinary));
+ n1->type = NSEMI;
+ n1->nbinary.ch1 = ntop;
+ n1->nbinary.ch2 = n2;
+ ntop = n1;
+ } else {
n3 = stalloc(sizeof(struct nbinary));
n3->type = NSEMI;
- n3->nbinary.ch1 = n1;
+ n3->nbinary.ch1 = n1->nbinary.ch2;
n3->nbinary.ch2 = n2;
+ n1->nbinary.ch2 = n3;
n1 = n3;
- } else
- n1 = n2;
+ }
switch (tok) {
case TBACKGND:
@@ -223,24 +231,24 @@ list(int nlflag)
if (tok == TNL) {
readheredocs();
if (nlflag)
- return n1;
+ return ntop;
} else if (tok == TEOF && nlflag)
- return n1;
+ return ntop;
else
tokpushback++;
checkkwd = 2;
if (!nlflag && tokendlist[peektoken()])
- return n1;
+ return ntop;
break;
case TEOF:
pungetc(); /* push back EOF on input */
- return n1;
+ return ntop;
default:
if (nlflag)
synexpect(-1, 0);
tokpushback++;
- return n1;
+ return ntop;
}
}
}
Index: src/bin/sh/trap.c
diff -u src/bin/sh/trap.c:1.44 src/bin/sh/trap.c:1.45
--- src/bin/sh/trap.c:1.44 Sun Jul 22 20:43:58 2018
+++ src/bin/sh/trap.c Sun Aug 19 23:50:27 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.44 2018/07/22 20:43:58 kre Exp $ */
+/* $NetBSD: trap.c,v 1.45 2018/08/19 23:50:27 kre Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)trap.c 8.5 (Berkeley) 6/5/95";
#else
-__RCSID("$NetBSD: trap.c,v 1.44 2018/07/22 20:43:58 kre Exp $");
+__RCSID("$NetBSD: trap.c,v 1.45 2018/08/19 23:50:27 kre Exp $");
#endif
#endif /* not lint */
@@ -324,7 +324,19 @@ clear_traps(int vforked)
}
}
+/*
+ * See if there are any defined traps
+ */
+int
+have_traps(void)
+{
+ char **tp;
+ for (tp = trap ; tp < &trap[NSIG] ; tp++)
+ if (*tp && **tp) /* trap not NULL or SIG_IGN */
+ return 1;
+ return 0;
+}
/*
* Set the signal handler for the specified signal. The routine figures
Index: src/bin/sh/trap.h
diff -u src/bin/sh/trap.h:1.22 src/bin/sh/trap.h:1.23
--- src/bin/sh/trap.h:1.22 Sat Aug 22 12:12:47 2015
+++ src/bin/sh/trap.h Sun Aug 19 23:50:27 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.h,v 1.22 2015/08/22 12:12:47 christos Exp $ */
+/* $NetBSD: trap.h,v 1.23 2018/08/19 23:50:27 kre Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -37,6 +37,7 @@
extern volatile int pendingsigs;
void clear_traps(int);
+int have_traps(void);
sig_t setsignal(int, int);
void ignoresig(int, int);
void onsig(int);
