Commit c1f29705 authored by unknown's avatar unknown
Browse files

Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 

into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.1


configure.in:
  Auto merged
parents c91fb136 37aad6bb

cmd-line-utils/libedit/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ pkginclude_HEADERS = readline/readline.h 


noinst_HEADERS =	chared.h el.h histedit.h key.h parse.h refresh.h sig.h \

			sys.h tokenizer.h config.h hist.h map.h prompt.h read.h \

			search.h tty.h libedit_term.h term.h

			search.h tty.h libedit_term.h



EXTRA_DIST = makelist.sh np/unvis.c np/strlcpy.c np/vis.c np/vis.h np/strlcat.c np/fgetln.c

cmd-line-utils/libedit/el.c

+2 −2
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ el_init(const char *prog, FILE *fin, FILE *fout, FILE *ferr) 
		el_free(el);

		return NULL;

	}

	(void) key_init(el);

	(void) el_key_init(el);

	(void) map_init(el);

	if (tty_init(el) == -1)

		el->el_flags |= NO_TTY;
@@ -112,7 +112,7 @@ el_end(EditLine *el) 
	el_reset(el);



	term_end(el);

	key_end(el);

	el_key_end(el);

	map_end(el);

	tty_end(el);

	ch_end(el);

cmd-line-utils/libedit/el.h

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ typedef struct el_state_t { 
#include "tty.h"

#include "prompt.h"

#include "key.h"

#include "term.h"

#include "libedit_term.h"

#include "refresh.h"

#include "chared.h"

#include "common.h"

cmd-line-utils/libedit/key.c

+17 −17
Original line number Diff line number Diff line
@@ -103,14 +103,14 @@ private int key__decode_char(char *, int, int); 
 *	Initialize the key maps

 */

protected int

key_init(EditLine *el)

el_key_init(EditLine *el)

{



	el->el_key.buf = (char *) el_malloc(KEY_BUFSIZ);

	if (el->el_key.buf == NULL)

		return (-1);

	el->el_key.map = NULL;

	key_reset(el);

	el_key_reset(el);

	return (0);

}
@@ -119,7 +119,7 @@ key_init(EditLine *el) 
 *	Free the key maps

 */

protected void

key_end(EditLine *el)

el_key_end(EditLine *el)

{



	el_free((ptr_t) el->el_key.buf);
@@ -133,7 +133,7 @@ key_end(EditLine *el) 
 *	Associate cmd with a key value

 */

protected key_value_t *

key_map_cmd(EditLine *el, int cmd)

el_key_map_cmd(EditLine *el, int cmd)

{



	el->el_key.val.cmd = (el_action_t) cmd;
@@ -145,7 +145,7 @@ key_map_cmd(EditLine *el, int cmd) 
 *	Associate str with a key value

 */

protected key_value_t *

key_map_str(EditLine *el, char *str)

el_key_map_str(EditLine *el, char *str)

{



	el->el_key.val.str = str;
@@ -159,7 +159,7 @@ key_map_str(EditLine *el, char *str) 
 *	[Always bind the ansi arrow keys?]

 */

protected void

key_reset(EditLine *el)

el_key_reset(EditLine *el)

{



	node__put(el, el->el_key.map);
@@ -177,7 +177,7 @@ key_reset(EditLine *el) 
 *      The last character read is returned in *ch.

 */

protected int

key_get(EditLine *el, char *ch, key_value_t *val)

el_key_get(EditLine *el, char *ch, key_value_t *val)

{



	return (node_trav(el, el->el_key.map, ch, val));
@@ -191,7 +191,7 @@ key_get(EditLine *el, char *ch, key_value_t *val) 
 *      out str or a unix command.

 */

protected void

key_add(EditLine *el, const char *key, key_value_t *val, int ntype)

el_key_add(EditLine *el, const char *key, key_value_t *val, int ntype)

{



	if (key[0] == '\0') {
@@ -219,7 +219,7 @@ key_add(EditLine *el, const char *key, key_value_t *val, int ntype) 
 *

 */

protected void

key_clear(EditLine *el, el_action_t *map, const char *in)

el_key_clear(EditLine *el, el_action_t *map, const char *in)

{



	if ((map[(unsigned char)*in] == ED_SEQUENCE_LEAD_IN) &&
@@ -227,7 +227,7 @@ key_clear(EditLine *el, el_action_t *map, const char *in) 
	    el->el_map.alt[(unsigned char)*in] != ED_SEQUENCE_LEAD_IN) ||

	    (map == el->el_map.alt &&

	    el->el_map.key[(unsigned char)*in] != ED_SEQUENCE_LEAD_IN)))

		(void) key_delete(el, in);

		(void) el_key_delete(el, in);

}
@@ -236,7 +236,7 @@ key_clear(EditLine *el, el_action_t *map, const char *in) 
 *      they exists.

 */

protected int

key_delete(EditLine *el, const char *key)

el_key_delete(EditLine *el, const char *key)

{



	if (key[0] == '\0') {
@@ -257,7 +257,7 @@ key_delete(EditLine *el, const char *key) 
 *	Print entire el->el_key.map if null

 */

protected void

key_print(EditLine *el, const char *key)

el_key_print(EditLine *el, const char *key)

{



	/* do nothing if el->el_key.map is empty and null key specified */
@@ -504,7 +504,7 @@ node_lookup(EditLine *el, const char *str, key_node_t *ptr, int cnt) 
				if (str[1] == 0) {

					el->el_key.buf[ncnt + 1] = '"';

					el->el_key.buf[ncnt + 2] = '\0';

					key_kprint(el, el->el_key.buf,

					el_key_kprint(el, el->el_key.buf,

					    &ptr->val, ptr->type);

					return (0);

				} else
@@ -552,7 +552,7 @@ node_enum(EditLine *el, key_node_t *ptr, int cnt) 
		/* print this key and function */

		el->el_key.buf[ncnt + 1] = '"';

		el->el_key.buf[ncnt + 2] = '\0';

		key_kprint(el, el->el_key.buf, &ptr->val, ptr->type);

		el_key_kprint(el, el->el_key.buf, &ptr->val, ptr->type);

	} else

		(void) node_enum(el, ptr->next, ncnt + 1);
@@ -568,7 +568,7 @@ node_enum(EditLine *el, key_node_t *ptr, int cnt) 
 *	function specified by val

 */

protected void

key_kprint(EditLine *el, const char *key, key_value_t *val, int ntype)

el_key_kprint(EditLine *el, const char *key, key_value_t *val, int ntype)

{

	el_bindings_t *fp;

	char unparsbuf[EL_BUFSIZ];
@@ -579,7 +579,7 @@ key_kprint(EditLine *el, const char *key, key_value_t *val, int ntype) 
		case XK_STR:

		case XK_EXE:

			(void) fprintf(el->el_outfile, fmt, key,

			    key__decode_str(val->str, unparsbuf,

			    el_key__decode_str(val->str, unparsbuf,

				ntype == XK_STR ? "\"\"" : "[]"));

			break;

		case XK_CMD:
@@ -644,7 +644,7 @@ key__decode_char(char *buf, int cnt, int ch) 
 *	Make a printable version of the ey

 */

protected char *

key__decode_str(const char *str, char *buf, const char *sep)

el_key__decode_str(const char *str, char *buf, const char *sep)

{

	char *b;

	const char *p;

cmd-line-utils/libedit/key.h

+13 −12
Original line number Diff line number Diff line
@@ -62,18 +62,19 @@ typedef struct el_key_t { 
#define	XK_NOD	2

#define	XK_EXE	3



protected int		 key_init(EditLine *);

protected void		 key_end(EditLine *);

protected key_value_t	*key_map_cmd(EditLine *, int);

protected key_value_t	*key_map_str(EditLine *, char *);

protected void		 key_reset(EditLine *);

protected int		 key_get(EditLine *, char *, key_value_t *);

protected void		 key_add(EditLine *, const char *, key_value_t *, int);

protected void		 key_clear(EditLine *, el_action_t *, const char *);

protected int		 key_delete(EditLine *, const char *);

protected void		 key_print(EditLine *, const char *);

protected void	         key_kprint(EditLine *, const char *, key_value_t *,

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		*key__decode_str(const char *, char *, const char *);

protected char		*el_key__decode_str(const char *, char *, const char *);



#endif /* _h_el_key */