[Python-checkins] python/dist/src/Modules bz2module.c,1.24,1.25
birkenfeld@users.sourceforge.net
birkenfeld at users.sourceforge.net
Sun Aug 21 16:16:15 CEST 2005
Update of /cvsroot/python/python/dist/src/Modules
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4264/Modules
Modified Files:
bz2module.c
Log Message:
Fix BZ2File.(x)readlines() for files without a newline.
Index: bz2module.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/bz2module.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- bz2module.c 3 Jun 2005 19:47:00 -0000 1.24
+++ bz2module.c 21 Aug 2005 14:16:03 -0000 1.25
@@ -22,6 +22,18 @@
Gustavo Niemeyer <niemeyer at conectiva.com>\n\
";
+/* Our very own off_t-like type, 64-bit if possible */
+/* copied from Objects/fileobject.c */
+#if !defined(HAVE_LARGEFILE_SUPPORT)
+typedef off_t Py_off_t;
+#elif SIZEOF_OFF_T >= 8
+typedef off_t Py_off_t;
+#elif SIZEOF_FPOS_T >= 8
+typedef fpos_t Py_off_t;
+#else
+#error "Large file support, but neither off_t nor fpos_t is large enough."
+#endif
+
#define BUF(v) PyString_AS_STRING((PyStringObject *)v)
#define MODE_CLOSED 0
@@ -405,7 +417,9 @@
Util_DropReadAhead(f);
}
if (f->mode == MODE_READ_EOF) {
- return -1;
+ f->f_bufptr = f->f_buf;
+ f->f_bufend = f->f_buf;
+ return 0;
}
if ((f->f_buf = PyMem_Malloc(bufsize)) == NULL) {
return -1;
@@ -682,13 +696,13 @@
}
totalread += nread;
p = memchr(buffer+nfilled, '\n', nread);
- if (p == NULL) {
+ if (!shortread && p == NULL) {
/* Need a larger buffer to fit this line */
nfilled += nread;
buffersize *= 2;
if (buffersize > INT_MAX) {
PyErr_SetString(PyExc_OverflowError,
- "line is longer than a Python string can hold");
+ "line is longer than a Python string can hold");
goto error;
}
if (big_buffer == NULL) {
@@ -705,11 +719,11 @@
_PyString_Resize(&big_buffer, buffersize);
buffer = PyString_AS_STRING(big_buffer);
}
- continue;
+ continue;
}
end = buffer+nfilled+nread;
q = buffer;
- do {
+ while (p != NULL) {
/* Process complete lines */
p++;
line = PyString_FromStringAndSize(q, p-q);
@@ -721,7 +735,7 @@
goto error;
q = p;
p = memchr(q, '\n', end-q);
- } while (p != NULL);
+ }
/* Move the remaining incomplete line to the start */
nfilled = end-q;
memmove(buffer, q, nfilled);
@@ -962,7 +976,8 @@
BZ2File_seek(BZ2FileObject *self, PyObject *args)
{
int where = 0;
- long offset;
+ PyObject *offobj;
+ Py_off_t offset;
char small_buffer[SMALLCHUNK];
char *buffer = small_buffer;
size_t buffersize = SMALLCHUNK;
@@ -973,7 +988,15 @@
int rewind = 0;
PyObject *ret = NULL;
- if (!PyArg_ParseTuple(args, "l|i:seek", &offset, &where))
+ if (!PyArg_ParseTuple(args, "O|i:seek", &offobj, &where))
+ return NULL;
+#if !defined(HAVE_LARGEFILE_SUPPORT)
+ offset = PyInt_AsLong(offobj);
+#else
+ offset = PyLong_Check(offobj) ?
+ PyLong_AsLongLong(offobj) : PyInt_AsLong(offobj);
+#endif
+ if (PyErr_Occurred())
return NULL;
ACQUIRE_LOCK(self);
More information about the Python-checkins
mailing list