From: Jonathan Nieder <jrnieder@gmail.com>
To: Herbert Xu <herbert@gondor.apana.org.au>
Cc: dash@vger.kernel.org, Jilles Tjoelker <jilles@stack.nl>,
Drake Wilson <drake@begriffli.ch>, Reuben Thomas <rrt@sc3d.org>
Subject: Re: [PATCH 4/4] [MAIN] Optimize dash -c "command" to avoid a fork
Date: Thu, 7 Jul 2011 02:48:56 -0500 [thread overview]
Message-ID: <20110707074856.GC11514@elie> (raw)
In-Reply-To: <20110707055602.GA17215@gondor.apana.org.au>
Herbert Xu wrote:
> OK, what about this patch?
Neat. Let's see:
> --- a/src/parser.c
> +++ b/src/parser.c
[...]
> @@ -210,6 +210,7 @@ list(int nlflag)
> parseheredoc();
> else
> pungetc(); /* push back EOF on input */
> + tokpushback++;
> return n1;
> default:
> if (nlflag == 1)
This means to push back the TEOF instead of calling pgetc again and
again. Should be safe.
By the way, is the pungetc() call needed? I tried to provoke
misbehavior using here documents and reading from the terminal but
didn't manage to come up with a relevant scenario.
> --- a/src/parser.h
> +++ b/src/parser.h
> @@ -34,6 +34,8 @@
> * @(#)parser.h 8.3 (Berkeley) 5/4/95
> */
>
> +#include "token.h"
mksyntax #include-s parser.h, so after a "make clean":
gcc -include ../config.h -DBSD=1 -DSHELL -DIFS_BROKEN -g -Os -Wall -o mksyntax mksyntax.c
In file included from mksyntax.c:43:0:
parser.h:37:19: fatal error: token.h: No such file or directory
The following (on top) fixes it here.
---
src/parser.c | 1 +
src/parser.h | 11 +++++++++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/parser.c b/src/parser.c
index 6de27629..9c0ef606 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -40,6 +40,7 @@
#include "shell.h"
#include "parser.h"
+#include "token.h"
#include "nodes.h"
#include "expand.h" /* defines rmescapes() */
#include "exec.h" /* defines find_builtin() */
diff --git a/src/parser.h b/src/parser.h
index 2875cce6..8735890e 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -34,8 +34,6 @@
* @(#)parser.h 8.3 (Berkeley) 5/4/95
*/
-#include "token.h"
next prev parent reply other threads:[~2011-07-07 7:49 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 ` [PATCH 3/4] [EVAL] Take advantage of EV_EXIT in evalstring Jonathan Nieder
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 [this message]
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=20110707074856.GC11514@elie \
--to=jrnieder@gmail.com \
--cc=dash@vger.kernel.org \
--cc=drake@begriffli.ch \
--cc=herbert@gondor.apana.org.au \
--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).