From: Jonathan Nieder <jrnieder@gmail.com>
To: dash@vger.kernel.org
Cc: Jilles Tjoelker <jilles@stack.nl>,
Drake Wilson <drake@begriffli.ch>, Reuben Thomas <rrt@sc3d.org>
Subject: [PATCH 3/4] [EVAL] Take advantage of EV_EXIT in evalstring
Date: Sun, 10 Apr 2011 02:35:49 -0500 [thread overview]
Message-ID: <20110410073549.GC17649@elie> (raw)
In-Reply-To: <20110410071734.GA16736@elie>
From: Jilles Tjoelker <jilles@stack.nl>
Date: Sat, 13 Jun 2009 16:17:45 -0500
Check if there may be additional data in the string after parsing each
command. If there is none, let the EV_EXIT flag take effect so a fork
can be omitted in specific cases.
No change in behavior intended --- all current callers leave the
EV_EXIT flag cleared.
[jn: the original from FreeBSD SVN r194128 would unconditionally exit
if the EV_EXIT bit was set. but for simplicity and consistency with
other non-evaltree eval* commands, this version relies on the caller
to exit when the command is empty. One can insert a
evaltree(NULL, flags);
call before popfile() to get the original's semantics.
Any outstanding bugs are my fault.]
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
src/eval.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/eval.c b/src/eval.c
index 5c26133..77a9d00 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -165,7 +165,10 @@ evalstring(char *s, int flags)
status = 0;
while ((n = parsecmd(0)) != NEOF) {
- evaltree(n, flags);
+ if (preadateof())
+ evaltree(n, flags);
+ else
+ evaltree(n, flags & ~EV_EXIT);
status = exitstatus;
popstackmark(&smark);
if (evalskip)
--
1.7.5.rc0
next prev parent reply other threads:[~2011-04-10 7:35 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-10 7:18 [PATCH/RFC dash 0/4] Avoid a fork before running last command given to -c Jonathan Nieder
2011-04-10 7:21 ` [PATCH 1/4] [INPUT] Introduce preadateof predicate to check for end of input Jonathan Nieder
2011-04-10 7:22 ` [PATCH 2/4] [EVAL] Make eval flags public Jonathan Nieder
2011-04-10 7:35 ` Jonathan Nieder [this message]
2011-04-10 7:36 ` [PATCH 4/4] [MAIN] Optimize dash -c "command" to avoid a fork Jonathan Nieder
2011-07-07 3:48 ` Herbert Xu
2011-07-07 4:27 ` Jonathan Nieder
2011-07-07 4:57 ` Herbert Xu
2011-07-07 5:56 ` Herbert Xu
2011-07-07 7:48 ` Jonathan Nieder
2011-07-07 8:22 ` Herbert Xu
2011-07-07 8:37 ` Jonathan Nieder
2011-07-07 8:39 ` Herbert Xu
2011-04-10 7:38 ` [PATCH 5/4] [EVAL] Remove unused EV_BACKCMD flag Jonathan Nieder
2011-07-07 3:56 ` Herbert Xu
2011-04-15 13:07 ` [PATCH/RFC dash 0/4] Avoid a fork before running last command given to -c Herbert Xu
2011-04-17 22:13 ` Jilles Tjoelker
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110410073549.GC17649@elie \
--to=jrnieder@gmail.com \
--cc=dash@vger.kernel.org \
--cc=drake@begriffli.ch \
--cc=jilles@stack.nl \
--cc=rrt@sc3d.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).