80efbcbbcd
This is a MFC of all the commits listed below. My original goal of this change was to only merge the move of the tests from tools/regression/bin/ into the new layout (which include tests for sh(1) and other tools as well). However, doing so is tricky due to the ongoing work in sh(1) and, especially, the many changes to its tests since stable/10 was first branched. Merging everything is the simplest way to achieve this goal and, as a bonus point, we get various fixes and miscellaneous improvements into the branch. Per jilles' suggestion, I'm avoiding the merge of a couple of changes (r256850 and r257506) that required depending kernel changes. I'm also avoiding very recent changes that have not had a long enough time to be validated in current. This is "make tinderbox" clean. r256735 sh: Remove one syscall when waiting for a foreground job. r257399 sh: Allow trapping SIGINT/SIGQUIT after ignore because of '&'. r257504 sh: Reorder union node to reduce its size on 64-bit platforms. r257920 sh: Add a test case for would-be assignments that are not due to quoting. r257929 sh: Properly quote alias output from command -v. r258489 sh: Add tests for the </dev/null implicit in a background command. r258533 sh: Add more tests for the </dev/null implicit in a background command. r258535 sh: Make <&0 disable the </dev/null implicit in a background command. r258776 sh: Prefer memcpy() to strcpy() in most cases. Remove the scopy macro. r259047 sh: Split set -x output into a separate function. r259210 Migrate tools/regression/bin/ tests to the new layout. r259844 sh: Remove an unused variable. r259846 sh: Initialize OPTIND=1 even if it came from the environment. r259874 sh: Simplify code related to PPID variable. r259946 sh: Don't check input for non-whitespace if history is disabled. r260246 sh(1): Discourage use of -e. r260506 Run the sh(1) and test(1) tests as unprivileged. r260586 Mark the bin/pax tests as requiring perl. r260634 Use TAP_TESTS_PERL to register the legacy_test in bin/pax. r260635 Replace hand-crafted Kyuafiles with automatic generation. r260654 sh: Remove SIGWINCH handler and just check for resize before every read. r261121 sh: Add test for nested alias. r261125 sh: Solve the alias recursion problem in a less hackish way. r261141 sh: Do not depend on parse/execute split in new alias test. r261160 sh: Add tests for alias names after another alias. r261192 sh: Allow aliases to force alias substitution on the following word. r262533 sh: Make expari() static. r262565 sh: Do not corrupt internal representation if LINENO inner expansion fails. r262697 sh: Simplify expari(). Reviewed by: jilles
146 lines
5.1 KiB
Plaintext
146 lines
5.1 KiB
Plaintext
#-
|
|
# Copyright (c) 1991, 1993
|
|
# The Regents of the University of California. All rights reserved.
|
|
#
|
|
# 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.
|
|
# 4. 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.
|
|
#
|
|
# 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.
|
|
#
|
|
# @(#)nodetypes 8.2 (Berkeley) 5/4/95
|
|
# $FreeBSD$
|
|
|
|
# This file describes the nodes used in parse trees. Unindented lines
|
|
# contain a node type followed by a structure tag. Subsequent indented
|
|
# lines specify the fields of the structure. Several node types can share
|
|
# the same structure, in which case the fields of the structure should be
|
|
# specified only once.
|
|
#
|
|
# A field of a structure is described by the name of the field followed
|
|
# by a type. The currently implemented types are:
|
|
# nodeptr - a pointer to a node
|
|
# nodelist - a pointer to a list of nodes
|
|
# string - a pointer to a nul terminated string
|
|
# int - an integer
|
|
# other - any type that can be copied by assignment
|
|
# temp - a field that doesn't have to be copied when the node is copied
|
|
# The last two types should be followed by the text of a C declaration for
|
|
# the field.
|
|
|
|
NSEMI nbinary # two commands separated by a semicolon
|
|
type int
|
|
ch1 nodeptr # the first child
|
|
ch2 nodeptr # the second child
|
|
|
|
NCMD ncmd # a simple command
|
|
type int
|
|
args nodeptr # the arguments
|
|
redirect nodeptr # list of file redirections
|
|
|
|
NPIPE npipe # a pipeline
|
|
type int
|
|
backgnd int # set to run pipeline in background
|
|
cmdlist nodelist # the commands in the pipeline
|
|
|
|
NREDIR nredir # redirection (of a compex command)
|
|
type int
|
|
n nodeptr # the command
|
|
redirect nodeptr # list of file redirections
|
|
|
|
NBACKGND nredir # run command in background
|
|
NSUBSHELL nredir # run command in a subshell
|
|
|
|
NAND nbinary # the && operator
|
|
NOR nbinary # the || operator
|
|
|
|
NIF nif # the if statement. Elif clauses are handled
|
|
type int # using multiple if nodes.
|
|
test nodeptr # if test
|
|
ifpart nodeptr # then ifpart
|
|
elsepart nodeptr # else elsepart
|
|
|
|
NWHILE nbinary # the while statement. First child is the test
|
|
NUNTIL nbinary # the until statement
|
|
|
|
NFOR nfor # the for statement
|
|
type int
|
|
args nodeptr # for var in args
|
|
body nodeptr # do body; done
|
|
var string # the for variable
|
|
|
|
NCASE ncase # a case statement
|
|
type int
|
|
expr nodeptr # the word to switch on
|
|
cases nodeptr # the list of cases (NCLIST nodes)
|
|
|
|
NCLIST nclist # a case ending with ;;
|
|
type int
|
|
next nodeptr # the next case in list
|
|
pattern nodeptr # list of patterns for this case
|
|
body nodeptr # code to execute for this case
|
|
|
|
NCLISTFALLTHRU nclist # a case ending with ;&
|
|
|
|
NDEFUN narg # define a function. The "next" field contains
|
|
# the body of the function.
|
|
|
|
NARG narg # represents a word
|
|
type int
|
|
next nodeptr # next word in list
|
|
text string # the text of the word
|
|
backquote nodelist # list of commands in back quotes
|
|
|
|
NTO nfile # fd> fname
|
|
NFROM nfile # fd< fname
|
|
NFROMTO nfile # fd<> fname
|
|
NAPPEND nfile # fd>> fname
|
|
NCLOBBER nfile # fd>| fname
|
|
type int
|
|
fd int # file descriptor being redirected
|
|
next nodeptr # next redirection in list
|
|
fname nodeptr # file name, in a NARG node
|
|
expfname temp char *expfname # actual file name
|
|
|
|
NTOFD ndup # fd<&dupfd
|
|
NFROMFD ndup # fd>&dupfd
|
|
type int
|
|
fd int # file descriptor being redirected
|
|
next nodeptr # next redirection in list
|
|
dupfd int # file descriptor to duplicate
|
|
vname nodeptr # file name if fd>&$var
|
|
|
|
|
|
NHERE nhere # fd<<\!
|
|
NXHERE nhere # fd<<!
|
|
type int
|
|
fd int # file descriptor being redirected
|
|
next nodeptr # next redirection in list
|
|
doc nodeptr # input to command (NARG node)
|
|
expdoc temp char *expdoc # actual document (for NXHERE)
|
|
|
|
NNOT nnot # ! command (actually pipeline)
|
|
type int
|
|
com nodeptr
|