author | Tomas Kuthan <tomas.kuthan@oracle.com> |
Wed, 20 Apr 2016 13:13:57 -0700 | |
changeset 5820 | cef0da89f9ee |
parent 5399 | 88010dbde9bb |
permissions | -rw-r--r-- |
5399
88010dbde9bb
22638766 tcsh 6.19.0 command completion partly broken.
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
1 |
this is from upstream. described by: |
88010dbde9bb
22638766 tcsh 6.19.0 command completion partly broken.
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
2 |
|
88010dbde9bb
22638766 tcsh 6.19.0 command completion partly broken.
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
3 |
http://mx.gw.com/pipermail/tcsh-bugs/2015-September/000978.html |
88010dbde9bb
22638766 tcsh 6.19.0 command completion partly broken.
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
4 |
|
88010dbde9bb
22638766 tcsh 6.19.0 command completion partly broken.
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
5 |
and fixed by: |
88010dbde9bb
22638766 tcsh 6.19.0 command completion partly broken.
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
6 |
|
88010dbde9bb
22638766 tcsh 6.19.0 command completion partly broken.
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
7 |
https://github.com/tcsh-org/tcsh/commit/86f1ca6000f81be5b3401a2ec102521cb612a518 |
88010dbde9bb
22638766 tcsh 6.19.0 command completion partly broken.
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
8 |
|
88010dbde9bb
22638766 tcsh 6.19.0 command completion partly broken.
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
9 |
--- tcsh-6.19.00/tw.comp.c.orig Wed Feb 3 14:07:50 2016 |
88010dbde9bb
22638766 tcsh 6.19.0 command completion partly broken.
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
10 |
+++ tcsh-6.19.00/tw.comp.c Wed Feb 3 14:08:18 2016 |
88010dbde9bb
22638766 tcsh 6.19.0 command completion partly broken.
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
11 |
@@ -251,7 +251,7 @@ |
88010dbde9bb
22638766 tcsh 6.19.0 command completion partly broken.
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
12 |
tw_match(const Char *str, const Char *pat, int exact) |
88010dbde9bb
22638766 tcsh 6.19.0 command completion partly broken.
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
13 |
{ |
88010dbde9bb
22638766 tcsh 6.19.0 command completion partly broken.
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
14 |
const Char *estr; |
88010dbde9bb
22638766 tcsh 6.19.0 command completion partly broken.
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
15 |
- int rv = exact ? Gmatch(str, pat) : Gnmatch(str, pat, &estr); |
88010dbde9bb
22638766 tcsh 6.19.0 command completion partly broken.
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
16 |
+ int rv = exact ? Gmatch(estr = str, pat) : Gnmatch(str, pat, &estr); |
88010dbde9bb
22638766 tcsh 6.19.0 command completion partly broken.
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
17 |
#ifdef TDEBUG |
88010dbde9bb
22638766 tcsh 6.19.0 command completion partly broken.
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
18 |
xprintf("G%smatch(%s, ", exact ? "" : "n", short2str(str)); |
88010dbde9bb
22638766 tcsh 6.19.0 command completion partly broken.
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
19 |
xprintf("%s, ", short2str(pat)); |