[src/trunk]: src/bin/sh When matching a char class ([[:name:]]) in a pattern ...

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

details:   https://anonhg.NetBSD.org/src/rev/897869534a5d
branches:  trunk
changeset: 323602:897869534a5d
user:      kre <kre%NetBSD.org@localhost>
date:      Fri Jun 22 17:22:34 2018 +0000

description:
When matching a char class ([[:name:]]) in a pattern (for filename
expansion, case patterrns, etc) do not force '[' to be a member of
every class.

Before this fix, try:
        case [ in [[:alpha:]]) echo Huh\?;; esac

XXX pullup-8    (Perhaps -7 as well, though that shell version has
much more relevant bugs than this one.)  This bug is not in -6 as
that has no charclass support.

diffstat:

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

diffs (30 lines):

diff -r e5e2ee00e02f -r 897869534a5d bin/sh/expand.c
--- a/bin/sh/expand.c   Fri Jun 22 15:52:00 2018 +0000
+++ b/bin/sh/expand.c   Fri Jun 22 17:22:34 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: expand.c,v 1.121 2017/10/06 21:09:45 kre Exp $ */
+/*     $NetBSD: expand.c,v 1.122 2018/06/22 17:22:34 kre 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.121 2017/10/06 21:09:45 kre Exp $");
+__RCSID("$NetBSD: expand.c,v 1.122 2018/06/22 17:22:34 kre Exp $");
 #endif
 #endif /* not lint */
 
@@ -1777,8 +1777,10 @@
                                }
                                if (c == '[' && *p == ':') {
                                        found |= match_charclass(p, chr, &end);
-                                       if (end != NULL)
+                                       if (end != NULL) {
                                                p = end;
+                                               continue;
+                                       }
                                }
                                if (c == CTLESC)
                                        c = *p++;