960da93430
This change only affects strings passed to -c, when the -s option is not used. The approach is to check if there may be additional data in the string after parsing each command. If there is none, use the EV_EXIT flag so that a fork may be omitted in specific cases. If there are empty lines after the command, the check will not see the end and forks will not be omitted. The same thing seems to happen in bash. Example: sh -c 'ps lT' No longer shows a shell process waiting for ps to finish. PR: bin/113860 Reviewed by: stefanf Approved by: ed (mentor)
63 lines
2.5 KiB
C
63 lines
2.5 KiB
C
/*-
|
|
* 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.
|
|
*
|
|
* @(#)input.h 8.2 (Berkeley) 5/4/95
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
/* PEOF (the end of file marker) is defined in syntax.h */
|
|
|
|
/*
|
|
* The input line number. Input.c just defines this variable, and saves
|
|
* and restores it when files are pushed and popped. The user of this
|
|
* package must set its value.
|
|
*/
|
|
extern int plinno;
|
|
extern int parsenleft; /* number of characters left in input buffer */
|
|
extern char *parsenextc; /* next character in input buffer */
|
|
extern int init_editline; /* 0 == not setup, 1 == OK, -1 == failed */
|
|
|
|
char *pfgets(char *, int);
|
|
int pgetc(void);
|
|
int preadbuffer(void);
|
|
int preadateof(void);
|
|
void pungetc(void);
|
|
void pushstring(char *, int, void *);
|
|
void popstring(void);
|
|
void setinputfile(char *, int);
|
|
void setinputfd(int, int);
|
|
void setinputstring(char *, int);
|
|
void popfile(void);
|
|
void popallfiles(void);
|
|
void closescript(void);
|
|
|
|
#define pgetc_macro() (--parsenleft >= 0? *parsenextc++ : preadbuffer())
|