mirror of
https://https.git.savannah.gnu.org/git/bash.git
synced 2026-07-04 02:40:49 +02:00
change `read -d' on a tty when the delimiter is not a newline to set the terminal EOL character instead of putting the terminal into character-at-a-time mode; change some calls to atoi to use strol instead
This commit is contained in:
Chet Ramey
@@ -1,39 +0,0 @@
|
||||
#if defined (READLINE_AUTOCOMPLETE)
|
||||
/* Return the list of completions for the text between START and END.
|
||||
FOUND_QUOTE is non-zero if we're completing a quoted word; if so,
|
||||
QUOTE_CHAR is the delimiter. If NONTRIVIAL_P is nonzero, it gets
|
||||
set to a flag saying whether or not the completion added anything
|
||||
to the word. Not part of rl_complete_internal because it's too
|
||||
hard to separate functions without postprocess_matches possibly being
|
||||
called twice; here to support the autocompletion code. */
|
||||
char **
|
||||
_rl_generate_completions (start, end, found_quote, quote_char, nontrivial_p)
|
||||
int start, end, found_quote, quote_char, *nontrivial_p;
|
||||
{
|
||||
rl_compentry_func_t *our_func;
|
||||
char *text;
|
||||
char **matches;
|
||||
|
||||
our_func = rl_completion_entry_function
|
||||
? rl_completion_entry_function
|
||||
: rl_filename_completion_function;
|
||||
text = rl_copy_text (start, end);
|
||||
matches = gen_completion_matches (text, start, end, our_func, found_quote, quote_char);
|
||||
|
||||
/* *nontrivial_p is set if the common prefix adds something to the word
|
||||
being completed. */
|
||||
if (nontrivial_p)
|
||||
*nontrivial_p = matches && strcmp (text, matches[0]) != 0;
|
||||
|
||||
free (text);
|
||||
|
||||
/* Postprocess the matches */
|
||||
if (matches == 0)
|
||||
return (char **)0;
|
||||
|
||||
if (postprocess_matches (&matches, rl_filename_completion_desired) == 0)
|
||||
return (char **)0;
|
||||
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,6 +0,0 @@
|
||||
./rl-timeout readline1 0.5
|
||||
./rl-timeout readline2 0.25
|
||||
|
||||
./rl-timeout callback1 0.5
|
||||
./rl-timeout callback2 0.5
|
||||
|
||||
@@ -1,245 +0,0 @@
|
||||
/* rl-timeout: test various readline builtin timeouts. */
|
||||
|
||||
/* Copyright (C) 2021 Free Software Foundation, Inc.
|
||||
|
||||
This file is part of the GNU Readline Library (Readline), a library for
|
||||
reading lines of text with interactive input and history editing.
|
||||
|
||||
Readline is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
Readline is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with readline. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
/* Standard include files. stdio.h is required. */
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
#include <string.h>
|
||||
#include <limits.h>
|
||||
|
||||
/* Used for select(2) */
|
||||
#include <sys/types.h>
|
||||
#include <sys/select.h>
|
||||
|
||||
#include <errno.h>
|
||||
#include <stdio.h>
|
||||
|
||||
/* Standard readline include files. */
|
||||
#if defined (READLINE_LIBRARY)
|
||||
# include "readline.h"
|
||||
# include "history.h"
|
||||
#else
|
||||
# include <readline/readline.h>
|
||||
# include <readline/history.h>
|
||||
#endif
|
||||
|
||||
extern int errno;
|
||||
|
||||
static void cb_linehandler (char *);
|
||||
|
||||
int timeout_secs = 1, timeout_usecs = 0;
|
||||
int running;
|
||||
const char *prompt = "rl-timeout$ ";
|
||||
|
||||
/* **************************************************************** */
|
||||
/* */
|
||||
/* Example 1: readline () with rl_readline_state */
|
||||
/* */
|
||||
/* **************************************************************** */
|
||||
|
||||
void
|
||||
rltest_timeout_readline1 ()
|
||||
{
|
||||
const char *temp;
|
||||
|
||||
rl_set_timeout (timeout_secs, timeout_usecs);
|
||||
temp = readline (prompt);
|
||||
if (RL_ISSTATE (RL_STATE_TIMEOUT))
|
||||
printf ("timeout\n");
|
||||
else if (temp == NULL)
|
||||
printf ("no input line\n");
|
||||
else
|
||||
printf ("input line: %s\n", temp);
|
||||
free ((void *) temp);
|
||||
}
|
||||
|
||||
/* **************************************************************** */
|
||||
/* */
|
||||
/* Example 2: readline () with rl_timeout_event_hook */
|
||||
/* */
|
||||
/* **************************************************************** */
|
||||
|
||||
static int
|
||||
timeout_handler ()
|
||||
{
|
||||
printf ("timeout\n");
|
||||
return READERR;
|
||||
}
|
||||
|
||||
void
|
||||
rltest_timeout_readline2 ()
|
||||
{
|
||||
const char *temp;
|
||||
|
||||
rl_set_timeout (timeout_secs, timeout_usecs);
|
||||
rl_timeout_event_hook = timeout_handler;
|
||||
temp = readline (prompt);
|
||||
if (temp == NULL)
|
||||
printf ("no input line\n");
|
||||
else
|
||||
printf ("input line: %s\n", temp);
|
||||
free ((void *)temp);
|
||||
}
|
||||
|
||||
/* **************************************************************** */
|
||||
/* */
|
||||
/* Example 3: rl_callback_* () with rl_timeout_remaining */
|
||||
/* */
|
||||
/* **************************************************************** */
|
||||
|
||||
/* Callback function called for each line when accept-line executed, EOF
|
||||
seen, or EOF character read. This sets a flag and returns; it could
|
||||
also call exit(3). */
|
||||
static void
|
||||
cb_linehandler (char *line)
|
||||
{
|
||||
/* Can use ^D (stty eof) or `exit' to exit. */
|
||||
if (line == NULL || strcmp (line, "exit") == 0)
|
||||
{
|
||||
if (line == 0)
|
||||
printf ("\n");
|
||||
printf ("exit\n");
|
||||
/* This function needs to be called to reset the terminal settings,
|
||||
and calling it from the line handler keeps one extra prompt from
|
||||
being displayed. */
|
||||
rl_callback_handler_remove ();
|
||||
|
||||
running = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (*line)
|
||||
add_history (line);
|
||||
printf ("input line: %s\n", line);
|
||||
free (line);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
rltest_timeout_callback1 ()
|
||||
{
|
||||
fd_set fds;
|
||||
int r;
|
||||
unsigned sec, usec;
|
||||
|
||||
rl_set_timeout (timeout_secs, timeout_usecs);
|
||||
rl_callback_handler_install (prompt, cb_linehandler);
|
||||
running = 1;
|
||||
while (running)
|
||||
{
|
||||
FD_ZERO (&fds);
|
||||
FD_SET (fileno (rl_instream), &fds);
|
||||
r = rl_timeout_remaining (&sec, &usec);
|
||||
if (r == 1)
|
||||
{
|
||||
struct timeval timeout = {sec, usec};
|
||||
r = select (FD_SETSIZE, &fds, NULL, NULL, &timeout);
|
||||
}
|
||||
if (r < 0 && errno != EINTR)
|
||||
{
|
||||
perror ("rl-timeout: select");
|
||||
rl_callback_handler_remove ();
|
||||
break;
|
||||
}
|
||||
else if (r == 0)
|
||||
{
|
||||
printf ("rl-timeout: timeout\n");
|
||||
rl_callback_handler_remove ();
|
||||
break;
|
||||
}
|
||||
|
||||
if (FD_ISSET (fileno (rl_instream), &fds))
|
||||
rl_callback_read_char ();
|
||||
}
|
||||
|
||||
printf ("rl-timeout: Event loop has exited\n");
|
||||
}
|
||||
|
||||
/* **************************************************************** */
|
||||
/* */
|
||||
/* Example 4: rl_callback_* () with rl_timeout_event_hook */
|
||||
/* */
|
||||
/* **************************************************************** */
|
||||
|
||||
static int
|
||||
cb_timeouthandler ()
|
||||
{
|
||||
printf ("timeout\n");
|
||||
rl_callback_handler_remove ();
|
||||
running = 0;
|
||||
return READERR;
|
||||
}
|
||||
|
||||
void
|
||||
rltest_timeout_callback2 ()
|
||||
{
|
||||
int r;
|
||||
|
||||
rl_set_timeout (timeout_secs, timeout_usecs);
|
||||
rl_timeout_event_hook = cb_timeouthandler;
|
||||
rl_callback_handler_install (prompt, cb_linehandler);
|
||||
running = 1;
|
||||
while (running)
|
||||
rl_callback_read_char ();
|
||||
|
||||
printf ("rl-timeout: Event loop has exited\n");
|
||||
}
|
||||
|
||||
int
|
||||
main (int argc, char **argv)
|
||||
{
|
||||
if (argc >= 2)
|
||||
{
|
||||
if (argc >= 3)
|
||||
{
|
||||
double timeout = atof (argv[2]);
|
||||
if (timeout <= 0.0)
|
||||
{
|
||||
fprintf (stderr, "rl-timeout: specify a positive number for timeout.\n");
|
||||
return 2;
|
||||
}
|
||||
else if (timeout > UINT_MAX)
|
||||
{
|
||||
fprintf (stderr, "rl-timeout: timeout too large.\n");
|
||||
return 2;
|
||||
}
|
||||
timeout_secs = (unsigned) timeout;
|
||||
timeout_usecs = (unsigned) ((timeout - timeout_secs) * 1000000 + 0.5);
|
||||
}
|
||||
|
||||
if (strcmp (argv[1], "readline1") == 0)
|
||||
rltest_timeout_readline1 ();
|
||||
else if (strcmp (argv[1], "readline2") == 0)
|
||||
rltest_timeout_readline2 ();
|
||||
else if (strcmp (argv[1], "callback1") == 0)
|
||||
rltest_timeout_callback1 ();
|
||||
else if (strcmp (argv[1], "callback2") == 0)
|
||||
rltest_timeout_callback2 ();
|
||||
else
|
||||
return 2;
|
||||
}
|
||||
else
|
||||
{
|
||||
fprintf (stderr, "usage: rl-timeout [readline1 | readline2 | callback1 | callback2] [timeout]\n");
|
||||
return 2;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@@ -1 +0,0 @@
|
||||
N 3149) 5/1 To: peggy.gup@c Re: FW: Phone for Mike Dailey (2413 chars)N 3150) 5/1 Jason Cutcher RE: Phone for Mike Dailey (34705 chars)N 3151) 5/1 Wizards *****SPAM***** Relief (7291 chars)N 3152) 5/1 FCG Help Desk Case HD0000002533519, Medium, h (2537 chars)N 3153) 5/1 To: jrw11@case. HD0000002533519 (2247 chars)N 3154) 5/1 Peggy Watts Gup RE: [tis-staff] Boxes back to m (12903 chars)N 3155) 5/1 Debbie Andrews [firewall-changes] Firewa
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
* shtty.c -- abstract interface to the terminal, focusing on capabilities.
|
||||
*/
|
||||
|
||||
/* Copyright (C) 1999, 2022 Free Software Foundation, Inc.
|
||||
/* Copyright (C) 1999, 2022-2026 Free Software Foundation, Inc.
|
||||
|
||||
This file is part of GNU Bash, the Bourne Again SHell.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user