mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-15 21:44:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Patch #512981: Update readline input stream on sys.stdin/out change.

Browse source
This commit is contained in:
Martin v. Löwis 2002-10-26 14:39:10 +00:00
parent 88afe666da
commit 566f6afe9a
5 changed files with 42 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Parser/myreadline.c
View file

@ -87,14 +87,14 @@ my_fgets(char *buf, int len, FILE *fp)
/* Readline implementation using fgets() */
char *
PyOS_StdioReadline(char *prompt)
PyOS_StdioReadline(FILE *sys_stdin, FILE *sys_stdout, char *prompt)
{
size_t n;
char *p;
n = 100;
if ((p = PyMem_MALLOC(n)) == NULL)
return NULL;
fflush(stdout);
fflush(sys_stdout);
#ifndef RISCOS
if (prompt)
fprintf(stderr, "%s", prompt);
@ -107,7 +107,7 @@ PyOS_StdioReadline(char *prompt)
}
#endif
fflush(stderr);
switch (my_fgets(p, (int)n, stdin)) {
switch (my_fgets(p, (int)n, sys_stdin)) {
case 0: /* Normal case */
break;
case 1: /* Interrupt */
@ -135,7 +135,7 @@ PyOS_StdioReadline(char *prompt)
if (incr > INT_MAX) {
PyErr_SetString(PyExc_OverflowError, "input line too long");
}
if (my_fgets(p+n, (int)incr, stdin) != 0)
if (my_fgets(p+n, (int)incr, sys_stdin) != 0)
break;
n += strlen(p+n);
}
@ -148,20 +148,32 @@ PyOS_StdioReadline(char *prompt)
Note: Python expects in return a buffer allocated with PyMem_Malloc. */
char *(*PyOS_ReadlineFunctionPointer)(char *);
char *(*PyOS_ReadlineFunctionPointer)(FILE *, FILE *, char *);
/* Interface used by tokenizer.c and bltinmodule.c */
char *
PyOS_Readline(char *prompt)
PyOS_Readline(FILE *sys_stdin, FILE *sys_stdout, char *prompt)
{
char *rv;
if (PyOS_ReadlineFunctionPointer == NULL) {
PyOS_ReadlineFunctionPointer = PyOS_StdioReadline;
PyOS_ReadlineFunctionPointer = PyOS_StdioReadline;
}
Py_BEGIN_ALLOW_THREADS
rv = (*PyOS_ReadlineFunctionPointer)(prompt);
/* This is needed to handle the unlikely case that the
* interpreter is in interactive mode *and* stdin/out are not
* a tty. This can happen, for example if python is run like
* this: python -i < test1.py
*/
if (!isatty (fileno (sys_stdin)) || !isatty (fileno (sys_stdout)))
rv = PyOS_StdioReadline (sys_stdin, sys_stdout, prompt);
else
rv = (*PyOS_ReadlineFunctionPointer)(sys_stdin, sys_stdout,
prompt);
Py_END_ALLOW_THREADS
return rv;
}