Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/bin/ksh PR: 39604



details:   https://anonhg.NetBSD.org/src/rev/200c5e804173
branches:  trunk
changeset: 755415:200c5e804173
user:      sjg <sjg%NetBSD.org@localhost>
date:      Sat Jun 05 03:02:37 2010 +0000

description:
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*

diffstat:

 bin/ksh/edit.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (35 lines):

diff -r c8331fc5ad60 -r 200c5e804173 bin/ksh/edit.c
--- a/bin/ksh/edit.c    Fri Jun 04 23:17:28 2010 +0000
+++ b/bin/ksh/edit.c    Sat Jun 05 03:02:37 2010 +0000
@@ -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))



Home | Main Index | Thread Index | Old Index