Displaying 2 results from an estimated 2 matches for "df226632".
2020 Mar 28
0
[klibc:update-dash] dash: expand: Fix skipping of command substitution when trimming in evalvar
...and
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: Do not reprocess data when expanding words
...ana.org.au>
Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
---
usr/dash/expand.c | 294 ++++++++++++++++++++++++------------------------------
usr/dash/expand.h | 2 +-
2 files changed, 133 insertions(+), 163 deletions(-)
diff --git a/usr/dash/expand.c b/usr/dash/expand.c
index df226632..c3d67fc3 100644
--- a/usr/dash/expand.c
+++ b/usr/dash/expand.c
@@ -110,10 +110,10 @@ static struct ifsregion *ifslastp;
/* holds expanded arg list */
static struct arglist exparg;
-STATIC void argstr(char *, int);
-STATIC char *exptilde(char *, char *, int);
+static char *argstr(char *p, int...