Commit 8da2b01c authored by Michael W. Hudson's avatar Michael W. Hudson

This is Michiel de Hoon's patch, as attached to the bug report:

[ 1030629 ] PyOS_InputHook broken

with a couple of utterly inconsequential changes by me.
parent 3afe4f37
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include <setjmp.h> #include <setjmp.h>
#include <signal.h> #include <signal.h>
#include <errno.h> #include <errno.h>
#include <sys/time.h>
#if defined(HAVE_SETLOCALE) #if defined(HAVE_SETLOCALE)
/* GNU readline() mistakenly sets the LC_CTYPE locale. /* GNU readline() mistakenly sets the LC_CTYPE locale.
...@@ -749,15 +750,21 @@ readline_until_enter_or_signal(char *prompt, int *signal) ...@@ -749,15 +750,21 @@ readline_until_enter_or_signal(char *prompt, int *signal)
rl_callback_handler_install (prompt, rlhandler); rl_callback_handler_install (prompt, rlhandler);
FD_ZERO(&selectset); FD_ZERO(&selectset);
FD_SET(fileno(rl_instream), &selectset);
completed_input_string = not_done_reading; completed_input_string = not_done_reading;
while(completed_input_string == not_done_reading) { while (completed_input_string == not_done_reading) {
int has_input; int has_input = 0;
while (!has_input)
{ struct timeval timeout = {0, 100000}; /* 0.1 seconds */
FD_SET(fileno(rl_instream), &selectset);
/* select resets selectset if no input was available */
has_input = select(fileno(rl_instream) + 1, &selectset, has_input = select(fileno(rl_instream) + 1, &selectset,
NULL, NULL, NULL); NULL, NULL, &timeout);
if(PyOS_InputHook) PyOS_InputHook();
}
if(has_input > 0) { if(has_input > 0) {
rl_callback_read_char(); rl_callback_read_char();
} }
...@@ -812,6 +819,7 @@ readline_until_enter_or_signal(char *prompt, int *signal) ...@@ -812,6 +819,7 @@ readline_until_enter_or_signal(char *prompt, int *signal)
*signal = 1; *signal = 1;
return NULL; return NULL;
} }
rl_event_hook = PyOS_InputHook;
p = readline(prompt); p = readline(prompt);
PyOS_setsig(SIGINT, old_inthandler); PyOS_setsig(SIGINT, old_inthandler);
...@@ -834,8 +842,6 @@ call_readline(FILE *sys_stdin, FILE *sys_stdout, char *prompt) ...@@ -834,8 +842,6 @@ call_readline(FILE *sys_stdin, FILE *sys_stdout, char *prompt)
setlocale(LC_CTYPE, ""); setlocale(LC_CTYPE, "");
#endif #endif
rl_event_hook = PyOS_InputHook;
if (sys_stdin != rl_instream || sys_stdout != rl_outstream) { if (sys_stdin != rl_instream || sys_stdout != rl_outstream) {
rl_instream = sys_stdin; rl_instream = sys_stdin;
rl_outstream = sys_stdout; rl_outstream = sys_stdout;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment