0a374fd7e5
Reduce obfuscation of errno handling. There is only one purpose
non-local errno handling is needed for: Inside el_wgets(), several
functions call down indirectly to el_wgetc(), many of them via the
dispatch table. When el_wgetc() fails, it does properly report
failure, but then various cleanup is done which may clobber errno.
But when returning due to failure, el_wgets() wants to have errno
set to the reason of the original read failure, not to the reason
of some subsequent failure of some cleanup operation. So el_wgetc()
needs to save errno, and if it's non-zero, el_wgets() needs to
restore it on failure.
This core logic is currently obscured by the fact that el_errno
is set and inspected at some additional places where it isn't needed.
Besides, since el_wgetc() and and el_wgets() are both in read.c,
el_errno does not need to be in struct editline, it can and should
be local to read.c in struct el_read_t.
Let's look at what can be simplified.
1. keymacro_get() abuses el_errno instead of having a proper
error return code. Adding that error return code is easy
because node_trav() already detects the condition and an
adequate code is already defined. Returning it, testing
for it in read_getcmd(), and returning with error from there
removes the need to inspect el_errno from el_wgets() after
calling read_getcmd().
Note that resetting lastchar and cursor and clearing buffer[0]
is irrelevant. The code returns from el_wgets() right afterwards.
Outside el_wgets(), these variables are no longer relevant.
When el_wgets() is called the next time, it will call ch_reset()
anyway, resetting the two pointers. And as long as lastchar
points to the beginning of the buffer, the contents of the
buffer won't be used for anything.
2. read_getcmd() doesn't need to set el_errno again after el_wgetc()
failure since el_wgetc() already did so. While here, remove
the silly "if EOF or error" comments from the el_wgetc()
return value tests. It's a public interface documented in a
manual, so people working on the implementation can obviously
be expected to know how it works. It's a case of
count++; /* Increment count. */
3. In the two code paths of el_wgets() that lead up to "goto noedit",
there is no need to save the errno because nothing that might
change it happens before returning.
For clarity, since el_wgets() is the function restoring the errno,
also move initializing it to the same function.
Finally, note that restoring errno when the saved value is zero is
wrong. No library code is ever allowed to clear a previously set
value of errno. Only application programs are allowed to do that,
and even they usually don't need to do so, except when using certain
ill-designed interfaces like strtol(3).
I tested that the behaviour remains sane in the following cases,
all during execution of el_wgets(3) and with a signal handler
for USR1 installed without SA_RESTART.
* Enter some text and maybe move around a bit.
Then send a USR1 signal.
The signal gets processed, then read_char() resumes reading.
Send another USR1 signal.
Now el_wgets() sets errno=EINTR and returns -1.
* Press Ctrl-V to activate ed-quoted-insert.
Then send a USR1 signal.
The signal gets processed, then read_char() resumes reading.
Send another USR1 signal.
ed_quoted_insert() returns ed_end_of_file(), i.e. CC_EOF,
and el_wgets() returns 0.
* Press a key starting a keyboard macro.
Then send a USR1 signal.
The signal gets processed, then read_char() resumes reading.
Send another USR1 signal.
Now el_wgets() sets errno=EINTR and returns -1.
* Press : to enter builtin command mode.
Start typing a command.
Then send a USR1 signal.
The signal gets processed, then read_char() resumes reading.
Send another USR1 signal.
Now c_gets() returns -1, ed_command() beeps and returns CC_REFRESH,
and el_wgets() resumes operation as it should.
I also tested with "el_set(el, EL_EDITMODE, 0)", and it returns
the right value and sets errno correctly.
154 lines
5.1 KiB
C
154 lines
5.1 KiB
C
/* $NetBSD: el.h,v 1.41 2016/05/24 15:00:45 christos Exp $ */
|
|
|
|
/*-
|
|
* Copyright (c) 1992, 1993
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* This code is derived from software contributed to Berkeley by
|
|
* Christos Zoulas of Cornell University.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. Neither the name of the University nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
* @(#)el.h 8.1 (Berkeley) 6/4/93
|
|
*/
|
|
|
|
/*
|
|
* el.h: Internal structures.
|
|
*/
|
|
#ifndef _h_el
|
|
#define _h_el
|
|
/*
|
|
* Local defaults
|
|
*/
|
|
#define KSHVI
|
|
#define VIDEFAULT
|
|
#define ANCHOR
|
|
|
|
#include "histedit.h"
|
|
#include "chartype.h"
|
|
|
|
#define EL_BUFSIZ ((size_t)1024) /* Maximum line size */
|
|
|
|
#define HANDLE_SIGNALS 0x01
|
|
#define NO_TTY 0x02
|
|
#define EDIT_DISABLED 0x04
|
|
#define UNBUFFERED 0x08
|
|
#define CHARSET_IS_UTF8 0x10
|
|
#define NARROW_HISTORY 0x40
|
|
|
|
typedef unsigned char el_action_t; /* Index to command array */
|
|
|
|
typedef struct coord_t { /* Position on the screen */
|
|
int h;
|
|
int v;
|
|
} coord_t;
|
|
|
|
typedef struct el_line_t {
|
|
wchar_t *buffer; /* Input line */
|
|
wchar_t *cursor; /* Cursor position */
|
|
wchar_t *lastchar; /* Last character */
|
|
const wchar_t *limit; /* Max position */
|
|
} el_line_t;
|
|
|
|
/*
|
|
* Editor state
|
|
*/
|
|
typedef struct el_state_t {
|
|
int inputmode; /* What mode are we in? */
|
|
int doingarg; /* Are we getting an argument? */
|
|
int argument; /* Numeric argument */
|
|
int metanext; /* Is the next char a meta char */
|
|
el_action_t lastcmd; /* Previous command */
|
|
el_action_t thiscmd; /* this command */
|
|
wchar_t thisch; /* char that generated it */
|
|
} el_state_t;
|
|
|
|
/*
|
|
* Until we come up with something better...
|
|
*/
|
|
#define el_malloc(a) malloc(a)
|
|
#define el_realloc(a,b) realloc(a, b)
|
|
#define el_free(a) free(a)
|
|
|
|
#include "tty.h"
|
|
#include "prompt.h"
|
|
#include "keymacro.h"
|
|
#include "terminal.h"
|
|
#include "refresh.h"
|
|
#include "chared.h"
|
|
#include "search.h"
|
|
#include "hist.h"
|
|
#include "map.h"
|
|
#include "sig.h"
|
|
|
|
struct el_read_t;
|
|
|
|
struct editline {
|
|
wchar_t *el_prog; /* the program name */
|
|
FILE *el_infile; /* Stdio stuff */
|
|
FILE *el_outfile; /* Stdio stuff */
|
|
FILE *el_errfile; /* Stdio stuff */
|
|
int el_infd; /* Input file descriptor */
|
|
int el_outfd; /* Output file descriptor */
|
|
int el_errfd; /* Error file descriptor */
|
|
int el_flags; /* Various flags. */
|
|
coord_t el_cursor; /* Cursor location */
|
|
wchar_t **el_display; /* Real screen image = what is there */
|
|
wchar_t **el_vdisplay; /* Virtual screen image = what we see */
|
|
void *el_data; /* Client data */
|
|
el_line_t el_line; /* The current line information */
|
|
el_state_t el_state; /* Current editor state */
|
|
el_terminal_t el_terminal; /* Terminal dependent stuff */
|
|
el_tty_t el_tty; /* Tty dependent stuff */
|
|
el_refresh_t el_refresh; /* Refresh stuff */
|
|
el_prompt_t el_prompt; /* Prompt stuff */
|
|
el_prompt_t el_rprompt; /* Prompt stuff */
|
|
el_chared_t el_chared; /* Characted editor stuff */
|
|
el_map_t el_map; /* Key mapping stuff */
|
|
el_keymacro_t el_keymacro; /* Key binding stuff */
|
|
el_history_t el_history; /* History stuff */
|
|
el_search_t el_search; /* Search stuff */
|
|
el_signal_t el_signal; /* Signal handling stuff */
|
|
struct el_read_t *el_read; /* Character reading stuff */
|
|
ct_buffer_t el_visual; /* Buffer for displayable str */
|
|
ct_buffer_t el_scratch; /* Scratch conversion buffer */
|
|
ct_buffer_t el_lgcyconv; /* Buffer for legacy wrappers */
|
|
LineInfo el_lgcylinfo; /* Legacy LineInfo buffer */
|
|
};
|
|
|
|
libedit_private int el_editmode(EditLine *, int, const wchar_t **);
|
|
|
|
#ifdef DEBUG
|
|
#define EL_ABORT(a) do { \
|
|
fprintf(el->el_errfile, "%s, %d: ", \
|
|
__FILE__, __LINE__); \
|
|
fprintf a; \
|
|
abort(); \
|
|
} while( /*CONSTCOND*/0);
|
|
#else
|
|
#define EL_ABORT(a) abort()
|
|
#endif
|
|
#endif /* _h_el */
|