65cf828420
following a suggestion from him, the way the fix to PR bin/50993 was implemented has changed a little. There are three steps involved in processing a here document, reading it, parsing it, and then evaluating it before applying it to the correct file descriptor for the command to use. The third of those is not related to this problem, and has not changed. The bug was caused by combining the first two steps into one (and not doing it correctly - which would be hard that way.) The fix is to split the first two stages into separate events. The original fix moved the 2nd stage (parsing) to just immediately before the 3rd stage (evaluation.) Jilles pointed out some unwanted side effects from doing it that way, and suggested moving the 2nd stage to immediately after the first. This commit makes that change. The effect is to revert the changes to expand.c and parser.h (which are no longer needed) and simplify slightly the change to parser.c. (from kre@)
86 lines
3.6 KiB
C
86 lines
3.6 KiB
C
/* $NetBSD: parser.h,v 1.21 2016/03/31 23:11:05 christos Exp $ */
|
|
|
|
/*-
|
|
* 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.
|
|
* 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.
|
|
*
|
|
* 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.
|
|
*
|
|
* @(#)parser.h 8.3 (Berkeley) 5/4/95
|
|
*/
|
|
|
|
/* control characters in argument strings */
|
|
#define CTL_FIRST '\201' /* first 'special' character */
|
|
#define CTLESC '\201' /* escape next character */
|
|
#define CTLVAR '\202' /* variable defn */
|
|
#define CTLENDVAR '\203'
|
|
#define CTLBACKQ '\204'
|
|
#define CTLQUOTE 01 /* ored with CTLBACKQ code if in quotes */
|
|
/* CTLBACKQ | CTLQUOTE == '\205' */
|
|
#define CTLARI '\206' /* arithmetic expression */
|
|
#define CTLENDARI '\207'
|
|
#define CTLQUOTEMARK '\210'
|
|
#define CTLQUOTEEND '\211' /* only inside ${...} */
|
|
#define CTL_LAST '\211' /* last 'special' character */
|
|
|
|
/* variable substitution byte (follows CTLVAR) */
|
|
#define VSTYPE 0x0f /* type of variable substitution */
|
|
#define VSNUL 0x10 /* colon--treat the empty string as unset */
|
|
#define VSLINENO 0x20 /* expansion of $LINENO, the line number
|
|
follows immediately */
|
|
#define VSPATQ 0x40 /* ensure correct pattern quoting in ${x#pat} */
|
|
#define VSQUOTE 0x80 /* inside double quotes--suppress splitting */
|
|
|
|
/* values of VSTYPE field */
|
|
#define VSNORMAL 0x1 /* normal variable: $var or ${var} */
|
|
#define VSMINUS 0x2 /* ${var-text} */
|
|
#define VSPLUS 0x3 /* ${var+text} */
|
|
#define VSQUESTION 0x4 /* ${var?message} */
|
|
#define VSASSIGN 0x5 /* ${var=text} */
|
|
#define VSTRIMLEFT 0x6 /* ${var#pattern} */
|
|
#define VSTRIMLEFTMAX 0x7 /* ${var##pattern} */
|
|
#define VSTRIMRIGHT 0x8 /* ${var%pattern} */
|
|
#define VSTRIMRIGHTMAX 0x9 /* ${var%%pattern} */
|
|
#define VSLENGTH 0xa /* ${#var} */
|
|
|
|
|
|
/*
|
|
* NEOF is returned by parsecmd when it encounters an end of file. It
|
|
* must be distinct from NULL, so we use the address of a variable that
|
|
* happens to be handy.
|
|
*/
|
|
extern int tokpushback;
|
|
#define NEOF ((union node *)&tokpushback)
|
|
extern int whichprompt; /* 1 == PS1, 2 == PS2 */
|
|
|
|
|
|
union node *parsecmd(int);
|
|
void fixredir(union node *, const char *, int);
|
|
int goodname(char *);
|
|
const char *getprompt(void *);
|