Module Name: src
Committed By: sjg
Date: Sat Jun 5 03:02:37 UTC 2010
Modified Files:
src/bin/ksh: edit.c
Log Message:
PR: 39604
Reviewed by:
add_glob:
Do not stop scanning if we see '$' as it does more harm than good.
For $HOME/tm we should return $HOME/tm*
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/bin/ksh/edit.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.24 src/bin/ksh/edit.c:1.25
--- src/bin/ksh/edit.c:1.24 Fri Apr 2 20:19:40 2010
+++ src/bin/ksh/edit.c Sat Jun 5 03:02:37 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: edit.c,v 1.24 2010/04/02 20:19:40 plunky Exp $ */
+/* $NetBSD: edit.c,v 1.25 2010/06/05 03:02:37 sjg Exp $ */
/*
* Command line editing - common code
@@ -7,7 +7,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: edit.c,v 1.24 2010/04/02 20:19:40 plunky Exp $");
+__RCSID("$NetBSD: edit.c,v 1.25 2010/06/05 03:02:37 sjg Exp $");
#endif
@@ -873,14 +873,14 @@
/*
* If the pathname contains a wildcard (an unquoted '*',
- * '?', or '[') or parameter expansion ('$'), or a ~username
+ * '?', or '['), or a ~username
* with no trailing slash, then it is globbed based on that
* value (i.e., without the appended '*').
*/
for (s = toglob; *s; s++) {
if (*s == '\\' && s[1])
s++;
- else if (*s == '*' || *s == '[' || *s == '?' || *s == '$'
+ else if (*s == '*' || *s == '[' || *s == '?'
|| (s[1] == '(' /*)*/ && strchr("*...@!", *s)))
break;
else if (ISDIRSEP(*s))
