38bcc89d48
The type of the function pointer PyOS_ReadlineFunctionPointer (part of the Python C API), which we use, slightly changed starting with Python 3.4. The signature went from PyAPI_DATA(char) *(*PyOS_ReadlineFunctionPointer)(FILE *, FILE *, char *); to PyAPI_DATA(char) *(*PyOS_ReadlineFunctionPointer)(FILE *, FILE *, const char *); The parameter that changed is the prompt text. This commits adjust gdb accordingly by making the prompt_arg parameter const, as well as the fallouts of that. I needed to rework how annotations are added to the prompt, since the it is now const. If annotations are enabled, it will make a copy of the prompt overwrite the prompt variable that is used throughout the function. Otherwise, no copy is done and the original prompt_arg value is passed. I changed the signature of deprecated_readline_hook. I would've changed any user of it, but it seems like nothing is using it, Built-tested with python 2.7.x, 3.3.y and 3.4.z. gdb/ChangeLog: * defs.h (gdb_readline): Constify argument. (gdb_readline_wrapper): Same. (command_line_input): Same. (deprecated_readline_hook): Same. * top.c (deprecated_readline_hook): Same. (gdb_readline): Same. (gdb_readline_wrapper): Same. (command_line_input): Constify argument. Pass prompt to called functions instead of local_prompt, overwriting prompt if using annotations. * event-top.h (display_gdb_prompt): Constify argument. * event-top.c (display_gdb_prompt): Same. * python/py-gdb-readline.c (gdbpy_readline_wrapper): Constify argument if building with Python 3.4 and up. Signed-off-by: Simon Marchi <simon.marchi@ericsson.com>
111 lines
3.2 KiB
C
111 lines
3.2 KiB
C
/* Readline support for Python.
|
|
|
|
Copyright (C) 2012-2014 Free Software Foundation, Inc.
|
|
|
|
This file is part of GDB.
|
|
|
|
This program 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.
|
|
|
|
This program 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 this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#include "defs.h"
|
|
#include "python-internal.h"
|
|
#include "top.h"
|
|
#include "cli/cli-utils.h"
|
|
/* Readline function suitable for PyOS_ReadlineFunctionPointer, which
|
|
is used for Python's interactive parser and raw_input. In both
|
|
cases, sys_stdin and sys_stdout are always stdin and stdout
|
|
respectively, as far as I can tell; they are ignored and
|
|
command_line_input is used instead. */
|
|
|
|
static char *
|
|
gdbpy_readline_wrapper (FILE *sys_stdin, FILE *sys_stdout,
|
|
#if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 4
|
|
const char *prompt)
|
|
#else
|
|
char *prompt)
|
|
#endif
|
|
{
|
|
int n;
|
|
char *p = NULL, *q;
|
|
volatile struct gdb_exception except;
|
|
|
|
TRY_CATCH (except, RETURN_MASK_ALL)
|
|
p = command_line_input (prompt, 0, "python");
|
|
|
|
/* Detect user interrupt (Ctrl-C). */
|
|
if (except.reason == RETURN_QUIT)
|
|
return NULL;
|
|
|
|
/* Handle errors by raising Python exceptions. */
|
|
if (except.reason < 0)
|
|
{
|
|
/* The thread state is nulled during gdbpy_readline_wrapper,
|
|
with the original value saved in the following undocumented
|
|
variable (see Python's Parser/myreadline.c and
|
|
Modules/readline.c). */
|
|
PyEval_RestoreThread (_PyOS_ReadlineTState);
|
|
gdbpy_convert_exception (except);
|
|
PyEval_SaveThread ();
|
|
return NULL;
|
|
}
|
|
|
|
/* Detect EOF (Ctrl-D). */
|
|
if (p == NULL)
|
|
{
|
|
q = PyMem_Malloc (1);
|
|
if (q != NULL)
|
|
q[0] = '\0';
|
|
return q;
|
|
}
|
|
|
|
n = strlen (p);
|
|
|
|
/* Copy the line to Python and return. */
|
|
q = PyMem_Malloc (n + 2);
|
|
if (q != NULL)
|
|
{
|
|
strncpy (q, p, n);
|
|
q[n] = '\n';
|
|
q[n + 1] = '\0';
|
|
}
|
|
return q;
|
|
}
|
|
|
|
/* Initialize Python readline support. */
|
|
|
|
void
|
|
gdbpy_initialize_gdb_readline (void)
|
|
{
|
|
/* Python's readline module conflicts with GDB's use of readline
|
|
since readline is not reentrant. Ideally, a reentrant wrapper to
|
|
GDB's readline should be implemented to replace Python's readline
|
|
and prevent conflicts. For now, this file implements a
|
|
sys.meta_path finder that simply fails to import the readline
|
|
module. */
|
|
if (PyRun_SimpleString ("\
|
|
import sys\n\
|
|
\n\
|
|
class GdbRemoveReadlineFinder:\n\
|
|
def find_module(self, fullname, path=None):\n\
|
|
if fullname == 'readline' and path is None:\n\
|
|
return self\n\
|
|
return None\n\
|
|
\n\
|
|
def load_module(self, fullname):\n\
|
|
raise ImportError('readline module disabled under GDB')\n\
|
|
\n\
|
|
sys.meta_path.append(GdbRemoveReadlineFinder())\n\
|
|
") == 0)
|
|
PyOS_ReadlineFunctionPointer = gdbpy_readline_wrapper;
|
|
}
|
|
|