diff options
| author | Stefan Farfeleder <stefanf@FreeBSD.org> | 2007-03-11 18:30:22 +0000 |
|---|---|---|
| committer | Stefan Farfeleder <stefanf@FreeBSD.org> | 2007-03-11 18:30:22 +0000 |
| commit | e6de94e677c203f8ea20949853fda5d879cd6f59 (patch) | |
| tree | 509b6d0c810b13835386c30b69cd13d7ebcd95d7 /lib/libedit/key.h | |
| parent | 7149ee16963d25a78af50c0dd473372f03d23dbd (diff) | |
| download | src-e6de94e677c203f8ea20949853fda5d879cd6f59.tar.gz src-e6de94e677c203f8ea20949853fda5d879cd6f59.zip | |
Merge the following changes from NetBSD:
chared.h 1.17, common.c 1.19, emacs.c 1.21, key.c 1.18, key.h 1.9, map.c 1.23,
term.c 1.42, term.h 1.17, vi.c 1.25:
# Print the actual eofc, instead of ^D\b\b.
# Change internal character decoding to prevent buffer oveflows.
key.c 1.19, key.h 1.10:
# move declaration to header file.
term.c 1.43:
# Coverity CID 806: Prevent NULL deref
term.c 1.44:
# Coverity CID 1668: Plug memory leak.
term.c 1.45:
# Fix compilation.
MFC after: 3 weeks
Notes
Notes:
svn path=/head/; revision=167457
Diffstat (limited to 'lib/libedit/key.h')
| -rw-r--r-- | lib/libedit/key.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/libedit/key.h b/lib/libedit/key.h index 0301f928cd30..3a212923b968 100644 --- a/lib/libedit/key.h +++ b/lib/libedit/key.h @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)key.h 8.1 (Berkeley) 6/4/93 - * $NetBSD: key.h,v 1.8 2003/08/07 16:44:32 agc Exp $ + * $NetBSD: key.h,v 1.10 2006/03/23 20:22:51 christos Exp $ * $FreeBSD$ */ @@ -76,6 +76,8 @@ protected int key_delete(EditLine *, const char *); protected void key_print(EditLine *, const char *); protected void key_kprint(EditLine *, const char *, key_value_t *, int); -protected char *key__decode_str(const char *, char *, const char *); +protected int key__decode_str(const char *, char *, int, + const char *); +protected int key__decode_char(char *, int, int, int); #endif /* _h_el_key */ |