Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Files
d4a0465d35cf47bc8f3b2bb917df03e27ec7a194
pkgsrc-ng/chat/icb/patches/patch-an
T
sambuc 4af1cdf7a9 Import of pkgsrc-2015Q1
2016-01-21 23:40:00 +01:00

788 lines
18 KiB
Plaintext
Raw Blame History

$NetBSD: patch-an,v 1.6 2014/09/23 22:37:29 jperkin Exp $
Don't include termcap.h on SunOS.
--- readline/readline.c.orig 1995-02-24 21:20:03.000000000 +0000
+++ readline/readline.c
@@ -38,17 +38,27 @@ static char *xmalloc (), *xrealloc ();
# endif
#endif
+#include <unistd.h>
+#ifndef __sun
+#include <termcap.h>
+#endif
#include <stdio.h>
#include <sys/types.h>
#include <fcntl.h>
#include <sys/file.h>
#include <signal.h>
+#include <stdlib.h>
+#include <readline/readline.h>
#if defined (HAVE_UNISTD_H)
# include <unistd.h>
#endif
+#if !defined(__linux__)
#define NEW_TTY_DRIVER
+#else
+#define TERMIOS_TTY_DRIVER
+#endif
#define HAVE_BSD_SIGNALS
/* #define USE_XON_XOFF */
@@ -80,6 +90,10 @@ static char *xmalloc (), *xrealloc ();
# if !defined (O_NDELAY)
# define O_NDELAY O_NONBLOCK /* Posix-style non-blocking i/o */
# endif /* O_NDELAY */
+#else
+# ifdef TERMIOS_TTY_DRIVER
+# include <termios.h>
+# endif /* !TERMIOS_MISSING */
#endif /* _POSIX_VERSION */
/* Other (BSD) machines use sgtty. */
@@ -104,7 +118,6 @@ static char *xmalloc (), *xrealloc ();
#endif /* !NEW_TTY_DRIVER && !_POSIX_VDISABLE */
#include <errno.h>
-extern int errno;
#include <setjmp.h>
#if defined (SHELL)
@@ -133,7 +146,7 @@ struct passwd *getpwuid (), *getpwent ()
# endif /* USGr3 */
#endif /* USG && hpux */
-#if defined (_POSIX_VERSION) || defined (USGr3)
+#if defined (_POSIX_VERSION) || defined (USGr3) || defined(__linux__)
# include <dirent.h>
# define direct dirent
# if defined (_POSIX_VERSION)
@@ -204,10 +217,13 @@ extern char *index ();
extern char *getenv ();
extern char *tilde_expand ();
-static update_line ();
+static void update_line (char *, char *, int);
static void output_character_function ();
-static delete_chars ();
+static void delete_chars (int);
static insert_some_chars ();
+static void move_vert (int to);
+static void rl_digit_loop (void);
+static void free_history_entry(HIST_ENTRY *entry);
#if defined (VOID_SIGHANDLER)
# define sighandler void
@@ -280,7 +296,7 @@ static jmp_buf readline_top_level;
static FILE *in_stream, *out_stream;
/* The names of the streams that we do input and output to. */
-FILE *rl_instream = stdin, *rl_outstream = stdout;
+FILE *rl_instream = NULL, *rl_outstream = NULL;
/* Non-zero means echo characters as they are read. */
int readline_echoing_p = 1;
@@ -335,6 +351,8 @@ static int stricmp (), strnicmp ();
/* Non-zero means to save keys that we dispatch on in a kbd macro. */
static int defining_kbd_macro = 0;
+static void init_terminal_io (char *terminal_name);
+
/* **************************************************************** */
/* */
@@ -744,7 +762,7 @@ rl_unget_char (key)
/* If a character is available to be read, then read it
and stuff it into IBUFFER. Otherwise, just return. */
-rl_gather_tyi ()
+static void rl_gather_tyi (void)
{
int tty = fileno (in_stream);
register int tem, result = -1;
@@ -861,7 +879,7 @@ rl_dispatch (key, map)
}
else
ding ();
- return;
+ return 0;
}
switch (map[key].type)
@@ -876,7 +894,7 @@ rl_dispatch (key, map)
if (func == rl_do_lowercase_version)
{
rl_dispatch (to_lower (key), map);
- return;
+ return 0;
}
(*map[key].function)(rl_numeric_arg * rl_arg_sign, key);
@@ -890,7 +908,7 @@ rl_dispatch (key, map)
else
{
rl_abort ();
- return;
+ return 0;
}
}
break;
@@ -907,7 +925,7 @@ rl_dispatch (key, map)
else
{
rl_abort ();
- return;
+ return 0;
}
break;
@@ -918,10 +936,11 @@ rl_dispatch (key, map)
macro = savestring ((char *)map[key].function);
with_macro_input (macro);
- return;
+ return 0;
}
break;
}
+ return 0;
}
@@ -1152,6 +1171,8 @@ readline_initialize_everything ()
{
/* Find out if we are running in Emacs. */
running_in_emacs = getenv ("EMACS");
+ rl_instream = stdin;
+ rl_outstream = stdout;
/* Allocate data structures. */
if (!rl_line_buffer)
@@ -1320,7 +1341,7 @@ rl_universal_argument ()
rl_digit_loop ();
}
-rl_digit_loop ()
+static void rl_digit_loop (void)
{
int key, c;
while (1)
@@ -1450,7 +1471,7 @@ static void output_character_function ()
static int compare_strings ();
/* Basic redisplay algorithm. */
-rl_redisplay ()
+void rl_redisplay (void)
{
register int in, out, c, linenum;
register char *line = invisible_line;
@@ -1677,10 +1698,8 @@ new: eddie> Oh, my little buggy says to
no differences, as well as for end of line additions must be handeled.
Could be made even smarter, but this works well enough */
-static
-update_line (old, new, current_line)
- register char *old, *new;
- int current_line;
+static void
+update_line (char *old, char *new, int current_line)
{
register char *ofd, *ols, *oe, *nfd, *nls, *ne;
int lendiff, wsatend;
@@ -1872,8 +1891,7 @@ move_cursor_relative (new, data)
}
/* PWP: move the cursor up or down. */
-move_vert (to)
- int to;
+static void move_vert (int to)
{
void output_character_function ();
register int delta, i;
@@ -2018,8 +2036,7 @@ rl_reset_terminal (terminal_name)
init_terminal_io (terminal_name);
}
-init_terminal_io (terminal_name)
- char *terminal_name;
+static void init_terminal_io (char *terminal_name)
{
extern char *tgetstr ();
char *term, *buffer;
@@ -2158,9 +2175,8 @@ output_some_chars (string, count)
}
/* Delete COUNT characters from the display line. */
-static
-delete_chars (count)
- int count;
+static void
+delete_chars (int count)
{
if (count > screenwidth)
return;
@@ -2505,7 +2521,11 @@ rl_prep_terminal ()
tio.c_lflag &= ~(ICANON | ECHO);
- if (otio.c_cc[VEOF] != _POSIX_VDISABLE)
+#ifdef ONLCR
+ tio.c_oflag |= OPOST|ONLCR;
+#endif
+
+ if ((unsigned char)otio.c_cc[VEOF] != (unsigned char)_POSIX_VDISABLE)
eof_char = otio.c_cc[VEOF];
#if defined (USE_XON_XOFF)
@@ -2637,7 +2657,7 @@ alphabetic (c)
return (1);
if (allow_pathname_alphabetic_chars)
- return ((int)rindex (pathname_alphabetic_chars, c));
+ return (rindex (pathname_alphabetic_chars, c) != NULL);
else
return (0);
}
@@ -2845,12 +2865,13 @@ rl_forward (count)
#endif /* VI_MODE */
{
ding ();
- return;
+ return 0;
}
else
rl_point++;
--count;
}
+ return 0;
}
/* Move backward COUNT characters. */
@@ -2865,12 +2886,13 @@ rl_backward (count)
if (!rl_point)
{
ding ();
- return;
+ return 0;
}
else
--rl_point;
--count;
}
+ return 0;
}
/* Move to the beginning of the line. */
@@ -2894,13 +2916,13 @@ rl_forward_word (count)
if (count < 0)
{
rl_backward_word (-count);
- return;
+ return 0;
}
while (count)
{
if (rl_point == rl_end)
- return;
+ return 0;
/* If we are not in a word, move forward until we are in one.
Then, move forward until we hit a non-alphabetic character. */
@@ -2913,7 +2935,7 @@ rl_forward_word (count)
if (alphabetic (c)) break;
}
}
- if (rl_point == rl_end) return;
+ if (rl_point == rl_end) return 0;
while (++rl_point < rl_end)
{
c = the_line[rl_point];
@@ -2921,6 +2943,7 @@ rl_forward_word (count)
}
--count;
}
+ return 0;
}
/* Move backward a word. We do what Emacs does. */
@@ -2932,13 +2955,13 @@ rl_backward_word (count)
if (count < 0)
{
rl_forward_word (-count);
- return;
+ return 0;
}
while (count)
{
if (!rl_point)
- return;
+ return 0;
/* Like rl_forward_word (), except that we look at the characters
just before point. */
@@ -2962,6 +2985,7 @@ rl_backward_word (count)
}
--count;
}
+ return 0;
}
/* Clear the current line. Numeric argument to C-l does this. */
@@ -2990,7 +3014,7 @@ rl_clear_screen ()
if (rl_explicit_arg)
{
rl_refresh_line ();
- return;
+ return 0;
}
if (term_clrpag)
@@ -3000,6 +3024,7 @@ rl_clear_screen ()
rl_forced_update_display ();
rl_display_fixed = 1;
+ return 0;
}
rl_arrow_keys (count, c)
@@ -3047,7 +3072,7 @@ rl_insert (count, c)
char *string;
if (count <= 0)
- return;
+ return 0;
/* If we can optimize, then do it. But don't let people crash
readline because of extra large arguments. */
@@ -3060,7 +3085,7 @@ rl_insert (count, c)
string[i] = '\0';
rl_insert_text (string);
- return;
+ return 0;
}
if (count > 1024)
@@ -3079,7 +3104,7 @@ rl_insert (count, c)
rl_insert_text (string);
count -= decreaser;
}
- return;
+ return 0;
}
/* We are inserting a single character.
@@ -3104,7 +3129,6 @@ rl_insert (count, c)
string[i] = '\0';
rl_insert_text (string);
- return;
}
else
{
@@ -3115,6 +3139,7 @@ rl_insert (count, c)
string[0] = c;
rl_insert_text (string);
}
+ return 0;
}
/* Insert the next typed character verbatim. */
@@ -3127,9 +3152,10 @@ rl_quoted_insert (count)
if (c==0x01)
{
printf("\007");
- return;
+ return 0;
}
rl_insert (count, c);
+ return 0;
}
/* Insert a tab character. */
@@ -3196,14 +3222,14 @@ rl_rubout (count)
if (count < 0)
{
rl_delete (-count);
- return;
+ return 0;
}
if (!rl_point)
{
ding ();
last_command_was_kill++;
- return;
+ return 0;
}
if (count > 1)
@@ -3228,6 +3254,7 @@ rl_rubout (count)
rl_display_fixed++;
}
}
+ return 0;
}
/* Delete the character under the cursor. Given a numeric argument,
@@ -3238,13 +3265,13 @@ rl_delete (count, invoking_key)
if (count < 0)
{
rl_rubout (-count);
- return;
+ return 0;
}
if (rl_point == rl_end)
{
ding ();
- return;
+ return 0;
}
if (count > 1)
@@ -3256,6 +3283,7 @@ rl_delete (count, invoking_key)
}
else
rl_delete_text (rl_point, rl_point + 1);
+ return 0;
}
@@ -3412,7 +3440,7 @@ rl_transpose_words (count)
int w1_beg, w1_end, w2_beg, w2_end;
int orig_point = rl_point;
- if (!count) return;
+ if (!count) return 0;
/* Find the two words. */
rl_forward_word (count);
@@ -3429,7 +3457,7 @@ rl_transpose_words (count)
{
ding ();
rl_point = orig_point;
- return;
+ return 0;
}
/* Get the text of the words. */
@@ -3457,6 +3485,7 @@ rl_transpose_words (count)
/* I think that does it. */
rl_end_undo_group ();
free (word1); free (word2);
+ return 0;
}
/* Transpose the characters at point. If point is at the end of the line,
@@ -3465,11 +3494,11 @@ rl_transpose_chars (count)
int count;
{
if (!count)
- return;
+ return 0;
if (!rl_point || rl_end < 2) {
ding ();
- return;
+ return 0;
}
while (count)
@@ -3499,6 +3528,7 @@ rl_transpose_chars (count)
else
count--;
}
+ return 0;
}
@@ -3570,7 +3600,7 @@ Function *rl_completion_entry_function =
If this function exists and returns NULL then call the value of
rl_completion_entry_function to try to match, otherwise use the
array of strings returned. */
-Function *rl_attempted_completion_function = (Function *)NULL;
+CPPFunction *rl_attempted_completion_function = (CPPFunction *)NULL;
/* Local variable states what happened during the last completion attempt. */
static int completion_changed_buffer = 0;
@@ -3706,8 +3736,7 @@ rl_complete_internal (what_to_do)
variable rl_attempted_completion_function. */
if (rl_attempted_completion_function)
{
- matches =
- (char **)(*rl_attempted_completion_function) (text, start, end);
+ matches = (*rl_attempted_completion_function) (text, start, end);
if (matches)
{
@@ -3760,8 +3789,7 @@ rl_complete_internal (what_to_do)
/* We have marked all the dead slots with (char *)-1.
Copy all the non-dead entries into a new array. */
{
- char **temp_array =
- (char **)malloc ((3 + newlen) * sizeof (char *));
+ char **temp_array = malloc ((3 + newlen) * sizeof (char *));
for (i = 1, j = 1; matches[i]; i++)
{
@@ -4236,7 +4264,7 @@ rl_revert_line ()
/* Do some undoing of things that were done. */
rl_undo_command (count)
{
- if (count < 0) return; /* Nothing to do. */
+ if (count < 0) return 0; /* Nothing to do. */
while (count)
{
@@ -4250,6 +4278,7 @@ rl_undo_command (count)
break;
}
}
+ return 0;
}
/* **************************************************************** */
@@ -4277,8 +4306,7 @@ start_using_history ()
}
/* Free the contents (and containing structure) of a HIST_ENTRY. */
-free_history_entry (entry)
- HIST_ENTRY *entry;
+static void free_history_entry(HIST_ENTRY *entry)
{
if (!entry) return;
if (entry->line)
@@ -4362,11 +4390,11 @@ rl_get_next_history (count)
if (count < 0)
{
rl_get_previous_history (-count);
- return;
+ return 0;
}
if (!count)
- return;
+ return 0;
maybe_replace_line ();
@@ -4397,6 +4425,7 @@ rl_get_next_history (count)
rl_point = 0;
#endif /* VI_MODE */
}
+ return 0;
}
/* Get the previous item out of our interactive history, making it the current
@@ -4410,11 +4439,11 @@ rl_get_previous_history (count)
if (count < 0)
{
rl_get_next_history (-count);
- return;
+ return 0;
}
if (!count)
- return;
+ return 0;
/* If we don't have a line saved, then save this one. */
maybe_save_line ();
@@ -4457,6 +4486,7 @@ rl_get_previous_history (count)
rl_point = 0;
#endif /* VI_MODE */
}
+ return 0;
}
@@ -4643,7 +4673,7 @@ rl_search_history (direction, invoking_k
rl_point = orig_point;
rl_end = strlen (the_line);
rl_clear_message ();
- return;
+ return 0;
default:
if (c < 32 || c > 126)
@@ -4779,6 +4809,7 @@ rl_search_history (direction, invoking_k
rl_point = index;
rl_clear_message ();
}
+ return 0;
}
/* Make C be the next command to be executed. */
@@ -4831,7 +4862,7 @@ rl_kill_text (from, to)
{
free (text);
last_command_was_kill++;
- return;
+ return 0;
}
/* Delete the copied text from the line. */
@@ -4902,6 +4933,7 @@ rl_kill_text (from, to)
}
rl_kill_index = slot;
last_command_was_kill++;
+ return 0;
}
/* Now REMEMBER! In order to do prepending or appending correctly, kill
@@ -5039,14 +5071,14 @@ rl_yank_nth_arg (count, ignore)
else
{
ding ();
- return;
+ return 0;
}
arg = history_arg_extract (count, count, entry->line);
if (!arg || !*arg)
{
ding ();
- return;
+ return 0;
}
rl_begin_undo_group ();
@@ -5065,6 +5097,7 @@ rl_yank_nth_arg (count, ignore)
free (arg);
rl_end_undo_group ();
+ return 0;
}
/* How to toggle back and forth between editing modes. */
@@ -5417,9 +5450,10 @@ rl_macro_bind (keyseq, macro, map)
if (rl_translate_keyseq (macro, macro_keys, &macro_keys_len))
{
free (macro_keys);
- return;
+ return 0;
}
rl_generic_bind (ISMACR, keyseq, macro_keys, map);
+ return 0;
}
/* Bind the key sequence represented by the string KEYSEQ to
@@ -5441,7 +5475,7 @@ rl_generic_bind (type, keyseq, data, map
{
if (type == ISMACR)
free (data);
- return;
+ return 0;
}
keys = (char *)alloca (1 + (2 * strlen (keyseq)));
@@ -5450,7 +5484,7 @@ rl_generic_bind (type, keyseq, data, map
of characters. Stuff the characters into ARRAY, and the
length of ARRAY into LENGTH. */
if (rl_translate_keyseq (keyseq, keys, &keys_len))
- return;
+ return 0;
/* Bind keys, making new keymaps as necessary. */
for (i = 0; i < keys_len; i++)
@@ -5476,6 +5510,7 @@ rl_generic_bind (type, keyseq, data, map
map[keys[i]].type = type;
}
}
+ return 0;
}
/* Translate the ASCII representation of SEQ, stuffing the
@@ -5661,7 +5696,7 @@ parser_if (args)
/* If parsing is turned off, then nothing can turn it back on except
for finding the matching endif. In that case, return right now. */
if (parsing_conditionalized_out)
- return;
+ return 0;
/* Isolate first argument. */
for (i = 0; args[i] && !whitespace (args[i]); i++);
@@ -5713,6 +5748,7 @@ parser_if (args)
parsing_conditionalized_out = 0;
else
parsing_conditionalized_out = 1;
+ return 0;
}
/* Invert the current parser state if there is anything on the stack. */
@@ -5724,17 +5760,18 @@ parser_else (args)
if (!if_stack_depth)
{
/* Error message? */
- return;
+ return 0;
}
/* Check the previous (n - 1) levels of the stack to make sure that
we haven't previously turned off parsing. */
for (i = 0; i < if_stack_depth - 1; i++)
if (if_stack[i] == 1)
- return;
+ return 0;
/* Invert the state of parsing if at top level. */
parsing_conditionalized_out = !parsing_conditionalized_out;
+ return 0;
}
/* Terminate a conditional, popping the value of
@@ -5819,18 +5856,18 @@ rl_parse_and_bind (string)
string++;
if (!string || !*string || *string == '#')
- return;
+ return 0;
/* If this is a parser directive, act on it. */
if (*string == '$')
{
handle_parser_directive (&string[1]);
- return;
+ return 0;
}
/* If we are supposed to be skipping parsing right now, then do it. */
if (parsing_conditionalized_out)
- return;
+ return 0;
i = 0;
/* If this keyname is a complex key expression surrounded by quotes,
@@ -5868,7 +5905,7 @@ rl_parse_and_bind (string)
while (*value && whitespace (*value)) value++;
rl_variable_bind (var, value);
- return;
+ return 0;
}
/* Skip any whitespace between keyname and funname. */
@@ -5928,7 +5965,7 @@ rl_parse_and_bind (string)
else
rl_set_key (seq, rl_named_function (funname), keymap);
- return;
+ return 0;
}
/* Get the actual character we want to deal with. */
@@ -5972,6 +6009,7 @@ rl_parse_and_bind (string)
#endif /* PREFIX_META_HACK */
else
rl_bind_key (key, rl_named_function (funname));
+ return 0;
}
rl_variable_bind (name, value)
Reference in New Issue View Git Blame Copy Permalink