diff options
| author | dchagin <dchagin@FreeBSD.org> | 2017-04-15 11:13:11 +0000 |
|---|---|---|
| committer | dchagin <dchagin@FreeBSD.org> | 2017-04-15 11:13:11 +0000 |
| commit | 9878fb1e0f314058f4c30cc4c77722f00e17188a (patch) | |
| tree | 2f0dd759511c9fea5ee93d228684a99622ed5e8e /contrib/tcsh/ed.xmap.c | |
| parent | 21382a2b98c257da842adc1f651f3e207dd235af (diff) | |
| download | FreeBSD-src-9878fb1e0f314058f4c30cc4c77722f00e17188a.zip FreeBSD-src-9878fb1e0f314058f4c30cc4c77722f00e17188a.tar.gz | |
MFC r315948:
Update tcsh to 6.20.00
MFC r315952:
Update tcsh to vendor git b605cb561d
Vendor changes:
1. PR/471: Daiki Ueno: Delay interpreting arginp until we've processed
our startup files (which can change the NLS environment).
2. Fix type of read in prompt confirmation (eg. rmstar) (David Kaspar).
3. Fix out of bounds read (Brooks Davis)
(reproduce by starting tcsh and hitting tab at the prompt).
4. Don't play pointer tricks that are undefined in modern c
(Brooks Davis).
Diffstat (limited to 'contrib/tcsh/ed.xmap.c')
| -rw-r--r-- | contrib/tcsh/ed.xmap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/tcsh/ed.xmap.c b/contrib/tcsh/ed.xmap.c index acd29d3..f87509b 100644 --- a/contrib/tcsh/ed.xmap.c +++ b/contrib/tcsh/ed.xmap.c @@ -1,4 +1,4 @@ -/* $Header: /p/tcsh/cvsroot/tcsh/ed.xmap.c,v 3.37 2009/06/25 21:15:37 christos Exp $ */ +/* $Header: /p/tcsh/cvsroot/tcsh/ed.xmap.c,v 3.38 2015/06/06 21:19:07 christos Exp $ */ /* * ed.xmap.c: This module contains the procedures for maintaining * the extended-key map. @@ -88,7 +88,7 @@ */ #include "sh.h" -RCSID("$tcsh: ed.xmap.c,v 3.37 2009/06/25 21:15:37 christos Exp $") +RCSID("$tcsh: ed.xmap.c,v 3.38 2015/06/06 21:19:07 christos Exp $") #include "ed.h" #include "ed.defns.h" @@ -743,7 +743,7 @@ unparsestring(const CStr *str, const Char *sep) *b++ = (unsigned char) p; } else if (p == ' ' || (Isprint(p) && !Isspace(p))) - b += one_wctomb((char *)b, p & CHAR); + b += one_wctomb((char *)b, p); else { *b++ = '\\'; *b++ = ((p >> 6) & 7) + '0'; |
