summaryrefslogtreecommitdiffstats
path: root/Modules/_io/fileio.c
diff options
context:
space:
mode:
authorSteve Dower <steve.dower@microsoft.com>2015-03-21 02:50:46 (GMT)
committerSteve Dower <steve.dower@microsoft.com>2015-03-21 02:50:46 (GMT)
commitfe0a41aae425c61364b79c18ca8321dffed3ac40 (patch)
treebf19237ec3d8058d4b22bbc02177435ac1a1ce43 /Modules/_io/fileio.c
parentc7d979f0221b4426fb2160f0960a61c1e7bc59df (diff)
downloadcpython-fe0a41aae425c61364b79c18ca8321dffed3ac40.zip
cpython-fe0a41aae425c61364b79c18ca8321dffed3ac40.tar.gz
cpython-fe0a41aae425c61364b79c18ca8321dffed3ac40.tar.bz2
Issue #23668: Adds support for os.truncate and os.ftruncate on Windows
Diffstat (limited to 'Modules/_io/fileio.c')
-rw-r--r--Modules/_io/fileio.c54
1 files changed, 4 insertions, 50 deletions
diff --git a/Modules/_io/fileio.c b/Modules/_io/fileio.c
index 5108fc7..bb3e9b9 100644
--- a/Modules/_io/fileio.c
+++ b/Modules/_io/fileio.c
@@ -839,9 +839,7 @@ static PyObject *
fileio_truncate(fileio *self, PyObject *args)
{
PyObject *posobj = NULL; /* the new size wanted by the user */
-#ifndef MS_WINDOWS
Py_off_t pos;
-#endif
int ret;
int fd;
@@ -864,52 +862,6 @@ fileio_truncate(fileio *self, PyObject *args)
Py_INCREF(posobj);
}
-#ifdef MS_WINDOWS
- /* MS _chsize doesn't work if newsize doesn't fit in 32 bits,
- so don't even try using it. */
- {
- PyObject *oldposobj, *tempposobj;
- HANDLE hFile;
-
- /* we save the file pointer position */
- oldposobj = portable_lseek(fd, NULL, 1);
- if (oldposobj == NULL) {
- Py_DECREF(posobj);
- return NULL;
- }
-
- /* we then move to the truncation position */
- tempposobj = portable_lseek(fd, posobj, 0);
- if (tempposobj == NULL) {
- Py_DECREF(oldposobj);
- Py_DECREF(posobj);
- return NULL;
- }
- Py_DECREF(tempposobj);
-
- /* Truncate. Note that this may grow the file! */
- Py_BEGIN_ALLOW_THREADS
- errno = 0;
- hFile = (HANDLE)_get_osfhandle(fd);
- ret = hFile == (HANDLE)-1; /* testing for INVALID_HANDLE value */
- if (ret == 0) {
- ret = SetEndOfFile(hFile) == 0;
- if (ret)
- errno = EACCES;
- }
- Py_END_ALLOW_THREADS
-
- /* we restore the file pointer position in any case */
- tempposobj = portable_lseek(fd, oldposobj, 0);
- Py_DECREF(oldposobj);
- if (tempposobj == NULL) {
- Py_DECREF(posobj);
- return NULL;
- }
- Py_DECREF(tempposobj);
- }
-#else
-
#if defined(HAVE_LARGEFILE_SUPPORT)
pos = PyLong_AsLongLong(posobj);
#else
@@ -922,11 +874,13 @@ fileio_truncate(fileio *self, PyObject *args)
Py_BEGIN_ALLOW_THREADS
errno = 0;
+#ifdef MS_WINDOWS
+ ret = _chsize_s(fd, pos);
+#else
ret = ftruncate(fd, pos);
+#endif
Py_END_ALLOW_THREADS
-#endif /* !MS_WINDOWS */
-
if (ret != 0) {
Py_DECREF(posobj);
PyErr_SetFromErrno(PyExc_IOError);