mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
37aad6bb4f
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)
BitKeeper/deleted/.del-term.h~23716a5310508e0:
Delete: cmd-line-utils/libedit/term.h
cmd-line-utils/libedit/Makefile.am:
discarded term.h from the distribution
cmd-line-utils/libedit/el.c:
changed
key_init -> el_key_init
key_end -> el_key_end
cmd-line-utils/libedit/el.h:
change
#include "term.h"
to
#include "libedit_term.h"
cmd-line-utils/libedit/key.c:
changed functions key_... to el_key_...
because it's in conflict with the aix definitions
cmd-line-utils/libedit/key.h:
changed functions key_... to el_key_...
because it's in conflict with the aix definitions
cmd-line-utils/libedit/map.c:
changed functions key_... to el_key_...
because it's in conflict with the aix definitions
cmd-line-utils/libedit/read.c:
1. added definition of MIN
2. fixed problems with undefined uint
3. changed key_get to el_key_get
cmd-line-utils/libedit/term.c:
1. discarded #include "term.h" at all
2. changed functions key_* to el_key_*
3. add declaration of el_key__decode_str
cmd-line-utils/libedit/tty.c:
changed functions key_... to el_key_...
because it's in conflict with the aix definitions
configure.in:
discarded definition of SUNOS macro
(libedit doesn't require it anymore)
80 lines
3.2 KiB
C
80 lines
3.2 KiB
C
/* $NetBSD: key.h,v 1.6 2002/03/18 16:00:55 christos Exp $ */
|
|
|
|
/*-
|
|
* Copyright (c) 1992, 1993
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* This code is derived from software contributed to Berkeley by
|
|
* Christos Zoulas of Cornell University.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
* must display the following acknowledgement:
|
|
* This product includes software developed by the University of
|
|
* California, Berkeley and its contributors.
|
|
* 4. Neither the name of the University nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
* @(#)key.h 8.1 (Berkeley) 6/4/93
|
|
*/
|
|
|
|
/*
|
|
* el.key.h: Key macro header
|
|
*/
|
|
#ifndef _h_el_key
|
|
#define _h_el_key
|
|
|
|
typedef union key_value_t {
|
|
el_action_t cmd; /* If it is a command the # */
|
|
char *str; /* If it is a string... */
|
|
} key_value_t;
|
|
|
|
typedef struct key_node_t key_node_t;
|
|
|
|
typedef struct el_key_t {
|
|
char *buf; /* Key print buffer */
|
|
key_node_t *map; /* Key map */
|
|
key_value_t val; /* Local conversion buffer */
|
|
} el_key_t;
|
|
|
|
#define XK_CMD 0
|
|
#define XK_STR 1
|
|
#define XK_NOD 2
|
|
#define XK_EXE 3
|
|
|
|
protected int el_key_init(EditLine *);
|
|
protected void el_key_end(EditLine *);
|
|
protected key_value_t *el_key_map_cmd(EditLine *, int);
|
|
protected key_value_t *el_key_map_str(EditLine *, char *);
|
|
protected void el_key_reset(EditLine *);
|
|
protected int el_key_get(EditLine *, char *, key_value_t *);
|
|
protected void el_key_add(EditLine *,
|
|
const char *, key_value_t *, int);
|
|
protected void el_key_clear(EditLine *, el_action_t *, const char *);
|
|
protected int el_key_delete(EditLine *, const char *);
|
|
protected void el_key_print(EditLine *, const char *);
|
|
protected void el_key_kprint(EditLine *, const char *, key_value_t *,
|
|
int);
|
|
protected char *el_key__decode_str(const char *, char *, const char *);
|
|
|
|
#endif /* _h_el_key */
|