mirror of
https://github.com/python/cpython
synced 2024-09-05 00:05:39 +00:00
21896a330a
svn+ssh://pythondev@svn.python.org/python/trunk ........ r77952 | mark.dickinson | 2010-02-03 10:50:14 -0600 (Wed, 03 Feb 2010) | 1 line Fix test_inspect.py data to match recent change to inspect_fodder.py (r77942). ........ r78030 | benjamin.peterson | 2010-02-06 14:14:10 -0600 (Sat, 06 Feb 2010) | 1 line check type_getattro for correctness in a descriptor corner case ........ r78102 | andrew.kuchling | 2010-02-07 19:35:35 -0600 (Sun, 07 Feb 2010) | 1 line Move distutils into its own subsection; add various items ........ r78104 | andrew.kuchling | 2010-02-08 07:22:24 -0600 (Mon, 08 Feb 2010) | 1 line Add two items; move a subsection ........ r78107 | antoine.pitrou | 2010-02-08 14:25:47 -0600 (Mon, 08 Feb 2010) | 3 lines Clarify and correct description for ccbench and iobench. ........ r78206 | r.david.murray | 2010-02-16 11:55:26 -0600 (Tue, 16 Feb 2010) | 3 lines Make the references to Popen in the description of Call and check_call into links. ........ r78216 | andrew.kuchling | 2010-02-18 08:16:48 -0600 (Thu, 18 Feb 2010) | 1 line Add various items ........ r78296 | andrew.kuchling | 2010-02-21 20:08:45 -0600 (Sun, 21 Feb 2010) | 1 line Re-word ........ r78297 | andrew.kuchling | 2010-02-21 20:29:10 -0600 (Sun, 21 Feb 2010) | 1 line #7076: mention SystemRandom class near start of the module docs; reword change description for clarity. Noted by Shawn Ligocki. ........ r78328 | jack.diederich | 2010-02-22 12:17:16 -0600 (Mon, 22 Feb 2010) | 1 line fixes issue #7530, serve_forever() ........ r78331 | andrew.kuchling | 2010-02-22 12:38:23 -0600 (Mon, 22 Feb 2010) | 1 line Fix comment typo ........ r78332 | andrew.kuchling | 2010-02-22 12:42:07 -0600 (Mon, 22 Feb 2010) | 2 lines #7627: MH.remove() would fail if the MH mailbox was locked; it would call _unlock_file() and pass it a closed file object. Noted by Rob Austein. ........ r78336 | jack.diederich | 2010-02-22 13:55:22 -0600 (Mon, 22 Feb 2010) | 1 line fixes issue #1522237, bad init check in _threading_local ........ r78339 | jack.diederich | 2010-02-22 15:27:38 -0600 (Mon, 22 Feb 2010) | 1 line * fix issue#7476 ........ r78343 | andrew.kuchling | 2010-02-22 16:48:41 -0600 (Mon, 22 Feb 2010) | 10 lines #2560: remove an unnecessary 'for' loop from my_fgets() in Parser/myreadline.c. Noted by Joseph Armbruster; patch by Jessica McKellar. The original code was 'for (;;) {...}', where ... ended with a 'return -2' statement and did not contain a 'break' or 'continue' statement. Therefore, the body of the loop is always executed once. Once upon a time there was a 'continue' in the loop, but it was removed in rev36346, committed by mwh on Wed Jul 7 17:44:12 2004. ........ r78378 | jack.diederich | 2010-02-23 11:23:30 -0600 (Tue, 23 Feb 2010) | 1 line fixup markup error ........ r78379 | jack.diederich | 2010-02-23 13:34:06 -0600 (Tue, 23 Feb 2010) | 1 line issue#6442 use in operator instead of has_key ........ r78415 | dirkjan.ochtman | 2010-02-23 22:00:52 -0600 (Tue, 23 Feb 2010) | 1 line Issue #7733: add explicit reference in asyncore docs. ........ r78559 | andrew.kuchling | 2010-03-01 13:45:21 -0600 (Mon, 01 Mar 2010) | 1 line #7637: update discussion of minidom.unlink() and garbage collection ........ r78717 | benjamin.peterson | 2010-03-05 21:13:33 -0600 (Fri, 05 Mar 2010) | 1 line settscdump is definitely an implementation detail ........ r78791 | andrew.kuchling | 2010-03-08 06:00:39 -0600 (Mon, 08 Mar 2010) | 1 line Add various items ........
204 lines
5.1 KiB
C
204 lines
5.1 KiB
C
|
|
/* Readline interface for tokenizer.c and [raw_]input() in bltinmodule.c.
|
|
By default, or when stdin is not a tty device, we have a super
|
|
simple my_readline function using fgets.
|
|
Optionally, we can use the GNU readline library.
|
|
my_readline() has a different return value from GNU readline():
|
|
- NULL if an interrupt occurred or if an error occurred
|
|
- a malloc'ed empty string if EOF was read
|
|
- a malloc'ed string ending in \n normally
|
|
*/
|
|
|
|
#include "Python.h"
|
|
#ifdef MS_WINDOWS
|
|
#define WIN32_LEAN_AND_MEAN
|
|
#include "windows.h"
|
|
#endif /* MS_WINDOWS */
|
|
|
|
#ifdef __VMS
|
|
extern char* vms__StdioReadline(FILE *sys_stdin, FILE *sys_stdout, char *prompt);
|
|
#endif
|
|
|
|
|
|
PyThreadState* _PyOS_ReadlineTState;
|
|
|
|
#ifdef WITH_THREAD
|
|
#include "pythread.h"
|
|
static PyThread_type_lock _PyOS_ReadlineLock = NULL;
|
|
#endif
|
|
|
|
int (*PyOS_InputHook)(void) = NULL;
|
|
|
|
/* This function restarts a fgets() after an EINTR error occurred
|
|
except if PyOS_InterruptOccurred() returns true. */
|
|
|
|
static int
|
|
my_fgets(char *buf, int len, FILE *fp)
|
|
{
|
|
char *p;
|
|
if (PyOS_InputHook != NULL)
|
|
(void)(PyOS_InputHook)();
|
|
errno = 0;
|
|
p = fgets(buf, len, fp);
|
|
if (p != NULL)
|
|
return 0; /* No error */
|
|
#ifdef MS_WINDOWS
|
|
/* In the case of a Ctrl+C or some other external event
|
|
interrupting the operation:
|
|
Win2k/NT: ERROR_OPERATION_ABORTED is the most recent Win32
|
|
error code (and feof() returns TRUE).
|
|
Win9x: Ctrl+C seems to have no effect on fgets() returning
|
|
early - the signal handler is called, but the fgets()
|
|
only returns "normally" (ie, when Enter hit or feof())
|
|
*/
|
|
if (GetLastError()==ERROR_OPERATION_ABORTED) {
|
|
/* Signals come asynchronously, so we sleep a brief
|
|
moment before checking if the handler has been
|
|
triggered (we cant just return 1 before the
|
|
signal handler has been called, as the later
|
|
signal may be treated as a separate interrupt).
|
|
*/
|
|
Sleep(1);
|
|
if (PyOS_InterruptOccurred()) {
|
|
return 1; /* Interrupt */
|
|
}
|
|
/* Either the sleep wasn't long enough (need a
|
|
short loop retrying?) or not interrupted at all
|
|
(in which case we should revisit the whole thing!)
|
|
Logging some warning would be nice. assert is not
|
|
viable as under the debugger, the various dialogs
|
|
mean the condition is not true.
|
|
*/
|
|
}
|
|
#endif /* MS_WINDOWS */
|
|
if (feof(fp)) {
|
|
return -1; /* EOF */
|
|
}
|
|
#ifdef EINTR
|
|
if (errno == EINTR) {
|
|
int s;
|
|
#ifdef WITH_THREAD
|
|
PyEval_RestoreThread(_PyOS_ReadlineTState);
|
|
#endif
|
|
s = PyErr_CheckSignals();
|
|
#ifdef WITH_THREAD
|
|
PyEval_SaveThread();
|
|
#endif
|
|
if (s < 0) {
|
|
return 1;
|
|
}
|
|
}
|
|
#endif
|
|
if (PyOS_InterruptOccurred()) {
|
|
return 1; /* Interrupt */
|
|
}
|
|
return -2; /* Error */
|
|
}
|
|
|
|
|
|
/* Readline implementation using fgets() */
|
|
|
|
char *
|
|
PyOS_StdioReadline(FILE *sys_stdin, FILE *sys_stdout, char *prompt)
|
|
{
|
|
size_t n;
|
|
char *p;
|
|
n = 100;
|
|
if ((p = (char *)PyMem_MALLOC(n)) == NULL)
|
|
return NULL;
|
|
fflush(sys_stdout);
|
|
if (prompt)
|
|
fprintf(stderr, "%s", prompt);
|
|
fflush(stderr);
|
|
switch (my_fgets(p, (int)n, sys_stdin)) {
|
|
case 0: /* Normal case */
|
|
break;
|
|
case 1: /* Interrupt */
|
|
PyMem_FREE(p);
|
|
return NULL;
|
|
case -1: /* EOF */
|
|
case -2: /* Error */
|
|
default: /* Shouldn't happen */
|
|
*p = '\0';
|
|
break;
|
|
}
|
|
n = strlen(p);
|
|
while (n > 0 && p[n-1] != '\n') {
|
|
size_t incr = n+2;
|
|
p = (char *)PyMem_REALLOC(p, n + incr);
|
|
if (p == NULL)
|
|
return NULL;
|
|
if (incr > INT_MAX) {
|
|
PyErr_SetString(PyExc_OverflowError, "input line too long");
|
|
}
|
|
if (my_fgets(p+n, (int)incr, sys_stdin) != 0)
|
|
break;
|
|
n += strlen(p+n);
|
|
}
|
|
return (char *)PyMem_REALLOC(p, n+1);
|
|
}
|
|
|
|
|
|
/* By initializing this function pointer, systems embedding Python can
|
|
override the readline function.
|
|
|
|
Note: Python expects in return a buffer allocated with PyMem_Malloc. */
|
|
|
|
char *(*PyOS_ReadlineFunctionPointer)(FILE *, FILE *, char *);
|
|
|
|
|
|
/* Interface used by tokenizer.c and bltinmodule.c */
|
|
|
|
char *
|
|
PyOS_Readline(FILE *sys_stdin, FILE *sys_stdout, char *prompt)
|
|
{
|
|
char *rv;
|
|
|
|
if (_PyOS_ReadlineTState == PyThreadState_GET()) {
|
|
PyErr_SetString(PyExc_RuntimeError,
|
|
"can't re-enter readline");
|
|
return NULL;
|
|
}
|
|
|
|
|
|
if (PyOS_ReadlineFunctionPointer == NULL) {
|
|
#ifdef __VMS
|
|
PyOS_ReadlineFunctionPointer = vms__StdioReadline;
|
|
#else
|
|
PyOS_ReadlineFunctionPointer = PyOS_StdioReadline;
|
|
#endif
|
|
}
|
|
|
|
#ifdef WITH_THREAD
|
|
if (_PyOS_ReadlineLock == NULL) {
|
|
_PyOS_ReadlineLock = PyThread_allocate_lock();
|
|
}
|
|
#endif
|
|
|
|
_PyOS_ReadlineTState = PyThreadState_GET();
|
|
Py_BEGIN_ALLOW_THREADS
|
|
#ifdef WITH_THREAD
|
|
PyThread_acquire_lock(_PyOS_ReadlineLock, 1);
|
|
#endif
|
|
|
|
/* 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
|
|
|
|
#ifdef WITH_THREAD
|
|
PyThread_release_lock(_PyOS_ReadlineLock);
|
|
#endif
|
|
|
|
_PyOS_ReadlineTState = NULL;
|
|
|
|
return rv;
|
|
}
|