[src/netbsd-7]: src/bin/sh Pull up following revision(s) (requested by kre in...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/639106d27125
branches:  netbsd-7
changeset: 800189:639106d27125
user:      snj <snj%NetBSD.org@localhost>
date:      Wed Apr 19 17:09:38 2017 +0000

description:
Pull up following revision(s) (requested by kre in ticket #1388):
        bin/sh/expand.c: revision 1.102
Fix for the "${unset-var#$(cmd1)}$(cmd2)" runs the wrong command bug.
... From FreeBSD

diffstat:

 bin/sh/expand.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (30 lines):

diff -r 0facbefda2a4 -r 639106d27125 bin/sh/expand.c
--- a/bin/sh/expand.c   Wed Apr 19 17:06:21 2017 +0000
+++ b/bin/sh/expand.c   Wed Apr 19 17:09:38 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: expand.c,v 1.91 2014/01/20 14:05:51 roy Exp $  */
+/*     $NetBSD: expand.c,v 1.91.4.1 2017/04/19 17:09:38 snj Exp $      */
 
 /*-
  * Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)expand.c   8.5 (Berkeley) 5/15/95";
 #else
-__RCSID("$NetBSD: expand.c,v 1.91 2014/01/20 14:05:51 roy Exp $");
+__RCSID("$NetBSD: expand.c,v 1.91.4.1 2017/04/19 17:09:38 snj Exp $");
 #endif
 #endif /* not lint */
 
@@ -753,8 +753,10 @@
        case VSTRIMLEFTMAX:
        case VSTRIMRIGHT:
        case VSTRIMRIGHTMAX:
-               if (!set)
+               if (!set) {
+                       set = 1;  /* allow argbackq to be advanced if needed */
                        break;
+               }
                /*
                 * Terminate the string and start recording the pattern
                 * right after it