Module Name: src
Committed By: seanb
Date: Tue Nov 24 16:00:42 UTC 2009
Modified Files:
src/bin/ksh: edit.c eval.c
Log Message:
Back out fix for PR 22846 as it has issues. See PR 22846 for details.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/bin/ksh/edit.c
cvs rdiff -u -r1.11 -r1.12 src/bin/ksh/eval.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/ksh/edit.c
diff -u src/bin/ksh/edit.c:1.22 src/bin/ksh/edit.c:1.23
--- src/bin/ksh/edit.c:1.22 Sat Apr 25 05:11:37 2009
+++ src/bin/ksh/edit.c Tue Nov 24 16:00:42 2009
@@ -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))
Index: src/bin/ksh/eval.c
diff -u src/bin/ksh/eval.c:1.11 src/bin/ksh/eval.c:1.12
--- src/bin/ksh/eval.c:1.11 Sat Apr 25 05:11:37 2009
+++ src/bin/ksh/eval.c Tue Nov 24 16:00:42 2009
@@ -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 ']':
