mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-28 09:10:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Second part of sf# 1752225: On windows, emulate ftruncate with Win32

Browse source 
api functions. Code from fileobject.c, patch by Amaury Forgeot d'Arc.

This patch also changes:

The return value of the native ftruncate function is checked for '!=
0' instead of '< 0' as before.

fileio_seekable returns bool now instead of an int.
This commit is contained in:
Thomas Heller 2007-07-12 11:21:36 +00:00
parent af2be262af
commit fdeee3a6cd
1 changed files with 37 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

41
Modules/_fileio.c
View file

@ -22,7 +22,7 @@
#ifdef MS_WINDOWS #ifdef MS_WINDOWS
/* can simulate truncate with Win32 API functions; see file_truncate */ /* can simulate truncate with Win32 API functions; see file_truncate */
/* #define HAVE_FTRUNCATE */ #define HAVE_FTRUNCATE
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#endif #endif
@ -337,7 +337,7 @@ fileio_seekable(PyFileIOObject *self)
else else
self->seekable = 1; self->seekable = 1;
} }
return PyInt_FromLong((long) self->seekable); return PyBool_FromLong((long) self->seekable);
} }
static PyObject * static PyObject *
@ -590,6 +590,7 @@ fileio_truncate(PyFileIOObject *self, PyObject *args)
{ {
PyObject *posobj = NULL; PyObject *posobj = NULL;
Py_off_t pos; Py_off_t pos;
int ret;
int fd; int fd;
fd = self->fd; fd = self->fd;
@ -621,14 +622,46 @@ fileio_truncate(PyFileIOObject *self, PyObject *args)
return NULL; return NULL;
} }
#ifdef MS_WINDOWS
/* MS _chsize doesn't work if newsize doesn't fit in 32 bits,
so don't even try using it. */
{
HANDLE hFile;
PyObject *pos2;
/* Have to move current pos to desired endpoint on Windows. */
errno = 0;
pos2 = portable_lseek(fd, posobj, SEEK_SET);
if (pos2 == NULL)
{
Py_DECREF(posobj);
return NULL;
}
Py_DECREF(pos2);
/* Truncate. Note that this may grow the file! */
Py_BEGIN_ALLOW_THREADS
errno = 0;
hFile = (HANDLE)_get_osfhandle(fd);
ret = hFile == (HANDLE)-1;
if (ret == 0) {
ret = SetEndOfFile(hFile) == 0;
if (ret)
errno = EACCES;
}
Py_END_ALLOW_THREADS
}
#else
Py_BEGIN_ALLOW_THREADS Py_BEGIN_ALLOW_THREADS
errno = 0; errno = 0;
pos = ftruncate(fd, pos); ret = ftruncate(fd, pos);
Py_END_ALLOW_THREADS Py_END_ALLOW_THREADS
#endif /* !MS_WINDOWS */
if (pos < 0) { if (ret != 0) {
Py_DECREF(posobj); Py_DECREF(posobj);
PyErr_SetFromErrno(PyExc_IOError); PyErr_SetFromErrno(PyExc_IOError);
return NULL;
} }
return posobj; return posobj;