From owner-svn-src-head@freebsd.org Sun Apr 2 13:29:29 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0B237D2A792; Sun, 2 Apr 2017 13:29:29 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BD6F0798; Sun, 2 Apr 2017 13:29:28 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v32DTRVK003836; Sun, 2 Apr 2017 13:29:27 GMT (envelope-from jilles@FreeBSD.org) Received: (from jilles@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v32DTRVk003835; Sun, 2 Apr 2017 13:29:27 GMT (envelope-from jilles@FreeBSD.org) Message-Id: <201704021329.v32DTRVk003835@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jilles set sender to jilles@FreeBSD.org using -f From: Jilles Tjoelker Date: Sun, 2 Apr 2017 13:29:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r316416 - head/bin/sh X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Apr 2017 13:29:29 -0000 Author: jilles Date: Sun Apr 2 13:29:27 2017 New Revision: 316416 URL: https://svnweb.freebsd.org/changeset/base/316416 Log: sh: Don't scan word twice in ${param#%##%%word}. If word is expanded, use the found end instead of iterating over the data again. Modified: head/bin/sh/expand.c Modified: head/bin/sh/expand.c ============================================================================== --- head/bin/sh/expand.c Sun Apr 2 13:24:58 2017 (r316415) +++ head/bin/sh/expand.c Sun Apr 2 13:29:27 2017 (r316416) @@ -96,7 +96,8 @@ static const char *exptilde(const char * static const char *expari(const char *, struct nodelist **restrict, int, struct worddest *); static void expbackq(union node *, int, int, struct worddest *); -static void subevalvar_trim(const char *, struct nodelist *, int, int, int); +static const char *subevalvar_trim(const char *, struct nodelist **restrict, + int, int, int); static void subevalvar_misc(const char *, struct nodelist *, const char *, int, int, int); static const char *evalvar(const char *, struct nodelist **restrict, int, @@ -540,18 +541,17 @@ recordleft(const char *str, const char * *startp++ = *loc++; } -static void -subevalvar_trim(const char *p, struct nodelist *argbackq, int strloc, +static const char * +subevalvar_trim(const char *p, struct nodelist **restrict argbackq, int strloc, int subtype, int startloc) { char *startp; char *loc = NULL; char *str; int c = 0; - struct nodelist *argbackqcopy = argbackq; int amount; - argstr(p, &argbackqcopy, EXP_CASE | EXP_TILDE, NULL); + p = argstr(p, argbackq, EXP_CASE | EXP_TILDE, NULL); STACKSTRNUL(expdest); startp = stackblock() + startloc; str = stackblock() + strloc; @@ -564,7 +564,7 @@ subevalvar_trim(const char *p, struct no if (patmatch(str, startp)) { *loc = c; recordleft(str, loc, startp); - return; + return p; } *loc = c; } @@ -577,7 +577,7 @@ subevalvar_trim(const char *p, struct no if (patmatch(str, startp)) { *loc = c; recordleft(str, loc, startp); - return; + return p; } *loc = c; loc--; @@ -589,7 +589,7 @@ subevalvar_trim(const char *p, struct no if (patmatch(str, loc)) { amount = loc - expdest; STADJUST(amount, expdest); - return; + return p; } loc--; } @@ -600,7 +600,7 @@ subevalvar_trim(const char *p, struct no if (patmatch(str, loc)) { amount = loc - expdest; STADJUST(amount, expdest); - return; + return p; } } break; @@ -611,6 +611,7 @@ subevalvar_trim(const char *p, struct no } amount = (expdest - stackblock() - strloc) + 1; STADJUST(-amount, expdest); + return p; } @@ -776,11 +777,11 @@ again: /* jump here after setting a vari */ STPUTC('\0', expdest); patloc = expdest - stackblock(); - subevalvar_trim(p, *argbackq, patloc, subtype, startloc); + p = subevalvar_trim(p, argbackq, patloc, subtype, startloc); reprocess(startloc, flag, VSNORMAL, varflags & VSQUOTE, dst); if (flag & EXP_SPLIT && *var == '@' && varflags & VSQUOTE) dst->state = WORD_QUOTEMARK; - break; + return p; case VSASSIGN: case VSQUESTION: