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)
77 lines
3.0 KiB
C
77 lines
3.0 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.
|
|
*
|
|
* @(#)eval.h 8.2 (Berkeley) 5/4/95
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
extern char *commandname; /* currently executing command */
|
|
extern int exitstatus; /* exit status of last command */
|
|
extern struct strlist *cmdenviron; /* environment for builtin command */
|
|
|
|
|
|
struct backcmd { /* result of evalbackcmd */
|
|
int fd; /* file descriptor to read from */
|
|
char *buf; /* buffer */
|
|
int nleft; /* number of chars in buffer */
|
|
struct job *jp; /* job structure for command */
|
|
};
|
|
|
|
/* flags in argument to evaltree/evalstring */
|
|
#define EV_EXIT 01 /* exit after evaluating tree */
|
|
#define EV_TESTED 02 /* exit status is checked; ignore -e flag */
|
|
#define EV_BACKCMD 04 /* command executing within back quotes */
|
|
|
|
int evalcmd(int, char **);
|
|
void evalstring(char *, int);
|
|
union node; /* BLETCH for ansi C */
|
|
void evaltree(union node *, int);
|
|
void evalbackcmd(union node *, struct backcmd *);
|
|
int bltincmd(int, char **);
|
|
int breakcmd(int, char **);
|
|
int returncmd(int, char **);
|
|
int falsecmd(int, char **);
|
|
int truecmd(int, char **);
|
|
int execcmd(int, char **);
|
|
int timescmd(int, char **);
|
|
int commandcmd(int, char **);
|
|
|
|
/* in_function returns nonzero if we are currently evaluating a function */
|
|
#define in_function() funcnest
|
|
extern int funcnest;
|
|
extern int evalskip;
|
|
|
|
/* reasons for skipping commands (see comment on breakcmd routine) */
|
|
#define SKIPBREAK 1
|
|
#define SKIPCONT 2
|
|
#define SKIPFUNC 3
|
|
#define SKIPFILE 4
|