Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Patch #102469: Use glibc's getline() extension when reading unbounded lines

This commit is contained in:
Andrew M. Kuchling 2000-11-29 02:53:22 +00:00
parent 78a14423af
commit 4b2b445f28
1 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Objects/fileobject.c
View File

@ -645,13 +645,40 @@ file_readinto(PyFileObject *f, PyObject *args)
static PyObject * static PyObject *
get_line(PyFileObject *f, int n) get_line(PyFileObject *f, int n)
{ {
register FILE *fp; register FILE *fp = f->f_fp;
register int c; register int c;
register char *buf, *end; char *buf, *end;
size_t n1, n2; size_t n1, n2;
PyObject *v; PyObject *v;
fp = f->f_fp; #ifdef HAVE_GETLINE
/* Use GNU libc extension getline() for arbitrary-sized lines */
if (n == 0) {
size_t size = 0;
buf = NULL;
Py_BEGIN_ALLOW_THREADS
n1 = getline(&buf, &size, fp);
Py_END_ALLOW_THREADS
if (n1 == -1) {
clearerr(fp);
if (PyErr_CheckSignals()) {
return NULL;
}
if (n < 0 && feof(fp)) {
PyErr_SetString(PyExc_EOFError,
"EOF when reading a line");
return NULL;
}
return PyString_FromStringAndSize(NULL, 0);
}
/* No error */
v = PyString_FromStringAndSize(buf, n1);
free(buf);
return v;
}
#endif
n2 = n > 0 ? n : 100; n2 = n > 0 ? n : 100;
v = PyString_FromStringAndSize((char *)NULL, n2); v = PyString_FromStringAndSize((char *)NULL, n2);
if (v == NULL) if (v == NULL)