From: Guido van Rossum Date: Tue, 3 Mar 1998 22:36:10 +0000 (+0000) Subject: Of course, I shouldn't have used lseek() to find out the file's X-Git-Tag: v1.5.1~518 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dcb5e7f3892da0a8f7bb8ac518a2053c04ed1e43;p=thirdparty%2FPython%2Fcpython.git Of course, I shouldn't have used lseek() to find out the file's position in new_buffersize(); the correct function to use is ftell(). Thanks to Ben Jackson. --- diff --git a/Objects/fileobject.c b/Objects/fileobject.c index 5502f156ff68..f8c58ba45430 100644 --- a/Objects/fileobject.c +++ b/Objects/fileobject.c @@ -406,17 +406,14 @@ new_buffersize(f, currentsize) size_t currentsize; { #ifdef HAVE_FSTAT -#ifndef SEEK_CUR -#define SEEK_CUR 1 -#endif long pos, end; struct stat st; if (fstat(fileno(f->f_fp), &st) == 0) { end = st.st_size; - pos = lseek(fileno(f->f_fp), 0L, SEEK_CUR); + pos = ftell(f->f_fp); if (end > pos && pos >= 0) - return end - pos + BUFSIZ; - /* Add BUFSIZ to allow for stdio buffered data */ + return end - pos + 1; + /* Add 1 so if the file were to grow we'd notice. */ } #endif if (currentsize > SMALLCHUNK) {