Displaying 2 results from an estimated 2 matches for "a764881".
Did you mean:
a764881e
2020 Mar 28
0
[klibc:update-dash] dash: expand: Fix skipping of command substitution when trimming in evalvar
...other command
substitutions in the same input word.
Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
---
usr/dash/expand.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/usr/dash/expand.c b/usr/dash/expand.c
index a764881e..df226632 100644
--- a/usr/dash/expand.c
+++ b/usr/dash/expand.c
@@ -805,6 +805,8 @@ record:
goto record;
}
+ varlen = 0;
+
end:
if (subtype != VSNORMAL) { /* skip to end of alternative */
int nesting = 1;
2020 Mar 28
0
[klibc:update-dash] dash: expand: Merge syntax/quotes in memtodest with flags
...ndor.apana.org.au>
Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
---
usr/dash/expand.c | 42 +++++++++++++++++-------------------------
usr/dash/expand.h | 1 +
2 files changed, 18 insertions(+), 25 deletions(-)
diff --git a/usr/dash/expand.c b/usr/dash/expand.c
index f1f5a9fa..a764881e 100644
--- a/usr/dash/expand.c
+++ b/usr/dash/expand.c
@@ -86,8 +86,6 @@
/* Add CTLESC when necessary. */
#define QUOTES_ESC (EXP_FULL | EXP_CASE)
-/* Do not skip NUL characters. */
-#define QUOTES_KEEPNUL EXP_TILDE
/*
* Structure specifying which parts of the string should be searched
@@...