"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "libedit/readline.c" between
tnftp-20151004.tar.gz and tnftp-20200705.tar.gz

About: tnftp is an enhanced ftp client (prior name "lukemftp").

readline.c  (tnftp-20151004):readline.c  (tnftp-20200705)
/* $NetBSD: readline.c,v 1.5 2008/04/29 08:13:38 martin Exp $ */ /* $NetBSD: readline.c,v 1.8 2020/07/04 13:43:21 lukem Exp $ */
/* from NetBSD: readline.c,v 1.55 2005/05/27 14:01:46 agc Exp */ /* from NetBSD: readline.c,v 1.159 2019/10/09 14:31:07 christos Exp *
/
/*- /*-
* Copyright (c) 1997 The NetBSD Foundation, Inc. * Copyright (c) 1997 The NetBSD Foundation, Inc.
* All rights reserved. * All rights reserved.
* *
* This code is derived from software contributed to The NetBSD Foundation * This code is derived from software contributed to The NetBSD Foundation
* by Jaromir Dolecek. * by Jaromir Dolecek.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
skipping to change at line 33 skipping to change at line 33
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * 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 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "config.h"
#if 0 /* tnftp */
#if !defined(lint) && !defined(SCCSID)
__RCSID(" NetBSD: readline.c,v 1.159 2019/10/09 14:31:07 christos Exp ");
#endif /* not lint && not SCCSID */
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <stdio.h> #include <ctype.h>
#include <dirent.h> #include <dirent.h>
#include <string.h> #include <errno.h>
#include <fcntl.h>
#include <limits.h>
#include <pwd.h> #include <pwd.h>
#include <ctype.h> #include <setjmp.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <unistd.h> #include <unistd.h>
#include <limits.h>
#include <errno.h>
#include <fcntl.h>
#ifdef HAVE_VIS_H
#include <vis.h> #include <vis.h>
#else #endif /* tnftp */
#include "np/vis.h"
#endif
#ifdef HAVE_ALLOCA_H
#include <alloca.h>
#endif
#include "el.h"
#include "fcns.h" /* for EL_NUM_FCNS */
#include "histedit.h"
#include "readline/readline.h" #include "readline/readline.h"
#include "el.h"
#include "fcns.h"
#include "filecomplete.h" #include "filecomplete.h"
void rl_prep_terminal(int);
void rl_deprep_terminal(void);
/* for rl_complete() */ /* for rl_complete() */
#define TAB '\r' #define TAB '\r'
/* see comment at the #ifdef for sense of this */ /* see comment at the #ifdef for sense of this */
/* #define GDB_411_HACK */ /* #define GDB_411_HACK */
/* readline compatibility stuff - look at readline sources/documentation */ /* readline compatibility stuff - look at readline sources/documentation */
/* to see what these variables mean */ /* to see what these variables mean */
const char *rl_library_version = "EditLine wrapper"; const char *rl_library_version = "EditLine wrapper";
int rl_readline_version = RL_READLINE_VERSION;
static char empty[] = { '\0' }; static char empty[] = { '\0' };
static char expand_chars[] = { ' ', '\t', '\n', '=', '(', '\0' }; static char expand_chars[] = { ' ', '\t', '\n', '=', '(', '\0' };
static char break_chars[] = { ' ', '\t', '\n', '"', '\\', '\'', '`', '@', '$', static char break_chars[] = { ' ', '\t', '\n', '"', '\\', '\'', '`', '@', '$',
'>', '<', '=', ';', '|', '&', '{', '(', '\0' }; '>', '<', '=', ';', '|', '&', '{', '(', '\0' };
char *rl_readline_name = empty; const char *rl_readline_name = empty;
FILE *rl_instream = NULL; FILE *rl_instream = NULL;
FILE *rl_outstream = NULL; FILE *rl_outstream = NULL;
int rl_point = 0; int rl_point = 0;
int rl_end = 0; int rl_end = 0;
char *rl_line_buffer = NULL; char *rl_line_buffer = NULL;
VCPFunction *rl_linefunc = NULL; rl_vcpfunc_t *rl_linefunc = NULL;
int rl_done = 0; int rl_done = 0;
VFunction *rl_event_hook = NULL; rl_hook_func_t *rl_event_hook = NULL;
KEYMAP_ENTRY_ARRAY emacs_standard_keymap,
emacs_meta_keymap,
emacs_ctlx_keymap;
/*
* The following is not implemented; we always catch signals in the
* libedit fashion: set handlers on entry to el_gets() and clear them
* on the way out. This simplistic approach works for most cases; if
* it does not work for your application, please let us know.
*/
int rl_catch_signals = 1;
int rl_catch_sigwinch = 1;
int history_base = 1; /* probably never subject to change */ int history_base = 1; /* probably never subject to change */
int history_length = 0; int history_length = 0;
int history_offset = 0;
int max_input_history = 0; int max_input_history = 0;
char history_expansion_char = '!'; char history_expansion_char = '!';
char history_subst_char = '^'; char history_subst_char = '^';
char *history_no_expand_chars = expand_chars; char *history_no_expand_chars = expand_chars;
Function *history_inhibit_expansion_function = NULL; Function *history_inhibit_expansion_function = NULL;
char *history_arg_extract(int start, int end, const char *str); char *history_arg_extract(int start, int end, const char *str);
int rl_inhibit_completion = 0; int rl_inhibit_completion = 0;
int rl_attempted_completion_over = 0; int rl_attempted_completion_over = 0;
char *rl_basic_word_break_characters = break_chars; const char *rl_basic_word_break_characters = break_chars;
char *rl_completer_word_break_characters = NULL; char *rl_completer_word_break_characters = NULL;
char *rl_completer_quote_characters = NULL; const char *rl_completer_quote_characters = NULL;
Function *rl_completion_entry_function = NULL; rl_compentry_func_t *rl_completion_entry_function = NULL;
CPPFunction *rl_attempted_completion_function = NULL; char *(*rl_completion_word_break_hook)(void) = NULL;
rl_completion_func_t *rl_attempted_completion_function = NULL;
Function *rl_pre_input_hook = NULL; Function *rl_pre_input_hook = NULL;
Function *rl_startup1_hook = NULL; Function *rl_startup1_hook = NULL;
Function *rl_getc_function = NULL; int (*rl_getc_function)(FILE *) = NULL;
char *rl_terminal_name = NULL; char *rl_terminal_name = NULL;
int rl_already_prompted = 0; int rl_already_prompted = 0;
int rl_filename_completion_desired = 0; int rl_filename_completion_desired = 0;
int rl_ignore_completion_duplicates = 0; int rl_ignore_completion_duplicates = 0;
int rl_catch_signals = 1; int readline_echoing_p = 1;
int _rl_print_completions_horizontally = 0;
VFunction *rl_redisplay_function = NULL; VFunction *rl_redisplay_function = NULL;
Function *rl_startup_hook = NULL; Function *rl_startup_hook = NULL;
int rl_did_startup_hook = 0;
VFunction *rl_completion_display_matches_hook = NULL; VFunction *rl_completion_display_matches_hook = NULL;
VFunction *rl_prep_term_function = NULL; VFunction *rl_prep_term_function = (VFunction *)rl_prep_terminal;
VFunction *rl_deprep_term_function = NULL; VFunction *rl_deprep_term_function = (VFunction *)rl_deprep_terminal;
KEYMAP_ENTRY_ARRAY emacs_meta_keymap;
/* /*
* The current prompt string. * The current prompt string.
*/ */
char *rl_prompt = NULL; char *rl_prompt = NULL;
/* /*
* This is set to character indicating type of completion being done by * This is set to character indicating type of completion being done by
* rl_complete_internal(); this is available for application completion * rl_complete_internal(); this is available for application completion
* functions. * functions.
*/ */
skipping to change at line 134 skipping to change at line 157
* If more than this number of items results from query for possible * If more than this number of items results from query for possible
* completions, we ask user if they are sure to really display the list. * completions, we ask user if they are sure to really display the list.
*/ */
int rl_completion_query_items = 100; int rl_completion_query_items = 100;
/* /*
* List of characters which are word break characters, but should be left * List of characters which are word break characters, but should be left
* in the parsed text when it is passed to the completion function. * in the parsed text when it is passed to the completion function.
* Shell uses this to help determine what kind of completing to do. * Shell uses this to help determine what kind of completing to do.
*/ */
char *rl_special_prefixes = NULL; const char *rl_special_prefixes = NULL;
/* /*
* This is the character appended to the completed words if at the end of * This is the character appended to the completed words if at the end of
* the line. Default is ' ' (a space). * the line. Default is ' ' (a space).
*/ */
int rl_completion_append_character = ' '; int rl_completion_append_character = ' ';
/* stuff below is used internally by libedit for readline emulation */ /* stuff below is used internally by libedit for readline emulation */
static History *h = NULL; static History *h = NULL;
static EditLine *e = NULL; static EditLine *e = NULL;
static Function *map[256]; static rl_command_func_t *map[256];
static jmp_buf topbuf;
/* internal functions */ /* internal functions */
static unsigned char _el_rl_complete(EditLine *, int); static unsigned char _el_rl_complete(EditLine *, int);
static unsigned char _el_rl_tstp(EditLine *, int); static unsigned char _el_rl_tstp(EditLine *, int);
static char *_get_prompt(EditLine *); static char *_get_prompt(EditLine *);
static HIST_ENTRY *_move_history(int); static int _getc_function(EditLine *, wchar_t *);
static int _history_expand_command(const char *, size_t, size_t, static int _history_expand_command(const char *, size_t, size_t,
char **); char **);
static char *_rl_compat_sub(const char *, const char *, static char *_rl_compat_sub(const char *, const char *,
const char *, int); const char *, int);
static int _rl_event_read_char(EditLine *, char *); static int _rl_event_read_char(EditLine *, wchar_t *);
static void _rl_update_pos(void); static void _rl_update_pos(void);
static HIST_ENTRY rl_he;
/* ARGSUSED */ /* ARGSUSED */
static char * static char *
_get_prompt(EditLine *el __attribute__((__unused__))) _get_prompt(EditLine *el __attribute__((__unused__)))
{ {
rl_already_prompted = 1; rl_already_prompted = 1;
return (rl_prompt); return rl_prompt;
} }
/* /*
* generic function for moving around history * read one key from user defined input function
*/ */
static HIST_ENTRY * static int
_move_history(int op) /*ARGSUSED*/
_getc_function(EditLine *el __attribute__((__unused__)), wchar_t *c)
{ {
HistEvent ev; int i;
static HIST_ENTRY rl_he;
if (history(h, &ev, op) != 0) i = (*rl_getc_function)(rl_instream);
return (HIST_ENTRY *) NULL; if (i == -1)
return 0;
*c = (wchar_t)i;
return 1;
}
rl_he.line = ev.str; static void
rl_he.data = NULL; _resize_fun(EditLine *el, void *a)
{
const LineInfo *li;
char **ap = a;
return (&rl_he); li = el_line(el);
/* a cheesy way to get rid of const cast. */
*ap = memchr(li->buffer, *li->buffer, (size_t)1);
}
static const char *
_default_history_file(void)
{
struct passwd *p;
static char *path;
size_t len;
if (path)
return path;
if ((p = getpwuid(getuid())) == NULL)
return NULL;
len = strlen(p->pw_dir) + sizeof("/.history");
if ((path = malloc(len)) == NULL)
return NULL;
(void)snprintf(path, len, "%s/.history", p->pw_dir);
return path;
} }
/* /*
* READLINE compatibility stuff * READLINE compatibility stuff
*/ */
/* /*
* Set the prompt
*/
int
rl_set_prompt(const char *prompt)
{
char *p;
if (!prompt)
prompt = "";
if (rl_prompt != NULL && strcmp(rl_prompt, prompt) == 0)
return 0;
if (rl_prompt)
el_free(rl_prompt);
rl_prompt = strdup(prompt);
if (rl_prompt == NULL)
return -1;
while ((p = strchr(rl_prompt, RL_PROMPT_END_IGNORE)) != NULL) {
/* Remove adjacent end/start markers to avoid double-escapes. */
if (p[1] == RL_PROMPT_START_IGNORE) {
memmove(p, p + 2, 1 + strlen(p + 2));
} else {
*p = RL_PROMPT_START_IGNORE;
}
}
return 0;
}
/*
* initialize rl compat stuff * initialize rl compat stuff
*/ */
int int
rl_initialize(void) rl_initialize(void)
{ {
HistEvent ev; HistEvent ev;
const LineInfo *li;
int editmode = 1; int editmode = 1;
struct termios t; struct termios t;
if (e != NULL) if (e != NULL)
el_end(e); el_end(e);
if (h != NULL) if (h != NULL)
history_end(h); history_end(h);
if (!rl_instream) if (!rl_instream)
rl_instream = stdin; rl_instream = stdin;
if (!rl_outstream) if (!rl_outstream)
rl_outstream = stdout; rl_outstream = stdout;
/* /*
* See if we don't really want to run the editor * See if we don't really want to run the editor
*/ */
if (tcgetattr(fileno(rl_instream), &t) != -1 && (t.c_lflag & ECHO) == 0) if (tcgetattr(fileno(rl_instream), &t) != -1 && (t.c_lflag & ECHO) == 0)
editmode = 0; editmode = 0;
e = el_init(rl_readline_name, rl_instream, rl_outstream, stderr); e = el_init_internal(rl_readline_name, rl_instream, rl_outstream,
stderr, fileno(rl_instream), fileno(rl_outstream), fileno(stderr),
NO_RESET);
if (!editmode) if (!editmode)
el_set(e, EL_EDITMODE, 0); el_set(e, EL_EDITMODE, 0);
h = history_init(); h = history_init();
if (!e || !h) if (!e || !h)
return (-1); return -1;
history(h, &ev, H_SETSIZE, INT_MAX); /* unlimited */ history(h, &ev, H_SETSIZE, INT_MAX); /* unlimited */
history_length = 0; history_length = 0;
max_input_history = INT_MAX; max_input_history = INT_MAX;
el_set(e, EL_HIST, history, h); el_set(e, EL_HIST, history, h);
/* Setup resize function */
el_set(e, EL_RESIZE, _resize_fun, &rl_line_buffer);
/* setup getc function if valid */
if (rl_getc_function)
el_set(e, EL_GETCFN, _getc_function);
/* for proper prompt printing in readline() */ /* for proper prompt printing in readline() */
rl_prompt = strdup(""); if (rl_set_prompt("") == -1) {
if (rl_prompt == NULL) {
history_end(h); history_end(h);
el_end(e); el_end(e);
return -1; return -1;
} }
el_set(e, EL_PROMPT, _get_prompt); el_set(e, EL_PROMPT_ESC, _get_prompt, RL_PROMPT_START_IGNORE);
el_set(e, EL_SIGNAL, rl_catch_signals); el_set(e, EL_SIGNAL, rl_catch_signals);
/* set default mode to "emacs"-style and read setting afterwards */ /* set default mode to "emacs"-style and read setting afterwards */
/* so this can be overriden */ /* so this can be overridden */
el_set(e, EL_EDITOR, "emacs"); el_set(e, EL_EDITOR, "emacs");
if (rl_terminal_name != NULL) if (rl_terminal_name != NULL)
el_set(e, EL_TERMINAL, rl_terminal_name); el_set(e, EL_TERMINAL, rl_terminal_name);
else else
el_get(e, EL_TERMINAL, &rl_terminal_name); el_get(e, EL_TERMINAL, &rl_terminal_name);
/* /*
* Word completion - this has to go AFTER rebinding keys * Word completion - this has to go AFTER rebinding keys
* to emacs-style. * to emacs-style.
*/ */
skipping to change at line 266 skipping to change at line 359
el_set(e, EL_BIND, "^I", "rl_complete", NULL); el_set(e, EL_BIND, "^I", "rl_complete", NULL);
/* /*
* Send TSTP when ^Z is pressed. * Send TSTP when ^Z is pressed.
*/ */
el_set(e, EL_ADDFN, "rl_tstp", el_set(e, EL_ADDFN, "rl_tstp",
"ReadLine compatible suspend function", "ReadLine compatible suspend function",
_el_rl_tstp); _el_rl_tstp);
el_set(e, EL_BIND, "^Z", "rl_tstp", NULL); el_set(e, EL_BIND, "^Z", "rl_tstp", NULL);
/*
* Set some readline compatible key-bindings.
*/
el_set(e, EL_BIND, "^R", "em-inc-search-prev", NULL);
/*
* Allow the use of Home/End keys.
*/
el_set(e, EL_BIND, "\\e[1~", "ed-move-to-beg", NULL);
el_set(e, EL_BIND, "\\e[4~", "ed-move-to-end", NULL);
el_set(e, EL_BIND, "\\e[7~", "ed-move-to-beg", NULL);
el_set(e, EL_BIND, "\\e[8~", "ed-move-to-end", NULL);
el_set(e, EL_BIND, "\\e[H", "ed-move-to-beg", NULL);
el_set(e, EL_BIND, "\\e[F", "ed-move-to-end", NULL);
/*
* Allow the use of the Delete/Insert keys.
*/
el_set(e, EL_BIND, "\\e[3~", "ed-delete-next-char", NULL);
el_set(e, EL_BIND, "\\e[2~", "ed-quoted-insert", NULL);
/*
* Ctrl-left-arrow and Ctrl-right-arrow for word moving.
*/
el_set(e, EL_BIND, "\\e[1;5C", "em-next-word", NULL);
el_set(e, EL_BIND, "\\e[1;5D", "ed-prev-word", NULL);
el_set(e, EL_BIND, "\\e[5C", "em-next-word", NULL);
el_set(e, EL_BIND, "\\e[5D", "ed-prev-word", NULL);
el_set(e, EL_BIND, "\\e\\e[C", "em-next-word", NULL);
el_set(e, EL_BIND, "\\e\\e[D", "ed-prev-word", NULL);
/* read settings from configuration file */ /* read settings from configuration file */
el_source(e, NULL); el_source(e, NULL);
/* /*
* Unfortunately, some applications really do use rl_point * Unfortunately, some applications really do use rl_point
* and rl_line_buffer directly. * and rl_line_buffer directly.
*/ */
li = el_line(e); _resize_fun(e, &rl_line_buffer);
/* a cheesy way to get rid of const cast. */
rl_line_buffer = memchr(li->buffer, *li->buffer, 1);
_rl_update_pos(); _rl_update_pos();
if (rl_startup_hook) tty_end(e, TCSADRAIN);
(*rl_startup_hook)(NULL, 0);
return (0); return 0;
} }
/* /*
* read one line from input stream and return it, chomping * read one line from input stream and return it, chomping
* trailing newline (if there is any) * trailing newline (if there is any)
*/ */
char * char *
readline(const char *prompt) readline(const char *p)
{ {
HistEvent ev; HistEvent ev;
const char * volatile prompt = p;
int count; int count;
const char *ret; const char *ret;
char *buf; char *buf;
static int used_event_hook; static int used_event_hook;
if (e == NULL || h == NULL) if (e == NULL || h == NULL)
rl_initialize(); rl_initialize();
if (rl_did_startup_hook == 0 && rl_startup_hook) {
rl_did_startup_hook = 1;
(*rl_startup_hook)(NULL, 0);
}
tty_init(e);
rl_done = 0; rl_done = 0;
(void)setjmp(topbuf);
buf = NULL;
/* update prompt accordingly to what has been passed */ /* update prompt accordingly to what has been passed */
if (!prompt) if (rl_set_prompt(prompt) == -1)
prompt = ""; goto out;
if (strcmp(rl_prompt, prompt) != 0) {
free(rl_prompt);
rl_prompt = strdup(prompt);
if (rl_prompt == NULL)
return NULL;
}
if (rl_pre_input_hook) if (rl_pre_input_hook)
(*rl_pre_input_hook)(NULL, 0); (*rl_pre_input_hook)(NULL, 0);
if (rl_event_hook && !(e->el_flags&NO_TTY)) { if (rl_event_hook && !(e->el_flags & NO_TTY)) {
el_set(e, EL_GETCFN, _rl_event_read_char); el_set(e, EL_GETCFN, _rl_event_read_char);
used_event_hook = 1; used_event_hook = 1;
} }
if (!rl_event_hook && used_event_hook) { if (!rl_event_hook && used_event_hook) {
el_set(e, EL_GETCFN, EL_BUILTIN_GETCFN); el_set(e, EL_GETCFN, EL_BUILTIN_GETCFN);
used_event_hook = 0; used_event_hook = 0;
} }
rl_already_prompted = 0; rl_already_prompted = 0;
/* get one line from input stream */ /* get one line from input stream */
ret = el_gets(e, &count); ret = el_gets(e, &count);
if (ret && count > 0) { if (ret && count > 0) {
int lastidx; int lastidx;
buf = strdup(ret); buf = strdup(ret);
if (buf == NULL) if (buf == NULL)
return NULL; goto out;
lastidx = count - 1; lastidx = count - 1;
if (buf[lastidx] == '\n') if (buf[lastidx] == '\n')
buf[lastidx] = '\0'; buf[lastidx] = '\0';
} else } else
buf = NULL; buf = NULL;
history(h, &ev, H_GETSIZE); history(h, &ev, H_GETSIZE);
history_length = ev.num; history_length = ev.num;
out:
tty_end(e, TCSADRAIN);
return buf; return buf;
} }
/* /*
* history functions * history functions
*/ */
/* /*
* is normally called before application starts to use * is normally called before application starts to use
* history expansion functions * history expansion functions
*/ */
void void
using_history(void) using_history(void)
{ {
if (h == NULL || e == NULL) if (h == NULL || e == NULL)
rl_initialize(); rl_initialize();
history_offset = history_length;
} }
/* /*
* substitute ``what'' with ``with'', returning resulting string; if * substitute ``what'' with ``with'', returning resulting string; if
* globally == 1, substitutes all occurrences of what, otherwise only the * globally == 1, substitutes all occurrences of what, otherwise only the
* first one * first one
*/ */
static char * static char *
_rl_compat_sub(const char *str, const char *what, const char *with, _rl_compat_sub(const char *str, const char *what, const char *with,
int globally) int globally)
skipping to change at line 391 skipping to change at line 518
s = str; s = str;
while (*s) { while (*s) {
if (*s == *what && !strncmp(s, what, what_len)) { if (*s == *what && !strncmp(s, what, what_len)) {
len += with_len - what_len; len += with_len - what_len;
if (!globally) if (!globally)
break; break;
s += what_len; s += what_len;
} else } else
s++; s++;
} }
r = result = malloc(len + 1); r = result = el_calloc(len + 1, sizeof(*r));
if (result == NULL) if (result == NULL)
return NULL; return NULL;
s = str; s = str;
while (*s) { while (*s) {
if (*s == *what && !strncmp(s, what, what_len)) { if (*s == *what && !strncmp(s, what, what_len)) {
(void)strncpy(r, with, with_len); memcpy(r, with, with_len);
r += with_len; r += with_len;
s += what_len; s += what_len;
if (!globally) { if (!globally) {
(void)strcpy(r, s); (void)strcpy(r, s);
return(result); return result;
} }
} else } else
*r++ = *s++; *r++ = *s++;
} }
*r = 0; *r = '\0';
return(result); return result;
} }
static char *last_search_pat; /* last !?pat[?] search pattern */ static char *last_search_pat; /* last !?pat[?] search pattern */
static char *last_search_match; /* last !?pat[?] that matched */ static char *last_search_match; /* last !?pat[?] that matched */
const char * const char *
get_history_event(const char *cmd, int *cindex, int qchar) get_history_event(const char *cmd, int *cindex, int qchar)
{ {
int idx, sign, sub, num, begin, ret; int idx, sign, sub, num, begin, ret;
size_t len; size_t len;
char *pat; char *pat;
const char *rptr; const char *rptr;
HistEvent ev; HistEvent ev;
idx = *cindex; idx = *cindex;
if (cmd[idx++] != history_expansion_char) if (cmd[idx++] != history_expansion_char)
return(NULL); return NULL;
/* find out which event to take */ /* find out which event to take */
if (cmd[idx] == history_expansion_char || cmd[idx] == 0) { if (cmd[idx] == history_expansion_char || cmd[idx] == '\0') {
if (history(h, &ev, H_FIRST) != 0) if (history(h, &ev, H_FIRST) != 0)
return(NULL); return NULL;
*cindex = cmd[idx]? (idx + 1):idx; *cindex = cmd[idx]? (idx + 1):idx;
return(ev.str); return ev.str;
} }
sign = 0; sign = 0;
if (cmd[idx] == '-') { if (cmd[idx] == '-') {
sign = 1; sign = 1;
idx++; idx++;
} }
if ('0' <= cmd[idx] && cmd[idx] <= '9') { if ('0' <= cmd[idx] && cmd[idx] <= '9') {
HIST_ENTRY *rl_he; HIST_ENTRY *he;
num = 0; num = 0;
while (cmd[idx] && '0' <= cmd[idx] && cmd[idx] <= '9') { while (cmd[idx] && '0' <= cmd[idx] && cmd[idx] <= '9') {
num = num * 10 + cmd[idx] - '0'; num = num * 10 + cmd[idx] - '0';
idx++; idx++;
} }
if (sign) if (sign)
num = history_length - num + 1; num = history_length - num + history_base;
if (!(rl_he = history_get(num))) if (!(he = history_get(num)))
return(NULL); return NULL;
*cindex = idx; *cindex = idx;
return(rl_he->line); return he->line;
} }
sub = 0; sub = 0;
if (cmd[idx] == '?') { if (cmd[idx] == '?') {
sub = 1; sub = 1;
idx++; idx++;
} }
begin = idx; begin = idx;
while (cmd[idx]) { while (cmd[idx]) {
if (cmd[idx] == '\n') if (cmd[idx] == '\n')
break; break;
if (sub && cmd[idx] == '?') if (sub && cmd[idx] == '?')
break; break;
if (!sub && (cmd[idx] == ':' || cmd[idx] == ' ' if (!sub && (cmd[idx] == ':' || cmd[idx] == ' '
|| cmd[idx] == '\t' || cmd[idx] == qchar)) || cmd[idx] == '\t' || cmd[idx] == qchar))
break; break;
idx++; idx++;
} }
len = idx - begin; len = (size_t)idx - (size_t)begin;
if (sub && cmd[idx] == '?') if (sub && cmd[idx] == '?')
idx++; idx++;
if (sub && len == 0 && last_search_pat && *last_search_pat) if (sub && len == 0 && last_search_pat && *last_search_pat)
pat = last_search_pat; pat = last_search_pat;
else if (len == 0) else if (len == 0)
return(NULL); return NULL;
else { else {
if ((pat = malloc(len + 1)) == NULL) if ((pat = el_calloc(len + 1, sizeof(*pat))) == NULL)
return NULL; return NULL;
(void)strncpy(pat, cmd + begin, len); (void)strlcpy(pat, cmd + begin, len + 1);
pat[len] = '\0';
} }
if (history(h, &ev, H_CURR) != 0) { if (history(h, &ev, H_CURR) != 0) {
if (pat != last_search_pat) if (pat != last_search_pat)
free(pat); el_free(pat);
return (NULL); return NULL;
} }
num = ev.num; num = ev.num;
if (sub) { if (sub) {
if (pat != last_search_pat) { if (pat != last_search_pat) {
if (last_search_pat) if (last_search_pat)
free(last_search_pat); el_free(last_search_pat);
last_search_pat = pat; last_search_pat = pat;
} }
ret = history_search(pat, -1); ret = history_search(pat, -1);
} else } else
ret = history_search_prefix(pat, -1); ret = history_search_prefix(pat, -1);
if (ret == -1) { if (ret == -1) {
/* restore to end of list on failed search */ /* restore to end of list on failed search */
history(h, &ev, H_FIRST); history(h, &ev, H_FIRST);
(void)fprintf(rl_outstream, "%s: Event not found\n", pat); (void)fprintf(rl_outstream, "%s: Event not found\n", pat);
if (pat != last_search_pat) if (pat != last_search_pat)
free(pat); el_free(pat);
return(NULL); return NULL;
} }
if (sub && len) { if (sub && len) {
if (last_search_match && last_search_match != pat) if (last_search_match && last_search_match != pat)
free(last_search_match); el_free(last_search_match);
last_search_match = pat; last_search_match = pat;
} }
if (pat != last_search_pat) if (pat != last_search_pat)
free(pat); el_free(pat);
if (history(h, &ev, H_CURR) != 0) if (history(h, &ev, H_CURR) != 0)
return(NULL); return NULL;
*cindex = idx; *cindex = idx;
rptr = ev.str; rptr = ev.str;
/* roll back to original position */ /* roll back to original position */
(void)history(h, &ev, H_SET, num); (void)history(h, &ev, H_SET, num);
return rptr; return rptr;
} }
/* /*
* the real function doing history expansion - takes as argument command * the real function doing history expansion - takes as argument command
* to do and data upon which the command should be executed * to do and data upon which the command should be executed
* does expansion the way I've understood readline documentation * does expansion the way I've understood readline documentation
* *
* returns 0 if data was not modified, 1 if it was and 2 if the string * returns 0 if data was not modified, 1 if it was and 2 if the string
* should be only printed and not executed; in case of error, * should be only printed and not executed; in case of error,
* returns -1 and *result points to NULL * returns -1 and *result points to NULL
* it's callers responsibility to free() string returned in *result * it's the caller's responsibility to free() the string returned in *result
*/ */
static int static int
_history_expand_command(const char *command, size_t offs, size_t cmdlen, _history_expand_command(const char *command, size_t offs, size_t cmdlen,
char **result) char **result)
{ {
char *tmp, *search = NULL, *aptr; char *tmp, *search = NULL, *aptr;
const char *ptr, *cmd; const char *ptr, *cmd;
static char *from = NULL, *to = NULL; static char *from = NULL, *to = NULL;
int start, end, idx, has_mods = 0; int start, end, idx, has_mods = 0;
int p_on = 0, g_on = 0; int p_on = 0, g_on = 0;
skipping to change at line 575 skipping to change at line 701
* "!!:^", "!!:*" and "!!:$" respectively. * "!!:^", "!!:*" and "!!:$" respectively.
*/ */
str[0] = str[1] = '!'; str[0] = str[1] = '!';
str[2] = '0'; str[2] = '0';
ptr = get_history_event(str, &idx, 0); ptr = get_history_event(str, &idx, 0);
idx = (command[offs + 1] == ':')? 1:0; idx = (command[offs + 1] == ':')? 1:0;
has_mods = 1; has_mods = 1;
} else { } else {
if (command[offs + 1] == '#') { if (command[offs + 1] == '#') {
/* use command so far */ /* use command so far */
if ((aptr = malloc(offs + 1)) == NULL) if ((aptr = el_calloc(offs + 1, sizeof(*aptr)))
== NULL)
return -1; return -1;
(void)strncpy(aptr, command, offs); (void)strlcpy(aptr, command, offs + 1);
aptr[offs] = '\0';
idx = 1; idx = 1;
} else { } else {
int qchar; int qchar;
qchar = (offs > 0 && command[offs - 1] == '"')? '"':0; qchar = (offs > 0 && command[offs - 1] == '"')? '"':0;
ptr = get_history_event(command + offs, &idx, qchar); ptr = get_history_event(command + offs, &idx, qchar);
} }
has_mods = command[offs + idx] == ':'; has_mods = command[offs + (size_t)idx] == ':';
} }
if (ptr == NULL && aptr == NULL) if (ptr == NULL && aptr == NULL)
return(-1); return -1;
if (!has_mods) { if (!has_mods) {
*result = strdup(aptr? aptr : ptr); *result = strdup(aptr ? aptr : ptr);
if (aptr) if (aptr)
free(aptr); el_free(aptr);
return(1); if (*result == NULL)
return -1;
return 1;
} }
cmd = command + offs + idx + 1; cmd = command + offs + idx + 1;
/* Now parse any word designators */ /* Now parse any word designators */
if (*cmd == '%') /* last word matched by ?pat? */ if (*cmd == '%') /* last word matched by ?pat? */
tmp = strdup(last_search_match? last_search_match:""); tmp = strdup(last_search_match? last_search_match:"");
else if (strchr("^*$-0123456789", *cmd)) { else if (strchr("^*$-0123456789", *cmd)) {
start = end = -1; start = end = -1;
skipping to change at line 641 skipping to change at line 769
} else if (*cmd == '*') } else if (*cmd == '*')
end = -1, cmd++; end = -1, cmd++;
else else
end = start; end = start;
} }
tmp = history_arg_extract(start, end, aptr? aptr:ptr); tmp = history_arg_extract(start, end, aptr? aptr:ptr);
if (tmp == NULL) { if (tmp == NULL) {
(void)fprintf(rl_outstream, "%s: Bad word specifier", (void)fprintf(rl_outstream, "%s: Bad word specifier",
command + offs + idx); command + offs + idx);
if (aptr) if (aptr)
free(aptr); el_free(aptr);
return(-1); return -1;
} }
} else } else
tmp = strdup(aptr? aptr:ptr); tmp = strdup(aptr? aptr:ptr);
if (aptr) if (aptr)
free(aptr); el_free(aptr);
if (*cmd == 0 || (cmd - (command + offs) >= cmdlen)) { if (*cmd == '\0' || ((size_t)(cmd - (command + offs)) >= cmdlen)) {
*result = tmp; *result = tmp;
return(1); return 1;
} }
for (; *cmd; cmd++) { for (; *cmd; cmd++) {
if (*cmd == ':') if (*cmd == ':')
continue; continue;
else if (*cmd == 'h') { /* remove trailing path */ else if (*cmd == 'h') { /* remove trailing path */
if ((aptr = strrchr(tmp, '/')) != NULL) if ((aptr = strrchr(tmp, '/')) != NULL)
*aptr = 0; *aptr = '\0';
} else if (*cmd == 't') { /* remove leading path */ } else if (*cmd == 't') { /* remove leading path */
if ((aptr = strrchr(tmp, '/')) != NULL) { if ((aptr = strrchr(tmp, '/')) != NULL) {
aptr = strdup(aptr + 1); aptr = strdup(aptr + 1);
free(tmp); el_free(tmp);
tmp = aptr; tmp = aptr;
} }
} else if (*cmd == 'r') { /* remove trailing suffix */ } else if (*cmd == 'r') { /* remove trailing suffix */
if ((aptr = strrchr(tmp, '.')) != NULL) if ((aptr = strrchr(tmp, '.')) != NULL)
*aptr = 0; *aptr = '\0';
} else if (*cmd == 'e') { /* remove all but suffix */ } else if (*cmd == 'e') { /* remove all but suffix */
if ((aptr = strrchr(tmp, '.')) != NULL) { if ((aptr = strrchr(tmp, '.')) != NULL) {
aptr = strdup(aptr); aptr = strdup(aptr);
free(tmp); el_free(tmp);
tmp = aptr; tmp = aptr;
} }
} else if (*cmd == 'p') /* print only */ } else if (*cmd == 'p') /* print only */
p_on = 1; p_on = 1;
else if (*cmd == 'g') else if (*cmd == 'g')
g_on = 2; g_on = 2;
else if (*cmd == 's' || *cmd == '&') { else if (*cmd == 's' || *cmd == '&') {
char *what, *with, delim; char *what, *with, delim;
size_t len, from_len; size_t len, from_len;
size_t size; size_t size;
if (*cmd == '&' && (from == NULL || to == NULL)) if (*cmd == '&' && (from == NULL || to == NULL))
continue; continue;
else if (*cmd == 's') { else if (*cmd == 's') {
delim = *(++cmd), cmd++; delim = *(++cmd), cmd++;
size = 16; size = 16;
what = realloc(from, size); what = el_realloc(from, size * sizeof(*what));
if (what == NULL) { if (what == NULL) {
free(from); el_free(from);
el_free(tmp);
return 0; return 0;
} }
len = 0; len = 0;
for (; *cmd && *cmd != delim; cmd++) { for (; *cmd && *cmd != delim; cmd++) {
if (*cmd == '\\' && cmd[1] == delim) if (*cmd == '\\' && cmd[1] == delim)
cmd++; cmd++;
if (len >= size) { if (len >= size) {
char *nwhat; char *nwhat;
nwhat = realloc(what, nwhat = el_realloc(what,
(size <<= 1)); (size <<= 1) *
sizeof(*nwhat));
if (nwhat == NULL) { if (nwhat == NULL) {
free(what); el_free(what);
el_free(tmp);
return 0; return 0;
} }
what = nwhat; what = nwhat;
} }
what[len++] = *cmd; what[len++] = *cmd;
} }
what[len] = '\0'; what[len] = '\0';
from = what; from = what;
if (*what == '\0') { if (*what == '\0') {
free(what); el_free(what);
if (search) { if (search) {
from = strdup(search); from = strdup(search);
if (from == NULL) if (from == NULL) {
el_free(tmp);
return 0; return 0;
}
} else { } else {
from = NULL; from = NULL;
return (-1); el_free(tmp);
return -1;
} }
} }
cmd++; /* shift after delim */ cmd++; /* shift after delim */
if (!*cmd) if (!*cmd)
continue; continue;
size = 16; size = 16;
with = realloc(to, size); with = el_realloc(to, size * sizeof(*with));
if (with == NULL) { if (with == NULL) {
free(to); el_free(to);
el_free(tmp);
return -1; return -1;
} }
len = 0; len = 0;
from_len = strlen(from); from_len = strlen(from);
for (; *cmd && *cmd != delim; cmd++) { for (; *cmd && *cmd != delim; cmd++) {
if (len + from_len + 1 >= size) { if (len + from_len + 1 >= size) {
char *nwith; char *nwith;
size += from_len + 1; size += from_len + 1;
nwith = realloc(with, size); nwith = el_realloc(with,
size * sizeof(*nwith));
if (nwith == NULL) { if (nwith == NULL) {
free(with); el_free(with);
el_free(tmp);
return -1; return -1;
} }
with = nwith; with = nwith;
} }
if (*cmd == '&') { if (*cmd == '&') {
/* safe */ /* safe */
(void)strcpy(&with[len], from); (void)strcpy(&with[len], from);
len += from_len; len += from_len;
continue; continue;
} }
skipping to change at line 765 skipping to change at line 902
|| *(cmd + 1) == '&')) || *(cmd + 1) == '&'))
cmd++; cmd++;
with[len++] = *cmd; with[len++] = *cmd;
} }
with[len] = '\0'; with[len] = '\0';
to = with; to = with;
} }
aptr = _rl_compat_sub(tmp, from, to, g_on); aptr = _rl_compat_sub(tmp, from, to, g_on);
if (aptr) { if (aptr) {
free(tmp); el_free(tmp);
tmp = aptr; tmp = aptr;
} }
g_on = 0; g_on = 0;
} }
} }
*result = tmp; *result = tmp;
return (p_on? 2:1); return p_on? 2:1;
} }
/* /*
* csh-style history expansion * csh-style history expansion
*/ */
int int
history_expand(char *str, char **output) history_expand(char *str, char **output)
{ {
int ret = 0; int ret = 0;
size_t idx, i, size; size_t idx, i, size;
char *tmp, *result; char *tmp, *result;
if (h == NULL || e == NULL) if (h == NULL || e == NULL)
rl_initialize(); rl_initialize();
if (history_expansion_char == 0) { if (history_expansion_char == 0) {
*output = strdup(str); *output = strdup(str);
return(0); return 0;
} }
*output = NULL; *output = NULL;
if (str[0] == history_subst_char) { if (str[0] == history_subst_char) {
/* ^foo^foo2^ is equivalent to !!:s^foo^foo2^ */ /* ^foo^foo2^ is equivalent to !!:s^foo^foo2^ */
*output = malloc(strlen(str) + 4 + 1); *output = el_calloc(strlen(str) + 4 + 1, sizeof(**output));
if (*output == NULL) if (*output == NULL)
return 0; return 0;
(*output)[0] = (*output)[1] = history_expansion_char; (*output)[0] = (*output)[1] = history_expansion_char;
(*output)[2] = ':'; (*output)[2] = ':';
(*output)[3] = 's'; (*output)[3] = 's';
(void)strcpy((*output) + 4, str); (void)strcpy((*output) + 4, str);
str = *output; str = *output;
} else { } else {
*output = strdup(str); *output = strdup(str);
if (*output == NULL) if (*output == NULL)
return 0; return 0;
} }
#define ADD_STRING(what, len) \ #define ADD_STRING(what, len, fr) \
{ \ { \
if (idx + len + 1 > size) { \ if (idx + len + 1 > size) { \
char *nresult = realloc(result, (size += len + 1));\ char *nresult = el_realloc(result, \
(size += len + 1) * sizeof(*nresult)); \
if (nresult == NULL) { \ if (nresult == NULL) { \
free(*output); \ el_free(*output); \
if (/*CONSTCOND*/fr) \
el_free(tmp); \
return 0; \ return 0; \
} \ } \
result = nresult; \ result = nresult; \
} \ } \
(void)strncpy(&result[idx], what, len); \ (void)strlcpy(&result[idx], what, len + 1); \
idx += len; \ idx += len; \
result[idx] = '\0'; \
} }
result = NULL; result = NULL;
size = idx = 0; size = idx = 0;
tmp = NULL;
for (i = 0; str[i];) { for (i = 0; str[i];) {
int qchar, loop_again; int qchar, loop_again;
size_t len, start, j; size_t len, start, j;
qchar = 0; qchar = 0;
loop_again = 1; loop_again = 1;
start = j = i; start = j = i;
loop: loop:
for (; str[j]; j++) { for (; str[j]; j++) {
if (str[j] == '\\' && if (str[j] == '\\' &&
str[j + 1] == history_expansion_char) { str[j + 1] == history_expansion_char) {
(void)strcpy(&str[j], &str[j + 1]); len = strlen(&str[j + 1]) + 1;
memmove(&str[j], &str[j + 1], len);
continue; continue;
} }
if (!loop_again) { if (!loop_again) {
if (isspace((unsigned char) str[j]) if (isspace((unsigned char) str[j])
|| str[j] == qchar) || str[j] == qchar)
break; break;
} }
if (str[j] == history_expansion_char if (str[j] == history_expansion_char
&& !strchr(history_no_expand_chars, str[j + 1]) && !strchr(history_no_expand_chars, str[j + 1])
&& (!history_inhibit_expansion_function || && (!history_inhibit_expansion_function ||
skipping to change at line 864 skipping to change at line 1005
if (str[j] && loop_again) { if (str[j] && loop_again) {
i = j; i = j;
qchar = (j > 0 && str[j - 1] == '"' )? '"':0; qchar = (j > 0 && str[j - 1] == '"' )? '"':0;
j++; j++;
if (str[j] == history_expansion_char) if (str[j] == history_expansion_char)
j++; j++;
loop_again = 0; loop_again = 0;
goto loop; goto loop;
} }
len = i - start; len = i - start;
tmp = &str[start]; ADD_STRING(&str[start], len, 0);
ADD_STRING(tmp, len);
if (str[i] == '\0' || str[i] != history_expansion_char) { if (str[i] == '\0' || str[i] != history_expansion_char) {
len = j - i; len = j - i;
tmp = &str[i]; ADD_STRING(&str[i], len, 0);
ADD_STRING(tmp, len);
if (start == 0) if (start == 0)
ret = 0; ret = 0;
else else
ret = 1; ret = 1;
break; break;
} }
ret = _history_expand_command (str, i, (j - i), &tmp); ret = _history_expand_command (str, i, (j - i), &tmp);
if (ret > 0 && tmp) { if (ret > 0 && tmp) {
len = strlen(tmp); len = strlen(tmp);
ADD_STRING(tmp, len); ADD_STRING(tmp, len, 1);
free(tmp); }
if (tmp) {
el_free(tmp);
tmp = NULL;
} }
i = j; i = j;
} }
/* ret is 2 for "print only" option */ /* ret is 2 for "print only" option */
if (ret == 2) { if (ret == 2) {
add_history(result); add_history(result);
#ifdef GDB_411_HACK #ifdef GDB_411_HACK
/* gdb 4.11 has been shipped with readline, where */ /* gdb 4.11 has been shipped with readline, where */
/* history_expand() returned -1 when the line */ /* history_expand() returned -1 when the line */
/* should not be executed; in readline 2.1+ */ /* should not be executed; in readline 2.1+ */
/* it should return 2 in such a case */ /* it should return 2 in such a case */
ret = -1; ret = -1;
#endif #endif
} }
free(*output); el_free(*output);
*output = result; *output = result;
return (ret); return ret;
} }
/* /*
* Return a string consisting of arguments of "str" from "start" to "end". * Return a string consisting of arguments of "str" from "start" to "end".
*/ */
char * char *
history_arg_extract(int start, int end, const char *str) history_arg_extract(int start, int end, const char *str)
{ {
size_t i, len, max; size_t i, len, max;
char **arr, *result; char **arr, *result = NULL;
arr = history_tokenize(str); arr = history_tokenize(str);
if (!arr) if (!arr)
return(NULL); return NULL;
if (arr && *arr == NULL) { if (arr && *arr == NULL)
free(arr); goto out;
return(NULL);
}
for (max = 0; arr[max]; max++) for (max = 0; arr[max]; max++)
continue; continue;
max--; max--;
if (start == '$') if (start == '$')
start = max; start = (int)max;
if (end == '$') if (end == '$')
end = max; end = (int)max;
if (end < 0) if (end < 0)
end = max + end + 1; end = (int)max + end + 1;
if (start < 0) if (start < 0)
start = end; start = end;
if (start < 0 || end < 0 || start > max || end > max || start > end) if (start < 0 || end < 0 || (size_t)start > max ||
return(NULL); (size_t)end > max || start > end)
goto out;
for (i = start, len = 0; i <= end; i++) for (i = (size_t)start, len = 0; i <= (size_t)end; i++)
len += strlen(arr[i]) + 1; len += strlen(arr[i]) + 1;
len++; len++;
result = malloc(len); result = el_calloc(len, sizeof(*result));
if (result == NULL) if (result == NULL)
return NULL; goto out;
for (i = start, len = 0; i <= end; i++) { for (i = (size_t)start, len = 0; i <= (size_t)end; i++) {
(void)strcpy(result + len, arr[i]); (void)strcpy(result + len, arr[i]);
len += strlen(arr[i]); len += strlen(arr[i]);
if (i < end) if (i < (size_t)end)
result[len++] = ' '; result[len++] = ' ';
} }
result[len] = 0; result[len] = '\0';
out:
for (i = 0; arr[i]; i++) for (i = 0; arr[i]; i++)
free(arr[i]); el_free(arr[i]);
free(arr); el_free(arr);
return(result); return result;
} }
/* /*
* Parse the string into individual tokens, * Parse the string into individual tokens,
* similar to how shell would do it. * similar to how shell would do it.
*/ */
char ** char **
history_tokenize(const char *str) history_tokenize(const char *str)
{ {
int size = 1, idx = 0, i, start; int size = 1, idx = 0, i, start;
skipping to change at line 992 skipping to change at line 1134
break; break;
else if (!delim && strchr("'`\"", str[i])) else if (!delim && strchr("'`\"", str[i]))
delim = str[i]; delim = str[i];
if (str[i]) if (str[i])
i++; i++;
} }
if (idx + 2 >= size) { if (idx + 2 >= size) {
char **nresult; char **nresult;
size <<= 1; size <<= 1;
nresult = realloc(result, size * sizeof(char *)); nresult = el_realloc(result, (size_t)size * sizeof(*nresu lt));
if (nresult == NULL) { if (nresult == NULL) {
free(result); el_free(result);
return NULL; return NULL;
} }
result = nresult; result = nresult;
} }
len = i - start; len = (size_t)i - (size_t)start;
temp = malloc(len + 1); temp = el_calloc(len + 1, sizeof(*temp));
if (temp == NULL) { if (temp == NULL) {
for (i = 0; i < idx; i++) for (i = 0; i < idx; i++)
free(result[i]); el_free(result[i]);
free(result); el_free(result);
return NULL; return NULL;
} }
(void)strncpy(temp, &str[start], len); (void)strlcpy(temp, &str[start], len + 1);
temp[len] = '\0';
result[idx++] = temp; result[idx++] = temp;
result[idx] = NULL; result[idx] = NULL;
if (str[i]) if (str[i])
i++; i++;
} }
return (result); return result;
} }
/* /*
* limit size of history record to ``max'' events * limit size of history record to ``max'' events
*/ */
void void
stifle_history(int max) stifle_history(int max)
{ {
HistEvent ev; HistEvent ev;
HIST_ENTRY *he;
if (h == NULL || e == NULL) if (h == NULL || e == NULL)
rl_initialize(); rl_initialize();
if (history(h, &ev, H_SETSIZE, max) == 0) if (history(h, &ev, H_SETSIZE, max) == 0) {
max_input_history = max; max_input_history = max;
if (history_length > max)
history_base = history_length - max;
while (history_length > max) {
he = remove_history(0);
el_free(he->data);
el_free((void *)(unsigned long)he->line);
el_free(he);
}
}
} }
/* /*
* "unlimit" size of history - set the limit to maximum allowed int value * "unlimit" size of history - set the limit to maximum allowed int value
*/ */
int int
unstifle_history(void) unstifle_history(void)
{ {
HistEvent ev; HistEvent ev;
int omax; int omax;
history(h, &ev, H_SETSIZE, INT_MAX); history(h, &ev, H_SETSIZE, INT_MAX);
omax = max_input_history; omax = max_input_history;
max_input_history = INT_MAX; max_input_history = INT_MAX;
return (omax); /* some value _must_ be returned */ return omax; /* some value _must_ be returned */
} }
int int
history_is_stifled(void) history_is_stifled(void)
{ {
/* cannot return true answer */ /* cannot return true answer */
return (max_input_history != INT_MAX); return max_input_history != INT_MAX;
}
static const char _history_tmp_template[] = "/tmp/.historyXXXXXX";
int
history_truncate_file (const char *filename, int nlines)
{
int ret = 0;
FILE *fp, *tp;
char template[sizeof(_history_tmp_template)];
char buf[4096];
int fd;
char *cp;
off_t off;
int count = 0;
ssize_t left = 0;
if (filename == NULL && (filename = _default_history_file()) == NULL)
return errno;
if ((fp = fopen(filename, "r+")) == NULL)
return errno;
strcpy(template, _history_tmp_template);
if ((fd = mkstemp(template)) == -1) {
ret = errno;
goto out1;
}
if ((tp = fdopen(fd, "r+")) == NULL) {
close(fd);
ret = errno;
goto out2;
}
for(;;) {
if (fread(buf, sizeof(buf), (size_t)1, fp) != 1) {
if (ferror(fp)) {
ret = errno;
break;
}
if (fseeko(fp, (off_t)sizeof(buf) * count, SEEK_SET) ==
(off_t)-1) {
ret = errno;
break;
}
left = (ssize_t)fread(buf, (size_t)1, sizeof(buf), fp);
if (ferror(fp)) {
ret = errno;
break;
}
if (left == 0) {
count--;
left = sizeof(buf);
} else if (fwrite(buf, (size_t)left, (size_t)1, tp)
!= 1) {
ret = errno;
break;
}
fflush(tp);
break;
}
if (fwrite(buf, sizeof(buf), (size_t)1, tp) != 1) {
ret = errno;
break;
}
count++;
}
if (ret)
goto out3;
cp = buf + left - 1;
if(*cp != '\n')
cp++;
for(;;) {
while (--cp >= buf) {
if (*cp == '\n') {
if (--nlines == 0) {
if (++cp >= buf + sizeof(buf)) {
count++;
cp = buf;
}
break;
}
}
}
if (nlines <= 0 || count == 0)
break;
count--;
if (fseeko(tp, (off_t)sizeof(buf) * count, SEEK_SET) < 0) {
ret = errno;
break;
}
if (fread(buf, sizeof(buf), (size_t)1, tp) != 1) {
if (ferror(tp)) {
ret = errno;
break;
}
ret = EAGAIN;
break;
}
cp = buf + sizeof(buf);
}
if (ret || nlines > 0)
goto out3;
if (fseeko(fp, (off_t)0, SEEK_SET) == (off_t)-1) {
ret = errno;
goto out3;
}
if (fseeko(tp, (off_t)sizeof(buf) * count + (cp - buf), SEEK_SET) ==
(off_t)-1) {
ret = errno;
goto out3;
}
for(;;) {
if ((left = (ssize_t)fread(buf, (size_t)1, sizeof(buf), tp)) == 0
) {
if (ferror(fp))
ret = errno;
break;
}
if (fwrite(buf, (size_t)left, (size_t)1, fp) != 1) {
ret = errno;
break;
}
}
fflush(fp);
if((off = ftello(fp)) > 0)
(void)ftruncate(fileno(fp), off);
out3:
fclose(tp);
out2:
unlink(template);
out1:
fclose(fp);
return ret;
} }
/* /*
* read history from a file given * read history from a file given
*/ */
int int
read_history(const char *filename) read_history(const char *filename)
{ {
HistEvent ev; HistEvent ev;
if (h == NULL || e == NULL) if (h == NULL || e == NULL)
rl_initialize(); rl_initialize();
return (history(h, &ev, H_LOAD, filename)); if (filename == NULL && (filename = _default_history_file()) == NULL)
return errno;
errno = 0;
if (history(h, &ev, H_LOAD, filename) == -1)
return errno ? errno : EINVAL;
if (history(h, &ev, H_GETSIZE) == 0)
history_length = ev.num;
if (history_length < 0)
return EINVAL;
return 0;
} }
/* /*
* write history to a file given * write history to a file given
*/ */
int int
write_history(const char *filename) write_history(const char *filename)
{ {
HistEvent ev; HistEvent ev;
if (h == NULL || e == NULL) if (h == NULL || e == NULL)
rl_initialize(); rl_initialize();
return (history(h, &ev, H_SAVE, filename)); if (filename == NULL && (filename = _default_history_file()) == NULL)
return errno;
return history(h, &ev, H_SAVE, filename) == -1 ?
(errno ? errno : EINVAL) : 0;
}
int
append_history(int n, const char *filename)
{
HistEvent ev;
FILE *fp;
if (h == NULL || e == NULL)
rl_initialize();
if (filename == NULL && (filename = _default_history_file()) == NULL)
return errno;
if ((fp = fopen(filename, "a")) == NULL)
return errno;
if (history(h, &ev, H_NSAVE_FP, (size_t)n, fp) == -1) {
int serrno = errno ? errno : EINVAL;
fclose(fp);
return serrno;
}
fclose(fp);
return 0;
} }
/* /*
* returns history ``num''th event * returns history ``num''th event
* *
* returned pointer points to static variable * returned pointer points to static variable
*/ */
HIST_ENTRY * HIST_ENTRY *
history_get(int num) history_get(int num)
{ {
static HIST_ENTRY she; static HIST_ENTRY she;
HistEvent ev; HistEvent ev;
int curr_num; int curr_num;
if (h == NULL || e == NULL) if (h == NULL || e == NULL)
rl_initialize(); rl_initialize();
if (num < history_base)
return NULL;
/* save current position */ /* save current position */
if (history(h, &ev, H_CURR) != 0) if (history(h, &ev, H_CURR) != 0)
return (NULL); return NULL;
curr_num = ev.num; curr_num = ev.num;
/* start from most recent */ /*
if (history(h, &ev, H_FIRST) != 0) * use H_DELDATA to set to nth history (without delete) by passing
return (NULL); /* error */ * (void **)-1 -- as in history_set_pos
*/
/* look backwards for event matching specified offset */ if (history(h, &ev, H_DELDATA, num - history_base, (void **)-1) != 0)
if (history(h, &ev, H_NEXT_EVENT, num)) goto out;
return (NULL);
/* get current entry */
if (history(h, &ev, H_CURR) != 0)
goto out;
if (history(h, &ev, H_NEXT_EVDATA, ev.num, &she.data) != 0)
goto out;
she.line = ev.str; she.line = ev.str;
she.data = NULL;
/* restore pointer to where it was */ /* restore pointer to where it was */
(void)history(h, &ev, H_SET, curr_num); (void)history(h, &ev, H_SET, curr_num);
return (&she); return &she;
out:
/* restore pointer to where it was */
(void)history(h, &ev, H_SET, curr_num);
return NULL;
} }
/* /*
* add the line to history table * add the line to history table
*/ */
int int
add_history(const char *line) add_history(const char *line)
{ {
HistEvent ev; HistEvent ev;
if (h == NULL || e == NULL) if (h == NULL || e == NULL)
rl_initialize(); rl_initialize();
(void)history(h, &ev, H_ENTER, line); if (history(h, &ev, H_ENTER, line) == -1)
return 0;
(void)history(h, &ev, H_GETSIZE);
if (ev.num == history_length)
history_base++;
else {
history_offset++;
history_length = ev.num;
}
return 0;
}
/*
* remove the specified entry from the history list and return it.
*/
HIST_ENTRY *
remove_history(int num)
{
HIST_ENTRY *he;
HistEvent ev;
if (h == NULL || e == NULL)
rl_initialize();
if ((he = el_malloc(sizeof(*he))) == NULL)
return NULL;
if (history(h, &ev, H_DELDATA, num, &he->data) != 0) {
el_free(he);
return NULL;
}
he->line = ev.str;
if (history(h, &ev, H_GETSIZE) == 0) if (history(h, &ev, H_GETSIZE) == 0)
history_length = ev.num; history_length = ev.num;
return (!(history_length > 0)); /* return 0 if all is okay */ return he;
}
/*
* replace the line and data of the num-th entry
*/
HIST_ENTRY *
replace_history_entry(int num, const char *line, histdata_t data)
{
HIST_ENTRY *he;
HistEvent ev;
int curr_num;
if (h == NULL || e == NULL)
rl_initialize();
/* save current position */
if (history(h, &ev, H_CURR) != 0)
return NULL;
curr_num = ev.num;
/* start from the oldest */
if (history(h, &ev, H_LAST) != 0)
return NULL; /* error */
if ((he = el_malloc(sizeof(*he))) == NULL)
return NULL;
/* look forwards for event matching specified offset */
if (history(h, &ev, H_NEXT_EVDATA, num, &he->data))
goto out;
he->line = strdup(ev.str);
if (he->line == NULL)
goto out;
if (history(h, &ev, H_REPLACE, line, data))
goto out;
/* restore pointer to where it was */
if (history(h, &ev, H_SET, curr_num))
goto out;
return he;
out:
el_free(he);
return NULL;
} }
/* /*
* clear the history list - delete all entries * clear the history list - delete all entries
*/ */
void void
clear_history(void) clear_history(void)
{ {
HistEvent ev; HistEvent ev;
history(h, &ev, H_CLEAR); if (h == NULL || e == NULL)
rl_initialize();
(void)history(h, &ev, H_CLEAR);
history_offset = history_length = 0;
} }
/* /*
* returns offset of the current history event * returns offset of the current history event
*/ */
int int
where_history(void) where_history(void)
{ {
return history_offset;
}
static HIST_ENTRY **_history_listp;
static HIST_ENTRY *_history_list;
HIST_ENTRY **
history_list(void)
{
HistEvent ev; HistEvent ev;
int curr_num, off; HIST_ENTRY **nlp, *nl;
int i;
if (history(h, &ev, H_CURR) != 0) if (history(h, &ev, H_LAST) != 0)
return (0); return NULL;
curr_num = ev.num;
if ((nlp = el_realloc(_history_listp,
((size_t)history_length + 1) * sizeof(*nlp))) == NULL)
return NULL;
_history_listp = nlp;
history(h, &ev, H_FIRST); if ((nl = el_realloc(_history_list,
off = 1; (size_t)history_length * sizeof(*nl))) == NULL)
while (ev.num != curr_num && history(h, &ev, H_NEXT) == 0) return NULL;
off++; _history_list = nl;
return (off); i = 0;
do {
_history_listp[i] = &_history_list[i];
_history_list[i].line = ev.str;
_history_list[i].data = NULL;
if (i++ == history_length)
abort();
} while (history(h, &ev, H_PREV) == 0);
_history_listp[i] = NULL;
return _history_listp;
} }
/* /*
* returns current history event or NULL if there is no such event * returns current history event or NULL if there is no such event
*/ */
HIST_ENTRY * HIST_ENTRY *
current_history(void) current_history(void)
{ {
HistEvent ev;
if (history(h, &ev, H_PREV_EVENT, history_offset + 1) != 0)
return NULL;
return (_move_history(H_CURR)); rl_he.line = ev.str;
rl_he.data = NULL;
return &rl_he;
} }
/* /*
* returns total number of bytes history events' data are using * returns total number of bytes history events' data are using
*/ */
int int
history_total_bytes(void) history_total_bytes(void)
{ {
HistEvent ev; HistEvent ev;
int curr_num, size; int curr_num;
size_t size;
if (history(h, &ev, H_CURR) != 0) if (history(h, &ev, H_CURR) != 0)
return (-1); return -1;
curr_num = ev.num; curr_num = ev.num;
history(h, &ev, H_FIRST); (void)history(h, &ev, H_FIRST);
size = 0; size = 0;
do do
size += strlen(ev.str); size += strlen(ev.str) * sizeof(*ev.str);
while (history(h, &ev, H_NEXT) == 0); while (history(h, &ev, H_NEXT) == 0);
/* get to the same position as before */ /* get to the same position as before */
history(h, &ev, H_PREV_EVENT, curr_num); history(h, &ev, H_PREV_EVENT, curr_num);
return (size); return (int)size;
} }
/* /*
* sets the position in the history list to ``pos'' * sets the position in the history list to ``pos''
*/ */
int int
history_set_pos(int pos) history_set_pos(int pos)
{ {
HistEvent ev; if (pos >= history_length || pos < 0)
int curr_num; return 0;
if (pos > history_length || pos < 0) history_offset = pos;
return (-1); return 1;
history(h, &ev, H_CURR);
curr_num = ev.num;
if (history(h, &ev, H_SET, pos)) {
history(h, &ev, H_SET, curr_num);
return(-1);
}
return (0);
} }
/* /*
* returns previous event in history and shifts pointer accordingly * returns previous event in history and shifts pointer accordingly
* Note that readline and editline define directions in opposite ways.
*/ */
HIST_ENTRY * HIST_ENTRY *
previous_history(void) previous_history(void)
{ {
HistEvent ev;
if (history_offset == 0)
return NULL;
if (history(h, &ev, H_LAST) != 0)
return NULL;
return (_move_history(H_PREV)); history_offset--;
return current_history();
} }
/* /*
* returns next event in history and shifts pointer accordingly * returns next event in history and shifts pointer accordingly
*/ */
HIST_ENTRY * HIST_ENTRY *
next_history(void) next_history(void)
{ {
HistEvent ev;
if (history_offset >= history_length)
return NULL;
return (_move_history(H_NEXT)); if (history(h, &ev, H_LAST) != 0)
return NULL;
history_offset++;
return current_history();
} }
/* /*
* searches for first history event containing the str * searches for first history event containing the str
*/ */
int int
history_search(const char *str, int direction) history_search(const char *str, int direction)
{ {
HistEvent ev; HistEvent ev;
const char *strp; const char *strp;
int curr_num; int curr_num;
if (history(h, &ev, H_CURR) != 0) if (history(h, &ev, H_CURR) != 0)
return (-1); return -1;
curr_num = ev.num; curr_num = ev.num;
for (;;) { for (;;) {
if ((strp = strstr(ev.str, str)) != NULL) if ((strp = strstr(ev.str, str)) != NULL)
return (int) (strp - ev.str); return (int)(strp - ev.str);
if (history(h, &ev, direction < 0 ? H_NEXT:H_PREV) != 0) if (history(h, &ev, direction < 0 ? H_NEXT:H_PREV) != 0)
break; break;
} }
history(h, &ev, H_SET, curr_num); (void)history(h, &ev, H_SET, curr_num);
return (-1); return -1;
} }
/* /*
* searches for first history event beginning with str * searches for first history event beginning with str
*/ */
int int
history_search_prefix(const char *str, int direction) history_search_prefix(const char *str, int direction)
{ {
HistEvent ev; HistEvent ev;
return (history(h, &ev, direction < 0? H_PREV_STR:H_NEXT_STR, str)); return (history(h, &ev, direction < 0 ?
H_PREV_STR : H_NEXT_STR, str));
} }
/* /*
* search for event in history containing str, starting at offset * search for event in history containing str, starting at offset
* abs(pos); continue backward, if pos<0, forward otherwise * abs(pos); continue backward, if pos<0, forward otherwise
*/ */
/* ARGSUSED */ /* ARGSUSED */
int int
history_search_pos(const char *str, history_search_pos(const char *str,
int direction __attribute__((__unused__)), int pos) int direction __attribute__((__unused__)), int pos)
{ {
HistEvent ev; HistEvent ev;
int curr_num, off; int curr_num, off;
off = (pos > 0) ? pos : -pos; off = (pos > 0) ? pos : -pos;
pos = (pos > 0) ? 1 : -1; pos = (pos > 0) ? 1 : -1;
if (history(h, &ev, H_CURR) != 0) if (history(h, &ev, H_CURR) != 0)
return (-1); return -1;
curr_num = ev.num; curr_num = ev.num;
if (history_set_pos(off) != 0 || history(h, &ev, H_CURR) != 0) if (!history_set_pos(off) || history(h, &ev, H_CURR) != 0)
return (-1); return -1;
for (;;) { for (;;) {
if (strstr(ev.str, str)) if (strstr(ev.str, str))
return (off); return off;
if (history(h, &ev, (pos < 0) ? H_PREV : H_NEXT) != 0) if (history(h, &ev, (pos < 0) ? H_PREV : H_NEXT) != 0)
break; break;
} }
/* set "current" pointer back to previous state */ /* set "current" pointer back to previous state */
history(h, &ev, (pos < 0) ? H_NEXT_EVENT : H_PREV_EVENT, curr_num); (void)history(h, &ev,
pos < 0 ? H_NEXT_EVENT : H_PREV_EVENT, curr_num);
return (-1); return -1;
} }
/********************************/ /********************************/
/* completion functions */ /* completion functions */
char *
tilde_expand(char *name)
{
return fn_tilde_expand(name);
}
char *
filename_completion_function(const char *name, int state)
{
return fn_filename_completion_function(name, state);
}
/* /*
* a completion generator for usernames; returns _first_ username * a completion generator for usernames; returns _first_ username
* which starts with supplied text * which starts with supplied text
* text contains a partial username preceded by random character * text contains a partial username preceded by random character
* (usually '~'); state is ignored * (usually '~'); state resets search from start (??? should we do that anyway)
* it's callers responsibility to free returned value * it's the caller's responsibility to free the returned value
*/ */
char * char *
username_completion_function(const char *text, int state) username_completion_function(const char *text, int state)
{ {
struct passwd *pwd, pwres; #if defined(HAVE_GETPW_R_POSIX) || defined(HAVE_GETPW_R_DRAFT)
struct passwd pwres;
char pwbuf[1024]; char pwbuf[1024];
#endif
struct passwd *pass = NULL;
if (text[0] == '\0') if (text[0] == '\0')
return (NULL); return NULL;
if (*text == '~') if (*text == '~')
text++; text++;
if (state == 0) if (state == 0)
setpwent(); setpwent();
while (getpwent_r(&pwres, pwbuf, sizeof(pwbuf), &pwd) == 0 while (
&& pwd != NULL && text[0] == pwd->pw_name[0] #if defined(HAVE_GETPW_R_POSIX) || defined(HAVE_GETPW_R_DRAFT)
&& strcmp(text, pwd->pw_name) == 0); getpwent_r(&pwres, pwbuf, sizeof(pwbuf), &pass) == 0 && pass != NULL
#else
(pass = getpwent()) != NULL
#endif
&& text[0] == pass->pw_name[0]
&& strcmp(text, pass->pw_name) == 0)
continue;
if (pwd == NULL) { if (pass == NULL) {
endpwent(); endpwent();
return (NULL); return NULL;
} }
return (strdup(pwd->pw_name)); return strdup(pass->pw_name);
} }
/* /*
* el-compatible wrapper to send TSTP on ^Z * el-compatible wrapper to send TSTP on ^Z
*/ */
/* ARGSUSED */ /* ARGSUSED */
static unsigned char static unsigned char
_el_rl_tstp(EditLine *el __attribute__((__unused__)), int ch __attribute__((__un used__))) _el_rl_tstp(EditLine *el __attribute__((__unused__)), int ch __attribute__((__un used__)))
{ {
(void)kill(0, SIGTSTP); (void)kill(0, SIGTSTP);
return CC_NORM; return CC_NORM;
} }
static const char *
/*ARGSUSED*/
_rl_completion_append_character_function(const char *dummy
__attribute__((__unused__)))
{
static char buf[2];
buf[0] = (char)rl_completion_append_character;
buf[1] = '\0';
return buf;
}
/* /*
* Display list of strings in columnar format on readline's output stream. * Display list of strings in columnar format on readline's output stream.
* 'matches' is list of strings, 'len' is number of strings in 'matches', * 'matches' is list of strings, 'len' is number of strings in 'matches',
* 'max' is maximum length of string in 'matches'. * 'max' is maximum length of string in 'matches'.
*/ */
void void
rl_display_match_list(char **matches, int len, int max) rl_display_match_list(char **matches, int len, int max)
{ {
fn_display_match_list(e, matches, len, max); fn_display_match_list(e, matches, (size_t)len, (size_t)max,
_rl_completion_append_character_function);
} }
/* /*
* complete word at current point * complete word at current point
*/ */
/* ARGSUSED */ /* ARGSUSED */
int int
rl_complete(int ignore __attribute__((__unused__)), int invoking_key) rl_complete(int ignore __attribute__((__unused__)), int invoking_key)
{ {
static ct_buffer_t wbreak_conv, sprefix_conv;
const char *breakchars;
if (h == NULL || e == NULL) if (h == NULL || e == NULL)
rl_initialize(); rl_initialize();
if (rl_inhibit_completion) { if (rl_inhibit_completion) {
char arr[2]; char arr[2];
arr[0] = (char)invoking_key; arr[0] = (char)invoking_key;
arr[1] = '\0'; arr[1] = '\0';
el_insertstr(e, arr); el_insertstr(e, arr);
return (CC_REFRESH); return CC_REFRESH;
} }
if (rl_completion_word_break_hook != NULL)
breakchars = (*rl_completion_word_break_hook)();
else
breakchars = rl_basic_word_break_characters;
_rl_update_pos();
/* Just look at how many global variables modify this operation! */ /* Just look at how many global variables modify this operation! */
return fn_complete(e, return fn_complete(e,
(CPFunction *)rl_completion_entry_function, (rl_compentry_func_t *)rl_completion_entry_function,
rl_attempted_completion_function, rl_attempted_completion_function,
rl_basic_word_break_characters, rl_special_prefixes, ct_decode_string(rl_basic_word_break_characters, &wbreak_conv),
rl_completion_append_character, rl_completion_query_items, ct_decode_string(breakchars, &sprefix_conv),
_rl_completion_append_character_function,
(size_t)rl_completion_query_items,
&rl_completion_type, &rl_attempted_completion_over, &rl_completion_type, &rl_attempted_completion_over,
&rl_point, &rl_end); &rl_point, &rl_end);
} }
/* ARGSUSED */ /* ARGSUSED */
static unsigned char static unsigned char
_el_rl_complete(EditLine *el __attribute__((__unused__)), int ch) _el_rl_complete(EditLine *el __attribute__((__unused__)), int ch)
{ {
return (unsigned char)rl_complete(0, ch); return (unsigned char)rl_complete(0, ch);
} }
/* /*
* misc other functions * misc other functions
*/ */
/* /*
* bind key c to readline-type function func * bind key c to readline-type function func
*/ */
int int
rl_bind_key(int c, int func(int, int)) rl_bind_key(int c, rl_command_func_t *func)
{ {
int retval = -1; int retval = -1;
if (h == NULL || e == NULL) if (h == NULL || e == NULL)
rl_initialize(); rl_initialize();
if (func == rl_insert) { if (func == rl_insert) {
/* XXX notice there is no range checking of ``c'' */ /* XXX notice there is no range checking of ``c'' */
e->el_map.key[c] = ED_INSERT; e->el_map.key[c] = ED_INSERT;
retval = 0; retval = 0;
} }
return (retval); return retval;
} }
/* /*
* read one key from input - handles chars pushed back * read one key from input - handles chars pushed back
* to input stream also * to input stream also
*/ */
int int
rl_read_key(void) rl_read_key(void)
{ {
char fooarr[2 * sizeof(int)]; char fooarr[2 * sizeof(int)];
if (e == NULL || h == NULL) if (e == NULL || h == NULL)
rl_initialize(); rl_initialize();
return (el_getc(e, fooarr)); return el_getc(e, fooarr);
} }
/* /*
* reset the terminal * reset the terminal
*/ */
/* ARGSUSED */ /* ARGSUSED */
void int
rl_reset_terminal(const char *p __attribute__((__unused__))) rl_reset_terminal(const char *p __attribute__((__unused__)))
{ {
if (h == NULL || e == NULL) if (h == NULL || e == NULL)
rl_initialize(); rl_initialize();
el_reset(e); el_reset(e);
return 0;
} }
/* /*
* insert character ``c'' back into input stream, ``count'' times * insert character ``c'' back into input stream, ``count'' times
*/ */
int int
rl_insert(int count, int c) rl_insert(int count, int c)
{ {
char arr[2]; char arr[2];
if (h == NULL || e == NULL) if (h == NULL || e == NULL)
rl_initialize(); rl_initialize();
/* XXX - int -> char conversion can lose on multichars */ /* XXX - int -> char conversion can lose on multichars */
arr[0] = c; arr[0] = (char)c;
arr[1] = '\0'; arr[1] = '\0';
for (; count > 0; count--) for (; count > 0; count--)
el_push(e, arr); el_push(e, arr);
return (0); return 0;
}
int
rl_insert_text(const char *text)
{
if (!text || *text == 0)
return 0;
if (h == NULL || e == NULL)
rl_initialize();
if (el_insertstr(e, text) < 0)
return 0;
return (int)strlen(text);
} }
/*ARGSUSED*/ /*ARGSUSED*/
int int
rl_newline(int count, int c) rl_newline(int count __attribute__((__unused__)),
int c __attribute__((__unused__)))
{ {
/* /*
* Readline-4.0 appears to ignore the args. * Readline-4.0 appears to ignore the args.
*/ */
return rl_insert(1, '\n'); return rl_insert(1, '\n');
} }
/*ARGSUSED*/ /*ARGSUSED*/
static unsigned char static unsigned char
rl_bind_wrapper(EditLine *el, unsigned char c) rl_bind_wrapper(EditLine *el __attribute__((__unused__)), unsigned char c)
{ {
if (map[c] == NULL) if (map[c] == NULL)
return CC_ERROR; return CC_ERROR;
_rl_update_pos(); _rl_update_pos();
(*map[c])(NULL, c); (*map[c])(1, c);
/* If rl_done was set by the above call, deal with it here */ /* If rl_done was set by the above call, deal with it here */
if (rl_done) if (rl_done)
return CC_EOF; return CC_EOF;
return CC_NORM; return CC_NORM;
} }
int int
rl_add_defun(const char *name, Function *fun, int c) rl_add_defun(const char *name, rl_command_func_t *fun, int c)
{ {
char dest[8]; char dest[8];
if (c >= sizeof(map) / sizeof(map[0]) || c < 0) if ((size_t)c >= sizeof(map) / sizeof(map[0]) || c < 0)
return -1; return -1;
map[(unsigned char)c] = fun; map[(unsigned char)c] = fun;
el_set(e, EL_ADDFN, name, name, rl_bind_wrapper); el_set(e, EL_ADDFN, name, name, rl_bind_wrapper);
vis(dest, c, VIS_WHITE|VIS_NOSLASH, 0); vis(dest, c, VIS_WHITE|VIS_NOSLASH, 0);
el_set(e, EL_BIND, dest, name); el_set(e, EL_BIND, dest, name, NULL);
return 0; return 0;
} }
void void
rl_callback_read_char() rl_callback_read_char(void)
{ {
int count = 0, done = 0; int count = 0, done = 0;
const char *buf = el_gets(e, &count); const char *buf = el_gets(e, &count);
char *wbuf; char *wbuf;
if (buf == NULL || count-- <= 0) if (buf == NULL || count-- <= 0)
return; return;
if (count == 0 && buf[0] == CTRL('d')) if (count == 0 && buf[0] == e->el_tty.t_c[TS_IO][C_EOF])
done = 1; done = 1;
if (buf[count] == '\n' || buf[count] == '\r') if (buf[count] == '\n' || buf[count] == '\r')
done = 2; done = 2;
if (done && rl_linefunc != NULL) { if (done && rl_linefunc != NULL) {
el_set(e, EL_UNBUFFERED, 0); el_set(e, EL_UNBUFFERED, 0);
if (done == 2) { if (done == 2) {
if ((wbuf = strdup(buf)) != NULL) if ((wbuf = strdup(buf)) != NULL)
wbuf[count] = '\0'; wbuf[count] = '\0';
} else } else
wbuf = NULL; wbuf = NULL;
(*(void (*)(const char *))rl_linefunc)(wbuf); (*(void (*)(const char *))rl_linefunc)(wbuf);
el_set(e, EL_UNBUFFERED, 1); el_set(e, EL_UNBUFFERED, 1);
} }
} }
void void
rl_callback_handler_install (const char *prompt, VCPFunction *linefunc) rl_callback_handler_install(const char *prompt, rl_vcpfunc_t *linefunc)
{ {
if (e == NULL) { if (e == NULL) {
rl_initialize(); rl_initialize();
} }
if (rl_prompt) (void)rl_set_prompt(prompt);
free(rl_prompt);
rl_prompt = prompt ? strdup(strchr(prompt, *prompt)) : NULL;
rl_linefunc = linefunc; rl_linefunc = linefunc;
el_set(e, EL_UNBUFFERED, 1); el_set(e, EL_UNBUFFERED, 1);
} }
void void
rl_callback_handler_remove(void) rl_callback_handler_remove(void)
{ {
el_set(e, EL_UNBUFFERED, 0); rl_linefunc = NULL;
el_end(e);
e = NULL;
} }
void void
rl_redisplay(void) rl_redisplay(void)
{ {
char a[2]; char a[2];
a[0] = CTRL('r'); a[0] = (char)e->el_tty.t_c[TS_IO][C_REPRINT];
a[1] = '\0'; a[1] = '\0';
el_push(e, a); el_push(e, a);
} }
int int
rl_get_previous_history(int count, int key) rl_get_previous_history(int count, int key)
{ {
char a[2]; char a[2];
a[0] = key; a[0] = (char)key;
a[1] = '\0'; a[1] = '\0';
while (count--) while (count--)
el_push(e, a); el_push(e, a);
return 0; return 0;
} }
void void
/*ARGSUSED*/ /*ARGSUSED*/
rl_prep_terminal(int meta_flag) rl_prep_terminal(int meta_flag __attribute__((__unused__)))
{ {
el_set(e, EL_PREP_TERM, 1); el_set(e, EL_PREP_TERM, 1);
} }
void void
rl_deprep_terminal() rl_deprep_terminal(void)
{ {
el_set(e, EL_PREP_TERM, 0); el_set(e, EL_PREP_TERM, 0);
} }
int int
rl_read_init_file(const char *s) rl_read_init_file(const char *s)
{ {
return(el_source(e, s)); return el_source(e, s);
} }
int int
rl_parse_and_bind(const char *line) rl_parse_and_bind(const char *line)
{ {
const char **argv; const char **argv;
int argc; int argc;
Tokenizer *tok; Tokenizer *tok;
tok = tok_init(NULL); tok = tok_init(NULL);
tok_str(tok, line, &argc, &argv); tok_str(tok, line, &argc, &argv);
argc = el_parse(e, argc, argv); argc = el_parse(e, argc, argv);
tok_end(tok); tok_end(tok);
return (argc ? 1 : 0); return argc ? 1 : 0;
} }
int int
rl_variable_bind(const char *var, const char *value) rl_variable_bind(const char *var, const char *value)
{ {
/* /*
* The proper return value is undocument, but this is what the * The proper return value is undocument, but this is what the
* readline source seems to do. * readline source seems to do.
*/ */
return ((el_set(e, EL_BIND, "", var, value) == -1) ? 1 : 0); return el_set(e, EL_BIND, "", var, value, NULL) == -1 ? 1 : 0;
} }
void int
rl_stuff_char(int c) rl_stuff_char(int c)
{ {
char buf[2]; char buf[2];
buf[0] = c; buf[0] = (char)c;
buf[1] = '\0'; buf[1] = '\0';
el_insertstr(e, buf); el_insertstr(e, buf);
return 1;
} }
static int static int
_rl_event_read_char(EditLine *el, char *cp) _rl_event_read_char(EditLine *el, wchar_t *wc)
{ {
int n, num_read = 0; char ch;
int n;
ssize_t num_read = 0;
*cp = 0; ch = '\0';
*wc = L'\0';
while (rl_event_hook) { while (rl_event_hook) {
(*rl_event_hook)(); (*rl_event_hook)();
#if defined(FIONREAD) #if defined(FIONREAD)
if (ioctl(el->el_infd, FIONREAD, &n) < 0) if (ioctl(el->el_infd, FIONREAD, &n) < 0)
return(-1); return -1;
if (n) if (n)
num_read = read(el->el_infd, cp, 1); num_read = read(el->el_infd, &ch, (size_t)1);
else else
num_read = 0; num_read = 0;
#elif defined(F_SETFL) && defined(O_NDELAY) #elif defined(F_SETFL) && defined(O_NDELAY)
if ((n = fcntl(el->el_infd, F_GETFL, 0)) < 0) if ((n = fcntl(el->el_infd, F_GETFL, 0)) < 0)
return(-1); return -1;
if (fcntl(el->el_infd, F_SETFL, n|O_NDELAY) < 0) if (fcntl(el->el_infd, F_SETFL, n|O_NDELAY) < 0)
return(-1); return -1;
num_read = read(el->el_infd, cp, 1); num_read = read(el->el_infd, &ch, 1);
if (fcntl(el->el_infd, F_SETFL, n)) if (fcntl(el->el_infd, F_SETFL, n))
return(-1); return -1;
#else #else
/* not non-blocking, but what you gonna do? */ /* not non-blocking, but what you gonna do? */
num_read = read(el->el_infd, cp, 1); num_read = read(el->el_infd, &ch, 1);
return(-1); return -1;
#endif #endif
if (num_read < 0 && errno == EAGAIN) if (num_read < 0 && errno == EAGAIN)
continue; continue;
if (num_read == 0) if (num_read == 0)
continue; continue;
break; break;
} }
if (!rl_event_hook) if (!rl_event_hook)
el_set(el, EL_GETCFN, EL_BUILTIN_GETCFN); el_set(el, EL_GETCFN, EL_BUILTIN_GETCFN);
return(num_read); *wc = (wchar_t)ch;
return (int)num_read;
} }
static void static void
_rl_update_pos(void) _rl_update_pos(void)
{ {
const LineInfo *li = el_line(e); const LineInfo *li = el_line(e);
rl_point = li->cursor - li->buffer; rl_point = (int)(li->cursor - li->buffer);
rl_end = li->lastchar - li->buffer; rl_end = (int)(li->lastchar - li->buffer);
rl_line_buffer[rl_end] = '\0';
}
void
rl_get_screen_size(int *rows, int *cols)
{
if (rows)
el_get(e, EL_GETTC, "li", rows);
if (cols)
el_get(e, EL_GETTC, "co", cols);
}
void
rl_set_screen_size(int rows, int cols)
{
char buf[64];
(void)snprintf(buf, sizeof(buf), "%d", rows);
el_set(e, EL_SETTC, "li", buf, NULL);
(void)snprintf(buf, sizeof(buf), "%d", cols);
el_set(e, EL_SETTC, "co", buf, NULL);
}
char **
rl_completion_matches(const char *str, rl_compentry_func_t *fun)
{
size_t len, max, i, j, min;
char **list, *match, *a, *b;
len = 1;
max = 10;
if ((list = el_calloc(max, sizeof(*list))) == NULL)
return NULL;
while ((match = (*fun)(str, (int)(len - 1))) != NULL) {
list[len++] = match;
if (len == max) {
char **nl;
max += 10;
if ((nl = el_realloc(list, max * sizeof(*nl))) == NULL)
goto out;
list = nl;
}
}
if (len == 1)
goto out;
list[len] = NULL;
if (len == 2) {
if ((list[0] = strdup(list[1])) == NULL)
goto out;
return list;
}
qsort(&list[1], len - 1, sizeof(*list),
(int (*)(const void *, const void *)) strcmp);
min = SIZE_MAX;
for (i = 1, a = list[i]; i < len - 1; i++, a = b) {
b = list[i + 1];
for (j = 0; a[j] && a[j] == b[j]; j++)
continue;
if (min > j)
min = j;
}
if (min == 0 && *str) {
if ((list[0] = strdup(str)) == NULL)
goto out;
} else {
if ((list[0] = el_calloc(min + 1, sizeof(*list[0]))) == NULL)
goto out;
(void)memcpy(list[0], list[1], min);
list[0][min] = '\0';
}
return list;
out:
el_free(list);
return NULL;
}
char *
rl_filename_completion_function (const char *text, int state)
{
return fn_filename_completion_function(text, state);
}
void
rl_forced_update_display(void)
{
el_set(e, EL_REFRESH);
}
int
_rl_abort_internal(void)
{
el_beep(e);
longjmp(topbuf, 1);
/*NOTREACHED*/
}
int
_rl_qsort_string_compare(char **s1, char **s2)
{
return strcoll(*s1, *s2);
}
HISTORY_STATE *
history_get_history_state(void)
{
HISTORY_STATE *hs;
if ((hs = el_malloc(sizeof(*hs))) == NULL)
return NULL;
hs->length = history_length;
return hs;
}
int
/*ARGSUSED*/
rl_kill_text(int from __attribute__((__unused__)),
int to __attribute__((__unused__)))
{
return 0;
}
Keymap
rl_make_bare_keymap(void)
{
return NULL;
}
Keymap
rl_get_keymap(void)
{
return NULL;
}
void
/*ARGSUSED*/
rl_set_keymap(Keymap k __attribute__((__unused__)))
{
}
int
/*ARGSUSED*/
rl_generic_bind(int type __attribute__((__unused__)),
const char * keyseq __attribute__((__unused__)),
const char * data __attribute__((__unused__)),
Keymap k __attribute__((__unused__)))
{
return 0;
}
int
/*ARGSUSED*/
rl_bind_key_in_map(int key __attribute__((__unused__)),
rl_command_func_t *fun __attribute__((__unused__)),
Keymap k __attribute__((__unused__)))
{
return 0;
}
/* unsupported, but needed by python */
void
rl_cleanup_after_signal(void)
{
}
int
rl_on_new_line(void)
{
return 0;
}
void
rl_free_line_state(void)
{
}
int
/*ARGSUSED*/
rl_set_keyboard_input_timeout(int u __attribute__((__unused__)))
{
return 0;
}
void
rl_resize_terminal(void)
{
el_resize(e);
}
void
rl_reset_after_signal(void)
{
if (rl_prep_term_function)
(*rl_prep_term_function)();
}
void
rl_echo_signal_char(int sig)
{
int c = tty_get_signal_character(e, sig);
if (c == -1)
return;
re_putc(e, c, 0);
} }
 End of changes. 241 change blocks. 
290 lines changed or deleted 1019 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)