traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

readline: use PyUnicode_FSConverter() to parse filenames

This commit is contained in:
Victor Stinner 2010-06-11 22:27:14 +00:00
parent 2690461a9e
commit 19e65a3563
1 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Modules/readline.c
View File

@ -98,10 +98,16 @@ Parse and execute single line of a readline init file.");
static PyObject * static PyObject *
read_init_file(PyObject *self, PyObject *args) read_init_file(PyObject *self, PyObject *args)
{ {
char *s = NULL; PyObject *filename_obj = Py_None, *filename_bytes;
if (!PyArg_ParseTuple(args, "|z:read_init_file", &s)) if (!PyArg_ParseTuple(args, "|O:read_init_file", &filename_obj))
return NULL; return NULL;
errno = rl_read_init_file(s); if (filename_obj != Py_None) {
if (!PyUnicode_FSConverter(filename_obj, &filename_bytes))
return NULL;
errno = rl_read_init_file(PyBytes_AsString(filename_bytes));
Py_DECREF(filename_bytes);
} else
errno = rl_read_init_file(NULL);
if (errno) if (errno)
return PyErr_SetFromErrno(PyExc_IOError); return PyErr_SetFromErrno(PyExc_IOError);
Py_RETURN_NONE; Py_RETURN_NONE;
@ -118,10 +124,16 @@ The default filename is the last filename used.");
static PyObject * static PyObject *
read_history_file(PyObject *self, PyObject *args) read_history_file(PyObject *self, PyObject *args)
{ {
char *s = NULL; PyObject *filename_obj = Py_None, *filename_bytes;
if (!PyArg_ParseTuple(args, "|z:read_history_file", &s)) if (!PyArg_ParseTuple(args, "|O:read_history_file", &filename_obj))
return NULL; return NULL;
errno = read_history(s); if (filename_obj != Py_None) {
if (!PyUnicode_FSConverter(filename_obj, &filename_bytes))
return NULL;
errno = read_history(PyBytes_AsString(filename_bytes));
Py_DECREF(filename_bytes);
} else
errno = read_history(NULL);
if (errno) if (errno)
return PyErr_SetFromErrno(PyExc_IOError); return PyErr_SetFromErrno(PyExc_IOError);
Py_RETURN_NONE; Py_RETURN_NONE;
@ -139,12 +151,22 @@ The default filename is ~/.history.");
static PyObject * static PyObject *
write_history_file(PyObject *self, PyObject *args) write_history_file(PyObject *self, PyObject *args)
{ {
char *s = NULL; PyObject *filename_obj = Py_None, *filename_bytes;
if (!PyArg_ParseTuple(args, "|z:write_history_file", &s)) char *filename;
if (!PyArg_ParseTuple(args, "|O:write_history_file", &filename_obj))
return NULL; return NULL;
errno = write_history(s); if (filename_obj != Py_None) {
if (!PyUnicode_FSConverter(filename_obj, &filename_bytes))
return NULL;
filename = PyBytes_AsString(filename_bytes);
} else {
filename_bytes = NULL;
filename = NULL;
}
errno = write_history(filename);
if (!errno && _history_length >= 0) if (!errno && _history_length >= 0)
history_truncate_file(s, _history_length); history_truncate_file(filename, _history_length);
Py_XDECREF(filename_bytes);
if (errno) if (errno)
return PyErr_SetFromErrno(PyExc_IOError); return PyErr_SetFromErrno(PyExc_IOError);
Py_RETURN_NONE; Py_RETURN_NONE;