zhangyiss/editline
1
0
Fork 0
mirror of https://github.com/troglobit/editline.git synced 2025-09-18 10:28:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Check for tcgetattr() to enable HAVE_TCGETATTR in sysunix.c this seems

Browse Source 
to work better on embedded targets running off the initial console.

Also, first merge of patches from Debian.  This part holds all of the
sysunix.c changes and some 8-bit patches and SIGSTP patches in the
editline.c file.
This commit is contained in:
Joachim Nilsson
2008-06-09 21:37:01 +02:00
parent 9a94fc9d4d
commit f7b2ea938d
6 changed files with 85 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/editline.c
View File

@@ -20,6 +20,8 @@
#define META(x) ((x) | 0x80)
#define ISMETA(x) ((x) & 0x80)
#define UNMETA(x) ((x) & 0x7F)
#define MAPSIZE 33
#define METAMAPSIZE 17
#if !defined(HIST_SIZE)
#define HIST_SIZE 20
#endif /* !defined(HIST_SIZE) */
@@ -63,6 +65,9 @@ int rl_erase;
int rl_intr;
int rl_kill;
int rl_quit;
#if defined(DO_SIGTSTP)
int rl_susp;
#endif /* defined(DO_SIGTSTP) */
STATIC CHAR NIL[] = "";
STATIC CONST CHAR *Input = NIL;
@@ -80,8 +85,8 @@ STATIC int Point;
STATIC int PushBack;
STATIC int Pushed;
STATIC int Signal;
FORWARD KEYMAP Map[33];
FORWARD KEYMAP MetaMap[17];
FORWARD KEYMAP Map[MAPSIZE];
FORWARD KEYMAP MetaMap[METAMAPSIZE];
STATIC SIZE_T Length;
STATIC SIZE_T ScreenCount;
STATIC SIZE_T ScreenSize;
@@ -90,18 +95,17 @@ STATIC int TTYwidth;
STATIC int TTYrows;
/* Display print 8-bit chars as `M-x' or as the actual 8-bit char? */
int rl_meta_chars = 0;
int rl_meta_chars = 1;
/*
** Declarations.
*/
STATIC CHAR *editinput();
extern int read();
extern int write();
#if defined(USE_TERMCAP)
extern char *getenv();
extern char *tgetstr();
extern int tgetent();
extern int tgetnum();
#endif /* defined(USE_TERMCAP) */
/*
@@ -119,7 +123,7 @@ TTYflush()
STATIC void
TTYput(c)
CHAR c;
CONST CHAR c;
{
Screen[ScreenCount] = c;
if (++ScreenCount >= ScreenSize - 1) {
@@ -864,12 +868,16 @@ emacs(c)
STATUS s;
KEYMAP *kp;
#if 0 /* Debian patch removes this to be able to handle 8-bit input */
/* This test makes it impossible to enter eight-bit characters when
* meta-char mode is enabled. */
OldPoint = Point;
if (rl_meta_chars && ISMETA(c)) {
Pushed = 1;
PushBack = UNMETA(c);
return meta();
}
#endif /* Debian patch removal. */
for (kp = Map; kp->Function; kp++)
if (kp->Key == c)
break;
@@ -884,7 +892,7 @@ STATIC STATUS
TTYspecial(c)
unsigned int c;
{
if (ISMETA(c))
if (rl_meta_chars && ISMETA(c))
return CSdispatch;
if (c == rl_erase || c == DEL)
@@ -907,6 +915,12 @@ TTYspecial(c)
Signal = SIGQUIT;
return CSeof;
}
#if defined(DO_SIGTSTP)
if (c == rl_susp) {
Signal = SIGTSTP;
return CSsignal;
}
#endif /* defined(DO_SIGTSTP) */
return CSdispatch;
}
@@ -973,6 +987,32 @@ hist_add(p)
H.Pos = H.Size - 1;
}
STATIC char *
read_redirected()
{
int size;
char *p;
char *line;
char *end;
for (size = MEM_INC, p = line = NEW(char, size), end = p + size; ; p++) {
if (p == end) {
size += MEM_INC;
p = line = realloc(line, size);
end = p + size;
}
if (read(0, p, 1) <= 0) {
/* Ignore "incomplete" lines at EOF, just like we do for a tty. */
free(line);
return NULL;
}
if (*p == '\n')
break;
}
*p = '\0';
return line;
}
/*
** For compatibility with FSF readline.
*/
@@ -995,6 +1035,11 @@ readline(prompt)
CHAR *line;
int s;
if (!isatty(0)) {
TTYflush();
return read_redirected();
}
if (Line == NULL) {
Length = MEM_INC;
if ((Line = NEW(CHAR, Length)) == NULL)