ilusha/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2026-09-29 10:15:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Checkin of Jack's buffer mods.

Browse source 
Not really checked, but didn't fail any tests either...
This commit is contained in:
Guido van Rossum 1997-05-05 22:15:02 +00:00
parent 8290e07509
commit fdf95dd525
5 changed files with 232 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

36
Objects/fileobject.c
View file

@ -419,6 +419,41 @@ file_read(f, args)
return v;
}
static PyObject *
file_readinto(f, args)
PyFileObject *f;
PyObject *args;
{
char *ptr;
int ntodo, ndone, nnow;
if (f->f_fp == NULL)
return err_closed();
if (!PyArg_Parse(args, "w#", &ptr, &ntodo))
return NULL;
ndone = 0;
/*
** XXXX Is this correct? Other threads may see partially-completed
** reads if they look at the object we're reading into...
*/
Py_BEGIN_ALLOW_THREADS
while(ntodo > 0) {
nnow = fread(ptr+ndone, 1, ntodo, f->f_fp);
if (nnow < 0 ) {
PyErr_SetFromErrno(PyExc_IOError);
clearerr(f->f_fp);
return NULL;
}
if (nnow == 0)
break;
ndone += nnow;
ntodo -= nnow;
}
Py_END_ALLOW_THREADS
return PyInt_FromLong(ndone);
}
/* Internal routine to get a line.
Size argument interpretation:
> 0: max length;
@ -688,6 +723,7 @@ static PyMethodDef file_methods[] = {
{"tell", (PyCFunction)file_tell, 0},
{"write", (PyCFunction)file_write, 0},
{"writelines", (PyCFunction)file_writelines, 0},
{"readinto", (PyCFunction)file_readinto, 0},
{NULL, NULL} /* sentinel */
};