[src/trunk]: src/bin/ksh Back out fix for PR 22846 as it has issues. See PR ...

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

details:   https://anonhg.NetBSD.org/src/rev/845e3668adc6
branches:  trunk
changeset: 749274:845e3668adc6
user:      seanb <seanb%NetBSD.org@localhost>
date:      Tue Nov 24 16:00:42 2009 +0000

description:
Back out fix for PR 22846 as it has issues.  See PR 22846 for details.

diffstat:

 bin/ksh/edit.c |   6 +++---
 bin/ksh/eval.c |  19 ++-----------------
 2 files changed, 5 insertions(+), 20 deletions(-)

diffs (67 lines):

diff -r 4880573fb8be -r 845e3668adc6 bin/ksh/edit.c
--- a/bin/ksh/edit.c    Tue Nov 24 15:51:39 2009 +0000
+++ b/bin/ksh/edit.c    Tue Nov 24 16:00:42 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: edit.c,v 1.22 2009/04/25 05:11:37 lukem Exp $  */
+/*     $NetBSD: edit.c,v 1.23 2009/11/24 16:00:42 seanb Exp $  */
 
 /*
  * Command line editing - common code
@@ -7,7 +7,7 @@
 #include <sys/cdefs.h>
 
 #ifndef lint
-__RCSID("$NetBSD: edit.c,v 1.22 2009/04/25 05:11:37 lukem Exp $");
+__RCSID("$NetBSD: edit.c,v 1.23 2009/11/24 16:00:42 seanb Exp $");
 #endif
 
 
@@ -880,7 +880,7 @@
        for (s = toglob; *s; s++) {
                if (*s == '\\' && s[1])
                        s++;
-               else if (*s == '*' || *s == '?' || *s == '$'
+               else if (*s == '*' || *s == '[' || *s == '?' || *s == '$'
                         || (s[1] == '(' /*)*/ && strchr("*+?@!", *s)))
                        break;
                else if (ISDIRSEP(*s))
diff -r 4880573fb8be -r 845e3668adc6 bin/ksh/eval.c
--- a/bin/ksh/eval.c    Tue Nov 24 15:51:39 2009 +0000
+++ b/bin/ksh/eval.c    Tue Nov 24 16:00:42 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: eval.c,v 1.11 2009/04/25 05:11:37 lukem Exp $  */
+/*     $NetBSD: eval.c,v 1.12 2009/11/24 16:00:42 seanb Exp $  */
 
 /*
  * Expansion - quoting, separation, substitution, globbing
@@ -6,7 +6,7 @@
 #include <sys/cdefs.h>
 
 #ifndef lint
-__RCSID("$NetBSD: eval.c,v 1.11 2009/04/25 05:11:37 lukem Exp $");
+__RCSID("$NetBSD: eval.c,v 1.12 2009/11/24 16:00:42 seanb Exp $");
 #endif
 
 
@@ -605,21 +605,6 @@
                        if (!quote)
                                switch (c) {
                                  case '[':
-                                       {
-                                               const char *p = sp;
-                                               bool_t special = FALSE;
-                                               while (*p != EOS) {
-                                                       if (p[0] == CHAR &&
-                                                               p[1] == ']') {
-                                                               special = TRUE;
-                                                               break;
-                                                       }
-                                                               
-                                                       p += 2;
-                                               }
-                                               if (!special)
-                                                       break;
-                                       }
                                  case NOT:
                                  case '-':
                                  case ']':