From ab657e36b68f4a7e9ddb0f36c455c98d1c069a2c Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Wed, 8 Oct 2014 20:09:56 +0800 Subject: [EXPAND] Optimise nulonly away and just use quoted as before This patch makes a small optimisation by using the same value for quoted between evalvar and varvalue by eliminating nulonly and passing along quoted instead. Signed-off-by: Herbert Xu --- src/expand.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/expand.c b/src/expand.c index dc8ae47..dfb3f0e 100644 --- a/src/expand.c +++ b/src/expand.c @@ -722,7 +722,6 @@ evalvar(char *p, int flag) ssize_t varlen; int easy; int quoted; - int nulonly; varflags = *p++; subtype = varflags & VSTYPE; @@ -733,12 +732,11 @@ evalvar(char *p, int flag) quoted = flag & EXP_QUOTED; var = p; easy = (!quoted || (*var == '@' && shellparam.nparam)); - nulonly = easy; startloc = expdest - (char *)stackblock(); p = strchr(p, '=') + 1; again: - varlen = varvalue(var, varflags, flag, &nulonly); + varlen = varvalue(var, varflags, flag, "ed); if (varflags & VSNUL) varlen--; @@ -783,7 +781,7 @@ vsplus: record: if (!easy) goto end; - recordregion(startloc, expdest - (char *)stackblock(), nulonly); + recordregion(startloc, expdest - (char *)stackblock(), quoted); goto end; } @@ -888,7 +886,7 @@ strtodest(p, syntax, quotes) */ STATIC ssize_t -varvalue(char *name, int varflags, int flags, int *nulonly) +varvalue(char *name, int varflags, int flags, int *quotedp) { int num; char *p; @@ -897,14 +895,12 @@ varvalue(char *name, int varflags, int flags, int *nulonly) char sepc; char **ap; char const *syntax; - int quoted = flags & EXP_QUOTED; + int quoted = *quotedp; int subtype = varflags & VSTYPE; int discard = subtype == VSPLUS || subtype == VSLENGTH; int quotes = (discard ? 0 : (flags & QUOTES_ESC)) | QUOTES_KEEPNUL; ssize_t len = 0; - sep = *nulonly ? (flags & EXP_FULL) << CHAR_BIT : 0; - *nulonly = 0; syntax = quoted ? DQSYNTAX : BASESYNTAX; switch (*name) { @@ -935,16 +931,20 @@ numvar: expdest = p; break; case '@': + sep = 0; if (quoted) goto param; /* fall through */ case '*': - sep |= ifsset() ? ifsval()[0] : ' '; + sep = ifsset() ? ifsval()[0] : ' '; + if (!quoted) { param: + sep |= (flags & EXP_FULL) << CHAR_BIT; + } + sepc = sep; + *quotedp = !sepc; if (!(ap = shellparam.p)) return -1; - sepc = sep; - *nulonly = !sepc; while ((p = *ap++)) { len += strtodest(p, syntax, quotes); -- cgit 1.4.1 mon&id=3c2d8233b880cb22e2330a877f7d9ee1a9a8a5fa'>unfollow)
Commit message (Expand)Author
2017-07-31Fix removing clients from clientCastJune McEnroe
2017-07-31Build with debug infoJune McEnroe
2017-07-31Don't dump tiles in coreJune McEnroe
2017-07-31Use designated initializers for messagesJune McEnroe
2017-07-31Show other clients' cursorsJune McEnroe
2017-07-31Perform enter as two moves rather than a loopJune McEnroe
2017-07-31Track tile access countsJune McEnroe
2017-07-31Adjust move speed in clientJune McEnroe
2017-07-31Handle large movesJune McEnroe
2017-07-30Optimize builds for chrootJune McEnroe
2017-07-30Persist bright across color changesJune McEnroe
2017-07-30Add index.htmlJune McEnroe
2017-07-30Add snapshot.shJune McEnroe
2017-07-30Fix termcap patch for background colorsJune McEnroe
2017-07-30Update helpJune McEnroe
2017-07-30Fix help to track colorJune McEnroe
2017-07-30Support background colorsJune McEnroe
2017-07-30Track color only client-sideJune McEnroe
2017-07-30Add ostensible support for background colorsJune McEnroe
2017-07-30Add tile create and access timestampsJune McEnroe
2017-07-30Assert stable struct Tile field offsetsJune McEnroe
2017-07-30Add chroot.shJune McEnroe
2017-07-30Add ` commandJune McEnroe
2017-07-30Add sshd_configJune McEnroe
2017-07-30Add termcap patchJune McEnroe