Our libedit has been diverging from the mainstream version maintained in NetBSD. As a consequence it has been difficult to do an appropriate MFV and we have been bringing only partial updates. Here we update most of the files to at least match the version available in NetBSD's snapshot of 20091228. This version was chosen because it still doesn't include wide character support (UTF-8), which involves many changes and new files. From NetBSD's logs: Dec 15 22:13:33 2006 - editline.3 el.c el.h histedit.h add EL_GETFP, and EL_SETFP. Apr 5 15:53:28 2008 - editline.3 el.c histedit.h readline.c add EL_REFRESH for the benefit of readline Sep 10 15:45:37 2008 - common.c el.c read.c refresh.c sig.c term.c term.h tty.c Allow a single process to control multiple ttys (for pthreads using _REENTRANT) using multiple EditLine objects. Jan 18 12:17:24 2009 - el.c read.c readline.c fix -Wsign-compare issues Feb 6 14:40:32 2009 - history.c Plug memory leak, from MySQL. Feb 5 19:15:44 2009 - histedit.h read.c match documentation in el_push Feb 6 13:14:37 2009 - vi.c Portability fix. Feb 12 13:39:49 2009 - readline.c term.c More fixes for existing portability stuff. Feb 15 21:24:13 2009 - el.h read.c don't restart on EINTR, instead return NULL immediately. From Anon Ymous Feb 15 21:25:01 2009 - sig.c sig.h in order for read() to return EINTR we need to use sigaction, not signal, otherwise SA_RESTART is set. Feb 15 21:55:23 2009 - chared.c chared.h common.c emacs.c filecomplete.c filecomplete.h key.c key.h read.c readline.c refresh.c search.c term.c tokenizer.c tty.c vi.c pass lint on _LP64. Feb 17 21:34:26 2009 - el.c histedit.h prompt.c prompt.h allow for a prompt argument. Feb 18 15:04:40 2009 - sig.c SA_RESTART for all signals but SIGINT. From Anon Ymous. Feb 19 15:20:22 2009 - read.c sig.c sig.h reset and redraw on sigcont. From Anon Ymous. Feb 21 23:31:56 2009 - key.c key.h readline.c vi.c more size_t stuff. Mar 10 20:46:15 2009 - editline.3 read.c make el_gets set the count to -1 on error to distinguish between EOF and error. Mar 31 17:38:27 2009 - editline.3 el.c histedit.h prompt.c prompt.h refresh.c term.c term.h Implement literal prompt sequences. Now someone can implement RL_PROMPT_START_LITERAL/RL_PROMPT_END_LITERAL :-) Mar 31 21:33:17 2009 - term.c cast to size_t to avoid sign / unsigned comparison warning. Apr 23 02:03 2009 - term.c Apply patch (requested by msaitoh in ticket #2007): Coverity CID 1668: Plug memory leak when malloc() failed.:55 2009 May 11 18:33:30 2009 - editline.3 el.c histedit.h restore binary compatibility by providing new prompt functions that take an extra literal character. May 19 21:45:14 2009 - refresh.c always scroll when we advance past bottom. From Caleb Welton cwelton at greenplum dot com. Jul 17 12:27:57 2009 - term.c - off by one in the term.h case. - make code more similar to tcsh (if we want to handle wide chars, this is needed; for now it is a no-op) Jul 22 15:56:29 2009 - el.c Move filename to the scope it is being used. From Michael Cook mcook at bbn dot com Jul 22 15:57:00 2009 - read.c Always initialize nread since it is an out param. From Michael Cook mcook at bbn dot com Jul 22 18:25:26 2009 - el.c Only need path if we have issetugid... From Anon Ymous Jul 25 21:19:23 2009 - el.c Ignore comment lines in .editrc from Jess Thrysoee Sep 7 21:24:33 2009 histedit.h history.c readline.c apply apple patches from: http://opensource.apple.com/source/libedit/libedit-11/patches/ Dec 28 21:52:43 2009 - refresh.c Fix bug where tab completion on the second or > line that caused listing ended up corrupting the display by an extra space in the beginning. Reported by Mac Chan. Dec 28 22:15:36 2009 - refresh.c term.c reduce diff with tcsh Obtained from: NetBSD Tested by: bapt, jilles and current@ MFC after: 1 week
152 lines
4.8 KiB
C
152 lines
4.8 KiB
C
/*-
|
|
* 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. 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.
|
|
*
|
|
* @(#)el.h 8.1 (Berkeley) 6/4/93
|
|
* $NetBSD: el.h,v 1.17 2006/12/15 22:13:33 christos Exp $
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
/*
|
|
* el.h: Internal structures.
|
|
*/
|
|
#ifndef _h_el
|
|
#define _h_el
|
|
/*
|
|
* Local defaults
|
|
*/
|
|
#define KSHVI
|
|
#define VIDEFAULT
|
|
#define ANCHOR
|
|
|
|
#include <stdio.h>
|
|
#include <sys/types.h>
|
|
|
|
#define EL_BUFSIZ 1024 /* Maximum line size */
|
|
|
|
#define HANDLE_SIGNALS 0x01
|
|
#define NO_TTY 0x02
|
|
#define EDIT_DISABLED 0x04
|
|
#define UNBUFFERED 0x08
|
|
|
|
typedef int bool_t; /* True or not */
|
|
|
|
typedef unsigned char el_action_t; /* Index to command array */
|
|
|
|
typedef struct coord_t { /* Position on the screen */
|
|
int h;
|
|
int v;
|
|
} coord_t;
|
|
|
|
typedef struct el_line_t {
|
|
char *buffer; /* Input line */
|
|
char *cursor; /* Cursor position */
|
|
char *lastchar; /* Last character */
|
|
const char *limit; /* Max position */
|
|
} el_line_t;
|
|
|
|
/*
|
|
* Editor state
|
|
*/
|
|
typedef struct el_state_t {
|
|
int inputmode; /* What mode are we in? */
|
|
int doingarg; /* Are we getting an argument? */
|
|
int argument; /* Numeric argument */
|
|
int metanext; /* Is the next char a meta char */
|
|
el_action_t lastcmd; /* Previous command */
|
|
el_action_t thiscmd; /* this command */
|
|
char thisch; /* char that generated it */
|
|
} el_state_t;
|
|
|
|
/*
|
|
* Until we come up with something better...
|
|
*/
|
|
#define el_strdup(a) strdup(a)
|
|
#define el_malloc(a) malloc(a)
|
|
#define el_realloc(a,b) realloc(a, b)
|
|
#define el_free(a) free(a)
|
|
|
|
#include "tty.h"
|
|
#include "prompt.h"
|
|
#include "key.h"
|
|
#include "term.h"
|
|
#include "refresh.h"
|
|
#include "chared.h"
|
|
#include "common.h"
|
|
#include "search.h"
|
|
#include "hist.h"
|
|
#include "map.h"
|
|
#include "parse.h"
|
|
#include "sig.h"
|
|
#include "help.h"
|
|
#include "read.h"
|
|
|
|
struct editline {
|
|
char *el_prog; /* the program name */
|
|
FILE *el_infile; /* Stdio stuff */
|
|
FILE *el_outfile; /* Stdio stuff */
|
|
FILE *el_errfile; /* Stdio stuff */
|
|
int el_infd; /* Input file descriptor */
|
|
int el_flags; /* Various flags. */
|
|
int el_errno; /* Local copy of errno */
|
|
coord_t el_cursor; /* Cursor location */
|
|
char **el_display; /* Real screen image = what is there */
|
|
char **el_vdisplay; /* Virtual screen image = what we see */
|
|
void *el_data; /* Client data */
|
|
el_line_t el_line; /* The current line information */
|
|
el_state_t el_state; /* Current editor state */
|
|
el_term_t el_term; /* Terminal dependent stuff */
|
|
el_tty_t el_tty; /* Tty dependent stuff */
|
|
el_refresh_t el_refresh; /* Refresh stuff */
|
|
el_prompt_t el_prompt; /* Prompt stuff */
|
|
el_prompt_t el_rprompt; /* Prompt stuff */
|
|
el_chared_t el_chared; /* Characted editor stuff */
|
|
el_map_t el_map; /* Key mapping stuff */
|
|
el_key_t el_key; /* Key binding stuff */
|
|
el_history_t el_history; /* History stuff */
|
|
el_search_t el_search; /* Search stuff */
|
|
el_signal_t el_signal; /* Signal handling stuff */
|
|
el_read_t el_read; /* Character reading stuff */
|
|
};
|
|
|
|
protected int el_editmode(EditLine *, int, const char **);
|
|
|
|
#ifdef DEBUG
|
|
#define EL_ABORT(a) do { \
|
|
fprintf(el->el_errfile, "%s, %d: ", \
|
|
__FILE__, __LINE__); \
|
|
fprintf a; \
|
|
abort(); \
|
|
} while( /*CONSTCOND*/0);
|
|
#else
|
|
#define EL_ABORT(a) abort()
|
|
#endif
|
|
#endif /* _h_el */
|