diff options
| author | stefanf <stefanf@FreeBSD.org> | 2006-11-07 22:46:13 +0000 |
|---|---|---|
| committer | stefanf <stefanf@FreeBSD.org> | 2006-11-07 22:46:13 +0000 |
| commit | 085fc40080a3091cca7a42b7d2753bdfdd133968 (patch) | |
| tree | 7480793b415be27d33e4cd8184a727f18b1dd80b /bin/sh | |
| parent | 6c634eded77f6df0735687f5c2415235847428bb (diff) | |
| download | FreeBSD-src-085fc40080a3091cca7a42b7d2753bdfdd133968.zip FreeBSD-src-085fc40080a3091cca7a42b7d2753bdfdd133968.tar.gz | |
Fix expanding of quoted positional parameters in case patterns.
Obtained from: NetBSD (expand.c 1.58 and 1.59)
Submitted by: Paul Jarc
PR: 56147
Diffstat (limited to 'bin/sh')
| -rw-r--r-- | bin/sh/expand.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/bin/sh/expand.c b/bin/sh/expand.c index f26a999..93df92d 100644 --- a/bin/sh/expand.c +++ b/bin/sh/expand.c @@ -98,7 +98,7 @@ STATIC void expbackq(union node *, int, int); STATIC int subevalvar(char *, char *, int, int, int, int); STATIC char *evalvar(char *, int); STATIC int varisset(char *, int); -STATIC void varvalue(char *, int, int); +STATIC void varvalue(char *, int, int, int); STATIC void recordregion(int, int, int); STATIC void removerecordregions(int); STATIC void ifsbreakup(char *, struct arglist *); @@ -633,7 +633,7 @@ evalvar(char *p, int flag) int easy; int quotes = flag & (EXP_FULL | EXP_CASE | EXP_REDIR); - varflags = *p++; + varflags = (unsigned char)*p++; subtype = varflags & VSTYPE; var = p; special = 0; @@ -669,7 +669,7 @@ again: /* jump here after setting a variable with ${var=text} */ if (set && subtype != VSPLUS) { /* insert the value of the variable */ if (special) { - varvalue(var, varflags & VSQUOTE, flag & EXP_FULL); + varvalue(var, varflags & VSQUOTE, subtype, flag); if (subtype == VSLENGTH) { varlen = expdest - stackblock() - startloc; STADJUST(-varlen, expdest); @@ -841,7 +841,7 @@ varisset(char *name, int nulok) */ STATIC void -varvalue(char *name, int quoted, int allow_split) +varvalue(char *name, int quoted, int subtype, int flag) { int num; char *p; @@ -853,7 +853,7 @@ varvalue(char *name, int quoted, int allow_split) #define STRTODEST(p) \ do {\ - if (allow_split) { \ + if (flag & (EXP_FULL | EXP_CASE) && subtype != VSLENGTH) { \ syntax = quoted? DQSYNTAX : BASESYNTAX; \ while (*p) { \ if (syntax[(int)*p] == CCTL) \ @@ -888,7 +888,7 @@ numvar: } break; case '@': - if (allow_split && quoted) { + if (flag & EXP_FULL && quoted) { for (ap = shellparam.p ; (p = *ap++) != NULL ; ) { STRTODEST(p); if (*ap) |
