mischief/openbsd-src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2025-01-10 06:47:55 -08:00
Code
5ad0d35887
openbsd-src/lib/libedit/tty.c

1334 lines
30 KiB
C
Raw Normal View History

Delete obsolete /* ARGSUSED */ lint comments. ok miod@ millert@
2023-03-07 20:43:04 -08:00
/* $OpenBSD: tty.c,v 1.28 2023/03/08 04:43:05 guenther Exp $ */
sync with upstream, retaining local modifications. ok nicm@
2011-07-06 22:40:42 -07:00
/* $NetBSD: tty.c,v 1.34 2011/01/27 23:11:40 christos Exp $ */
Merge in NetBSD libedit changes and new man pages. Also fix some strncpy() usage in their code. NetBSD change log was: * add a man page for the editline routines * add a man page describing editrc * fix bugs in el_parse(): * didn't execute command when program name matched (test reversed) * was checking against empty string instead of program name * after checks, command to run also pointed to empty string * document ^char and \ escape sequences * when parsing ^char control chars, check the correct char when determining validity (previously, ^char was a NOP interpreted as the literal string because of this bug) * Implement CC_REDISPLAY, which (unlike CC_REFRESH) redraws the entire input * line (a la ^R). This is useful if the binding outputs information and * mucks up the input line. To be used in ``list-choices'' bindings (refer * to the ^D binding in csh when filec is set)
1997-01-15 21:18:27 -08:00
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
/*-
* 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.
Remove the advertising clause in the UCB license which Berkeley rescinded 22 July 1999. Proofed by myself and Theo.
2003-06-02 13:18:29 -07:00
* 3. Neither the name of the University nor the names of its contributors
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
* 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.
*/
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
#include "config.h"
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
/*
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
* tty.c: tty interface stuff
*/
Update libedit to bring it into sync with the latest version from NetBSD. ok deraadt
2010-06-29 17:05:35 -07:00
#include <assert.h>
#include <errno.h>
Cleanup of standard header inclusion: 1. Add the missing <errno.h> to sig.c. 2. Do not include standard headers from private headers "chared.h" and "el.h", include them directly where needed. 3. Delete a few needless inclusions of <ctype.h>. 4. Sort the standard headers. 5. Delete _GNU_SOURCE weirdness from histedit.h, that file doesn't even need the access to wcsdup(3) mentioned in the comment. 6. Delete some trailing blanks and blanks before tabs. OK czarkoff@
2016-03-20 16:48:27 -07:00
#include <stdlib.h> /* for abort */
#include <string.h>
Update libedit to bring it into sync with the latest version from NetBSD. ok deraadt
2010-06-29 17:05:35 -07:00
#include <strings.h> /* for ffs */
Cleanup of standard header inclusion: 1. Add the missing <errno.h> to sig.c. 2. Do not include standard headers from private headers "chared.h" and "el.h", include them directly where needed. 3. Delete a few needless inclusions of <ctype.h>. 4. Sort the standard headers. 5. Delete _GNU_SOURCE weirdness from histedit.h, that file doesn't even need the access to wcsdup(3) mentioned in the comment. 6. Delete some trailing blanks and blanks before tabs. OK czarkoff@
2016-03-20 16:48:27 -07:00
#include <unistd.h> /* for isatty */
Cleanup of private header inclusion: 1. Do not include private headers from "chared.h", "hist.h", "prompt.h", "refresh.h", "search.h", "sig.h", "terminal.h", "tty.h". The only private header having to include other private headers is "el.h". 2. Do not include "common.h", "parse.h", "help.h" from "el.h", and do not include "emacs.h" and "vi.h" from "chared.h", include them directly where needed. 3. Do include "fcns.h" from "el.h" because el_func_t is needed for "map.h". 4. Do not include private headers again that are already included by "el.h". 5. Include private headers after standard headers. OK czarkoff@
2016-03-20 15:57:59 -07:00
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
#include "el.h"
Replace the generated file "fcns.c" by a simpler header "func.h" included only in the one file needing it, "map.c". That allows to define el_action_t directly in "map.h", which in turn allows to stop including "fcns.h" from "el.h" and include it only in the modules needing it. Now we no longer autogenerate any C files. Feedback and OK martijn@. First version also proofread by Christian Heckendorf <mbie at ulmus dot me>.
2016-05-06 06:12:52 -07:00
#include "fcns.h"
Cleanup of private header inclusion: 1. Do not include private headers from "chared.h", "hist.h", "prompt.h", "refresh.h", "search.h", "sig.h", "terminal.h", "tty.h". The only private header having to include other private headers is "el.h". 2. Do not include "common.h", "parse.h", "help.h" from "el.h", and do not include "emacs.h" and "vi.h" from "chared.h", include them directly where needed. 3. Do include "fcns.h" from "el.h" because el_func_t is needed for "map.h". 4. Do not include private headers again that are already included by "el.h". 5. Include private headers after standard headers. OK czarkoff@
2016-03-20 15:57:59 -07:00
#include "parse.h"
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
typedef struct ttymodes_t {
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
const char *m_name;
Update libedit to bring it into sync with the latest version from NetBSD. ok deraadt
2010-06-29 17:05:35 -07:00
unsigned int m_value;
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
int m_type;
} ttymodes_t;
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
typedef struct ttymap_t {
Delete the useless Int datatype and always use the standard wint_t directly. This is not a problem because <wchar_t> is required all over the place anyway, even when WIDECHAR is not defined. No functional change except that it fixes a few printf(3) format string issues, %c vs. %lc. OK czarkoff@
2016-03-20 13:35:38 -07:00
wint_t nch, och; /* Internal and termio rep of chars */
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
el_action_t bind[3]; /* emacs, vi, and vi-cmd */
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
} ttymap_t;
delete the "private" and "public" preprocessor macros, just use standard C; OK martijn@
2016-04-11 14:17:29 -07:00
static const ttyperm_t ttyperm = {
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
{
{"iflag:", ICRNL, (INLCR | IGNCR)},
{"oflag:", (OPOST | ONLCR), ONLRET},
{"cflag:", 0, 0},
{"lflag:", (ISIG | ICANON | ECHO | ECHOE | ECHOCTL | IEXTEN),
(NOFLSH | ECHONL | EXTPROC | FLUSHO)},
{"chars:", 0, 0},
},
{
{"iflag:", (INLCR | ICRNL), IGNCR},
{"oflag:", (OPOST | ONLCR), ONLRET},
{"cflag:", 0, 0},
{"lflag:", ISIG,
(NOFLSH | ICANON | ECHO | ECHOK | ECHONL | EXTPROC | IEXTEN | FLUSHO)},
{"chars:", (C_SH(C_MIN) | C_SH(C_TIME) | C_SH(C_SWTCH) | C_SH(C_DSWTCH) |
C_SH(C_SUSP) | C_SH(C_DSUSP) | C_SH(C_EOL) | C_SH(C_DISCARD) |
C_SH(C_PGOFF) | C_SH(C_PAGE) | C_SH(C_STATUS)), 0}
},
{
{"iflag:", 0, IXON | IXOFF | INLCR | ICRNL},
{"oflag:", 0, 0},
{"cflag:", 0, 0},
{"lflag:", 0, ISIG | IEXTEN},
{"chars:", 0, 0},
}
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
};
delete the "private" and "public" preprocessor macros, just use standard C; OK martijn@
2016-04-11 14:17:29 -07:00
static const ttychar_t ttychar = {
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
{
CINTR, CQUIT, CERASE, CKILL,
CEOF, CEOL, CEOL2, CSWTCH,
CDSWTCH, CERASE2, CSTART, CSTOP,
CWERASE, CSUSP, CDSUSP, CREPRINT,
CDISCARD, CLNEXT, CSTATUS, CPAGE,
CPGOFF, CKILL2, CBRK, CMIN,
CTIME
},
{
CINTR, CQUIT, CERASE, CKILL,
_POSIX_VDISABLE, _POSIX_VDISABLE, _POSIX_VDISABLE, _POSIX_VDISABLE,
_POSIX_VDISABLE, CERASE2, CSTART, CSTOP,
_POSIX_VDISABLE, CSUSP, _POSIX_VDISABLE, _POSIX_VDISABLE,
CDISCARD, _POSIX_VDISABLE, _POSIX_VDISABLE, _POSIX_VDISABLE,
_POSIX_VDISABLE, _POSIX_VDISABLE, _POSIX_VDISABLE, 1,
0
},
{
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0
}
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
};
delete the "private" and "public" preprocessor macros, just use standard C; OK martijn@
2016-04-11 14:17:29 -07:00
static const ttymap_t tty_map[] = {
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
#ifdef VERASE
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
{C_ERASE, VERASE,
Update libedit to bring it into sync with the latest version from NetBSD. ok deraadt
2010-06-29 17:05:35 -07:00
{EM_DELETE_PREV_CHAR, VI_DELETE_PREV_CHAR, ED_PREV_CHAR}},
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
#endif /* VERASE */
#ifdef VERASE2
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
{C_ERASE2, VERASE2,
Update libedit to bring it into sync with the latest version from NetBSD. ok deraadt
2010-06-29 17:05:35 -07:00
{EM_DELETE_PREV_CHAR, VI_DELETE_PREV_CHAR, ED_PREV_CHAR}},
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
#endif /* VERASE2 */
#ifdef VKILL
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
{C_KILL, VKILL,
{EM_KILL_LINE, VI_KILL_LINE_PREV, ED_UNASSIGNED}},
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
#endif /* VKILL */
#ifdef VKILL2
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
{C_KILL2, VKILL2,
{EM_KILL_LINE, VI_KILL_LINE_PREV, ED_UNASSIGNED}},
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
#endif /* VKILL2 */
#ifdef VEOF
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
{C_EOF, VEOF,
{EM_DELETE_OR_LIST, VI_LIST_OR_EOF, ED_UNASSIGNED}},
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
#endif /* VEOF */
#ifdef VWERASE
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
{C_WERASE, VWERASE,
{ED_DELETE_PREV_WORD, ED_DELETE_PREV_WORD, ED_PREV_WORD}},
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
#endif /* VWERASE */
#ifdef VREPRINT
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
{C_REPRINT, VREPRINT,
{ED_REDISPLAY, ED_INSERT, ED_REDISPLAY}},
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
#endif /* VREPRINT */
#ifdef VLNEXT
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
{C_LNEXT, VLNEXT,
{ED_QUOTED_INSERT, ED_QUOTED_INSERT, ED_UNASSIGNED}},
#endif /* VLNEXT */
Delete the useless Int datatype and always use the standard wint_t directly. This is not a problem because <wchar_t> is required all over the place anyway, even when WIDECHAR is not defined. No functional change except that it fixes a few printf(3) format string issues, %c vs. %lc. OK czarkoff@
2016-03-20 13:35:38 -07:00
{(wint_t)-1, (wint_t)-1,
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
{ED_UNASSIGNED, ED_UNASSIGNED, ED_UNASSIGNED}}
};
delete the "private" and "public" preprocessor macros, just use standard C; OK martijn@
2016-04-11 14:17:29 -07:00
static const ttymodes_t ttymodes[] = {
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
#ifdef IGNBRK
{"ignbrk", IGNBRK, MD_INP},
#endif /* IGNBRK */
#ifdef BRKINT
{"brkint", BRKINT, MD_INP},
#endif /* BRKINT */
#ifdef IGNPAR
{"ignpar", IGNPAR, MD_INP},
#endif /* IGNPAR */
#ifdef PARMRK
{"parmrk", PARMRK, MD_INP},
#endif /* PARMRK */
#ifdef INPCK
{"inpck", INPCK, MD_INP},
#endif /* INPCK */
#ifdef ISTRIP
{"istrip", ISTRIP, MD_INP},
#endif /* ISTRIP */
#ifdef INLCR
{"inlcr", INLCR, MD_INP},
#endif /* INLCR */
#ifdef IGNCR
{"igncr", IGNCR, MD_INP},
#endif /* IGNCR */
#ifdef ICRNL
{"icrnl", ICRNL, MD_INP},
#endif /* ICRNL */
#ifdef IUCLC
{"iuclc", IUCLC, MD_INP},
#endif /* IUCLC */
#ifdef IXON
{"ixon", IXON, MD_INP},
#endif /* IXON */
#ifdef IXANY
{"ixany", IXANY, MD_INP},
#endif /* IXANY */
#ifdef IXOFF
{"ixoff", IXOFF, MD_INP},
#endif /* IXOFF */
#ifdef IMAXBEL
{"imaxbel", IMAXBEL, MD_INP},
#endif /* IMAXBEL */
#ifdef OPOST
{"opost", OPOST, MD_OUT},
#endif /* OPOST */
#ifdef OLCUC
{"olcuc", OLCUC, MD_OUT},
#endif /* OLCUC */
#ifdef ONLCR
{"onlcr", ONLCR, MD_OUT},
#endif /* ONLCR */
#ifdef OCRNL
{"ocrnl", OCRNL, MD_OUT},
#endif /* OCRNL */
#ifdef ONOCR
{"onocr", ONOCR, MD_OUT},
#endif /* ONOCR */
#ifdef ONOEOT
{"onoeot", ONOEOT, MD_OUT},
#endif /* ONOEOT */
#ifdef ONLRET
{"onlret", ONLRET, MD_OUT},
#endif /* ONLRET */
#ifdef OFILL
{"ofill", OFILL, MD_OUT},
#endif /* OFILL */
#ifdef OFDEL
{"ofdel", OFDEL, MD_OUT},
#endif /* OFDEL */
#ifdef NLDLY
{"nldly", NLDLY, MD_OUT},
#endif /* NLDLY */
#ifdef CRDLY
{"crdly", CRDLY, MD_OUT},
#endif /* CRDLY */
#ifdef TABDLY
{"tabdly", TABDLY, MD_OUT},
#endif /* TABDLY */
#ifdef XTABS
{"xtabs", XTABS, MD_OUT},
#endif /* XTABS */
#ifdef BSDLY
{"bsdly", BSDLY, MD_OUT},
#endif /* BSDLY */
#ifdef VTDLY
{"vtdly", VTDLY, MD_OUT},
#endif /* VTDLY */
#ifdef FFDLY
{"ffdly", FFDLY, MD_OUT},
#endif /* FFDLY */
#ifdef PAGEOUT
{"pageout", PAGEOUT, MD_OUT},
#endif /* PAGEOUT */
#ifdef WRAP
{"wrap", WRAP, MD_OUT},
#endif /* WRAP */
#ifdef CIGNORE
{"cignore", CIGNORE, MD_CTL},
#endif /* CBAUD */
#ifdef CBAUD
{"cbaud", CBAUD, MD_CTL},
#endif /* CBAUD */
#ifdef CSTOPB
{"cstopb", CSTOPB, MD_CTL},
#endif /* CSTOPB */
#ifdef CREAD
{"cread", CREAD, MD_CTL},
#endif /* CREAD */
#ifdef PARENB
{"parenb", PARENB, MD_CTL},
#endif /* PARENB */
#ifdef PARODD
{"parodd", PARODD, MD_CTL},
#endif /* PARODD */
#ifdef HUPCL
{"hupcl", HUPCL, MD_CTL},
#endif /* HUPCL */
#ifdef CLOCAL
{"clocal", CLOCAL, MD_CTL},
#endif /* CLOCAL */
#ifdef LOBLK
{"loblk", LOBLK, MD_CTL},
#endif /* LOBLK */
#ifdef CIBAUD
{"cibaud", CIBAUD, MD_CTL},
#endif /* CIBAUD */
#ifdef CRTSCTS
#ifdef CCTS_OFLOW
{"ccts_oflow", CCTS_OFLOW, MD_CTL},
#else
{"crtscts", CRTSCTS, MD_CTL},
#endif /* CCTS_OFLOW */
#endif /* CRTSCTS */
#ifdef CRTS_IFLOW
{"crts_iflow", CRTS_IFLOW, MD_CTL},
#endif /* CRTS_IFLOW */
#ifdef CDTRCTS
{"cdtrcts", CDTRCTS, MD_CTL},
#endif /* CDTRCTS */
#ifdef MDMBUF
{"mdmbuf", MDMBUF, MD_CTL},
#endif /* MDMBUF */
#ifdef RCV1EN
{"rcv1en", RCV1EN, MD_CTL},
#endif /* RCV1EN */
#ifdef XMT1EN
{"xmt1en", XMT1EN, MD_CTL},
#endif /* XMT1EN */
#ifdef ISIG
{"isig", ISIG, MD_LIN},
#endif /* ISIG */
#ifdef ICANON
{"icanon", ICANON, MD_LIN},
#endif /* ICANON */
#ifdef XCASE
{"xcase", XCASE, MD_LIN},
#endif /* XCASE */
#ifdef ECHO
{"echo", ECHO, MD_LIN},
#endif /* ECHO */
#ifdef ECHOE
{"echoe", ECHOE, MD_LIN},
#endif /* ECHOE */
#ifdef ECHOK
{"echok", ECHOK, MD_LIN},
#endif /* ECHOK */
#ifdef ECHONL
{"echonl", ECHONL, MD_LIN},
#endif /* ECHONL */
#ifdef NOFLSH
{"noflsh", NOFLSH, MD_LIN},
#endif /* NOFLSH */
#ifdef TOSTOP
{"tostop", TOSTOP, MD_LIN},
#endif /* TOSTOP */
#ifdef ECHOCTL
{"echoctl", ECHOCTL, MD_LIN},
#endif /* ECHOCTL */
#ifdef ECHOPRT
{"echoprt", ECHOPRT, MD_LIN},
#endif /* ECHOPRT */
#ifdef ECHOKE
{"echoke", ECHOKE, MD_LIN},
#endif /* ECHOKE */
#ifdef DEFECHO
{"defecho", DEFECHO, MD_LIN},
#endif /* DEFECHO */
#ifdef FLUSHO
{"flusho", FLUSHO, MD_LIN},
#endif /* FLUSHO */
#ifdef PENDIN
{"pendin", PENDIN, MD_LIN},
#endif /* PENDIN */
#ifdef IEXTEN
{"iexten", IEXTEN, MD_LIN},
#endif /* IEXTEN */
#ifdef NOKERNINFO
{"nokerninfo", NOKERNINFO, MD_LIN},
#endif /* NOKERNINFO */
#ifdef ALTWERASE
{"altwerase", ALTWERASE, MD_LIN},
#endif /* ALTWERASE */
#ifdef EXTPROC
{"extproc", EXTPROC, MD_LIN},
#endif /* EXTPROC */
#if defined(VINTR)
{"intr", C_SH(C_INTR), MD_CHAR},
#endif /* VINTR */
#if defined(VQUIT)
{"quit", C_SH(C_QUIT), MD_CHAR},
#endif /* VQUIT */
#if defined(VERASE)
{"erase", C_SH(C_ERASE), MD_CHAR},
#endif /* VERASE */
#if defined(VKILL)
{"kill", C_SH(C_KILL), MD_CHAR},
#endif /* VKILL */
#if defined(VEOF)
{"eof", C_SH(C_EOF), MD_CHAR},
#endif /* VEOF */
#if defined(VEOL)
{"eol", C_SH(C_EOL), MD_CHAR},
#endif /* VEOL */
#if defined(VEOL2)
{"eol2", C_SH(C_EOL2), MD_CHAR},
#endif /* VEOL2 */
#if defined(VSWTCH)
{"swtch", C_SH(C_SWTCH), MD_CHAR},
#endif /* VSWTCH */
#if defined(VDSWTCH)
{"dswtch", C_SH(C_DSWTCH), MD_CHAR},
#endif /* VDSWTCH */
#if defined(VERASE2)
{"erase2", C_SH(C_ERASE2), MD_CHAR},
#endif /* VERASE2 */
#if defined(VSTART)
{"start", C_SH(C_START), MD_CHAR},
#endif /* VSTART */
#if defined(VSTOP)
{"stop", C_SH(C_STOP), MD_CHAR},
#endif /* VSTOP */
#if defined(VWERASE)
{"werase", C_SH(C_WERASE), MD_CHAR},
#endif /* VWERASE */
#if defined(VSUSP)
{"susp", C_SH(C_SUSP), MD_CHAR},
#endif /* VSUSP */
#if defined(VDSUSP)
{"dsusp", C_SH(C_DSUSP), MD_CHAR},
#endif /* VDSUSP */
#if defined(VREPRINT)
{"reprint", C_SH(C_REPRINT), MD_CHAR},
#endif /* VREPRINT */
#if defined(VDISCARD)
{"discard", C_SH(C_DISCARD), MD_CHAR},
#endif /* VDISCARD */
#if defined(VLNEXT)
{"lnext", C_SH(C_LNEXT), MD_CHAR},
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
#endif /* VLNEXT */
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
#if defined(VSTATUS)
{"status", C_SH(C_STATUS), MD_CHAR},
#endif /* VSTATUS */
#if defined(VPAGE)
{"page", C_SH(C_PAGE), MD_CHAR},
#endif /* VPAGE */
#if defined(VPGOFF)
{"pgoff", C_SH(C_PGOFF), MD_CHAR},
#endif /* VPGOFF */
#if defined(VKILL2)
{"kill2", C_SH(C_KILL2), MD_CHAR},
#endif /* VKILL2 */
#if defined(VBRK)
{"brk", C_SH(C_BRK), MD_CHAR},
#endif /* VBRK */
#if defined(VMIN)
{"min", C_SH(C_MIN), MD_CHAR},
#endif /* VMIN */
#if defined(VTIME)
{"time", C_SH(C_TIME), MD_CHAR},
#endif /* VTIME */
{NULL, 0, -1},
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
};
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
#define tty__gettabs(td) ((((td)->c_oflag & TAB3) == TAB3) ? 0 : 1)
#define tty__geteightbit(td) (((td)->c_cflag & CSIZE) == CS8)
#define tty__cooked_mode(td) ((td)->c_lflag & ICANON)
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
delete the "private" and "public" preprocessor macros, just use standard C; OK martijn@
2016-04-11 14:17:29 -07:00
static int tty_getty(EditLine *, struct termios *);
static int tty_setty(EditLine *, int, const struct termios *);
static int tty__getcharindex(int);
static void tty__getchar(struct termios *, unsigned char *);
static void tty__setchar(struct termios *, unsigned char *);
static speed_t tty__getspeed(struct termios *);
static int tty_setup(EditLine *);
static void tty_setup_flags(EditLine *, struct termios *, int);
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
#define t_qu t_ts
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
Update libedit to bring it into sync with the latest version from NetBSD. ok deraadt
2010-06-29 17:05:35 -07:00
/* tty_getty():
* Wrapper for tcgetattr to handle EINTR
*/
delete the "private" and "public" preprocessor macros, just use standard C; OK martijn@
2016-04-11 14:17:29 -07:00
static int
Update libedit to bring it into sync with the latest version from NetBSD. ok deraadt
2010-06-29 17:05:35 -07:00
tty_getty(EditLine *el, struct termios *t)
{
int rv;
while ((rv = tcgetattr(el->el_infd, t)) == -1 && errno == EINTR)
continue;
return rv;
}
/* tty_setty():
* Wrapper for tcsetattr to handle EINTR
*/
delete the "private" and "public" preprocessor macros, just use standard C; OK martijn@
2016-04-11 14:17:29 -07:00
static int
Update libedit to bring it into sync with the latest version from NetBSD. ok deraadt
2010-06-29 17:05:35 -07:00
tty_setty(EditLine *el, int action, const struct termios *t)
{
int rv;
while ((rv = tcsetattr(el->el_infd, action, t)) == -1 && errno == EINTR)
continue;
return rv;
}
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
/* tty_setup():
* Get the tty parameters and initialize the editing state
*/
delete the "private" and "public" preprocessor macros, just use standard C; OK martijn@
2016-04-11 14:17:29 -07:00
static int
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
tty_setup(EditLine *el)
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
{
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
int rst = 1;
if (el->el_flags & EDIT_DISABLED)
Fourth step in synching with NetBSD: KNF: Remove parentheses from return lines. No object change. This makes emacs.c and prompt.c identical to the NetBSD versions. It reduces the remaining diff from +2053 -1261 to +1526 -734. OK czarkoff@
2016-01-30 04:22:20 -08:00
return 0;
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
Reset the terminal to its initial state before exiting a program using libedit, using code from NetBSD tty.c rev. 1.42, 1.48, 1.49, 1.58, and 1.59. Code mostly by Christos Zoulas, one bug report by John Hein, one additional bugfix by me (rev. 1.59). While here, switch t_mode to unsigned char, which is sufficient, also from NetBSD. OK martijn@. Also checked by Christian Heckendorf <mbie at ulmus dot me>.
2016-04-09 11:42:49 -07:00
if (el->el_tty.t_initialized)
return -1;
sync with upstream, retaining local modifications. ok nicm@
2011-07-06 22:40:42 -07:00
if (!isatty(el->el_outfd)) {
#ifdef DEBUG_TTY
(void) fprintf(el->el_errfile,
"tty_setup: isatty: %s\n", strerror(errno));
#endif /* DEBUG_TTY */
Fourth step in synching with NetBSD: KNF: Remove parentheses from return lines. No object change. This makes emacs.c and prompt.c identical to the NetBSD versions. It reduces the remaining diff from +2053 -1261 to +1526 -734. OK czarkoff@
2016-01-30 04:22:20 -08:00
return -1;
sync with upstream, retaining local modifications. ok nicm@
2011-07-06 22:40:42 -07:00
}
Reset the terminal to its initial state before exiting a program using libedit, using code from NetBSD tty.c rev. 1.42, 1.48, 1.49, 1.58, and 1.59. Code mostly by Christos Zoulas, one bug report by John Hein, one additional bugfix by me (rev. 1.59). While here, switch t_mode to unsigned char, which is sufficient, also from NetBSD. OK martijn@. Also checked by Christian Heckendorf <mbie at ulmus dot me>.
2016-04-09 11:42:49 -07:00
if (tty_getty(el, &el->el_tty.t_or) == -1) {
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
#ifdef DEBUG_TTY
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
(void) fprintf(el->el_errfile,
"tty_setup: tty_getty: %s\n", strerror(errno));
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
#endif /* DEBUG_TTY */
Fourth step in synching with NetBSD: KNF: Remove parentheses from return lines. No object change. This makes emacs.c and prompt.c identical to the NetBSD versions. It reduces the remaining diff from +2053 -1261 to +1526 -734. OK czarkoff@
2016-01-30 04:22:20 -08:00
return -1;
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
}
Reset the terminal to its initial state before exiting a program using libedit, using code from NetBSD tty.c rev. 1.42, 1.48, 1.49, 1.58, and 1.59. Code mostly by Christos Zoulas, one bug report by John Hein, one additional bugfix by me (rev. 1.59). While here, switch t_mode to unsigned char, which is sufficient, also from NetBSD. OK martijn@. Also checked by Christian Heckendorf <mbie at ulmus dot me>.
2016-04-09 11:42:49 -07:00
el->el_tty.t_ts = el->el_tty.t_ex = el->el_tty.t_ed = el->el_tty.t_or;
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
el->el_tty.t_speed = tty__getspeed(&el->el_tty.t_ex);
el->el_tty.t_tabs = tty__gettabs(&el->el_tty.t_ex);
el->el_tty.t_eight = tty__geteightbit(&el->el_tty.t_ex);
Merge the fixes from the upstream. Factor out some common code in tty.c and fix EL_SETTY to work. ok nicm
2014-05-20 15:28:07 -07:00
tty_setup_flags(el, &el->el_tty.t_ex, EX_IO);
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
/*
* Reset the tty chars to reasonable defaults
* If they are disabled, then enable them.
*/
if (rst) {
if (tty__cooked_mode(&el->el_tty.t_ts)) {
tty__getchar(&el->el_tty.t_ts, el->el_tty.t_c[TS_IO]);
/*
* Don't affect CMIN and CTIME for the editor mode
*/
for (rst = 0; rst < C_NCC - 2; rst++)
if (el->el_tty.t_c[TS_IO][rst] !=
el->el_tty.t_vdisable
&& el->el_tty.t_c[ED_IO][rst] !=
el->el_tty.t_vdisable)
el->el_tty.t_c[ED_IO][rst] =
el->el_tty.t_c[TS_IO][rst];
for (rst = 0; rst < C_NCC; rst++)
if (el->el_tty.t_c[TS_IO][rst] !=
el->el_tty.t_vdisable)
el->el_tty.t_c[EX_IO][rst] =
el->el_tty.t_c[TS_IO][rst];
}
tty__setchar(&el->el_tty.t_ex, el->el_tty.t_c[EX_IO]);
Update libedit to bring it into sync with the latest version from NetBSD. ok deraadt
2010-06-29 17:05:35 -07:00
if (tty_setty(el, TCSADRAIN, &el->el_tty.t_ex) == -1) {
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
#ifdef DEBUG_TTY
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
(void) fprintf(el->el_errfile,
"tty_setup: tty_setty: %s\n",
strerror(errno));
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
#endif /* DEBUG_TTY */
Fourth step in synching with NetBSD: KNF: Remove parentheses from return lines. No object change. This makes emacs.c and prompt.c identical to the NetBSD versions. It reduces the remaining diff from +2053 -1261 to +1526 -734. OK czarkoff@
2016-01-30 04:22:20 -08:00
return -1;
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
}
Update libedit to bring it into sync with the latest version from NetBSD. ok deraadt
2010-06-29 17:05:35 -07:00
}
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
Merge the fixes from the upstream. Factor out some common code in tty.c and fix EL_SETTY to work. ok nicm
2014-05-20 15:28:07 -07:00
tty_setup_flags(el, &el->el_tty.t_ed, ED_IO);
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
tty__setchar(&el->el_tty.t_ed, el->el_tty.t_c[ED_IO]);
tty_bind_char(el, 1);
Reset the terminal to its initial state before exiting a program using libedit, using code from NetBSD tty.c rev. 1.42, 1.48, 1.49, 1.58, and 1.59. Code mostly by Christos Zoulas, one bug report by John Hein, one additional bugfix by me (rev. 1.59). While here, switch t_mode to unsigned char, which is sufficient, also from NetBSD. OK martijn@. Also checked by Christian Heckendorf <mbie at ulmus dot me>.
2016-04-09 11:42:49 -07:00
el->el_tty.t_initialized = 1;
Fourth step in synching with NetBSD: KNF: Remove parentheses from return lines. No object change. This makes emacs.c and prompt.c identical to the NetBSD versions. It reduces the remaining diff from +2053 -1261 to +1526 -734. OK czarkoff@
2016-01-30 04:22:20 -08:00
return 0;
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
}
protected int
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
tty_init(EditLine *el)
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
{
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
el->el_tty.t_mode = EX_IO;
el->el_tty.t_vdisable = _POSIX_VDISABLE;
Reset the terminal to its initial state before exiting a program using libedit, using code from NetBSD tty.c rev. 1.42, 1.48, 1.49, 1.58, and 1.59. Code mostly by Christos Zoulas, one bug report by John Hein, one additional bugfix by me (rev. 1.59). While here, switch t_mode to unsigned char, which is sufficient, also from NetBSD. OK martijn@. Also checked by Christian Heckendorf <mbie at ulmus dot me>.
2016-04-09 11:42:49 -07:00
el->el_tty.t_initialized = 0;
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
(void) memcpy(el->el_tty.t_t, ttyperm, sizeof(ttyperm_t));
(void) memcpy(el->el_tty.t_c, ttychar, sizeof(ttychar_t));
Fourth step in synching with NetBSD: KNF: Remove parentheses from return lines. No object change. This makes emacs.c and prompt.c identical to the NetBSD versions. It reduces the remaining diff from +2053 -1261 to +1526 -734. OK czarkoff@
2016-01-30 04:22:20 -08:00
return tty_setup(el);
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
}
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
/* tty_end():
* Restore the tty to its original settings
*/
protected void
Reset the terminal to its initial state before exiting a program using libedit, using code from NetBSD tty.c rev. 1.42, 1.48, 1.49, 1.58, and 1.59. Code mostly by Christos Zoulas, one bug report by John Hein, one additional bugfix by me (rev. 1.59). While here, switch t_mode to unsigned char, which is sufficient, also from NetBSD. OK martijn@. Also checked by Christian Heckendorf <mbie at ulmus dot me>.
2016-04-09 11:42:49 -07:00
tty_end(EditLine *el)
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
{
Reset the terminal to its initial state before exiting a program using libedit, using code from NetBSD tty.c rev. 1.42, 1.48, 1.49, 1.58, and 1.59. Code mostly by Christos Zoulas, one bug report by John Hein, one additional bugfix by me (rev. 1.59). While here, switch t_mode to unsigned char, which is sufficient, also from NetBSD. OK martijn@. Also checked by Christian Heckendorf <mbie at ulmus dot me>.
2016-04-09 11:42:49 -07:00
if (el->el_flags & EDIT_DISABLED)
return;
if (!el->el_tty.t_initialized)
return;
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
Reset the terminal to its initial state before exiting a program using libedit, using code from NetBSD tty.c rev. 1.42, 1.48, 1.49, 1.58, and 1.59. Code mostly by Christos Zoulas, one bug report by John Hein, one additional bugfix by me (rev. 1.59). While here, switch t_mode to unsigned char, which is sufficient, also from NetBSD. OK martijn@. Also checked by Christian Heckendorf <mbie at ulmus dot me>.
2016-04-09 11:42:49 -07:00
if (tty_setty(el, TCSAFLUSH, &el->el_tty.t_or) == -1) {
#ifdef DEBUG_TTY
(void) fprintf(el->el_errfile,
"%s: tty_setty: %s\n", __func__, strerror(errno));
#endif /* DEBUG_TTY */
}
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
}
/* tty__getspeed():
* Get the tty speed
*/
delete the "private" and "public" preprocessor macros, just use standard C; OK martijn@
2016-04-11 14:17:29 -07:00
static speed_t
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
tty__getspeed(struct termios *td)
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
{
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
speed_t spd;
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
if ((spd = cfgetispeed(td)) == 0)
spd = cfgetospeed(td);
Fourth step in synching with NetBSD: KNF: Remove parentheses from return lines. No object change. This makes emacs.c and prompt.c identical to the NetBSD versions. It reduces the remaining diff from +2053 -1261 to +1526 -734. OK czarkoff@
2016-01-30 04:22:20 -08:00
return spd;
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
}
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
Sync libedit to NetBSD libedit as of Nov 8, 2003. Tested by jmc@ djm@ and myself
2003-11-25 12:12:38 -08:00
/* tty__getspeed():
* Return the index of the asked char in the c_cc array
*/
delete the "private" and "public" preprocessor macros, just use standard C; OK martijn@
2016-04-11 14:17:29 -07:00
static int
Sync libedit to NetBSD libedit as of Nov 8, 2003. Tested by jmc@ djm@ and myself
2003-11-25 12:12:38 -08:00
tty__getcharindex(int i)
{
switch (i) {
#ifdef VINTR
case C_INTR:
return VINTR;
#endif /* VINTR */
#ifdef VQUIT
case C_QUIT:
return VQUIT;
#endif /* VQUIT */
#ifdef VERASE
case C_ERASE:
return VERASE;
#endif /* VERASE */
#ifdef VKILL
case C_KILL:
return VKILL;
#endif /* VKILL */
#ifdef VEOF
case C_EOF:
return VEOF;
#endif /* VEOF */
#ifdef VEOL
case C_EOL:
return VEOL;
#endif /* VEOL */
#ifdef VEOL2
case C_EOL2:
return VEOL2;
#endif /* VEOL2 */
#ifdef VSWTCH
case C_SWTCH:
return VSWTCH;
#endif /* VSWTCH */
#ifdef VDSWTCH
case C_DSWTCH:
return VDSWTCH;
#endif /* VDSWTCH */
#ifdef VERASE2
case C_ERASE2:
return VERASE2;
#endif /* VERASE2 */
#ifdef VSTART
case C_START:
return VSTART;
#endif /* VSTART */
#ifdef VSTOP
case C_STOP:
return VSTOP;
#endif /* VSTOP */
#ifdef VWERASE
case C_WERASE:
return VWERASE;
#endif /* VWERASE */
#ifdef VSUSP
case C_SUSP:
return VSUSP;
#endif /* VSUSP */
#ifdef VDSUSP
case C_DSUSP:
return VDSUSP;
#endif /* VDSUSP */
#ifdef VREPRINT
case C_REPRINT:
return VREPRINT;
#endif /* VREPRINT */
#ifdef VDISCARD
case C_DISCARD:
return VDISCARD;
#endif /* VDISCARD */
#ifdef VLNEXT
case C_LNEXT:
return VLNEXT;
#endif /* VLNEXT */
#ifdef VSTATUS
case C_STATUS:
return VSTATUS;
#endif /* VSTATUS */
#ifdef VPAGE
case C_PAGE:
return VPAGE;
#endif /* VPAGE */
#ifdef VPGOFF
case C_PGOFF:
return VPGOFF;
#endif /* VPGOFF */
#ifdef VKILL2
case C_KILL2:
return VKILL2;
#endif /* KILL2 */
#ifdef VMIN
case C_MIN:
return VMIN;
#endif /* VMIN */
#ifdef VTIME
case C_TIME:
return VTIME;
#endif /* VTIME */
default:
return -1;
}
}
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
/* tty__getchar():
* Get the tty characters
*/
delete the "private" and "public" preprocessor macros, just use standard C; OK martijn@
2016-04-11 14:17:29 -07:00
static void
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
tty__getchar(struct termios *td, unsigned char *s)
{
#ifdef VINTR
s[C_INTR] = td->c_cc[VINTR];
#endif /* VINTR */
#ifdef VQUIT
s[C_QUIT] = td->c_cc[VQUIT];
#endif /* VQUIT */
#ifdef VERASE
s[C_ERASE] = td->c_cc[VERASE];
#endif /* VERASE */
#ifdef VKILL
s[C_KILL] = td->c_cc[VKILL];
#endif /* VKILL */
#ifdef VEOF
s[C_EOF] = td->c_cc[VEOF];
#endif /* VEOF */
#ifdef VEOL
s[C_EOL] = td->c_cc[VEOL];
#endif /* VEOL */
#ifdef VEOL2
s[C_EOL2] = td->c_cc[VEOL2];
#endif /* VEOL2 */
#ifdef VSWTCH
s[C_SWTCH] = td->c_cc[VSWTCH];
#endif /* VSWTCH */
#ifdef VDSWTCH
s[C_DSWTCH] = td->c_cc[VDSWTCH];
#endif /* VDSWTCH */
#ifdef VERASE2
s[C_ERASE2] = td->c_cc[VERASE2];
#endif /* VERASE2 */
#ifdef VSTART
s[C_START] = td->c_cc[VSTART];
#endif /* VSTART */
#ifdef VSTOP
s[C_STOP] = td->c_cc[VSTOP];
#endif /* VSTOP */
#ifdef VWERASE
s[C_WERASE] = td->c_cc[VWERASE];
#endif /* VWERASE */
#ifdef VSUSP
s[C_SUSP] = td->c_cc[VSUSP];
#endif /* VSUSP */
#ifdef VDSUSP
s[C_DSUSP] = td->c_cc[VDSUSP];
#endif /* VDSUSP */
#ifdef VREPRINT
s[C_REPRINT] = td->c_cc[VREPRINT];
#endif /* VREPRINT */
#ifdef VDISCARD
s[C_DISCARD] = td->c_cc[VDISCARD];
#endif /* VDISCARD */
#ifdef VLNEXT
s[C_LNEXT] = td->c_cc[VLNEXT];
#endif /* VLNEXT */
#ifdef VSTATUS
s[C_STATUS] = td->c_cc[VSTATUS];
#endif /* VSTATUS */
#ifdef VPAGE
s[C_PAGE] = td->c_cc[VPAGE];
#endif /* VPAGE */
#ifdef VPGOFF
s[C_PGOFF] = td->c_cc[VPGOFF];
#endif /* VPGOFF */
#ifdef VKILL2
s[C_KILL2] = td->c_cc[VKILL2];
#endif /* KILL2 */
#ifdef VMIN
s[C_MIN] = td->c_cc[VMIN];
#endif /* VMIN */
#ifdef VTIME
s[C_TIME] = td->c_cc[VTIME];
#endif /* VTIME */
} /* tty__getchar */
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
/* tty__setchar():
* Set the tty characters
*/
delete the "private" and "public" preprocessor macros, just use standard C; OK martijn@
2016-04-11 14:17:29 -07:00
static void
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
tty__setchar(struct termios *td, unsigned char *s)
{
#ifdef VINTR
td->c_cc[VINTR] = s[C_INTR];
#endif /* VINTR */
#ifdef VQUIT
td->c_cc[VQUIT] = s[C_QUIT];
#endif /* VQUIT */
#ifdef VERASE
td->c_cc[VERASE] = s[C_ERASE];
#endif /* VERASE */
#ifdef VKILL
td->c_cc[VKILL] = s[C_KILL];
#endif /* VKILL */
#ifdef VEOF
td->c_cc[VEOF] = s[C_EOF];
#endif /* VEOF */
#ifdef VEOL
td->c_cc[VEOL] = s[C_EOL];
#endif /* VEOL */
#ifdef VEOL2
td->c_cc[VEOL2] = s[C_EOL2];
#endif /* VEOL2 */
#ifdef VSWTCH
td->c_cc[VSWTCH] = s[C_SWTCH];
#endif /* VSWTCH */
#ifdef VDSWTCH
td->c_cc[VDSWTCH] = s[C_DSWTCH];
#endif /* VDSWTCH */
#ifdef VERASE2
td->c_cc[VERASE2] = s[C_ERASE2];
#endif /* VERASE2 */
#ifdef VSTART
td->c_cc[VSTART] = s[C_START];
#endif /* VSTART */
#ifdef VSTOP
td->c_cc[VSTOP] = s[C_STOP];
#endif /* VSTOP */
#ifdef VWERASE
td->c_cc[VWERASE] = s[C_WERASE];
#endif /* VWERASE */
#ifdef VSUSP
td->c_cc[VSUSP] = s[C_SUSP];
#endif /* VSUSP */
#ifdef VDSUSP
td->c_cc[VDSUSP] = s[C_DSUSP];
#endif /* VDSUSP */
#ifdef VREPRINT
td->c_cc[VREPRINT] = s[C_REPRINT];
#endif /* VREPRINT */
#ifdef VDISCARD
td->c_cc[VDISCARD] = s[C_DISCARD];
#endif /* VDISCARD */
#ifdef VLNEXT
td->c_cc[VLNEXT] = s[C_LNEXT];
#endif /* VLNEXT */
#ifdef VSTATUS
td->c_cc[VSTATUS] = s[C_STATUS];
#endif /* VSTATUS */
#ifdef VPAGE
td->c_cc[VPAGE] = s[C_PAGE];
#endif /* VPAGE */
#ifdef VPGOFF
td->c_cc[VPGOFF] = s[C_PGOFF];
#endif /* VPGOFF */
#ifdef VKILL2
td->c_cc[VKILL2] = s[C_KILL2];
#endif /* VKILL2 */
#ifdef VMIN
td->c_cc[VMIN] = s[C_MIN];
#endif /* VMIN */
#ifdef VTIME
td->c_cc[VTIME] = s[C_TIME];
#endif /* VTIME */
} /* tty__setchar */
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
/* tty_bind_char():
* Rebind the editline functions
*/
protected void
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
tty_bind_char(EditLine *el, int force)
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
{
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
unsigned char *t_n = el->el_tty.t_c[ED_IO];
unsigned char *t_o = el->el_tty.t_ed.c_cc;
get rid of the non-standard data type "Char" in almost all files; ok martijn@
2016-04-11 13:43:33 -07:00
wchar_t new[2], old[2];
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
const ttymap_t *tp;
el_action_t *map, *alt;
const el_action_t *dmap, *dalt;
new[1] = old[1] = '\0';
map = el->el_map.key;
alt = el->el_map.alt;
if (el->el_map.type == MAP_VI) {
dmap = el->el_map.vii;
dalt = el->el_map.vic;
} else {
dmap = el->el_map.emacs;
dalt = NULL;
}
Delete the useless Int datatype and always use the standard wint_t directly. This is not a problem because <wchar_t> is required all over the place anyway, even when WIDECHAR is not defined. No functional change except that it fixes a few printf(3) format string issues, %c vs. %lc. OK czarkoff@
2016-03-20 13:35:38 -07:00
for (tp = tty_map; tp->nch != (wint_t)-1; tp++) {
get rid of the non-standard data type "Char" in almost all files; ok martijn@
2016-04-11 13:43:33 -07:00
new[0] = (wchar_t)t_n[tp->nch];
old[0] = (wchar_t)t_o[tp->och];
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
if (new[0] == old[0] && !force)
continue;
/* Put the old default binding back, and set the new binding */
Second step in synching with NetBSD: * Rename some types from *key*_t to *keymacro*_t. * Rename struct editline member el_key to el_keymacro. * Rename some functions in keymacro.c from key*() to keymacro*(). This removes the conflict of key_clear(), key_end(), and key_print() with macros in <term.h>. No functional change. This makes keymacro.h identical to the NetBSD version. It reduces the remaining diff from +2640 -1998 to +2446 -1805. OK czarkoff@
2016-01-29 11:32:33 -08:00
keymacro_clear(el, map, old);
Delete 26 wrapper macros and two wrapper functions that are no longer needed now that we always compile with wide character support, reducing code obfuscation. OK czarkoff@ martijn@. Diff also proofread by Christian Heckendorf <mbie at ulmus dot me>.
2016-04-09 13:15:26 -07:00
map[(unsigned char)old[0]] = dmap[(unsigned char)old[0]];
Second step in synching with NetBSD: * Rename some types from *key*_t to *keymacro*_t. * Rename struct editline member el_key to el_keymacro. * Rename some functions in keymacro.c from key*() to keymacro*(). This removes the conflict of key_clear(), key_end(), and key_print() with macros in <term.h>. No functional change. This makes keymacro.h identical to the NetBSD version. It reduces the remaining diff from +2640 -1998 to +2446 -1805. OK czarkoff@
2016-01-29 11:32:33 -08:00
keymacro_clear(el, map, new);
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
/* MAP_VI == 1, MAP_EMACS == 0... */
Delete 26 wrapper macros and two wrapper functions that are no longer needed now that we always compile with wide character support, reducing code obfuscation. OK czarkoff@ martijn@. Diff also proofread by Christian Heckendorf <mbie at ulmus dot me>.
2016-04-09 13:15:26 -07:00
map[(unsigned char)new[0]] = tp->bind[el->el_map.type];
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
if (dalt) {
Second step in synching with NetBSD: * Rename some types from *key*_t to *keymacro*_t. * Rename struct editline member el_key to el_keymacro. * Rename some functions in keymacro.c from key*() to keymacro*(). This removes the conflict of key_clear(), key_end(), and key_print() with macros in <term.h>. No functional change. This makes keymacro.h identical to the NetBSD version. It reduces the remaining diff from +2640 -1998 to +2446 -1805. OK czarkoff@
2016-01-29 11:32:33 -08:00
keymacro_clear(el, alt, old);
Delete 26 wrapper macros and two wrapper functions that are no longer needed now that we always compile with wide character support, reducing code obfuscation. OK czarkoff@ martijn@. Diff also proofread by Christian Heckendorf <mbie at ulmus dot me>.
2016-04-09 13:15:26 -07:00
alt[(unsigned char)old[0]] =
dalt[(unsigned char)old[0]];
Second step in synching with NetBSD: * Rename some types from *key*_t to *keymacro*_t. * Rename struct editline member el_key to el_keymacro. * Rename some functions in keymacro.c from key*() to keymacro*(). This removes the conflict of key_clear(), key_end(), and key_print() with macros in <term.h>. No functional change. This makes keymacro.h identical to the NetBSD version. It reduces the remaining diff from +2640 -1998 to +2446 -1805. OK czarkoff@
2016-01-29 11:32:33 -08:00
keymacro_clear(el, alt, new);
Delete 26 wrapper macros and two wrapper functions that are no longer needed now that we always compile with wide character support, reducing code obfuscation. OK czarkoff@ martijn@. Diff also proofread by Christian Heckendorf <mbie at ulmus dot me>.
2016-04-09 13:15:26 -07:00
alt[(unsigned char)new[0]] =
tp->bind[el->el_map.type + 1];
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
}
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
}
}
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
delete the "private" and "public" preprocessor macros, just use standard C; OK martijn@
2016-04-11 14:17:29 -07:00
static tcflag_t *
Merge the fixes from the upstream. Factor out some common code in tty.c and fix EL_SETTY to work. ok nicm
2014-05-20 15:28:07 -07:00
tty__get_flag(struct termios *t, int kind) {
switch (kind) {
case MD_INP:
return &t->c_iflag;
case MD_OUT:
return &t->c_oflag;
case MD_CTL:
return &t->c_cflag;
case MD_LIN:
return &t->c_lflag;
default:
abort();
/*NOTREACHED*/
}
}
delete the "private" and "public" preprocessor macros, just use standard C; OK martijn@
2016-04-11 14:17:29 -07:00
static tcflag_t
Merge the fixes from the upstream. Factor out some common code in tty.c and fix EL_SETTY to work. ok nicm
2014-05-20 15:28:07 -07:00
tty_update_flag(EditLine *el, tcflag_t f, int mode, int kind)
{
f &= ~el->el_tty.t_t[mode][kind].t_clrmask;
f |= el->el_tty.t_t[mode][kind].t_setmask;
return f;
}
delete the "private" and "public" preprocessor macros, just use standard C; OK martijn@
2016-04-11 14:17:29 -07:00
static void
Merge the fixes from the upstream. Factor out some common code in tty.c and fix EL_SETTY to work. ok nicm
2014-05-20 15:28:07 -07:00
tty_update_flags(EditLine *el, int kind)
{
tcflag_t *tt, *ed, *ex;
tt = tty__get_flag(&el->el_tty.t_ts, kind);
ed = tty__get_flag(&el->el_tty.t_ed, kind);
ex = tty__get_flag(&el->el_tty.t_ex, kind);
if (*tt != *ex && (kind != MD_CTL || *tt != *ed)) {
*ed = tty_update_flag(el, *tt, ED_IO, kind);
*ex = tty_update_flag(el, *tt, EX_IO, kind);
}
}
delete the "private" and "public" preprocessor macros, just use standard C; OK martijn@
2016-04-11 14:17:29 -07:00
static void
Merge the fixes from the upstream. Factor out some common code in tty.c and fix EL_SETTY to work. ok nicm
2014-05-20 15:28:07 -07:00
tty_update_char(EditLine *el, int mode, int c) {
if (!((el->el_tty.t_t[mode][MD_CHAR].t_setmask & C_SH(c)))
&& (el->el_tty.t_c[TS_IO][c] != el->el_tty.t_c[EX_IO][c]))
el->el_tty.t_c[mode][c] = el->el_tty.t_c[TS_IO][c];
if (el->el_tty.t_t[mode][MD_CHAR].t_clrmask & C_SH(c))
el->el_tty.t_c[mode][c] = el->el_tty.t_vdisable;
}
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
/* tty_rawmode():
Cleanup of standard header inclusion: 1. Add the missing <errno.h> to sig.c. 2. Do not include standard headers from private headers "chared.h" and "el.h", include them directly where needed. 3. Delete a few needless inclusions of <ctype.h>. 4. Sort the standard headers. 5. Delete _GNU_SOURCE weirdness from histedit.h, that file doesn't even need the access to wcsdup(3) mentioned in the comment. 6. Delete some trailing blanks and blanks before tabs. OK czarkoff@
2016-03-20 16:48:27 -07:00
* Set terminal into 1 character at a time mode.
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
*/
protected int
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
tty_rawmode(EditLine *el)
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
{
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
if (el->el_tty.t_mode == ED_IO || el->el_tty.t_mode == QU_IO)
Fourth step in synching with NetBSD: KNF: Remove parentheses from return lines. No object change. This makes emacs.c and prompt.c identical to the NetBSD versions. It reduces the remaining diff from +2053 -1261 to +1526 -734. OK czarkoff@
2016-01-30 04:22:20 -08:00
return 0;
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
if (el->el_flags & EDIT_DISABLED)
Fourth step in synching with NetBSD: KNF: Remove parentheses from return lines. No object change. This makes emacs.c and prompt.c identical to the NetBSD versions. It reduces the remaining diff from +2053 -1261 to +1526 -734. OK czarkoff@
2016-01-30 04:22:20 -08:00
return 0;
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
if (tty_getty(el, &el->el_tty.t_ts) == -1) {
#ifdef DEBUG_TTY
(void) fprintf(el->el_errfile, "tty_rawmode: tty_getty: %s\n",
strerror(errno));
#endif /* DEBUG_TTY */
Fourth step in synching with NetBSD: KNF: Remove parentheses from return lines. No object change. This makes emacs.c and prompt.c identical to the NetBSD versions. It reduces the remaining diff from +2053 -1261 to +1526 -734. OK czarkoff@
2016-01-30 04:22:20 -08:00
return -1;
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
}
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
/*
* We always keep up with the eight bit setting and the speed of the
Update libedit to bring it into sync with the latest version from NetBSD. ok deraadt
2010-06-29 17:05:35 -07:00
* tty. But we only believe changes that are made to cooked mode!
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
*/
el->el_tty.t_eight = tty__geteightbit(&el->el_tty.t_ts);
el->el_tty.t_speed = tty__getspeed(&el->el_tty.t_ts);
if (tty__getspeed(&el->el_tty.t_ex) != el->el_tty.t_speed ||
tty__getspeed(&el->el_tty.t_ed) != el->el_tty.t_speed) {
(void) cfsetispeed(&el->el_tty.t_ex, el->el_tty.t_speed);
(void) cfsetospeed(&el->el_tty.t_ex, el->el_tty.t_speed);
(void) cfsetispeed(&el->el_tty.t_ed, el->el_tty.t_speed);
(void) cfsetospeed(&el->el_tty.t_ed, el->el_tty.t_speed);
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
}
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
if (tty__cooked_mode(&el->el_tty.t_ts)) {
Merge the fixes from the upstream. Factor out some common code in tty.c and fix EL_SETTY to work. ok nicm
2014-05-20 15:28:07 -07:00
int i;
for (i = MD_INP; i <= MD_LIN; i++)
tty_update_flags(el, i);
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
if (tty__gettabs(&el->el_tty.t_ex) == 0)
el->el_tty.t_tabs = 0;
else
el->el_tty.t_tabs = EL_CAN_TAB ? 1 : 0;
Merge the fixes from the upstream. Factor out some common code in tty.c and fix EL_SETTY to work. ok nicm
2014-05-20 15:28:07 -07:00
tty__getchar(&el->el_tty.t_ts, el->el_tty.t_c[TS_IO]);
/*
* Check if the user made any changes.
* If he did, then propagate the changes to the
* edit and execute data structures.
*/
for (i = 0; i < C_NCC; i++)
if (el->el_tty.t_c[TS_IO][i] !=
el->el_tty.t_c[EX_IO][i])
break;
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
Merge the fixes from the upstream. Factor out some common code in tty.c and fix EL_SETTY to work. ok nicm
2014-05-20 15:28:07 -07:00
if (i != C_NCC) {
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
/*
Merge the fixes from the upstream. Factor out some common code in tty.c and fix EL_SETTY to work. ok nicm
2014-05-20 15:28:07 -07:00
* Propagate changes only to the unprotected
* chars that have been modified just now.
*/
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
for (i = 0; i < C_NCC; i++)
Merge the fixes from the upstream. Factor out some common code in tty.c and fix EL_SETTY to work. ok nicm
2014-05-20 15:28:07 -07:00
tty_update_char(el, ED_IO, i);
tty_bind_char(el, 0);
tty__setchar(&el->el_tty.t_ed, el->el_tty.t_c[ED_IO]);
for (i = 0; i < C_NCC; i++)
tty_update_char(el, EX_IO, i);
tty__setchar(&el->el_tty.t_ex, el->el_tty.t_c[EX_IO]);
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
}
}
Update libedit to bring it into sync with the latest version from NetBSD. ok deraadt
2010-06-29 17:05:35 -07:00
if (tty_setty(el, TCSADRAIN, &el->el_tty.t_ed) == -1) {
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
#ifdef DEBUG_TTY
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
(void) fprintf(el->el_errfile, "tty_rawmode: tty_setty: %s\n",
strerror(errno));
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
#endif /* DEBUG_TTY */
Fourth step in synching with NetBSD: KNF: Remove parentheses from return lines. No object change. This makes emacs.c and prompt.c identical to the NetBSD versions. It reduces the remaining diff from +2053 -1261 to +1526 -734. OK czarkoff@
2016-01-30 04:22:20 -08:00
return -1;
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
}
el->el_tty.t_mode = ED_IO;
Fourth step in synching with NetBSD: KNF: Remove parentheses from return lines. No object change. This makes emacs.c and prompt.c identical to the NetBSD versions. It reduces the remaining diff from +2053 -1261 to +1526 -734. OK czarkoff@
2016-01-30 04:22:20 -08:00
return 0;
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
}
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
/* tty_cookedmode():
* Set the tty back to normal mode
*/
protected int
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
tty_cookedmode(EditLine *el)
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
{ /* set tty in normal setup */
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
if (el->el_tty.t_mode == EX_IO)
Fourth step in synching with NetBSD: KNF: Remove parentheses from return lines. No object change. This makes emacs.c and prompt.c identical to the NetBSD versions. It reduces the remaining diff from +2053 -1261 to +1526 -734. OK czarkoff@
2016-01-30 04:22:20 -08:00
return 0;
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
if (el->el_flags & EDIT_DISABLED)
Fourth step in synching with NetBSD: KNF: Remove parentheses from return lines. No object change. This makes emacs.c and prompt.c identical to the NetBSD versions. It reduces the remaining diff from +2053 -1261 to +1526 -734. OK czarkoff@
2016-01-30 04:22:20 -08:00
return 0;
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
Update libedit to bring it into sync with the latest version from NetBSD. ok deraadt
2010-06-29 17:05:35 -07:00
if (tty_setty(el, TCSADRAIN, &el->el_tty.t_ex) == -1) {
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
#ifdef DEBUG_TTY
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
(void) fprintf(el->el_errfile,
"tty_cookedmode: tty_setty: %s\n",
strerror(errno));
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
#endif /* DEBUG_TTY */
Fourth step in synching with NetBSD: KNF: Remove parentheses from return lines. No object change. This makes emacs.c and prompt.c identical to the NetBSD versions. It reduces the remaining diff from +2053 -1261 to +1526 -734. OK czarkoff@
2016-01-30 04:22:20 -08:00
return -1;
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
}
el->el_tty.t_mode = EX_IO;
Fourth step in synching with NetBSD: KNF: Remove parentheses from return lines. No object change. This makes emacs.c and prompt.c identical to the NetBSD versions. It reduces the remaining diff from +2053 -1261 to +1526 -734. OK czarkoff@
2016-01-30 04:22:20 -08:00
return 0;
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
}
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
/* tty_quotemode():
* Turn on quote mode
*/
protected int
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
tty_quotemode(EditLine *el)
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
{
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
if (el->el_tty.t_mode == QU_IO)
Fourth step in synching with NetBSD: KNF: Remove parentheses from return lines. No object change. This makes emacs.c and prompt.c identical to the NetBSD versions. It reduces the remaining diff from +2053 -1261 to +1526 -734. OK czarkoff@
2016-01-30 04:22:20 -08:00
return 0;
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
el->el_tty.t_qu = el->el_tty.t_ed;
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
Merge the fixes from the upstream. Factor out some common code in tty.c and fix EL_SETTY to work. ok nicm
2014-05-20 15:28:07 -07:00
tty_setup_flags(el, &el->el_tty.t_qu, QU_IO);
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
Update libedit to bring it into sync with the latest version from NetBSD. ok deraadt
2010-06-29 17:05:35 -07:00
if (tty_setty(el, TCSADRAIN, &el->el_tty.t_qu) == -1) {
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
#ifdef DEBUG_TTY
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
(void) fprintf(el->el_errfile, "QuoteModeOn: tty_setty: %s\n",
strerror(errno));
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
#endif /* DEBUG_TTY */
Fourth step in synching with NetBSD: KNF: Remove parentheses from return lines. No object change. This makes emacs.c and prompt.c identical to the NetBSD versions. It reduces the remaining diff from +2053 -1261 to +1526 -734. OK czarkoff@
2016-01-30 04:22:20 -08:00
return -1;
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
}
el->el_tty.t_mode = QU_IO;
Fourth step in synching with NetBSD: KNF: Remove parentheses from return lines. No object change. This makes emacs.c and prompt.c identical to the NetBSD versions. It reduces the remaining diff from +2053 -1261 to +1526 -734. OK czarkoff@
2016-01-30 04:22:20 -08:00
return 0;
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
}
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
/* tty_noquotemode():
* Turn off quote mode
*/
protected int
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
tty_noquotemode(EditLine *el)
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
{
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
if (el->el_tty.t_mode != QU_IO)
Fourth step in synching with NetBSD: KNF: Remove parentheses from return lines. No object change. This makes emacs.c and prompt.c identical to the NetBSD versions. It reduces the remaining diff from +2053 -1261 to +1526 -734. OK czarkoff@
2016-01-30 04:22:20 -08:00
return 0;
Update libedit to bring it into sync with the latest version from NetBSD. ok deraadt
2010-06-29 17:05:35 -07:00
if (tty_setty(el, TCSADRAIN, &el->el_tty.t_ed) == -1) {
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
#ifdef DEBUG_TTY
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
(void) fprintf(el->el_errfile, "QuoteModeOff: tty_setty: %s\n",
strerror(errno));
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
#endif /* DEBUG_TTY */
Fourth step in synching with NetBSD: KNF: Remove parentheses from return lines. No object change. This makes emacs.c and prompt.c identical to the NetBSD versions. It reduces the remaining diff from +2053 -1261 to +1526 -734. OK czarkoff@
2016-01-30 04:22:20 -08:00
return -1;
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
}
el->el_tty.t_mode = ED_IO;
Fourth step in synching with NetBSD: KNF: Remove parentheses from return lines. No object change. This makes emacs.c and prompt.c identical to the NetBSD versions. It reduces the remaining diff from +2053 -1261 to +1526 -734. OK czarkoff@
2016-01-30 04:22:20 -08:00
return 0;
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
}
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
/* tty_stty():
* Stty builtin
*/
protected int
get rid of the non-standard data type "Char" in almost all files; ok martijn@
2016-04-11 13:43:33 -07:00
tty_stty(EditLine *el, int argc __attribute__((__unused__)),
const wchar_t **argv)
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
{
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
const ttymodes_t *m;
char x;
int aflag = 0;
get rid of the non-standard data type "Char" in almost all files; ok martijn@
2016-04-11 13:43:33 -07:00
const wchar_t *s, *d;
Update libedit to bring it into sync with the latest version from NetBSD. ok deraadt
2010-06-29 17:05:35 -07:00
char name[EL_BUFSIZ];
Sync libedit to NetBSD libedit as of Nov 8, 2003. Tested by jmc@ djm@ and myself
2003-11-25 12:12:38 -08:00
struct termios *tios = &el->el_tty.t_ex;
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
int z = EX_IO;
if (argv == NULL)
Fourth step in synching with NetBSD: KNF: Remove parentheses from return lines. No object change. This makes emacs.c and prompt.c identical to the NetBSD versions. It reduces the remaining diff from +2053 -1261 to +1526 -734. OK czarkoff@
2016-01-30 04:22:20 -08:00
return -1;
Update libedit to bring it into sync with the latest version from NetBSD. ok deraadt
2010-06-29 17:05:35 -07:00
strncpy(name, ct_encode_string(*argv++, &el->el_scratch), sizeof(name));
name[sizeof(name) - 1] = '\0';
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
while (argv && *argv && argv[0][0] == '-' && argv[0][2] == '\0')
switch (argv[0][1]) {
case 'a':
aflag++;
argv++;
break;
case 'd':
argv++;
Sync libedit to NetBSD libedit as of Nov 8, 2003. Tested by jmc@ djm@ and myself
2003-11-25 12:12:38 -08:00
tios = &el->el_tty.t_ed;
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
z = ED_IO;
break;
case 'x':
argv++;
Sync libedit to NetBSD libedit as of Nov 8, 2003. Tested by jmc@ djm@ and myself
2003-11-25 12:12:38 -08:00
tios = &el->el_tty.t_ex;
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
z = EX_IO;
break;
case 'q':
argv++;
Sync libedit to NetBSD libedit as of Nov 8, 2003. Tested by jmc@ djm@ and myself
2003-11-25 12:12:38 -08:00
tios = &el->el_tty.t_ts;
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
z = QU_IO;
break;
default:
(void) fprintf(el->el_errfile,
Delete the useless Int datatype and always use the standard wint_t directly. This is not a problem because <wchar_t> is required all over the place anyway, even when WIDECHAR is not defined. No functional change except that it fixes a few printf(3) format string issues, %c vs. %lc. OK czarkoff@
2016-03-20 13:35:38 -07:00
"%s: Unknown switch `%lc'.\n",
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
name, argv[0][1]);
Fourth step in synching with NetBSD: KNF: Remove parentheses from return lines. No object change. This makes emacs.c and prompt.c identical to the NetBSD versions. It reduces the remaining diff from +2053 -1261 to +1526 -734. OK czarkoff@
2016-01-30 04:22:20 -08:00
return -1;
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
}
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
if (!argv || !*argv) {
int i = -1;
Update libedit to bring it into sync with the latest version from NetBSD. ok deraadt
2010-06-29 17:05:35 -07:00
size_t len = 0, st = 0, cu;
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
for (m = ttymodes; m->m_name; m++) {
if (m->m_type != i) {
(void) fprintf(el->el_outfile, "%s%s",
i != -1 ? "\n" : "",
el->el_tty.t_t[z][m->m_type].t_name);
i = m->m_type;
st = len =
strlen(el->el_tty.t_t[z][m->m_type].t_name);
}
Update libedit to bring it into sync with the latest version from NetBSD. ok deraadt
2010-06-29 17:05:35 -07:00
if (i != -1) {
x = (el->el_tty.t_t[z][i].t_setmask & m->m_value)
? '+' : '\0';
x = (el->el_tty.t_t[z][i].t_clrmask & m->m_value)
? '-' : x;
} else {
x = '\0';
}
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
if (x != '\0' || aflag) {
cu = strlen(m->m_name) + (x != '\0') + 1;
Third step in synching with NetBSD: * rename fkey_t to funckey_t and el_term_t to el_terminal_t * rename struct editline member el_term to el_terminal * rename many functions in terminal.c from term_*() to terminal_*(), for consistency with the file name and to not look related to <term.h> No functional change. This makes refresh.c and sig.c almost identical to the NetBSD versions. It reduces the remaining diff from +2446 -1805 to +2053 -1420. OK czarkoff@
2016-01-29 16:06:39 -08:00
if (len + cu >=
(size_t)el->el_terminal.t_size.h) {
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
(void) fprintf(el->el_outfile, "\n%*s",
Update libedit to bring it into sync with the latest version from NetBSD. ok deraadt
2010-06-29 17:05:35 -07:00
(int)st, "");
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
len = st + cu;
} else
len += cu;
if (x != '\0')
(void) fprintf(el->el_outfile, "%c%s ",
x, m->m_name);
else
(void) fprintf(el->el_outfile, "%s ",
m->m_name);
}
}
(void) fprintf(el->el_outfile, "\n");
Fourth step in synching with NetBSD: KNF: Remove parentheses from return lines. No object change. This makes emacs.c and prompt.c identical to the NetBSD versions. It reduces the remaining diff from +2053 -1261 to +1526 -734. OK czarkoff@
2016-01-30 04:22:20 -08:00
return 0;
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
}
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
while (argv && (s = *argv++)) {
get rid of the non-standard data type "Char" in almost all files; ok martijn@
2016-04-11 13:43:33 -07:00
const wchar_t *p;
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
switch (*s) {
case '+':
case '-':
x = *s++;
break;
default:
x = '\0';
break;
}
d = s;
Move wrapper macros to the two files actually needing them: FUNW, Strlen, Strdup, Strcmp, Strncmp, Strncpy, Strncat -> history.c Strchr, tok_strdup -> tokenizer.c FUN, TYPE, STR -> both of these files OK martijn@ Also proofread by Christian Heckendorf <mbie at ulmus dot me> who reported some whitespace issues in parse.c.
2016-04-11 12:54:53 -07:00
p = wcschr(s, L'=');
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
for (m = ttymodes; m->m_name; m++)
Update libedit to bring it into sync with the latest version from NetBSD. ok deraadt
2010-06-29 17:05:35 -07:00
if ((p ? strncmp(m->m_name, ct_encode_string(d, &el->el_scratch), (size_t)(p - d)) :
strcmp(m->m_name, ct_encode_string(d, &el->el_scratch))) == 0 &&
Sync libedit to NetBSD libedit as of Nov 8, 2003. Tested by jmc@ djm@ and myself
2003-11-25 12:12:38 -08:00
(p == NULL || m->m_type == MD_CHAR))
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
break;
if (!m->m_name) {
(void) fprintf(el->el_errfile,
Delete 26 wrapper macros and two wrapper functions that are no longer needed now that we always compile with wide character support, reducing code obfuscation. OK czarkoff@ martijn@. Diff also proofread by Christian Heckendorf <mbie at ulmus dot me>.
2016-04-09 13:15:26 -07:00
"%s: Invalid argument `%ls'.\n", name, d);
Fourth step in synching with NetBSD: KNF: Remove parentheses from return lines. No object change. This makes emacs.c and prompt.c identical to the NetBSD versions. It reduces the remaining diff from +2053 -1261 to +1526 -734. OK czarkoff@
2016-01-30 04:22:20 -08:00
return -1;
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
}
Sync libedit to NetBSD libedit as of Nov 8, 2003. Tested by jmc@ djm@ and myself
2003-11-25 12:12:38 -08:00
if (p) {
int c = ffs((int)m->m_value);
Update libedit to bring it into sync with the latest version from NetBSD. ok deraadt
2010-06-29 17:05:35 -07:00
int v = *++p ? parse__escape(&p) :
Sync libedit to NetBSD libedit as of Nov 8, 2003. Tested by jmc@ djm@ and myself
2003-11-25 12:12:38 -08:00
el->el_tty.t_vdisable;
Update libedit to bring it into sync with the latest version from NetBSD. ok deraadt
2010-06-29 17:05:35 -07:00
assert(c != 0);
Sync libedit to NetBSD libedit as of Nov 8, 2003. Tested by jmc@ djm@ and myself
2003-11-25 12:12:38 -08:00
c--;
c = tty__getcharindex(c);
Update libedit to bring it into sync with the latest version from NetBSD. ok deraadt
2010-06-29 17:05:35 -07:00
assert(c != -1);
Sync libedit to NetBSD libedit as of Nov 8, 2003. Tested by jmc@ djm@ and myself
2003-11-25 12:12:38 -08:00
tios->c_cc[c] = v;
continue;
}
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
switch (x) {
case '+':
el->el_tty.t_t[z][m->m_type].t_setmask |= m->m_value;
el->el_tty.t_t[z][m->m_type].t_clrmask &= ~m->m_value;
break;
case '-':
el->el_tty.t_t[z][m->m_type].t_setmask &= ~m->m_value;
el->el_tty.t_t[z][m->m_type].t_clrmask |= m->m_value;
break;
default:
el->el_tty.t_t[z][m->m_type].t_setmask &= ~m->m_value;
el->el_tty.t_t[z][m->m_type].t_clrmask &= ~m->m_value;
break;
}
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
}
Update libedit to bring it into sync with the latest version from NetBSD. ok deraadt
2010-06-29 17:05:35 -07:00
Merge the fixes from the upstream. Factor out some common code in tty.c and fix EL_SETTY to work. ok nicm
2014-05-20 15:28:07 -07:00
tty_setup_flags(el, tios, z);
Update libedit to bring it into sync with the latest version from NetBSD. ok deraadt
2010-06-29 17:05:35 -07:00
if (el->el_tty.t_mode == z) {
if (tty_setty(el, TCSADRAIN, tios) == -1) {
#ifdef DEBUG_TTY
(void) fprintf(el->el_errfile,
"tty_stty: tty_setty: %s\n", strerror(errno));
#endif /* DEBUG_TTY */
Fourth step in synching with NetBSD: KNF: Remove parentheses from return lines. No object change. This makes emacs.c and prompt.c identical to the NetBSD versions. It reduces the remaining diff from +2053 -1261 to +1526 -734. OK czarkoff@
2016-01-30 04:22:20 -08:00
return -1;
Update libedit to bring it into sync with the latest version from NetBSD. ok deraadt
2010-06-29 17:05:35 -07:00
}
}
Fourth step in synching with NetBSD: KNF: Remove parentheses from return lines. No object change. This makes emacs.c and prompt.c identical to the NetBSD versions. It reduces the remaining diff from +2053 -1261 to +1526 -734. OK czarkoff@
2016-01-30 04:22:20 -08:00
return 0;
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
}
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
#ifdef notyet
/* tty_printchar():
* DEbugging routine to print the tty characters
*/
delete the "private" and "public" preprocessor macros, just use standard C; OK martijn@
2016-04-11 14:17:29 -07:00
static void
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
tty_printchar(EditLine *el, unsigned char *s)
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
{
Update to NetBSD libedit (from Oct 1, 2003), adding some string cleaning and history bug fixes. The code includes GNU libreadline functionality, but the corresponding header files are not installed, since some libreadline functions are missing. There are some minor API changes, notably: old: EditLine *el_init(const char *, FILE *, FILE *); new: EditLine *el_init(const char *, FILE *, FILE *, FILE *); old: HistEvent *history(History *h, int op, ...); new: int history(History *h, HistEvent *ev, int op, ...); plus some changes in operation names. See editline(3) for details. Tested by djm@, mouring@, jmc@. ok deraadt@
2003-10-31 00:42:23 -08:00
ttyperm_t *m;
int i;
for (i = 0; i < C_NCC; i++) {
for (m = el->el_tty.t_t; m->m_name; m++)
if (m->m_type == MD_CHAR && C_SH(i) == m->m_value)
break;
if (m->m_name)
(void) fprintf(el->el_errfile, "%s ^%c ",
m->m_name, s[i] + 'A' - 1);
if (i % 5 == 0)
(void) fprintf(el->el_errfile, "\n");
}
(void) fprintf(el->el_errfile, "\n");
initial import of NetBSD tree
1995-10-18 01:37:01 -07:00
}
#endif /* notyet */
Merge the fixes from the upstream. Factor out some common code in tty.c and fix EL_SETTY to work. ok nicm
2014-05-20 15:28:07 -07:00
delete the "private" and "public" preprocessor macros, just use standard C; OK martijn@
2016-04-11 14:17:29 -07:00
static void
Merge the fixes from the upstream. Factor out some common code in tty.c and fix EL_SETTY to work. ok nicm
2014-05-20 15:28:07 -07:00
tty_setup_flags(EditLine *el, struct termios *tios, int mode)
{
int kind;
for (kind = MD_INP; kind <= MD_LIN; kind++) {
tcflag_t *f = tty__get_flag(tios, kind);
*f = tty_update_flag(el, *f, mode, kind);
}
}
Copy Permalink