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)
2018-08-20 02:50:27 +03:00
|
|
|
/* $NetBSD: input.c,v 1.63 2018/08/19 23:50:27 kre Exp $ */
|
1995-03-21 12:01:59 +03:00
|
|
|
|
1993-03-21 12:45:37 +03:00
|
|
|
/*-
|
1994-05-11 21:09:42 +04:00
|
|
|
* Copyright (c) 1991, 1993
|
|
|
|
* The Regents of the University of California. All rights reserved.
|
1993-03-21 12:45:37 +03:00
|
|
|
*
|
|
|
|
* This code is derived from software contributed to Berkeley by
|
|
|
|
* Kenneth Almquist.
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
* are met:
|
|
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
* 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.
|
2003-08-07 13:05:01 +04:00
|
|
|
* 3. Neither the name of the University nor the names of its contributors
|
1993-03-21 12:45:37 +03:00
|
|
|
* may be used to endorse or promote products derived from this software
|
|
|
|
* without specific prior written permission.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
|
|
* SUCH DAMAGE.
|
|
|
|
*/
|
|
|
|
|
1997-07-05 01:01:48 +04:00
|
|
|
#include <sys/cdefs.h>
|
1993-03-21 12:45:37 +03:00
|
|
|
#ifndef lint
|
1995-03-21 12:01:59 +03:00
|
|
|
#if 0
|
1995-06-09 05:53:44 +04:00
|
|
|
static char sccsid[] = "@(#)input.c 8.3 (Berkeley) 6/9/95";
|
1995-03-21 12:01:59 +03:00
|
|
|
#else
|
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)
2018-08-20 02:50:27 +03:00
|
|
|
__RCSID("$NetBSD: input.c,v 1.63 2018/08/19 23:50:27 kre Exp $");
|
1995-03-21 12:01:59 +03:00
|
|
|
#endif
|
1993-03-21 12:45:37 +03:00
|
|
|
#endif /* not lint */
|
|
|
|
|
|
|
|
#include <stdio.h> /* defines BUFSIZ */
|
|
|
|
#include <fcntl.h>
|
|
|
|
#include <errno.h>
|
1994-05-12 21:03:32 +04:00
|
|
|
#include <unistd.h>
|
2012-03-29 00:11:25 +04:00
|
|
|
#include <limits.h>
|
1995-05-12 01:28:33 +04:00
|
|
|
#include <stdlib.h>
|
1995-06-07 20:28:03 +04:00
|
|
|
#include <string.h>
|
2016-06-01 08:11:52 +03:00
|
|
|
#include <sys/stat.h>
|
1995-05-12 01:28:33 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* This file implements the input routines used by the parser.
|
|
|
|
*/
|
|
|
|
|
1994-05-12 21:03:32 +04:00
|
|
|
#include "shell.h"
|
1995-05-12 01:28:33 +04:00
|
|
|
#include "redir.h"
|
1993-03-21 12:45:37 +03:00
|
|
|
#include "syntax.h"
|
|
|
|
#include "input.h"
|
|
|
|
#include "output.h"
|
1994-05-11 21:09:42 +04:00
|
|
|
#include "options.h"
|
1993-03-21 12:45:37 +03:00
|
|
|
#include "memalloc.h"
|
|
|
|
#include "error.h"
|
1994-05-11 21:09:42 +04:00
|
|
|
#include "alias.h"
|
|
|
|
#include "parser.h"
|
|
|
|
#include "myhistedit.h"
|
A better LINENO implementation. This version deletes (well, #if 0's out)
the LINENO hack, and uses the LINENO var for both ${LINENO} and $((LINENO)).
(Code to invert the LINENO hack when required, like when de-compiling the
execution tree to provide the "jobs" command strings, is still included,
that can be deleted when the LINENO hack is completely removed - look for
refs to VSLINENO throughout the code. The var funclinno in parser.c can
also be removed, it is used only for the LINENO hack.)
This version produces accurate results: $((LINENO)) was made as accurate
as the LINENO hack made ${LINENO} which is very good. That's why the
LINENO hack is not yet completely removed, so it can be easily re-enabled.
If you can tell the difference when it is in use, or not in use, then
something has broken (or I managed to miss a case somewhere.)
The way that LINENO works is documented in its own (new) section in the
man page, so nothing more about that, or the new options, etc, here.
This version introduces the possibility of having a "reference" function
associated with a variable, which gets called whenever the value of the
variable is required (that's what implements LINENO). There is just
one function pointer however, so any particular variable gets at most
one of the set function (as used for PATH, etc) or the reference function.
The VFUNCREF bit in the var flags indicates which func the variable in
question uses (if any - the func ptr, as before, can be NULL).
I would not call the results of this perfect yet, but it is close.
2017-06-07 08:08:32 +03:00
|
|
|
#include "show.h"
|
1993-03-21 12:45:37 +03:00
|
|
|
|
|
|
|
#define EOF_NLEFT -99 /* value of parsenleft when EOF pushed back */
|
|
|
|
|
1994-05-11 21:09:42 +04:00
|
|
|
MKINIT
|
|
|
|
struct strpush {
|
|
|
|
struct strpush *prev; /* preceding string on stack */
|
2017-05-03 07:51:04 +03:00
|
|
|
const char *prevstring;
|
1994-05-11 21:09:42 +04:00
|
|
|
int prevnleft;
|
1995-09-26 16:25:19 +03:00
|
|
|
int prevlleft;
|
1994-05-11 21:09:42 +04:00
|
|
|
struct alias *ap; /* if push was associated with an alias */
|
|
|
|
};
|
1993-03-21 12:45:37 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* The parsefile structure pointed to by the global variable parsefile
|
|
|
|
* contains information about the current file being read.
|
|
|
|
*/
|
|
|
|
|
|
|
|
MKINIT
|
|
|
|
struct parsefile {
|
1994-05-11 21:09:42 +04:00
|
|
|
struct parsefile *prev; /* preceding file on stack */
|
1993-03-21 12:45:37 +03:00
|
|
|
int linno; /* current line */
|
|
|
|
int fd; /* file descriptor (or -1 if string) */
|
1995-09-26 16:25:19 +03:00
|
|
|
int nleft; /* number of chars left in this line */
|
|
|
|
int lleft; /* number of chars left in this buffer */
|
2017-05-03 07:51:04 +03:00
|
|
|
const char *nextc; /* next char in buffer */
|
1993-03-21 12:45:37 +03:00
|
|
|
char *buf; /* input buffer */
|
1994-05-11 21:09:42 +04:00
|
|
|
struct strpush *strpush; /* for pushing strings at this level */
|
|
|
|
struct strpush basestrpush; /* so pushing one is fast */
|
1993-03-21 12:45:37 +03:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
int plinno = 1; /* input line number */
|
2001-02-04 22:52:06 +03:00
|
|
|
int parsenleft; /* copy of parsefile->nleft */
|
1995-09-26 16:25:19 +03:00
|
|
|
MKINIT int parselleft; /* copy of parsefile->lleft */
|
2017-05-03 07:51:04 +03:00
|
|
|
const char *parsenextc; /* copy of parsefile->nextc */
|
1993-03-21 12:45:37 +03:00
|
|
|
MKINIT struct parsefile basepf; /* top level input file */
|
2001-02-04 22:52:06 +03:00
|
|
|
MKINIT char basebuf[BUFSIZ]; /* buffer for top level input file */
|
1993-03-21 12:45:37 +03:00
|
|
|
struct parsefile *parsefile = &basepf; /* current input file */
|
1994-05-11 21:09:42 +04:00
|
|
|
int init_editline = 0; /* editline library initialized? */
|
|
|
|
int whichprompt; /* 1 == PS1, 2 == PS2 */
|
|
|
|
|
2002-11-25 01:35:38 +03:00
|
|
|
STATIC void pushfile(void);
|
|
|
|
static int preadfd(void);
|
1993-03-21 12:45:37 +03:00
|
|
|
|
|
|
|
#ifdef mkinit
|
2001-02-04 22:52:06 +03:00
|
|
|
INCLUDE <stdio.h>
|
1993-03-21 12:45:37 +03:00
|
|
|
INCLUDE "input.h"
|
|
|
|
INCLUDE "error.h"
|
|
|
|
|
|
|
|
INIT {
|
|
|
|
basepf.nextc = basepf.buf = basebuf;
|
|
|
|
}
|
|
|
|
|
|
|
|
RESET {
|
|
|
|
if (exception != EXSHELLPROC)
|
1995-09-26 16:25:19 +03:00
|
|
|
parselleft = parsenleft = 0; /* clear input buffer */
|
1993-03-21 12:45:37 +03:00
|
|
|
popallfiles();
|
|
|
|
}
|
|
|
|
|
|
|
|
SHELLPROC {
|
|
|
|
popallfiles();
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
2017-07-05 22:54:21 +03:00
|
|
|
#if 0 /* this is unused */
|
1993-03-21 12:45:37 +03:00
|
|
|
/*
|
|
|
|
* Read a line from the script.
|
|
|
|
*/
|
|
|
|
|
|
|
|
char *
|
2002-11-25 01:35:38 +03:00
|
|
|
pfgets(char *line, int len)
|
1994-12-04 10:11:37 +03:00
|
|
|
{
|
1997-01-11 05:04:27 +03:00
|
|
|
char *p = line;
|
1993-03-21 12:45:37 +03:00
|
|
|
int nleft = len;
|
|
|
|
int c;
|
|
|
|
|
|
|
|
while (--nleft > 0) {
|
|
|
|
c = pgetc_macro();
|
|
|
|
if (c == PEOF) {
|
|
|
|
if (p == line)
|
|
|
|
return NULL;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
*p++ = c;
|
|
|
|
if (c == '\n')
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
*p = '\0';
|
|
|
|
return line;
|
|
|
|
}
|
2017-07-05 22:54:21 +03:00
|
|
|
#endif
|
1993-03-21 12:45:37 +03:00
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Read a character from the script, returning PEOF on end of file.
|
|
|
|
* Nul characters in the input are silently discarded.
|
|
|
|
*/
|
|
|
|
|
|
|
|
int
|
2002-11-25 01:35:38 +03:00
|
|
|
pgetc(void)
|
1995-09-26 16:25:19 +03:00
|
|
|
{
|
1993-03-21 12:45:37 +03:00
|
|
|
return pgetc_macro();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1995-09-26 16:25:19 +03:00
|
|
|
static int
|
2002-11-25 01:35:38 +03:00
|
|
|
preadfd(void)
|
1995-09-26 16:25:19 +03:00
|
|
|
{
|
|
|
|
int nr;
|
1999-07-09 07:05:49 +04:00
|
|
|
char *buf = parsefile->buf;
|
|
|
|
parsenextc = buf;
|
1993-03-21 12:45:37 +03:00
|
|
|
|
2017-07-05 22:54:21 +03:00
|
|
|
retry:
|
1997-03-14 04:42:18 +03:00
|
|
|
#ifndef SMALL
|
1994-05-11 21:09:42 +04:00
|
|
|
if (parsefile->fd == 0 && el) {
|
2002-11-25 01:35:38 +03:00
|
|
|
static const char *rl_cp;
|
|
|
|
static int el_len;
|
1994-05-11 21:09:42 +04:00
|
|
|
|
2002-11-25 01:35:38 +03:00
|
|
|
if (rl_cp == NULL)
|
|
|
|
rl_cp = el_gets(el, &el_len);
|
1995-09-26 16:25:19 +03:00
|
|
|
if (rl_cp == NULL)
|
2009-03-11 00:21:11 +03:00
|
|
|
nr = el_len == 0 ? 0 : -1;
|
1995-09-26 16:25:19 +03:00
|
|
|
else {
|
2002-11-25 01:35:38 +03:00
|
|
|
nr = el_len;
|
|
|
|
if (nr > BUFSIZ - 8)
|
|
|
|
nr = BUFSIZ - 8;
|
|
|
|
memcpy(buf, rl_cp, nr);
|
|
|
|
if (nr != el_len) {
|
|
|
|
el_len -= nr;
|
|
|
|
rl_cp += nr;
|
|
|
|
} else
|
|
|
|
rl_cp = 0;
|
1994-05-11 21:09:42 +04:00
|
|
|
}
|
2002-11-25 01:35:38 +03:00
|
|
|
|
1997-03-14 00:57:32 +03:00
|
|
|
} else
|
|
|
|
#endif
|
2002-11-25 01:35:38 +03:00
|
|
|
nr = read(parsefile->fd, buf, BUFSIZ - 8);
|
1997-03-14 00:57:32 +03:00
|
|
|
|
1995-09-26 16:25:19 +03:00
|
|
|
|
|
|
|
if (nr <= 0) {
|
|
|
|
if (nr < 0) {
|
1993-03-21 12:45:37 +03:00
|
|
|
if (errno == EINTR)
|
|
|
|
goto retry;
|
|
|
|
if (parsefile->fd == 0 && errno == EWOULDBLOCK) {
|
|
|
|
int flags = fcntl(0, F_GETFL, 0);
|
2017-07-05 22:54:21 +03:00
|
|
|
|
1993-03-21 12:45:37 +03:00
|
|
|
if (flags >= 0 && flags & O_NONBLOCK) {
|
|
|
|
flags &=~ O_NONBLOCK;
|
|
|
|
if (fcntl(0, F_SETFL, flags) >= 0) {
|
|
|
|
out2str("sh: turning off NDELAY mode\n");
|
|
|
|
goto retry;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
1995-09-26 16:25:19 +03:00
|
|
|
nr = -1;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
1995-09-26 16:25:19 +03:00
|
|
|
return nr;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Refill the input buffer and return the next input character:
|
|
|
|
*
|
|
|
|
* 1) If a string was pushed back on the input, pop it;
|
|
|
|
* 2) If an EOF was pushed back (parsenleft == EOF_NLEFT) or we are reading
|
|
|
|
* from a string so we can't refill the buffer, return EOF.
|
|
|
|
* 3) If the is more stuff in this buffer, use it else call read to fill it.
|
|
|
|
* 4) Process input up to the next newline, deleting nul characters.
|
|
|
|
*/
|
|
|
|
|
|
|
|
int
|
2002-11-25 01:35:38 +03:00
|
|
|
preadbuffer(void)
|
1995-09-26 16:25:19 +03:00
|
|
|
{
|
|
|
|
char *p, *q;
|
|
|
|
int more;
|
2013-10-30 12:38:40 +04:00
|
|
|
#ifndef SMALL
|
1995-09-26 16:25:19 +03:00
|
|
|
int something;
|
2013-10-30 12:38:40 +04:00
|
|
|
#endif
|
1995-09-26 16:25:19 +03:00
|
|
|
char savec;
|
|
|
|
|
2017-05-03 09:20:12 +03:00
|
|
|
while (parsefile->strpush) {
|
1995-09-26 16:25:19 +03:00
|
|
|
popstring();
|
|
|
|
if (--parsenleft >= 0)
|
|
|
|
return (*parsenextc++);
|
|
|
|
}
|
|
|
|
if (parsenleft == EOF_NLEFT || parsefile->buf == NULL)
|
|
|
|
return PEOF;
|
|
|
|
flushout(&output);
|
|
|
|
flushout(&errout);
|
|
|
|
|
2017-07-05 22:54:21 +03:00
|
|
|
again:
|
1995-09-26 16:25:19 +03:00
|
|
|
if (parselleft <= 0) {
|
1997-04-12 03:00:40 +04:00
|
|
|
if ((parselleft = preadfd()) == -1) {
|
1995-09-26 16:25:19 +03:00
|
|
|
parselleft = parsenleft = EOF_NLEFT;
|
|
|
|
return PEOF;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-05-03 07:51:04 +03:00
|
|
|
/* p = (not const char *)parsenextc; */
|
|
|
|
p = parsefile->buf + (parsenextc - parsefile->buf);
|
|
|
|
q = p;
|
1993-03-21 12:45:37 +03:00
|
|
|
|
|
|
|
/* delete nul characters */
|
2013-10-30 12:38:40 +04:00
|
|
|
#ifndef SMALL
|
1994-05-11 21:09:42 +04:00
|
|
|
something = 0;
|
2013-10-30 12:38:40 +04:00
|
|
|
#endif
|
1995-09-26 16:25:19 +03:00
|
|
|
for (more = 1; more;) {
|
|
|
|
switch (*p) {
|
|
|
|
case '\0':
|
|
|
|
p++; /* Skip nul */
|
|
|
|
goto check;
|
1996-10-16 19:45:03 +04:00
|
|
|
|
1995-09-26 16:25:19 +03:00
|
|
|
case '\t':
|
|
|
|
case ' ':
|
1993-03-21 12:45:37 +03:00
|
|
|
break;
|
1995-09-26 16:25:19 +03:00
|
|
|
|
|
|
|
case '\n':
|
|
|
|
parsenleft = q - parsenextc;
|
|
|
|
more = 0; /* Stop processing here */
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
2013-10-30 12:38:40 +04:00
|
|
|
#ifndef SMALL
|
1994-05-11 21:09:42 +04:00
|
|
|
something = 1;
|
2013-10-30 12:38:40 +04:00
|
|
|
#endif
|
1995-09-26 16:25:19 +03:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
*q++ = *p++;
|
2017-07-05 22:54:21 +03:00
|
|
|
check:
|
1995-09-26 16:25:19 +03:00
|
|
|
if (--parselleft <= 0) {
|
|
|
|
parsenleft = q - parsenextc - 1;
|
|
|
|
if (parsenleft < 0)
|
|
|
|
goto again;
|
|
|
|
*q = '\0';
|
|
|
|
more = 0;
|
1994-05-11 21:09:42 +04:00
|
|
|
}
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
1995-09-26 16:25:19 +03:00
|
|
|
|
|
|
|
savec = *q;
|
1994-05-11 21:09:42 +04:00
|
|
|
*q = '\0';
|
|
|
|
|
1997-03-14 04:42:18 +03:00
|
|
|
#ifndef SMALL
|
2017-08-05 14:33:05 +03:00
|
|
|
if (parsefile->fd == 0 && hist && (something || whichprompt == 2)) {
|
1997-10-14 19:06:42 +04:00
|
|
|
HistEvent he;
|
2017-08-05 14:33:05 +03:00
|
|
|
|
1994-05-11 21:09:42 +04:00
|
|
|
INTOFF;
|
2017-08-05 14:33:05 +03:00
|
|
|
history(hist, &he, whichprompt != 2 ? H_ENTER : H_APPEND,
|
1998-05-20 05:36:14 +04:00
|
|
|
parsenextc);
|
1994-05-11 21:09:42 +04:00
|
|
|
INTON;
|
|
|
|
}
|
1995-10-19 07:14:37 +03:00
|
|
|
#endif
|
1995-09-26 16:25:19 +03:00
|
|
|
|
1994-05-11 21:09:42 +04:00
|
|
|
if (vflag) {
|
1995-09-26 16:25:19 +03:00
|
|
|
out2str(parsenextc);
|
1994-05-11 21:09:42 +04:00
|
|
|
flushout(out2);
|
|
|
|
}
|
1995-09-26 16:25:19 +03:00
|
|
|
|
|
|
|
*q = savec;
|
|
|
|
|
1993-03-21 12:45:37 +03:00
|
|
|
return *parsenextc++;
|
|
|
|
}
|
|
|
|
|
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)
2018-08-20 02:50:27 +03:00
|
|
|
/*
|
|
|
|
* 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;
|
|
|
|
}
|
|
|
|
|
1993-03-21 12:45:37 +03:00
|
|
|
/*
|
|
|
|
* Undo the last call to pgetc. Only one character may be pushed back.
|
|
|
|
* PEOF may be pushed back.
|
|
|
|
*/
|
|
|
|
|
|
|
|
void
|
2002-11-25 01:35:38 +03:00
|
|
|
pungetc(void)
|
|
|
|
{
|
1993-03-21 12:45:37 +03:00
|
|
|
parsenleft++;
|
|
|
|
parsenextc--;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
1994-05-11 21:09:42 +04:00
|
|
|
* Push a string back onto the input at this current parsefile level.
|
|
|
|
* We handle aliases this way.
|
1993-03-21 12:45:37 +03:00
|
|
|
*/
|
|
|
|
void
|
2017-05-03 07:51:04 +03:00
|
|
|
pushstring(const char *s, int len, struct alias *ap)
|
2002-11-25 01:35:38 +03:00
|
|
|
{
|
1994-05-11 21:09:42 +04:00
|
|
|
struct strpush *sp;
|
|
|
|
|
2017-07-05 22:54:21 +03:00
|
|
|
VTRACE(DBG_INPUT,
|
|
|
|
("pushstring(\"%.*s\", %d)%s%s%s had: nl=%d ll=%d \"%.*s\"\n",
|
|
|
|
len, s, len, ap ? " for alias:'" : "",
|
|
|
|
ap ? ap->name : "", ap ? "'" : "",
|
|
|
|
parsenleft, parselleft, parsenleft, parsenextc));
|
|
|
|
|
1994-05-11 21:09:42 +04:00
|
|
|
INTOFF;
|
|
|
|
if (parsefile->strpush) {
|
|
|
|
sp = ckmalloc(sizeof (struct strpush));
|
|
|
|
sp->prev = parsefile->strpush;
|
|
|
|
parsefile->strpush = sp;
|
|
|
|
} else
|
|
|
|
sp = parsefile->strpush = &(parsefile->basestrpush);
|
2017-07-05 22:54:21 +03:00
|
|
|
|
1994-05-11 21:09:42 +04:00
|
|
|
sp->prevstring = parsenextc;
|
|
|
|
sp->prevnleft = parsenleft;
|
1995-09-26 16:25:19 +03:00
|
|
|
sp->prevlleft = parselleft;
|
2017-05-03 07:11:30 +03:00
|
|
|
sp->ap = ap;
|
1994-05-11 21:09:42 +04:00
|
|
|
if (ap)
|
2017-05-03 07:11:30 +03:00
|
|
|
ap->flag |= ALIASINUSE;
|
1994-05-11 21:09:42 +04:00
|
|
|
parsenextc = s;
|
|
|
|
parsenleft = len;
|
|
|
|
INTON;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
|
1994-12-04 10:11:37 +03:00
|
|
|
void
|
2002-11-25 01:35:38 +03:00
|
|
|
popstring(void)
|
1994-05-11 21:09:42 +04:00
|
|
|
{
|
|
|
|
struct strpush *sp = parsefile->strpush;
|
1993-03-21 12:45:37 +03:00
|
|
|
|
1994-05-11 21:09:42 +04:00
|
|
|
INTOFF;
|
|
|
|
parsenextc = sp->prevstring;
|
|
|
|
parsenleft = sp->prevnleft;
|
1995-09-26 16:25:19 +03:00
|
|
|
parselleft = sp->prevlleft;
|
2017-07-05 22:54:21 +03:00
|
|
|
|
|
|
|
VTRACE(DBG_INPUT, ("popstring()%s%s%s nl=%d ll=%d \"%.*s\"\n",
|
|
|
|
sp->ap ? " from alias:'" : "", sp->ap ? sp->ap->name : "",
|
|
|
|
sp->ap ? "'" : "", parsenleft, parselleft, parsenleft, parsenextc));
|
|
|
|
|
1994-05-11 21:09:42 +04:00
|
|
|
if (sp->ap)
|
|
|
|
sp->ap->flag &= ~ALIASINUSE;
|
|
|
|
parsefile->strpush = sp->prev;
|
|
|
|
if (sp != &(parsefile->basestrpush))
|
|
|
|
ckfree(sp);
|
|
|
|
INTON;
|
|
|
|
}
|
1993-03-21 12:45:37 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Set the input to take input from a file. If push is set, push the
|
|
|
|
* old input onto the stack first.
|
|
|
|
*/
|
|
|
|
|
|
|
|
void
|
2002-11-25 01:35:38 +03:00
|
|
|
setinputfile(const char *fname, int push)
|
1994-12-04 10:11:37 +03:00
|
|
|
{
|
2007-02-15 15:02:59 +03:00
|
|
|
unsigned char magic[4];
|
1993-03-21 12:45:37 +03:00
|
|
|
int fd;
|
|
|
|
int fd2;
|
2016-06-01 08:11:52 +03:00
|
|
|
struct stat sb;
|
1993-03-21 12:45:37 +03:00
|
|
|
|
2017-07-05 22:54:21 +03:00
|
|
|
CTRACE(DBG_INPUT,("setinputfile(\"%s\", %spush)\n",fname,push?"":"no"));
|
|
|
|
|
1993-03-21 12:45:37 +03:00
|
|
|
INTOFF;
|
|
|
|
if ((fd = open(fname, O_RDONLY)) < 0)
|
|
|
|
error("Can't open %s", fname);
|
2007-02-15 15:02:59 +03:00
|
|
|
|
|
|
|
/* Since the message "Syntax error: "(" unexpected" is not very
|
|
|
|
* helpful, we check if the file starts with the ELF magic to
|
|
|
|
* avoid that message. The first lseek tries to make sure that
|
|
|
|
* we can later rewind the file.
|
|
|
|
*/
|
2016-06-01 08:11:52 +03:00
|
|
|
if (fstat(fd, &sb) == 0 && S_ISREG(sb.st_mode) &&
|
|
|
|
lseek(fd, 0, SEEK_SET) == 0) {
|
2007-02-15 15:02:59 +03:00
|
|
|
if (read(fd, magic, 4) == 4) {
|
2016-05-07 23:06:30 +03:00
|
|
|
if (memcmp(magic, "\177ELF", 4) == 0) {
|
|
|
|
(void)close(fd);
|
2007-02-15 15:02:59 +03:00
|
|
|
error("Cannot execute ELF binary %s", fname);
|
2016-05-07 23:06:30 +03:00
|
|
|
}
|
2007-02-15 15:02:59 +03:00
|
|
|
}
|
2016-05-07 23:06:30 +03:00
|
|
|
if (lseek(fd, 0, SEEK_SET) != 0) {
|
|
|
|
(void)close(fd);
|
2007-02-15 15:02:59 +03:00
|
|
|
error("Cannot rewind the file %s", fname);
|
2016-05-07 23:06:30 +03:00
|
|
|
}
|
2007-02-15 15:02:59 +03:00
|
|
|
}
|
|
|
|
|
2016-05-02 04:46:31 +03:00
|
|
|
fd2 = to_upper_fd(fd); /* closes fd, returns higher equiv */
|
|
|
|
if (fd2 == fd) {
|
|
|
|
(void) close(fd);
|
|
|
|
error("Out of file descriptors");
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
2016-05-02 04:46:31 +03:00
|
|
|
|
|
|
|
setinputfd(fd2, push);
|
1993-03-21 12:45:37 +03:00
|
|
|
INTON;
|
|
|
|
}
|
|
|
|
|
2017-04-29 18:14:28 +03:00
|
|
|
/*
|
|
|
|
* When a shell fd needs to be altered (when the user wants to use
|
|
|
|
* the same fd - rare, but happens - we need to locate the ref to
|
|
|
|
* the fd, and update it. This happens via a callback.
|
|
|
|
* This is the callback func for fd's used for shell input
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
input_fd_swap(int from, int to)
|
|
|
|
{
|
|
|
|
struct parsefile *pf;
|
|
|
|
|
|
|
|
pf = parsefile;
|
|
|
|
while (pf != NULL) { /* don't need to stop at basepf */
|
|
|
|
if (pf->fd == from)
|
|
|
|
pf->fd = to;
|
|
|
|
pf = pf->prev;
|
|
|
|
}
|
|
|
|
}
|
1993-03-21 12:45:37 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Like setinputfile, but takes an open file descriptor. Call this with
|
|
|
|
* interrupts off.
|
|
|
|
*/
|
|
|
|
|
|
|
|
void
|
2002-11-25 01:35:38 +03:00
|
|
|
setinputfd(int fd, int push)
|
1994-12-04 10:11:37 +03:00
|
|
|
{
|
2017-07-05 22:54:21 +03:00
|
|
|
VTRACE(DBG_INPUT, ("setinputfd(%d, %spush)\n", fd, push?"":"no"));
|
|
|
|
|
2017-04-29 18:14:28 +03:00
|
|
|
register_sh_fd(fd, input_fd_swap);
|
1997-03-13 23:07:49 +03:00
|
|
|
(void) fcntl(fd, F_SETFD, FD_CLOEXEC);
|
2017-07-05 22:54:21 +03:00
|
|
|
if (push)
|
1993-03-21 12:45:37 +03:00
|
|
|
pushfile();
|
|
|
|
if (parsefile->fd > 0)
|
2017-04-29 18:14:28 +03:00
|
|
|
sh_close(parsefile->fd);
|
1993-03-21 12:45:37 +03:00
|
|
|
parsefile->fd = fd;
|
|
|
|
if (parsefile->buf == NULL)
|
|
|
|
parsefile->buf = ckmalloc(BUFSIZ);
|
1995-09-26 16:25:19 +03:00
|
|
|
parselleft = parsenleft = 0;
|
1993-03-21 12:45:37 +03:00
|
|
|
plinno = 1;
|
2017-07-05 22:54:21 +03:00
|
|
|
|
|
|
|
CTRACE(DBG_INPUT, ("setinputfd(%d, %spush) done; plinno=1\n", fd,
|
|
|
|
push ? "" : "no"));
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Like setinputfile, but takes input from a string.
|
|
|
|
*/
|
|
|
|
|
|
|
|
void
|
An initial attempt at implementing LINENO to meet the specs.
Aside from one problem (not too hard to fix if it was ever needed) this version
does about as well as most other shell implementations when expanding
$((LINENO)) and better for ${LINENO} as it retains the "LINENO hack" for the
latter, and that is very accurate.
Unfortunately that means that ${LINENO} and $((LINENO)) do not always produce
the same value when used on the same line (a defect that other shells do not
share - aside from the FreeBSD sh as it is today, where only the LINENO hack
exists and so (like for us before this commit) $((LINENO)) is always either
0, or at least whatever value was last set, perhaps by
LINENO=${LINENO}
which does actually work ... for that one line...)
This could be corrected by simply removing the LINENO hack (look for the string
LINENO in parser.c) in which case ${LINENO} and $((LINENO)) would give the
same (not perfectly accurate) values, as do most other shells.
POSIX requires that LINENO be set before each command, and this implementation
does that fairly literally - except that we only bother before the commands
which actually expand words (for, case and simple commands). Unfortunately
this forgot that expansions also occur in redirects, and the other compound
commands can also have redirects, so if a redirect on one of the other compound
commands wants to use the value of $((LINENO)) as a part of a generated file
name, then it will get an incorrect value. This is the "one problem" above.
(Because the LINENO hack is still enabled, using ${LINENO} works.)
This could be fixed, but as this version of the LINENO implementation is just
for reference purposes (it will be superseded within minutes by a better one)
I won't bother. However should anyone else decide that this is a better choice
(it is probably a smaller implementation, in terms of code & data space then
the replacement, but also I would expect, slower, and definitely less accurate)
this defect is something to bear in mind, and fix.
This version retains the *BSD historical practice that line numbers in functions
(all functions) count from 1 from the start of the function, and elsewhere,
start from 1 from where the shell started reading the input file/stream in
question. In an "eval" expression the line number starts at the line of the
"eval" (and then increases if the input is a multi-line string).
Note: this version is not documented (beyond as much as LINENO was before)
hence this slightly longer than usual commit message.
2017-06-07 07:44:17 +03:00
|
|
|
setinputstring(char *string, int push, int line1)
|
2002-11-25 01:35:38 +03:00
|
|
|
{
|
2016-03-27 17:34:46 +03:00
|
|
|
|
1993-03-21 12:45:37 +03:00
|
|
|
INTOFF;
|
A better LINENO implementation. This version deletes (well, #if 0's out)
the LINENO hack, and uses the LINENO var for both ${LINENO} and $((LINENO)).
(Code to invert the LINENO hack when required, like when de-compiling the
execution tree to provide the "jobs" command strings, is still included,
that can be deleted when the LINENO hack is completely removed - look for
refs to VSLINENO throughout the code. The var funclinno in parser.c can
also be removed, it is used only for the LINENO hack.)
This version produces accurate results: $((LINENO)) was made as accurate
as the LINENO hack made ${LINENO} which is very good. That's why the
LINENO hack is not yet completely removed, so it can be easily re-enabled.
If you can tell the difference when it is in use, or not in use, then
something has broken (or I managed to miss a case somewhere.)
The way that LINENO works is documented in its own (new) section in the
man page, so nothing more about that, or the new options, etc, here.
This version introduces the possibility of having a "reference" function
associated with a variable, which gets called whenever the value of the
variable is required (that's what implements LINENO). There is just
one function pointer however, so any particular variable gets at most
one of the set function (as used for PATH, etc) or the reference function.
The VFUNCREF bit in the var flags indicates which func the variable in
question uses (if any - the func ptr, as before, can be NULL).
I would not call the results of this perfect yet, but it is close.
2017-06-07 08:08:32 +03:00
|
|
|
if (push) /* XXX: always, as it happens */
|
1993-03-21 12:45:37 +03:00
|
|
|
pushfile();
|
|
|
|
parsenextc = string;
|
1995-09-26 16:25:19 +03:00
|
|
|
parselleft = parsenleft = strlen(string);
|
An initial attempt at implementing LINENO to meet the specs.
Aside from one problem (not too hard to fix if it was ever needed) this version
does about as well as most other shell implementations when expanding
$((LINENO)) and better for ${LINENO} as it retains the "LINENO hack" for the
latter, and that is very accurate.
Unfortunately that means that ${LINENO} and $((LINENO)) do not always produce
the same value when used on the same line (a defect that other shells do not
share - aside from the FreeBSD sh as it is today, where only the LINENO hack
exists and so (like for us before this commit) $((LINENO)) is always either
0, or at least whatever value was last set, perhaps by
LINENO=${LINENO}
which does actually work ... for that one line...)
This could be corrected by simply removing the LINENO hack (look for the string
LINENO in parser.c) in which case ${LINENO} and $((LINENO)) would give the
same (not perfectly accurate) values, as do most other shells.
POSIX requires that LINENO be set before each command, and this implementation
does that fairly literally - except that we only bother before the commands
which actually expand words (for, case and simple commands). Unfortunately
this forgot that expansions also occur in redirects, and the other compound
commands can also have redirects, so if a redirect on one of the other compound
commands wants to use the value of $((LINENO)) as a part of a generated file
name, then it will get an incorrect value. This is the "one problem" above.
(Because the LINENO hack is still enabled, using ${LINENO} works.)
This could be fixed, but as this version of the LINENO implementation is just
for reference purposes (it will be superseded within minutes by a better one)
I won't bother. However should anyone else decide that this is a better choice
(it is probably a smaller implementation, in terms of code & data space then
the replacement, but also I would expect, slower, and definitely less accurate)
this defect is something to bear in mind, and fix.
This version retains the *BSD historical practice that line numbers in functions
(all functions) count from 1 from the start of the function, and elsewhere,
start from 1 from where the shell started reading the input file/stream in
question. In an "eval" expression the line number starts at the line of the
"eval" (and then increases if the input is a multi-line string).
Note: this version is not documented (beyond as much as LINENO was before)
hence this slightly longer than usual commit message.
2017-06-07 07:44:17 +03:00
|
|
|
plinno = line1;
|
2017-07-05 22:54:21 +03:00
|
|
|
|
|
|
|
CTRACE(DBG_INPUT,
|
2017-08-20 00:13:11 +03:00
|
|
|
("setinputstring(\"%.20s%s\" (%d), %spush, @ %d)\n", string,
|
2017-07-05 22:54:21 +03:00
|
|
|
(parsenleft > 20 ? "..." : ""), parsenleft, push?"":"no", line1));
|
1993-03-21 12:45:37 +03:00
|
|
|
INTON;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* To handle the "." command, a stack of input files is used. Pushfile
|
|
|
|
* adds a new entry to the stack and popfile restores the previous level.
|
|
|
|
*/
|
|
|
|
|
|
|
|
STATIC void
|
2002-11-25 01:35:38 +03:00
|
|
|
pushfile(void)
|
|
|
|
{
|
1993-03-21 12:45:37 +03:00
|
|
|
struct parsefile *pf;
|
|
|
|
|
2017-07-05 22:54:21 +03:00
|
|
|
VTRACE(DBG_INPUT,
|
|
|
|
("pushfile(): fd=%d buf=%p nl=%d ll=%d \"%.*s\" plinno=%d\n",
|
|
|
|
parsefile->fd, parsefile->buf, parsenleft, parselleft,
|
2017-07-01 02:02:56 +03:00
|
|
|
parsenleft, parsenextc, plinno));
|
|
|
|
|
1993-03-21 12:45:37 +03:00
|
|
|
parsefile->nleft = parsenleft;
|
1995-09-26 16:25:19 +03:00
|
|
|
parsefile->lleft = parselleft;
|
1993-03-21 12:45:37 +03:00
|
|
|
parsefile->nextc = parsenextc;
|
|
|
|
parsefile->linno = plinno;
|
|
|
|
pf = (struct parsefile *)ckmalloc(sizeof (struct parsefile));
|
|
|
|
pf->prev = parsefile;
|
|
|
|
pf->fd = -1;
|
1994-05-11 21:09:42 +04:00
|
|
|
pf->strpush = NULL;
|
|
|
|
pf->basestrpush.prev = NULL;
|
2017-07-05 22:54:21 +03:00
|
|
|
pf->buf = NULL;
|
1993-03-21 12:45:37 +03:00
|
|
|
parsefile = pf;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void
|
2002-11-25 01:35:38 +03:00
|
|
|
popfile(void)
|
|
|
|
{
|
1993-03-21 12:45:37 +03:00
|
|
|
struct parsefile *pf = parsefile;
|
|
|
|
|
|
|
|
INTOFF;
|
|
|
|
if (pf->fd >= 0)
|
2017-04-29 18:14:28 +03:00
|
|
|
sh_close(pf->fd);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (pf->buf)
|
|
|
|
ckfree(pf->buf);
|
1994-05-11 21:09:42 +04:00
|
|
|
while (pf->strpush)
|
|
|
|
popstring();
|
1993-03-21 12:45:37 +03:00
|
|
|
parsefile = pf->prev;
|
|
|
|
ckfree(pf);
|
|
|
|
parsenleft = parsefile->nleft;
|
1995-09-26 16:25:19 +03:00
|
|
|
parselleft = parsefile->lleft;
|
1993-03-21 12:45:37 +03:00
|
|
|
parsenextc = parsefile->nextc;
|
2017-07-05 22:54:21 +03:00
|
|
|
|
2017-07-01 02:02:56 +03:00
|
|
|
VTRACE(DBG_INPUT,
|
2017-07-05 22:54:21 +03:00
|
|
|
("popfile(): fd=%d buf=%p nl=%d ll=%d \"%.*s\" plinno:%d->%d\n",
|
|
|
|
parsefile->fd, parsefile->buf, parsenleft, parselleft,
|
2017-07-01 02:02:56 +03:00
|
|
|
parsenleft, parsenextc, plinno, parsefile->linno));
|
2017-07-05 22:54:21 +03:00
|
|
|
|
1993-03-21 12:45:37 +03:00
|
|
|
plinno = parsefile->linno;
|
|
|
|
INTON;
|
|
|
|
}
|
|
|
|
|
2017-07-01 02:02:56 +03:00
|
|
|
/*
|
|
|
|
* Return current file (to go back to it later using popfilesupto()).
|
|
|
|
*/
|
|
|
|
|
|
|
|
struct parsefile *
|
|
|
|
getcurrentfile(void)
|
|
|
|
{
|
|
|
|
return parsefile;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Pop files until the given file is on top again. Useful for regular
|
|
|
|
* builtins that read shell commands from files or strings.
|
|
|
|
* If the given file is not an active file, an error is raised.
|
|
|
|
*/
|
|
|
|
|
|
|
|
void
|
|
|
|
popfilesupto(struct parsefile *file)
|
|
|
|
{
|
|
|
|
while (parsefile != file && parsefile != &basepf)
|
|
|
|
popfile();
|
|
|
|
if (parsefile != file)
|
|
|
|
error("popfilesupto() misused");
|
|
|
|
}
|
|
|
|
|
1993-03-21 12:45:37 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Return to top level.
|
|
|
|
*/
|
|
|
|
|
|
|
|
void
|
2002-11-25 01:35:38 +03:00
|
|
|
popallfiles(void)
|
|
|
|
{
|
1993-03-21 12:45:37 +03:00
|
|
|
while (parsefile != &basepf)
|
|
|
|
popfile();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Close the file(s) that the shell is reading commands from. Called
|
|
|
|
* after a fork is done.
|
2002-09-27 22:56:50 +04:00
|
|
|
*
|
|
|
|
* Takes one arg, vfork, which tells it to not modify its global vars
|
|
|
|
* as it is still running in the parent.
|
2003-05-15 17:26:45 +04:00
|
|
|
*
|
|
|
|
* This code is (probably) unnecessary as the 'close on exec' flag is
|
|
|
|
* set and should be enough. In the vfork case it is definitely wrong
|
|
|
|
* to close the fds as another fork() may be done later to feed data
|
|
|
|
* from a 'here' document into a pipe and we don't want to close the
|
|
|
|
* pipe!
|
1993-03-21 12:45:37 +03:00
|
|
|
*/
|
|
|
|
|
|
|
|
void
|
2002-11-25 01:35:38 +03:00
|
|
|
closescript(int vforked)
|
|
|
|
{
|
2003-05-15 17:26:45 +04:00
|
|
|
if (vforked)
|
2002-09-27 22:56:50 +04:00
|
|
|
return;
|
1993-03-21 12:45:37 +03:00
|
|
|
popallfiles();
|
|
|
|
if (parsefile->fd > 0) {
|
2017-04-29 18:14:28 +03:00
|
|
|
sh_close(parsefile->fd);
|
1993-03-21 12:45:37 +03:00
|
|
|
parsefile->fd = 0;
|
|
|
|
}
|
|
|
|
}
|