database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

1. discarded term.h from the distribution

Browse Source 
2. changed key_* to el_ley_* in the libedit key.h
   (because it's in the conflict with the aix definitions)
3. use libedit_term.h instead of term.h in the cmd-line-utils/libedit/el.h
4. added definition of MIN in the cmd-line-utils/libedit/read.c 
   (if it wasn't defined yet)
5. discarded definition of SUNOS macro from configure.in 
   (now we don't include term.h in the el.h at all)
This commit is contained in:
vva@eagle.mysql.r18.ru
2004-09-03 17:47:36 +05:00
parent e022b3144e
commit 0fda2f6b97
11 changed files with 97 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cmd-line-utils/libedit/read.c
View File

@ -198,6 +198,10 @@ read_preread(EditLine *el)
return (0);
#ifdef FIONREAD
#ifndef MIN // definition of MIN is lacking on hpux..
#define MIN(x,y) (((x)<(y))?(x):(y))
#endif
(void) ioctl(el->el_infd, FIONREAD, (ioctl_t) & chrs);
if (chrs > 0) {
char buf[EL_BUFSIZ];
@ -262,7 +266,7 @@ read_getcmd(EditLine *el, el_action_t *cmdnum, char *ch)
cmd = el->el_map.current[(unsigned char) *ch];
if (cmd == ED_SEQUENCE_LEAD_IN) {
key_value_t val;
switch (key_get(el, ch, &val)) {
switch (el_key_get(el, ch, &val)) {
case XK_CMD:
cmd = val.cmd;
break;
@ -459,7 +463,8 @@ el_gets(EditLine *el, int *nread)
#endif /* DEBUG_READ */
break;
}
if ((uint)cmdnum >= (uint)(el->el_map.nfunc)) { /* BUG CHECK command */
if ((unsigned int)cmdnum >= (unsigned int)(el->el_map.nfunc))
{ /* BUG CHECK command */
#ifdef DEBUG_EDIT
(void) fprintf(el->el_errfile,
"ERROR: illegal command from key 0%o\r\n", ch);