From: Herbert Xu <herbert@gondor.apana.org.au>
To: DASH Mailing List <dash@vger.kernel.org>
Subject: [v3 PATCH 12/13] builtin: Use pgetc in read(1)
Date: Sun, 05 May 2024 17:15:24 +0800 [thread overview]
Message-ID: <796a2b5732f4ac033de84ce0afcab4b36ff62296.1714900377.git.herbert@gondor.apana.org.au> (raw)
In-Reply-To: <cover.1714900377.git.herbert@gondor.apana.org.au>
Use pgetc instead of read(2) in read(1). This allows any future
buffering in the input layer to be used by read(1). This also
allows read(1) to call helpers in the parser that may use the
input layer.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
---
src/input.c | 42 ++++++++++++++++++++++++++++--------------
src/input.h | 1 +
src/miscbltin.c | 39 +++++++++++++++++++--------------------
3 files changed, 48 insertions(+), 34 deletions(-)
diff --git a/src/input.c b/src/input.c
index 1712e5f..6779069 100644
--- a/src/input.c
+++ b/src/input.c
@@ -42,19 +42,20 @@
* This file implements the input routines used by the parser.
*/
-#include "eval.h"
-#include "shell.h"
-#include "redir.h"
-#include "syntax.h"
-#include "input.h"
-#include "output.h"
-#include "options.h"
-#include "memalloc.h"
-#include "error.h"
#include "alias.h"
-#include "parser.h"
+#include "error.h"
+#include "eval.h"
+#include "input.h"
#include "main.h"
+#include "memalloc.h"
#include "myhistedit.h"
+#include "options.h"
+#include "output.h"
+#include "parser.h"
+#include "redir.h"
+#include "shell.h"
+#include "syntax.h"
+#include "trap.h"
#define IBUFSIZ (BUFSIZ + PUNGETC_MAX + 1)
@@ -258,7 +259,7 @@ retry:
}
if (nr < 0) {
- if (errno == EINTR)
+ if (errno == EINTR && !(basepf.prev && pending_sig))
goto retry;
}
return nr;
@@ -522,6 +523,13 @@ pushfile(void)
parsefile = pf;
}
+void pushstdin(void)
+{
+ INTOFF;
+ basepf.prev = parsefile;
+ parsefile = &basepf;
+ INTON;
+}
void
popfile(void)
@@ -529,6 +537,11 @@ popfile(void)
struct parsefile *pf = parsefile;
INTOFF;
+ parsefile = pf->prev;
+ pf->prev = NULL;
+ if (pf == &basepf)
+ goto out;
+
if (pf->fd >= 0)
close(pf->fd);
if (pf->buf)
@@ -539,15 +552,16 @@ popfile(void)
popstring();
freestrings(parsefile->spfree);
}
- parsefile = pf->prev;
ckfree(pf);
+
+out:
INTON;
}
-void unwindfiles(struct parsefile *stop)
+void __attribute__((noinline)) unwindfiles(struct parsefile *stop)
{
- while (parsefile != stop)
+ while (basepf.prev || parsefile != stop)
popfile();
}
diff --git a/src/input.h b/src/input.h
index 151b1c6..c59d784 100644
--- a/src/input.h
+++ b/src/input.h
@@ -109,6 +109,7 @@ void pungetn(int);
void pushstring(char *, void *);
int setinputfile(const char *, int);
void setinputstring(char *);
+void pushstdin(void);
void popfile(void);
void unwindfiles(struct parsefile *);
void popallfiles(void);
diff --git a/src/miscbltin.c b/src/miscbltin.c
index 8a0ddf4..10d256e 100644
--- a/src/miscbltin.c
+++ b/src/miscbltin.c
@@ -46,18 +46,20 @@
#include <ctype.h>
#include <inttypes.h>
-#include "shell.h"
-#include "options.h"
-#include "var.h"
-#include "output.h"
-#include "memalloc.h"
#include "error.h"
+#include "expand.h"
+#include "input.h"
+#include "memalloc.h"
#include "miscbltin.h"
#include "mystring.h"
#include "main.h"
-#include "expand.h"
+#include "options.h"
+#include "output.h"
#include "parser.h"
+#include "shell.h"
+#include "syntax.h"
#include "trap.h"
+#include "var.h"
#undef rflag
@@ -115,14 +117,13 @@ readcmd_handle_line(char *s, int ac, char **ap)
int
readcmd(int argc, char **argv)
{
- char **ap;
- char c;
- int rflag;
char *prompt;
- char *p;
int startloc;
int newloc;
int status;
+ char **ap;
+ int rflag;
+ char *p;
int i;
rflag = 0;
@@ -145,19 +146,17 @@ readcmd(int argc, char **argv)
status = 0;
STARTSTACKSTR(p);
+ pushstdin();
+
goto start;
for (;;) {
- switch (read(0, &c, 1)) {
- case 1:
- break;
- default:
- if (errno == EINTR && !pending_sig)
- continue;
- /* fall through */
- case 0:
+ int c;
+
+ c = pgetc();
+ if (c == PEOF) {
status = 1;
- goto out;
+ break;
}
if (c == '\0')
continue;
@@ -186,7 +185,7 @@ start:
newloc = startloc - 1;
}
}
-out:
+ popfile();
recordregion(startloc, p - (char *)stackblock(), 0);
STACKSTRNUL(p);
readcmd_handle_line(p + 1, argc - (ap - argv), ap);
--
2.39.2
next prev parent reply other threads:[~2024-05-05 9:15 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-05 9:14 [v3 PATCH 00/13] Add multi-byte support Herbert Xu
2024-05-05 9:14 ` [v3 PATCH 01/13] shell: Call setlocale Herbert Xu
2024-05-05 9:14 ` [v3 PATCH 02/13] shell: Use strcoll instead of strcmp where applicable Herbert Xu
2024-05-05 9:14 ` [v3 PATCH 03/13] expand: Count multi-byte characters for VSLENGTH Herbert Xu
2024-05-05 9:14 ` [v3 PATCH 04/13] expand: Process multi-byte characters in subevalvar Herbert Xu
2024-05-05 9:14 ` [v3 PATCH 05/13] expand: Process multi-byte characters in expmeta Herbert Xu
2024-05-05 9:14 ` [v3 PATCH 06/13] expand: Support multi-byte characters during field splitting Herbert Xu
2024-05-05 9:14 ` [v3 PATCH 07/13] input: Allow MB_LEN_MAX calls to pungetc Herbert Xu
2024-05-05 9:14 ` [v3 PATCH 08/13] input: Add pgetc_eoa Herbert Xu
2024-05-05 9:14 ` [v3 PATCH 09/13] parser: Add support for multi-byte characters Herbert Xu
2024-05-05 9:15 ` [v3 PATCH 10/13] input: Always push in setinputfile Herbert Xu
2024-05-05 9:15 ` [v3 PATCH 11/13] memalloc: Use void * instead of pointer Herbert Xu
2024-05-05 9:15 ` Herbert Xu [this message]
2024-05-05 9:15 ` [v3 PATCH 13/13] builtin: Process multi-byte characters in read(1) Herbert Xu
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=796a2b5732f4ac033de84ce0afcab4b36ff62296.1714900377.git.herbert@gondor.apana.org.au \
--to=herbert@gondor.apana.org.au \
--cc=dash@vger.kernel.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 read-only IMAP folder(s) and NNTP newsgroup(s).