Displaying 4 results from an estimated 4 matches for "e53423c5".
2019 Jan 25
0
[klibc:update-dash] input: Fix here-document redirection with vi/emacs on
...Cheers,
Harald van Dijk
Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
---
usr/dash/input.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/usr/dash/input.c b/usr/dash/input.c
index 06c08d49..e53423c5 100644
--- a/usr/dash/input.c
+++ b/usr/dash/input.c
@@ -147,8 +147,12 @@ retry:
static const char *rl_cp;
static int el_len;
- if (rl_cp == NULL)
+ if (rl_cp == NULL) {
+ struct stackmark smark;
+ pushstackmark(&smark, stackblocksize());
rl_cp = el_gets(el, &el_len);
+...
2019 Jan 25
0
[klibc:update-dash] eval: Restore input files in evalcommand
...BUILTIN;
@@ -896,6 +898,7 @@ out:
if (cmd->ncmd.redirect)
popredir(execcmd);
unwindredir(redir_stop);
+ unwindfiles(file_stop);
unwindlocalvars(localvar_stop);
if (lastarg)
/* dsl: I think this is intended to be used to support
diff --git a/usr/dash/input.c b/usr/dash/input.c
index e53423c5..ae0c4c80 100644
--- a/usr/dash/input.c
+++ b/usr/dash/input.c
@@ -479,6 +479,13 @@ popfile(void)
}
+void unwindfiles(struct parsefile *stop)
+{
+ while (parsefile != stop)
+ popfile();
+}
+
+
/*
* Return to top level.
*/
@@ -486,8 +493,7 @@ popfile(void)
void
popallfiles(void)
{
- wh...
2020 Mar 28
0
[klibc:update-dash] dash: input: Fix here-document redirection with vi/emacs on
...Cheers,
Harald van Dijk
Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
---
usr/dash/input.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/usr/dash/input.c b/usr/dash/input.c
index 06c08d49..e53423c5 100644
--- a/usr/dash/input.c
+++ b/usr/dash/input.c
@@ -147,8 +147,12 @@ retry:
static const char *rl_cp;
static int el_len;
- if (rl_cp == NULL)
+ if (rl_cp == NULL) {
+ struct stackmark smark;
+ pushstackmark(&smark, stackblocksize());
rl_cp = el_gets(el, &el_len);
+...
2020 Mar 28
0
[klibc:update-dash] dash: eval: Restore input files in evalcommand
...BUILTIN;
@@ -896,6 +898,7 @@ out:
if (cmd->ncmd.redirect)
popredir(execcmd);
unwindredir(redir_stop);
+ unwindfiles(file_stop);
unwindlocalvars(localvar_stop);
if (lastarg)
/* dsl: I think this is intended to be used to support
diff --git a/usr/dash/input.c b/usr/dash/input.c
index e53423c5..ae0c4c80 100644
--- a/usr/dash/input.c
+++ b/usr/dash/input.c
@@ -479,6 +479,13 @@ popfile(void)
}
+void unwindfiles(struct parsefile *stop)
+{
+ while (parsefile != stop)
+ popfile();
+}
+
+
/*
* Return to top level.
*/
@@ -486,8 +493,7 @@ popfile(void)
void
popallfiles(void)
{
- wh...