[src/netbsd-3]: src/bin/sh Pull up revision 1.69 (requested by dsl in ticket ...

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

details:   https://anonhg.NetBSD.org/src/rev/a3ea97baa8a6
branches:  netbsd-3
changeset: 575285:a3ea97baa8a6
user:      tron <tron%NetBSD.org@localhost>
date:      Thu Apr 07 11:36:28 2005 +0000

description:
Pull up revision 1.69 (requested by dsl in ticket #118):
Don't merge ifs regions with different quoting requirements

diffstat:

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

diffs (37 lines):

diff -r 24007b0d47e6 -r a3ea97baa8a6 bin/sh/expand.c
--- a/bin/sh/expand.c   Thu Apr 07 11:34:20 2005 +0000
+++ b/bin/sh/expand.c   Thu Apr 07 11:36:28 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: expand.c,v 1.68 2005/02/14 20:46:26 dsl Exp $  */
+/*     $NetBSD: expand.c,v 1.68.2.1 2005/04/07 11:36:28 tron 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.68 2005/02/14 20:46:26 dsl Exp $");
+__RCSID("$NetBSD: expand.c,v 1.68.2.1 2005/04/07 11:36:28 tron Exp $");
 #endif
 #endif /* not lint */
 
@@ -922,7 +922,8 @@
        if (ifslastp == NULL) {
                ifsp = &ifsfirst;
        } else {
-               if (ifslastp->endoff == start) {
+               if (ifslastp->endoff == start
+                   && ifslastp->inquotes == inquotes) {
                        /* extend previous area */
                        ifslastp->endoff = end;
                        return;
@@ -1009,7 +1010,7 @@
                        p++;
 
                        if (!inquotes) {
-                               /* Ignore trailing IFS writespace */
+                               /* Ignore trailing IFS whitespace */
                                for (; p < string + ifsp->endoff; p++) {
                                        q = p;
                                        if (*p == CTLESC)