2007-03-07 20:43:48 -04:00
|
|
|
/* Author: Daniel Stutzbach */
|
|
|
|
|
|
|
|
#define PY_SSIZE_T_CLEAN
|
|
|
|
#include "Python.h"
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <sys/stat.h>
|
|
|
|
#include <fcntl.h>
|
|
|
|
#include <stddef.h> /* For offsetof */
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Known likely problems:
|
|
|
|
*
|
|
|
|
* - Files larger then 2**32-1
|
|
|
|
* - Files with unicode filenames
|
|
|
|
* - Passing numbers greater than 2**32-1 when an integer is expected
|
|
|
|
* - Making it work on Windows and other oddball platforms
|
|
|
|
*
|
|
|
|
* To Do:
|
|
|
|
*
|
|
|
|
* - autoconfify header file inclusion
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifdef MS_WINDOWS
|
|
|
|
/* can simulate truncate with Win32 API functions; see file_truncate */
|
2007-07-12 08:21:36 -03:00
|
|
|
#define HAVE_FTRUNCATE
|
2007-03-07 20:43:48 -04:00
|
|
|
#define WIN32_LEAN_AND_MEAN
|
|
|
|
#include <windows.h>
|
|
|
|
#endif
|
|
|
|
|
2008-12-05 04:26:55 -04:00
|
|
|
#if BUFSIZ < (8*1024)
|
|
|
|
#define SMALLCHUNK (8*1024)
|
|
|
|
#elif (BUFSIZ >= (2 << 25))
|
|
|
|
#error "unreasonable BUFSIZ > 64MB defined"
|
|
|
|
#else
|
|
|
|
#define SMALLCHUNK BUFSIZ
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if SIZEOF_INT < 4
|
|
|
|
#define BIGCHUNK (512 * 32)
|
|
|
|
#else
|
|
|
|
#define BIGCHUNK (512 * 1024)
|
|
|
|
#endif
|
|
|
|
|
2007-03-07 20:43:48 -04:00
|
|
|
typedef struct {
|
|
|
|
PyObject_HEAD
|
|
|
|
int fd;
|
2007-08-12 14:23:54 -03:00
|
|
|
unsigned readable : 1;
|
|
|
|
unsigned writable : 1;
|
|
|
|
int seekable : 2; /* -1 means unknown */
|
2007-10-30 14:27:30 -03:00
|
|
|
int closefd : 1;
|
2007-03-07 20:43:48 -04:00
|
|
|
PyObject *weakreflist;
|
|
|
|
} PyFileIOObject;
|
|
|
|
|
2007-03-08 17:46:15 -04:00
|
|
|
PyTypeObject PyFileIO_Type;
|
|
|
|
|
2007-03-07 20:43:48 -04:00
|
|
|
#define PyFileIO_Check(op) (PyObject_TypeCheck((op), &PyFileIO_Type))
|
|
|
|
|
2009-01-20 20:55:13 -04:00
|
|
|
static PyObject *
|
|
|
|
portable_lseek(int fd, PyObject *posobj, int whence);
|
|
|
|
|
2008-12-18 13:15:54 -04:00
|
|
|
/* Returns 0 on success, -1 with exception set on failure. */
|
2007-08-12 14:23:54 -03:00
|
|
|
static int
|
|
|
|
internal_close(PyFileIOObject *self)
|
2007-03-07 20:43:48 -04:00
|
|
|
{
|
2008-12-18 13:15:54 -04:00
|
|
|
int err = 0;
|
2009-01-19 11:19:46 -04:00
|
|
|
int save_errno = 0;
|
2007-03-07 20:43:48 -04:00
|
|
|
if (self->fd >= 0) {
|
2007-04-08 14:44:42 -03:00
|
|
|
int fd = self->fd;
|
|
|
|
self->fd = -1;
|
2007-03-07 20:43:48 -04:00
|
|
|
Py_BEGIN_ALLOW_THREADS
|
2008-12-18 13:15:54 -04:00
|
|
|
err = close(fd);
|
|
|
|
if (err < 0)
|
2007-08-12 14:23:54 -03:00
|
|
|
save_errno = errno;
|
2007-03-07 20:43:48 -04:00
|
|
|
Py_END_ALLOW_THREADS
|
2007-08-12 14:23:54 -03:00
|
|
|
}
|
2008-12-18 13:15:54 -04:00
|
|
|
if (err < 0) {
|
|
|
|
errno = save_errno;
|
|
|
|
PyErr_SetFromErrno(PyExc_IOError);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
2007-08-12 14:23:54 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
fileio_close(PyFileIOObject *self)
|
|
|
|
{
|
2007-10-30 14:27:30 -03:00
|
|
|
if (!self->closefd) {
|
2008-11-05 15:30:32 -04:00
|
|
|
self->fd = -1;
|
2007-10-30 14:27:30 -03:00
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
2008-12-18 13:15:54 -04:00
|
|
|
if (internal_close(self))
|
2007-08-12 14:23:54 -03:00
|
|
|
return NULL;
|
2007-03-07 20:43:48 -04:00
|
|
|
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
fileio_new(PyTypeObject *type, PyObject *args, PyObject *kews)
|
|
|
|
{
|
|
|
|
PyFileIOObject *self;
|
|
|
|
|
|
|
|
assert(type != NULL && type->tp_alloc != NULL);
|
|
|
|
|
|
|
|
self = (PyFileIOObject *) type->tp_alloc(type, 0);
|
|
|
|
if (self != NULL) {
|
|
|
|
self->fd = -1;
|
2008-10-30 18:23:35 -03:00
|
|
|
self->readable = 0;
|
|
|
|
self->writable = 0;
|
|
|
|
self->seekable = -1;
|
|
|
|
self->closefd = 1;
|
2007-03-07 20:43:48 -04:00
|
|
|
self->weakreflist = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return (PyObject *) self;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* On Unix, open will succeed for directories.
|
|
|
|
In Python, there should be no file objects referring to
|
|
|
|
directories, so we need a check. */
|
|
|
|
|
|
|
|
static int
|
2008-12-29 14:02:28 -04:00
|
|
|
dircheck(PyFileIOObject* self, char *name)
|
2007-03-07 20:43:48 -04:00
|
|
|
{
|
|
|
|
#if defined(HAVE_FSTAT) && defined(S_IFDIR) && defined(EISDIR)
|
|
|
|
struct stat buf;
|
|
|
|
if (self->fd < 0)
|
|
|
|
return 0;
|
|
|
|
if (fstat(self->fd, &buf) == 0 && S_ISDIR(buf.st_mode)) {
|
|
|
|
char *msg = strerror(EISDIR);
|
|
|
|
PyObject *exc;
|
2008-12-18 13:15:54 -04:00
|
|
|
if (internal_close(self))
|
|
|
|
return -1;
|
2007-04-10 16:01:47 -03:00
|
|
|
|
2008-12-29 14:02:28 -04:00
|
|
|
exc = PyObject_CallFunction(PyExc_IOError, "(iss)",
|
|
|
|
EISDIR, msg, name);
|
2007-03-07 20:43:48 -04:00
|
|
|
PyErr_SetObject(PyExc_IOError, exc);
|
|
|
|
Py_XDECREF(exc);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-01-19 11:11:51 -04:00
|
|
|
static int
|
|
|
|
check_fd(int fd)
|
|
|
|
{
|
|
|
|
#if defined(HAVE_FSTAT)
|
|
|
|
struct stat buf;
|
|
|
|
if (fstat(fd, &buf) < 0 && errno == EBADF) {
|
|
|
|
PyObject *exc;
|
|
|
|
char *msg = strerror(EBADF);
|
|
|
|
exc = PyObject_CallFunction(PyExc_OSError, "(is)",
|
|
|
|
EBADF, msg);
|
|
|
|
PyErr_SetObject(PyExc_OSError, exc);
|
|
|
|
Py_XDECREF(exc);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-03-07 20:43:48 -04:00
|
|
|
|
|
|
|
static int
|
|
|
|
fileio_init(PyObject *oself, PyObject *args, PyObject *kwds)
|
|
|
|
{
|
|
|
|
PyFileIOObject *self = (PyFileIOObject *) oself;
|
2007-10-30 14:27:30 -03:00
|
|
|
static char *kwlist[] = {"file", "mode", "closefd", NULL};
|
2007-03-07 20:43:48 -04:00
|
|
|
char *name = NULL;
|
|
|
|
char *mode = "r";
|
2007-04-10 16:01:47 -03:00
|
|
|
char *s;
|
2007-07-12 08:03:13 -03:00
|
|
|
#ifdef MS_WINDOWS
|
|
|
|
Py_UNICODE *widename = NULL;
|
|
|
|
#endif
|
2007-03-07 20:43:48 -04:00
|
|
|
int ret = 0;
|
|
|
|
int rwa = 0, plus = 0, append = 0;
|
|
|
|
int flags = 0;
|
2007-04-08 14:44:42 -03:00
|
|
|
int fd = -1;
|
2007-10-30 14:27:30 -03:00
|
|
|
int closefd = 1;
|
2007-03-07 20:43:48 -04:00
|
|
|
|
|
|
|
assert(PyFileIO_Check(oself));
|
2007-08-12 14:23:54 -03:00
|
|
|
if (self->fd >= 0) {
|
2007-03-07 20:43:48 -04:00
|
|
|
/* Have to close the existing file first. */
|
2007-08-12 14:23:54 -03:00
|
|
|
if (internal_close(self) < 0)
|
2007-03-07 20:43:48 -04:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2007-10-30 14:27:30 -03:00
|
|
|
if (PyArg_ParseTupleAndKeywords(args, kwds, "i|si:fileio",
|
|
|
|
kwlist, &fd, &mode, &closefd)) {
|
2007-04-08 14:44:42 -03:00
|
|
|
if (fd < 0) {
|
|
|
|
PyErr_SetString(PyExc_ValueError,
|
|
|
|
"Negative filedescriptor");
|
|
|
|
return -1;
|
|
|
|
}
|
2009-01-19 11:11:51 -04:00
|
|
|
if (check_fd(fd))
|
|
|
|
return -1;
|
2007-04-08 14:44:42 -03:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
PyErr_Clear();
|
|
|
|
|
2007-03-07 20:43:48 -04:00
|
|
|
#ifdef Py_WIN_WIDE_FILENAMES
|
2007-04-08 14:44:42 -03:00
|
|
|
if (GetVersion() < 0x80000000) {
|
|
|
|
/* On NT, so wide API available */
|
2007-03-07 20:43:48 -04:00
|
|
|
PyObject *po;
|
2007-10-30 14:27:30 -03:00
|
|
|
if (PyArg_ParseTupleAndKeywords(args, kwds, "U|si:fileio",
|
|
|
|
kwlist, &po, &mode, &closefd)
|
|
|
|
) {
|
2007-07-12 08:03:13 -03:00
|
|
|
widename = PyUnicode_AS_UNICODE(po);
|
2007-03-07 20:43:48 -04:00
|
|
|
} else {
|
|
|
|
/* Drop the argument parsing error as narrow
|
|
|
|
strings are also valid. */
|
|
|
|
PyErr_Clear();
|
|
|
|
}
|
2007-04-08 14:44:42 -03:00
|
|
|
}
|
2007-10-30 14:27:30 -03:00
|
|
|
if (widename == NULL)
|
2007-03-07 20:43:48 -04:00
|
|
|
#endif
|
2007-07-12 08:03:13 -03:00
|
|
|
{
|
2007-10-30 14:27:30 -03:00
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwds, "et|si:fileio",
|
2007-03-07 20:43:48 -04:00
|
|
|
kwlist,
|
|
|
|
Py_FileSystemDefaultEncoding,
|
2007-10-30 14:27:30 -03:00
|
|
|
&name, &mode, &closefd))
|
2008-08-24 19:07:28 -03:00
|
|
|
return -1;
|
2007-04-08 14:44:42 -03:00
|
|
|
}
|
2007-03-07 20:43:48 -04:00
|
|
|
}
|
|
|
|
|
2007-04-10 16:01:47 -03:00
|
|
|
s = mode;
|
2007-03-07 20:43:48 -04:00
|
|
|
while (*s) {
|
|
|
|
switch (*s++) {
|
|
|
|
case 'r':
|
|
|
|
if (rwa) {
|
|
|
|
bad_mode:
|
|
|
|
PyErr_SetString(PyExc_ValueError,
|
|
|
|
"Must have exactly one of read/write/append mode");
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
rwa = 1;
|
|
|
|
self->readable = 1;
|
|
|
|
break;
|
|
|
|
case 'w':
|
|
|
|
if (rwa)
|
|
|
|
goto bad_mode;
|
|
|
|
rwa = 1;
|
|
|
|
self->writable = 1;
|
|
|
|
flags |= O_CREAT | O_TRUNC;
|
|
|
|
break;
|
|
|
|
case 'a':
|
|
|
|
if (rwa)
|
|
|
|
goto bad_mode;
|
|
|
|
rwa = 1;
|
|
|
|
self->writable = 1;
|
|
|
|
flags |= O_CREAT;
|
|
|
|
append = 1;
|
|
|
|
break;
|
2008-11-21 20:41:45 -04:00
|
|
|
case 'b':
|
|
|
|
break;
|
2007-03-07 20:43:48 -04:00
|
|
|
case '+':
|
|
|
|
if (plus)
|
|
|
|
goto bad_mode;
|
|
|
|
self->readable = self->writable = 1;
|
|
|
|
plus = 1;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
PyErr_Format(PyExc_ValueError,
|
|
|
|
"invalid mode: %.200s", mode);
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!rwa)
|
|
|
|
goto bad_mode;
|
|
|
|
|
|
|
|
if (self->readable && self->writable)
|
|
|
|
flags |= O_RDWR;
|
|
|
|
else if (self->readable)
|
|
|
|
flags |= O_RDONLY;
|
|
|
|
else
|
|
|
|
flags |= O_WRONLY;
|
|
|
|
|
|
|
|
#ifdef O_BINARY
|
|
|
|
flags |= O_BINARY;
|
|
|
|
#endif
|
|
|
|
|
2007-06-06 13:55:38 -03:00
|
|
|
#ifdef O_APPEND
|
|
|
|
if (append)
|
|
|
|
flags |= O_APPEND;
|
|
|
|
#endif
|
|
|
|
|
2007-04-08 14:44:42 -03:00
|
|
|
if (fd >= 0) {
|
|
|
|
self->fd = fd;
|
2007-10-30 14:27:30 -03:00
|
|
|
self->closefd = closefd;
|
2007-04-08 14:44:42 -03:00
|
|
|
}
|
|
|
|
else {
|
2007-10-30 14:27:30 -03:00
|
|
|
self->closefd = 1;
|
|
|
|
if (!closefd) {
|
|
|
|
PyErr_SetString(PyExc_ValueError,
|
Merged revisions 67028,67040,67044,67046,67052,67065,67070,67077,67082 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67028 | benjamin.peterson | 2008-10-25 18:27:07 -0500 (Sat, 25 Oct 2008) | 1 line
don't use a catch-all
........
r67040 | armin.rigo | 2008-10-28 12:01:21 -0500 (Tue, 28 Oct 2008) | 5 lines
Fix one of the tests: it relied on being present in an "output test" in
order to actually test what it was supposed to test, i.e. that the code
in the __del__ method did not crash. Use instead the new helper
test_support.captured_output().
........
r67044 | amaury.forgeotdarc | 2008-10-29 18:15:57 -0500 (Wed, 29 Oct 2008) | 3 lines
Correct error message in io.open():
closefd=True is the only accepted value with a file name.
........
r67046 | thomas.heller | 2008-10-30 15:18:13 -0500 (Thu, 30 Oct 2008) | 2 lines
Fixed a modulefinder crash on certain relative imports.
........
r67052 | christian.heimes | 2008-10-30 16:26:15 -0500 (Thu, 30 Oct 2008) | 1 line
Issue #4237: io.FileIO() was raising invalid warnings caused by insufficient initialization of PyFileIOObject struct members.
........
r67065 | benjamin.peterson | 2008-10-30 18:59:18 -0500 (Thu, 30 Oct 2008) | 1 line
move unprefixed error into .c file
........
r67070 | benjamin.peterson | 2008-10-31 15:41:44 -0500 (Fri, 31 Oct 2008) | 1 line
rephrase has_key doc
........
r67077 | benjamin.peterson | 2008-11-03 09:14:51 -0600 (Mon, 03 Nov 2008) | 1 line
#4048 make the parser module accept relative imports as valid
........
r67082 | hirokazu.yamamoto | 2008-11-03 12:03:06 -0600 (Mon, 03 Nov 2008) | 2 lines
Issue #3774: Fixed an error when create a Tkinter menu item without command
and then remove it. Written by Guilherme Polo (gpolo).
........
2008-11-03 16:31:38 -04:00
|
|
|
"Cannot use closefd=False with file name");
|
2007-10-30 14:27:30 -03:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
2007-04-08 14:44:42 -03:00
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
|
|
errno = 0;
|
2007-07-12 08:03:13 -03:00
|
|
|
#ifdef MS_WINDOWS
|
|
|
|
if (widename != NULL)
|
2007-08-12 14:23:54 -03:00
|
|
|
self->fd = _wopen(widename, flags, 0666);
|
2007-07-12 08:03:13 -03:00
|
|
|
else
|
|
|
|
#endif
|
2007-08-12 14:23:54 -03:00
|
|
|
self->fd = open(name, flags, 0666);
|
2007-04-08 14:44:42 -03:00
|
|
|
Py_END_ALLOW_THREADS
|
Merged revisions 66045,66048-66049,66053,66060,66062-66063,66065,66067,66071-66074,66080,66082-66083,66090-66093,66097-66099,66103,66105,66110,66118 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r66045 | andrew.kuchling | 2008-08-26 19:27:18 -0500 (Tue, 26 Aug 2008) | 1 line
Trim whitespace; add a few updates
........
r66048 | andrew.kuchling | 2008-08-26 19:45:02 -0500 (Tue, 26 Aug 2008) | 1 line
Add an item and a note
........
r66049 | andrew.kuchling | 2008-08-26 21:12:18 -0500 (Tue, 26 Aug 2008) | 1 line
Add various items
........
r66053 | georg.brandl | 2008-08-28 04:40:18 -0500 (Thu, 28 Aug 2008) | 2 lines
#3711: .dll isn't a valid Python extension anymore.
........
r66060 | armin.rigo | 2008-08-29 16:21:52 -0500 (Fri, 29 Aug 2008) | 3 lines
A collection of crashers, all variants of the idea
of issue #3720.
........
r66062 | georg.brandl | 2008-08-30 04:49:36 -0500 (Sat, 30 Aug 2008) | 2 lines
#3730: mention "server" attribute explicitly.
........
r66063 | georg.brandl | 2008-08-30 04:52:44 -0500 (Sat, 30 Aug 2008) | 2 lines
#3716: fix typo.
........
r66065 | georg.brandl | 2008-08-30 05:03:09 -0500 (Sat, 30 Aug 2008) | 2 lines
#3569: eval() also accepts "exec"able code objects.
........
r66067 | georg.brandl | 2008-08-30 08:17:39 -0500 (Sat, 30 Aug 2008) | 2 lines
super() actually returns a super object.
........
r66071 | andrew.kuchling | 2008-08-30 10:19:57 -0500 (Sat, 30 Aug 2008) | 1 line
Partial edits from revision and tidying pass
........
r66072 | andrew.kuchling | 2008-08-30 10:21:23 -0500 (Sat, 30 Aug 2008) | 1 line
Tidy up some sentences
........
r66073 | andrew.kuchling | 2008-08-30 10:25:47 -0500 (Sat, 30 Aug 2008) | 1 line
Correction from Antoine Pitrou: BufferedWriter and Reader support seek()
........
r66074 | andrew.kuchling | 2008-08-30 11:44:54 -0500 (Sat, 30 Aug 2008) | 1 line
Edit four more sections
........
r66080 | georg.brandl | 2008-08-30 17:00:28 -0500 (Sat, 30 Aug 2008) | 2 lines
Fix markup.
........
r66082 | andrew.kuchling | 2008-08-30 17:56:54 -0500 (Sat, 30 Aug 2008) | 1 line
More edits; markup fixes
........
r66083 | andrew.kuchling | 2008-08-30 21:24:08 -0500 (Sat, 30 Aug 2008) | 1 line
More edits
........
r66090 | andrew.kuchling | 2008-08-31 09:29:31 -0500 (Sun, 31 Aug 2008) | 1 line
Edit the library section, rearranging items to flow better and making lots of edits
........
r66091 | andrew.kuchling | 2008-08-31 10:41:48 -0500 (Sun, 31 Aug 2008) | 1 line
Last batch of edits; remove the 'other changes' section
........
r66092 | andrew.kuchling | 2008-08-31 10:48:44 -0500 (Sun, 31 Aug 2008) | 1 line
Update patch/bug count
........
r66093 | gregory.p.smith | 2008-08-31 11:34:18 -0500 (Sun, 31 Aug 2008) | 3 lines
issue3715: docstring representation of hex escaped string needs to be double
escaped.
........
r66097 | benjamin.peterson | 2008-09-01 09:13:43 -0500 (Mon, 01 Sep 2008) | 4 lines
#3703 unhelpful _fileio.FileIO error message when trying to open a directory
Reviewer: Gregory P. Smith
........
r66098 | georg.brandl | 2008-09-01 09:15:55 -0500 (Mon, 01 Sep 2008) | 2 lines
#3749: fix c'n'p errors.
........
r66099 | benjamin.peterson | 2008-09-01 09:18:30 -0500 (Mon, 01 Sep 2008) | 4 lines
Fix compilation when --without-threads is given #3683
Reviewer: Georg Brandl, Benjamin Peterson
........
r66103 | vinay.sajip | 2008-09-01 09:30:10 -0500 (Mon, 01 Sep 2008) | 1 line
logging: fixed lack of use of encoding attribute specified on a stream.
........
r66105 | vinay.sajip | 2008-09-01 09:33:59 -0500 (Mon, 01 Sep 2008) | 1 line
logging: fixed lack of use of encoding attribute specified on a stream.
........
r66110 | vinay.sajip | 2008-09-01 10:08:07 -0500 (Mon, 01 Sep 2008) | 1 line
Added section about configuring logging in a library. Thanks to Thomas Heller for the idea.
........
r66118 | vinay.sajip | 2008-09-01 12:44:14 -0500 (Mon, 01 Sep 2008) | 1 line
Bug #3738: Documentation is now more accurate in describing handler close methods.
........
2008-09-01 21:31:15 -03:00
|
|
|
if (self->fd < 0) {
|
2007-10-31 16:20:48 -03:00
|
|
|
#ifdef MS_WINDOWS
|
2009-01-01 12:03:45 -04:00
|
|
|
if (widename != NULL)
|
|
|
|
PyErr_SetFromErrnoWithUnicodeFilename(PyExc_IOError, widename);
|
|
|
|
else
|
2007-10-31 16:20:48 -03:00
|
|
|
#endif
|
2009-01-01 12:03:45 -04:00
|
|
|
PyErr_SetFromErrnoWithFilename(PyExc_IOError, name);
|
2007-04-08 14:44:42 -03:00
|
|
|
goto error;
|
|
|
|
}
|
2008-12-29 14:02:28 -04:00
|
|
|
if(dircheck(self, name) < 0)
|
Merged revisions 66045,66048-66049,66053,66060,66062-66063,66065,66067,66071-66074,66080,66082-66083,66090-66093,66097-66099,66103,66105,66110,66118 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r66045 | andrew.kuchling | 2008-08-26 19:27:18 -0500 (Tue, 26 Aug 2008) | 1 line
Trim whitespace; add a few updates
........
r66048 | andrew.kuchling | 2008-08-26 19:45:02 -0500 (Tue, 26 Aug 2008) | 1 line
Add an item and a note
........
r66049 | andrew.kuchling | 2008-08-26 21:12:18 -0500 (Tue, 26 Aug 2008) | 1 line
Add various items
........
r66053 | georg.brandl | 2008-08-28 04:40:18 -0500 (Thu, 28 Aug 2008) | 2 lines
#3711: .dll isn't a valid Python extension anymore.
........
r66060 | armin.rigo | 2008-08-29 16:21:52 -0500 (Fri, 29 Aug 2008) | 3 lines
A collection of crashers, all variants of the idea
of issue #3720.
........
r66062 | georg.brandl | 2008-08-30 04:49:36 -0500 (Sat, 30 Aug 2008) | 2 lines
#3730: mention "server" attribute explicitly.
........
r66063 | georg.brandl | 2008-08-30 04:52:44 -0500 (Sat, 30 Aug 2008) | 2 lines
#3716: fix typo.
........
r66065 | georg.brandl | 2008-08-30 05:03:09 -0500 (Sat, 30 Aug 2008) | 2 lines
#3569: eval() also accepts "exec"able code objects.
........
r66067 | georg.brandl | 2008-08-30 08:17:39 -0500 (Sat, 30 Aug 2008) | 2 lines
super() actually returns a super object.
........
r66071 | andrew.kuchling | 2008-08-30 10:19:57 -0500 (Sat, 30 Aug 2008) | 1 line
Partial edits from revision and tidying pass
........
r66072 | andrew.kuchling | 2008-08-30 10:21:23 -0500 (Sat, 30 Aug 2008) | 1 line
Tidy up some sentences
........
r66073 | andrew.kuchling | 2008-08-30 10:25:47 -0500 (Sat, 30 Aug 2008) | 1 line
Correction from Antoine Pitrou: BufferedWriter and Reader support seek()
........
r66074 | andrew.kuchling | 2008-08-30 11:44:54 -0500 (Sat, 30 Aug 2008) | 1 line
Edit four more sections
........
r66080 | georg.brandl | 2008-08-30 17:00:28 -0500 (Sat, 30 Aug 2008) | 2 lines
Fix markup.
........
r66082 | andrew.kuchling | 2008-08-30 17:56:54 -0500 (Sat, 30 Aug 2008) | 1 line
More edits; markup fixes
........
r66083 | andrew.kuchling | 2008-08-30 21:24:08 -0500 (Sat, 30 Aug 2008) | 1 line
More edits
........
r66090 | andrew.kuchling | 2008-08-31 09:29:31 -0500 (Sun, 31 Aug 2008) | 1 line
Edit the library section, rearranging items to flow better and making lots of edits
........
r66091 | andrew.kuchling | 2008-08-31 10:41:48 -0500 (Sun, 31 Aug 2008) | 1 line
Last batch of edits; remove the 'other changes' section
........
r66092 | andrew.kuchling | 2008-08-31 10:48:44 -0500 (Sun, 31 Aug 2008) | 1 line
Update patch/bug count
........
r66093 | gregory.p.smith | 2008-08-31 11:34:18 -0500 (Sun, 31 Aug 2008) | 3 lines
issue3715: docstring representation of hex escaped string needs to be double
escaped.
........
r66097 | benjamin.peterson | 2008-09-01 09:13:43 -0500 (Mon, 01 Sep 2008) | 4 lines
#3703 unhelpful _fileio.FileIO error message when trying to open a directory
Reviewer: Gregory P. Smith
........
r66098 | georg.brandl | 2008-09-01 09:15:55 -0500 (Mon, 01 Sep 2008) | 2 lines
#3749: fix c'n'p errors.
........
r66099 | benjamin.peterson | 2008-09-01 09:18:30 -0500 (Mon, 01 Sep 2008) | 4 lines
Fix compilation when --without-threads is given #3683
Reviewer: Georg Brandl, Benjamin Peterson
........
r66103 | vinay.sajip | 2008-09-01 09:30:10 -0500 (Mon, 01 Sep 2008) | 1 line
logging: fixed lack of use of encoding attribute specified on a stream.
........
r66105 | vinay.sajip | 2008-09-01 09:33:59 -0500 (Mon, 01 Sep 2008) | 1 line
logging: fixed lack of use of encoding attribute specified on a stream.
........
r66110 | vinay.sajip | 2008-09-01 10:08:07 -0500 (Mon, 01 Sep 2008) | 1 line
Added section about configuring logging in a library. Thanks to Thomas Heller for the idea.
........
r66118 | vinay.sajip | 2008-09-01 12:44:14 -0500 (Mon, 01 Sep 2008) | 1 line
Bug #3738: Documentation is now more accurate in describing handler close methods.
........
2008-09-01 21:31:15 -03:00
|
|
|
goto error;
|
2007-03-07 20:43:48 -04:00
|
|
|
}
|
|
|
|
|
2009-01-20 20:55:13 -04:00
|
|
|
if (append) {
|
|
|
|
/* For consistent behaviour, we explicitly seek to the
|
|
|
|
end of file (otherwise, it might be done only on the
|
|
|
|
first write()). */
|
|
|
|
PyObject *pos = portable_lseek(self->fd, NULL, 2);
|
|
|
|
if (pos == NULL)
|
|
|
|
goto error;
|
|
|
|
Py_DECREF(pos);
|
|
|
|
}
|
|
|
|
|
2007-03-07 20:43:48 -04:00
|
|
|
goto done;
|
|
|
|
|
|
|
|
error:
|
|
|
|
ret = -1;
|
2007-04-10 16:01:47 -03:00
|
|
|
|
2007-03-07 20:43:48 -04:00
|
|
|
done:
|
2008-08-24 02:48:10 -03:00
|
|
|
PyMem_Free(name);
|
2007-03-07 20:43:48 -04:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
fileio_dealloc(PyFileIOObject *self)
|
|
|
|
{
|
|
|
|
if (self->weakreflist != NULL)
|
|
|
|
PyObject_ClearWeakRefs((PyObject *) self);
|
|
|
|
|
2007-10-30 14:27:30 -03:00
|
|
|
if (self->fd >= 0 && self->closefd) {
|
2008-12-18 13:15:54 -04:00
|
|
|
if(internal_close(self))
|
|
|
|
PyErr_WriteUnraisable((PyObject*)self);
|
2007-03-07 20:43:48 -04:00
|
|
|
}
|
|
|
|
|
2007-12-18 22:45:37 -04:00
|
|
|
Py_TYPE(self)->tp_free((PyObject *)self);
|
2007-03-07 20:43:48 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
err_closed(void)
|
|
|
|
{
|
|
|
|
PyErr_SetString(PyExc_ValueError, "I/O operation on closed file");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2007-04-10 16:01:47 -03:00
|
|
|
static PyObject *
|
|
|
|
err_mode(char *action)
|
|
|
|
{
|
|
|
|
PyErr_Format(PyExc_ValueError, "File not open for %s", action);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2007-03-07 20:43:48 -04:00
|
|
|
static PyObject *
|
|
|
|
fileio_fileno(PyFileIOObject *self)
|
|
|
|
{
|
|
|
|
if (self->fd < 0)
|
|
|
|
return err_closed();
|
2007-12-02 10:31:20 -04:00
|
|
|
return PyLong_FromLong((long) self->fd);
|
2007-03-07 20:43:48 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
fileio_readable(PyFileIOObject *self)
|
|
|
|
{
|
|
|
|
if (self->fd < 0)
|
|
|
|
return err_closed();
|
2007-08-12 14:23:54 -03:00
|
|
|
return PyBool_FromLong((long) self->readable);
|
2007-03-07 20:43:48 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
fileio_writable(PyFileIOObject *self)
|
|
|
|
{
|
|
|
|
if (self->fd < 0)
|
|
|
|
return err_closed();
|
2007-08-12 14:23:54 -03:00
|
|
|
return PyBool_FromLong((long) self->writable);
|
2007-03-07 20:43:48 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
fileio_seekable(PyFileIOObject *self)
|
|
|
|
{
|
|
|
|
if (self->fd < 0)
|
|
|
|
return err_closed();
|
|
|
|
if (self->seekable < 0) {
|
|
|
|
int ret;
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
|
|
ret = lseek(self->fd, 0, SEEK_CUR);
|
|
|
|
Py_END_ALLOW_THREADS
|
|
|
|
if (ret < 0)
|
|
|
|
self->seekable = 0;
|
|
|
|
else
|
|
|
|
self->seekable = 1;
|
|
|
|
}
|
2007-07-12 08:21:36 -03:00
|
|
|
return PyBool_FromLong((long) self->seekable);
|
2007-03-07 20:43:48 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
fileio_readinto(PyFileIOObject *self, PyObject *args)
|
|
|
|
{
|
2008-08-13 12:53:07 -03:00
|
|
|
Py_buffer pbuf;
|
2007-03-07 20:43:48 -04:00
|
|
|
Py_ssize_t n;
|
2007-04-10 16:01:47 -03:00
|
|
|
|
2007-03-07 20:43:48 -04:00
|
|
|
if (self->fd < 0)
|
|
|
|
return err_closed();
|
2007-04-10 16:01:47 -03:00
|
|
|
if (!self->readable)
|
|
|
|
return err_mode("reading");
|
|
|
|
|
2008-08-13 12:53:07 -03:00
|
|
|
if (!PyArg_ParseTuple(args, "w*", &pbuf))
|
2007-03-07 20:43:48 -04:00
|
|
|
return NULL;
|
|
|
|
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
|
|
errno = 0;
|
2008-08-13 12:53:07 -03:00
|
|
|
n = read(self->fd, pbuf.buf, pbuf.len);
|
2007-03-07 20:43:48 -04:00
|
|
|
Py_END_ALLOW_THREADS
|
2008-08-13 12:53:07 -03:00
|
|
|
PyBuffer_Release(&pbuf);
|
2007-03-07 20:43:48 -04:00
|
|
|
if (n < 0) {
|
|
|
|
if (errno == EAGAIN)
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
PyErr_SetFromErrno(PyExc_IOError);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2007-12-02 10:31:20 -04:00
|
|
|
return PyLong_FromSsize_t(n);
|
2007-03-07 20:43:48 -04:00
|
|
|
}
|
|
|
|
|
2007-07-10 03:54:34 -03:00
|
|
|
static PyObject *
|
|
|
|
fileio_readall(PyFileIOObject *self)
|
|
|
|
{
|
|
|
|
PyObject *result;
|
|
|
|
Py_ssize_t total = 0;
|
|
|
|
int n;
|
|
|
|
|
2008-12-05 04:26:55 -04:00
|
|
|
result = PyBytes_FromStringAndSize(NULL, SMALLCHUNK);
|
2007-07-10 03:54:34 -03:00
|
|
|
if (result == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
while (1) {
|
2008-12-05 04:26:55 -04:00
|
|
|
Py_ssize_t newsize = (total < SMALLCHUNK) ? SMALLCHUNK : total;
|
|
|
|
|
|
|
|
/* Keep doubling until we reach BIGCHUNK;
|
|
|
|
then keep adding BIGCHUNK. */
|
|
|
|
if (newsize <= BIGCHUNK) {
|
|
|
|
newsize += newsize;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* NOTE: overflow impossible due to limits on BUFSIZ */
|
|
|
|
newsize += BIGCHUNK;
|
|
|
|
}
|
|
|
|
|
2008-05-26 10:28:38 -03:00
|
|
|
if (PyBytes_GET_SIZE(result) < newsize) {
|
|
|
|
if (_PyBytes_Resize(&result, newsize) < 0) {
|
2007-07-10 03:54:34 -03:00
|
|
|
if (total == 0) {
|
|
|
|
Py_DECREF(result);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
PyErr_Clear();
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
|
|
errno = 0;
|
|
|
|
n = read(self->fd,
|
2008-05-26 10:28:38 -03:00
|
|
|
PyBytes_AS_STRING(result) + total,
|
2007-07-10 03:54:34 -03:00
|
|
|
newsize - total);
|
|
|
|
Py_END_ALLOW_THREADS
|
|
|
|
if (n == 0)
|
|
|
|
break;
|
|
|
|
if (n < 0) {
|
|
|
|
if (total > 0)
|
|
|
|
break;
|
|
|
|
if (errno == EAGAIN) {
|
|
|
|
Py_DECREF(result);
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
|
|
|
Py_DECREF(result);
|
|
|
|
PyErr_SetFromErrno(PyExc_IOError);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
total += n;
|
|
|
|
}
|
|
|
|
|
2008-05-26 10:28:38 -03:00
|
|
|
if (PyBytes_GET_SIZE(result) > total) {
|
|
|
|
if (_PyBytes_Resize(&result, total) < 0) {
|
2007-07-10 03:54:34 -03:00
|
|
|
/* This should never happen, but just in case */
|
|
|
|
Py_DECREF(result);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2007-03-07 20:43:48 -04:00
|
|
|
static PyObject *
|
|
|
|
fileio_read(PyFileIOObject *self, PyObject *args)
|
|
|
|
{
|
|
|
|
char *ptr;
|
2007-07-10 03:54:34 -03:00
|
|
|
Py_ssize_t n;
|
|
|
|
Py_ssize_t size = -1;
|
2007-03-07 20:43:48 -04:00
|
|
|
PyObject *bytes;
|
|
|
|
|
|
|
|
if (self->fd < 0)
|
|
|
|
return err_closed();
|
2007-04-10 16:01:47 -03:00
|
|
|
if (!self->readable)
|
|
|
|
return err_mode("reading");
|
2007-03-07 20:43:48 -04:00
|
|
|
|
2007-08-08 01:36:17 -03:00
|
|
|
if (!PyArg_ParseTuple(args, "|n", &size))
|
2007-03-07 20:43:48 -04:00
|
|
|
return NULL;
|
|
|
|
|
2007-05-23 21:50:02 -03:00
|
|
|
if (size < 0) {
|
2007-07-10 03:54:34 -03:00
|
|
|
return fileio_readall(self);
|
2007-05-23 21:50:02 -03:00
|
|
|
}
|
|
|
|
|
2008-05-26 10:28:38 -03:00
|
|
|
bytes = PyBytes_FromStringAndSize(NULL, size);
|
2007-03-07 20:43:48 -04:00
|
|
|
if (bytes == NULL)
|
|
|
|
return NULL;
|
2008-05-26 10:28:38 -03:00
|
|
|
ptr = PyBytes_AS_STRING(bytes);
|
2007-03-07 20:43:48 -04:00
|
|
|
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
|
|
errno = 0;
|
|
|
|
n = read(self->fd, ptr, size);
|
|
|
|
Py_END_ALLOW_THREADS
|
|
|
|
|
|
|
|
if (n < 0) {
|
|
|
|
if (errno == EAGAIN)
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
PyErr_SetFromErrno(PyExc_IOError);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (n != size) {
|
2008-05-26 10:28:38 -03:00
|
|
|
if (_PyBytes_Resize(&bytes, n) < 0) {
|
2007-03-07 20:43:48 -04:00
|
|
|
Py_DECREF(bytes);
|
2007-04-10 16:01:47 -03:00
|
|
|
return NULL;
|
2007-03-07 20:43:48 -04:00
|
|
|
}
|
2007-04-10 16:01:47 -03:00
|
|
|
}
|
2007-03-07 20:43:48 -04:00
|
|
|
|
|
|
|
return (PyObject *) bytes;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
fileio_write(PyFileIOObject *self, PyObject *args)
|
|
|
|
{
|
2008-08-13 12:53:07 -03:00
|
|
|
Py_buffer pbuf;
|
2007-03-07 20:43:48 -04:00
|
|
|
Py_ssize_t n;
|
|
|
|
|
|
|
|
if (self->fd < 0)
|
|
|
|
return err_closed();
|
2007-04-10 16:01:47 -03:00
|
|
|
if (!self->writable)
|
|
|
|
return err_mode("writing");
|
|
|
|
|
2008-08-13 12:53:07 -03:00
|
|
|
if (!PyArg_ParseTuple(args, "s*", &pbuf))
|
2007-03-07 20:43:48 -04:00
|
|
|
return NULL;
|
|
|
|
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
|
|
errno = 0;
|
2008-08-13 12:53:07 -03:00
|
|
|
n = write(self->fd, pbuf.buf, pbuf.len);
|
2007-03-07 20:43:48 -04:00
|
|
|
Py_END_ALLOW_THREADS
|
|
|
|
|
2008-08-13 12:53:07 -03:00
|
|
|
PyBuffer_Release(&pbuf);
|
|
|
|
|
2007-03-07 20:43:48 -04:00
|
|
|
if (n < 0) {
|
|
|
|
if (errno == EAGAIN)
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
PyErr_SetFromErrno(PyExc_IOError);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2007-12-02 10:31:20 -04:00
|
|
|
return PyLong_FromSsize_t(n);
|
2007-03-07 20:43:48 -04:00
|
|
|
}
|
|
|
|
|
2007-04-10 16:01:47 -03:00
|
|
|
/* XXX Windows support below is likely incomplete */
|
|
|
|
|
|
|
|
#if defined(MS_WIN64) || defined(MS_WINDOWS)
|
|
|
|
typedef PY_LONG_LONG Py_off_t;
|
|
|
|
#else
|
|
|
|
typedef off_t Py_off_t;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* Cribbed from posix_lseek() */
|
2007-03-07 20:43:48 -04:00
|
|
|
static PyObject *
|
2007-04-10 16:01:47 -03:00
|
|
|
portable_lseek(int fd, PyObject *posobj, int whence)
|
2007-03-07 20:43:48 -04:00
|
|
|
{
|
2007-04-10 16:01:47 -03:00
|
|
|
Py_off_t pos, res;
|
2007-03-07 20:43:48 -04:00
|
|
|
|
2007-04-10 16:01:47 -03:00
|
|
|
#ifdef SEEK_SET
|
|
|
|
/* Turn 0, 1, 2 into SEEK_{SET,CUR,END} */
|
|
|
|
switch (whence) {
|
|
|
|
#if SEEK_SET != 0
|
|
|
|
case 0: whence = SEEK_SET; break;
|
|
|
|
#endif
|
|
|
|
#if SEEK_CUR != 1
|
|
|
|
case 1: whence = SEEK_CUR; break;
|
|
|
|
#endif
|
2009-01-20 07:42:11 -04:00
|
|
|
#if SEEK_END != 2
|
2007-04-10 16:01:47 -03:00
|
|
|
case 2: whence = SEEK_END; break;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
#endif /* SEEK_SET */
|
2007-03-07 20:43:48 -04:00
|
|
|
|
2007-04-10 16:01:47 -03:00
|
|
|
if (posobj == NULL)
|
|
|
|
pos = 0;
|
|
|
|
else {
|
2007-11-08 14:04:45 -04:00
|
|
|
if(PyFloat_Check(posobj)) {
|
|
|
|
PyErr_SetString(PyExc_TypeError, "an integer is required");
|
|
|
|
return NULL;
|
|
|
|
}
|
2008-05-06 16:48:38 -03:00
|
|
|
#if defined(HAVE_LARGEFILE_SUPPORT)
|
|
|
|
pos = PyLong_AsLongLong(posobj);
|
2007-04-10 16:01:47 -03:00
|
|
|
#else
|
2008-05-06 16:48:38 -03:00
|
|
|
pos = PyLong_AsLong(posobj);
|
2007-04-10 16:01:47 -03:00
|
|
|
#endif
|
|
|
|
if (PyErr_Occurred())
|
|
|
|
return NULL;
|
|
|
|
}
|
2007-03-07 20:43:48 -04:00
|
|
|
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
2007-04-10 16:01:47 -03:00
|
|
|
#if defined(MS_WIN64) || defined(MS_WINDOWS)
|
|
|
|
res = _lseeki64(fd, pos, whence);
|
|
|
|
#else
|
|
|
|
res = lseek(fd, pos, whence);
|
|
|
|
#endif
|
2007-03-07 20:43:48 -04:00
|
|
|
Py_END_ALLOW_THREADS
|
2007-04-10 16:01:47 -03:00
|
|
|
if (res < 0)
|
|
|
|
return PyErr_SetFromErrno(PyExc_IOError);
|
2007-03-07 20:43:48 -04:00
|
|
|
|
2008-05-06 16:48:38 -03:00
|
|
|
#if defined(HAVE_LARGEFILE_SUPPORT)
|
2007-04-10 16:01:47 -03:00
|
|
|
return PyLong_FromLongLong(res);
|
2008-05-06 16:48:38 -03:00
|
|
|
#else
|
|
|
|
return PyLong_FromLong(res);
|
2007-04-10 16:01:47 -03:00
|
|
|
#endif
|
2007-03-07 20:43:48 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
2007-04-10 16:01:47 -03:00
|
|
|
fileio_seek(PyFileIOObject *self, PyObject *args)
|
2007-03-07 20:43:48 -04:00
|
|
|
{
|
2007-04-10 16:01:47 -03:00
|
|
|
PyObject *posobj;
|
|
|
|
int whence = 0;
|
2007-03-07 20:43:48 -04:00
|
|
|
|
|
|
|
if (self->fd < 0)
|
|
|
|
return err_closed();
|
|
|
|
|
2007-04-10 16:01:47 -03:00
|
|
|
if (!PyArg_ParseTuple(args, "O|i", &posobj, &whence))
|
2007-03-07 20:43:48 -04:00
|
|
|
return NULL;
|
|
|
|
|
2007-04-10 16:01:47 -03:00
|
|
|
return portable_lseek(self->fd, posobj, whence);
|
2007-03-07 20:43:48 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
2007-04-10 16:01:47 -03:00
|
|
|
fileio_tell(PyFileIOObject *self, PyObject *args)
|
2007-03-07 20:43:48 -04:00
|
|
|
{
|
|
|
|
if (self->fd < 0)
|
|
|
|
return err_closed();
|
|
|
|
|
2007-04-10 16:01:47 -03:00
|
|
|
return portable_lseek(self->fd, NULL, 1);
|
|
|
|
}
|
2007-03-07 20:43:48 -04:00
|
|
|
|
2007-07-11 09:45:46 -03:00
|
|
|
#ifdef HAVE_FTRUNCATE
|
2007-04-10 16:01:47 -03:00
|
|
|
static PyObject *
|
|
|
|
fileio_truncate(PyFileIOObject *self, PyObject *args)
|
|
|
|
{
|
|
|
|
PyObject *posobj = NULL;
|
|
|
|
Py_off_t pos;
|
2007-07-12 08:21:36 -03:00
|
|
|
int ret;
|
2007-04-12 19:55:07 -03:00
|
|
|
int fd;
|
2007-04-10 16:01:47 -03:00
|
|
|
|
|
|
|
fd = self->fd;
|
|
|
|
if (fd < 0)
|
|
|
|
return err_closed();
|
|
|
|
if (!self->writable)
|
|
|
|
return err_mode("writing");
|
|
|
|
|
|
|
|
if (!PyArg_ParseTuple(args, "|O", &posobj))
|
2007-03-07 20:43:48 -04:00
|
|
|
return NULL;
|
|
|
|
|
2007-04-12 19:55:07 -03:00
|
|
|
if (posobj == Py_None || posobj == NULL) {
|
2008-05-06 16:48:38 -03:00
|
|
|
/* Get the current position. */
|
2007-04-12 19:55:07 -03:00
|
|
|
posobj = portable_lseek(fd, NULL, 1);
|
|
|
|
if (posobj == NULL)
|
2008-05-06 16:48:38 -03:00
|
|
|
return NULL;
|
2007-04-12 19:55:07 -03:00
|
|
|
}
|
|
|
|
else {
|
2008-05-06 16:48:38 -03:00
|
|
|
/* Move to the position to be truncated. */
|
|
|
|
posobj = portable_lseek(fd, posobj, 0);
|
2007-04-12 19:55:07 -03:00
|
|
|
}
|
2007-04-10 16:01:47 -03:00
|
|
|
|
2008-05-06 16:48:38 -03:00
|
|
|
#if defined(HAVE_LARGEFILE_SUPPORT)
|
|
|
|
pos = PyLong_AsLongLong(posobj);
|
2007-04-10 16:01:47 -03:00
|
|
|
#else
|
2008-05-06 16:48:38 -03:00
|
|
|
pos = PyLong_AsLong(posobj);
|
2007-04-10 16:01:47 -03:00
|
|
|
#endif
|
2008-05-06 16:48:38 -03:00
|
|
|
if (PyErr_Occurred())
|
2007-04-10 16:01:47 -03:00
|
|
|
return NULL;
|
2007-03-07 20:43:48 -04:00
|
|
|
|
2007-07-12 08:21:36 -03:00
|
|
|
#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;
|
|
|
|
|
|
|
|
/* 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
|
2007-03-07 20:43:48 -04:00
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
|
|
errno = 0;
|
2007-07-12 08:21:36 -03:00
|
|
|
ret = ftruncate(fd, pos);
|
2007-03-07 20:43:48 -04:00
|
|
|
Py_END_ALLOW_THREADS
|
2007-07-12 08:21:36 -03:00
|
|
|
#endif /* !MS_WINDOWS */
|
2007-03-07 20:43:48 -04:00
|
|
|
|
2007-07-12 08:21:36 -03:00
|
|
|
if (ret != 0) {
|
2007-03-07 20:43:48 -04:00
|
|
|
PyErr_SetFromErrno(PyExc_IOError);
|
2007-07-12 08:21:36 -03:00
|
|
|
return NULL;
|
2007-04-10 18:06:59 -03:00
|
|
|
}
|
2007-03-07 20:43:48 -04:00
|
|
|
|
2007-04-10 18:06:59 -03:00
|
|
|
return posobj;
|
2007-03-07 20:43:48 -04:00
|
|
|
}
|
2007-07-11 09:45:46 -03:00
|
|
|
#endif
|
2007-04-10 16:01:47 -03:00
|
|
|
|
|
|
|
static char *
|
|
|
|
mode_string(PyFileIOObject *self)
|
|
|
|
{
|
|
|
|
if (self->readable) {
|
|
|
|
if (self->writable)
|
2008-11-21 20:41:45 -04:00
|
|
|
return "rb+";
|
2007-04-10 16:01:47 -03:00
|
|
|
else
|
2008-11-21 20:41:45 -04:00
|
|
|
return "rb";
|
2007-04-10 16:01:47 -03:00
|
|
|
}
|
|
|
|
else
|
2008-11-21 20:41:45 -04:00
|
|
|
return "wb";
|
2007-04-10 16:01:47 -03:00
|
|
|
}
|
2007-03-07 20:43:48 -04:00
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
fileio_repr(PyFileIOObject *self)
|
|
|
|
{
|
2007-04-10 16:01:47 -03:00
|
|
|
if (self->fd < 0)
|
2007-05-18 14:15:44 -03:00
|
|
|
return PyUnicode_FromFormat("_fileio._FileIO(-1)");
|
2007-03-07 20:43:48 -04:00
|
|
|
|
2007-05-18 14:15:44 -03:00
|
|
|
return PyUnicode_FromFormat("_fileio._FileIO(%d, '%s')",
|
2007-04-10 16:01:47 -03:00
|
|
|
self->fd, mode_string(self));
|
2007-03-07 20:43:48 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
fileio_isatty(PyFileIOObject *self)
|
|
|
|
{
|
|
|
|
long res;
|
2007-04-10 16:01:47 -03:00
|
|
|
|
2007-03-07 20:43:48 -04:00
|
|
|
if (self->fd < 0)
|
|
|
|
return err_closed();
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
|
|
res = isatty(self->fd);
|
|
|
|
Py_END_ALLOW_THREADS
|
|
|
|
return PyBool_FromLong(res);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
PyDoc_STRVAR(fileio_doc,
|
|
|
|
"file(name: str[, mode: str]) -> file IO object\n"
|
|
|
|
"\n"
|
|
|
|
"Open a file. The mode can be 'r', 'w' or 'a' for reading (default),\n"
|
|
|
|
"writing or appending. The file will be created if it doesn't exist\n"
|
|
|
|
"when opened for writing or appending; it will be truncated when\n"
|
|
|
|
"opened for writing. Add a '+' to the mode to allow simultaneous\n"
|
|
|
|
"reading and writing.");
|
|
|
|
|
|
|
|
PyDoc_STRVAR(read_doc,
|
|
|
|
"read(size: int) -> bytes. read at most size bytes, returned as bytes.\n"
|
|
|
|
"\n"
|
|
|
|
"Only makes one system call, so less data may be returned than requested\n"
|
2007-07-10 03:54:34 -03:00
|
|
|
"In non-blocking mode, returns None if no data is available.\n"
|
|
|
|
"On end-of-file, returns ''.");
|
|
|
|
|
|
|
|
PyDoc_STRVAR(readall_doc,
|
|
|
|
"readall() -> bytes. read all data from the file, returned as bytes.\n"
|
|
|
|
"\n"
|
|
|
|
"In non-blocking mode, returns as much as is immediately available,\n"
|
|
|
|
"or None if no data is available. On end-of-file, returns ''.");
|
2007-03-07 20:43:48 -04:00
|
|
|
|
|
|
|
PyDoc_STRVAR(write_doc,
|
|
|
|
"write(b: bytes) -> int. Write bytes b to file, return number written.\n"
|
|
|
|
"\n"
|
|
|
|
"Only makes one system call, so not all of the data may be written.\n"
|
|
|
|
"The number of bytes actually written is returned.");
|
|
|
|
|
|
|
|
PyDoc_STRVAR(fileno_doc,
|
|
|
|
"fileno() -> int. \"file descriptor\".\n"
|
|
|
|
"\n"
|
|
|
|
"This is needed for lower-level file interfaces, such the fcntl module.");
|
|
|
|
|
|
|
|
PyDoc_STRVAR(seek_doc,
|
|
|
|
"seek(offset: int[, whence: int]) -> None. Move to new file position.\n"
|
|
|
|
"\n"
|
|
|
|
"Argument offset is a byte count. Optional argument whence defaults to\n"
|
|
|
|
"0 (offset from start of file, offset should be >= 0); other values are 1\n"
|
|
|
|
"(move relative to current position, positive or negative), and 2 (move\n"
|
|
|
|
"relative to end of file, usually negative, although many platforms allow\n"
|
|
|
|
"seeking beyond the end of a file)."
|
|
|
|
"\n"
|
|
|
|
"Note that not all file objects are seekable.");
|
|
|
|
|
2007-07-11 09:45:46 -03:00
|
|
|
#ifdef HAVE_FTRUNCATE
|
2007-03-07 20:43:48 -04:00
|
|
|
PyDoc_STRVAR(truncate_doc,
|
|
|
|
"truncate([size: int]) -> None. Truncate the file to at most size bytes.\n"
|
|
|
|
"\n"
|
2008-05-06 16:48:38 -03:00
|
|
|
"Size defaults to the current file position, as returned by tell()."
|
|
|
|
"The current file position is changed to the value of size.");
|
2007-07-11 09:45:46 -03:00
|
|
|
#endif
|
2007-03-07 20:43:48 -04:00
|
|
|
|
|
|
|
PyDoc_STRVAR(tell_doc,
|
|
|
|
"tell() -> int. Current file position");
|
|
|
|
|
|
|
|
PyDoc_STRVAR(readinto_doc,
|
|
|
|
"readinto() -> Undocumented. Don't use this; it may go away.");
|
|
|
|
|
|
|
|
PyDoc_STRVAR(close_doc,
|
|
|
|
"close() -> None. Close the file.\n"
|
|
|
|
"\n"
|
|
|
|
"A closed file cannot be used for further I/O operations. close() may be\n"
|
|
|
|
"called more than once without error. Changes the fileno to -1.");
|
|
|
|
|
|
|
|
PyDoc_STRVAR(isatty_doc,
|
|
|
|
"isatty() -> bool. True if the file is connected to a tty device.");
|
|
|
|
|
|
|
|
PyDoc_STRVAR(seekable_doc,
|
|
|
|
"seekable() -> bool. True if file supports random-access.");
|
|
|
|
|
|
|
|
PyDoc_STRVAR(readable_doc,
|
|
|
|
"readable() -> bool. True if file was opened in a read mode.");
|
|
|
|
|
|
|
|
PyDoc_STRVAR(writable_doc,
|
|
|
|
"writable() -> bool. True if file was opened in a write mode.");
|
|
|
|
|
|
|
|
static PyMethodDef fileio_methods[] = {
|
|
|
|
{"read", (PyCFunction)fileio_read, METH_VARARGS, read_doc},
|
2007-07-10 03:54:34 -03:00
|
|
|
{"readall", (PyCFunction)fileio_readall, METH_NOARGS, readall_doc},
|
2007-03-07 20:43:48 -04:00
|
|
|
{"readinto", (PyCFunction)fileio_readinto, METH_VARARGS, readinto_doc},
|
|
|
|
{"write", (PyCFunction)fileio_write, METH_VARARGS, write_doc},
|
|
|
|
{"seek", (PyCFunction)fileio_seek, METH_VARARGS, seek_doc},
|
|
|
|
{"tell", (PyCFunction)fileio_tell, METH_VARARGS, tell_doc},
|
2007-07-11 09:45:46 -03:00
|
|
|
#ifdef HAVE_FTRUNCATE
|
2007-03-07 20:43:48 -04:00
|
|
|
{"truncate", (PyCFunction)fileio_truncate, METH_VARARGS, truncate_doc},
|
2007-07-11 09:45:46 -03:00
|
|
|
#endif
|
2007-03-07 20:43:48 -04:00
|
|
|
{"close", (PyCFunction)fileio_close, METH_NOARGS, close_doc},
|
|
|
|
{"seekable", (PyCFunction)fileio_seekable, METH_NOARGS, seekable_doc},
|
|
|
|
{"readable", (PyCFunction)fileio_readable, METH_NOARGS, readable_doc},
|
|
|
|
{"writable", (PyCFunction)fileio_writable, METH_NOARGS, writable_doc},
|
|
|
|
{"fileno", (PyCFunction)fileio_fileno, METH_NOARGS, fileno_doc},
|
|
|
|
{"isatty", (PyCFunction)fileio_isatty, METH_NOARGS, isatty_doc},
|
|
|
|
{NULL, NULL} /* sentinel */
|
|
|
|
};
|
|
|
|
|
2007-04-10 16:01:47 -03:00
|
|
|
/* 'closed' and 'mode' are attributes for backwards compatibility reasons. */
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
get_closed(PyFileIOObject *self, void *closure)
|
|
|
|
{
|
|
|
|
return PyBool_FromLong((long)(self->fd < 0));
|
|
|
|
}
|
|
|
|
|
2008-11-05 15:30:32 -04:00
|
|
|
static PyObject *
|
|
|
|
get_closefd(PyFileIOObject *self, void *closure)
|
|
|
|
{
|
|
|
|
return PyBool_FromLong((long)(self->closefd));
|
|
|
|
}
|
|
|
|
|
2007-04-08 14:44:42 -03:00
|
|
|
static PyObject *
|
2007-04-10 16:01:47 -03:00
|
|
|
get_mode(PyFileIOObject *self, void *closure)
|
2007-04-08 14:44:42 -03:00
|
|
|
{
|
2007-06-18 15:26:36 -03:00
|
|
|
return PyUnicode_FromString(mode_string(self));
|
2007-04-08 14:44:42 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
static PyGetSetDef fileio_getsetlist[] = {
|
|
|
|
{"closed", (getter)get_closed, NULL, "True if the file is closed"},
|
2008-11-05 15:30:32 -04:00
|
|
|
{"closefd", (getter)get_closefd, NULL,
|
|
|
|
"True if the file descriptor will be closed"},
|
2007-04-10 16:01:47 -03:00
|
|
|
{"mode", (getter)get_mode, NULL, "String giving the file mode"},
|
2007-04-08 14:44:42 -03:00
|
|
|
{0},
|
|
|
|
};
|
|
|
|
|
2007-03-07 20:43:48 -04:00
|
|
|
PyTypeObject PyFileIO_Type = {
|
Merged revisions 56467-56482 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
................
r56477 | martin.v.loewis | 2007-07-21 09:04:38 +0200 (Sa, 21 Jul 2007) | 11 lines
Merged revisions 56466-56476 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r56476 | martin.v.loewis | 2007-07-21 08:55:02 +0200 (Sa, 21 Jul 2007) | 4 lines
PEP 3123: Provide forward compatibility with Python 3.0, while keeping
backwards compatibility. Add Py_Refcnt, Py_Type, Py_Size, and
PyVarObject_HEAD_INIT.
........
................
r56478 | martin.v.loewis | 2007-07-21 09:47:23 +0200 (Sa, 21 Jul 2007) | 2 lines
PEP 3123: Use proper C inheritance for PyObject.
................
r56479 | martin.v.loewis | 2007-07-21 10:06:55 +0200 (Sa, 21 Jul 2007) | 3 lines
Add longintrepr.h to Python.h, so that the compiler can
see that PyFalse is really some kind of PyObject*.
................
r56480 | martin.v.loewis | 2007-07-21 10:47:18 +0200 (Sa, 21 Jul 2007) | 2 lines
Qualify SHIFT, MASK, BASE.
................
r56482 | martin.v.loewis | 2007-07-21 19:10:57 +0200 (Sa, 21 Jul 2007) | 2 lines
Correctly refer to _ob_next.
................
2007-07-21 14:22:18 -03:00
|
|
|
PyVarObject_HEAD_INIT(&PyType_Type, 0)
|
2007-11-19 16:34:10 -04:00
|
|
|
"_FileIO",
|
2007-03-07 20:43:48 -04:00
|
|
|
sizeof(PyFileIOObject),
|
|
|
|
0,
|
|
|
|
(destructor)fileio_dealloc, /* tp_dealloc */
|
|
|
|
0, /* tp_print */
|
|
|
|
0, /* tp_getattr */
|
|
|
|
0, /* tp_setattr */
|
|
|
|
0, /* tp_compare */
|
|
|
|
(reprfunc)fileio_repr, /* tp_repr */
|
|
|
|
0, /* tp_as_number */
|
|
|
|
0, /* tp_as_sequence */
|
|
|
|
0, /* tp_as_mapping */
|
|
|
|
0, /* tp_hash */
|
|
|
|
0, /* tp_call */
|
|
|
|
0, /* tp_str */
|
|
|
|
PyObject_GenericGetAttr, /* tp_getattro */
|
|
|
|
0, /* tp_setattro */
|
|
|
|
0, /* tp_as_buffer */
|
|
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
|
|
|
|
fileio_doc, /* tp_doc */
|
|
|
|
0, /* tp_traverse */
|
|
|
|
0, /* tp_clear */
|
|
|
|
0, /* tp_richcompare */
|
|
|
|
offsetof(PyFileIOObject, weakreflist), /* tp_weaklistoffset */
|
|
|
|
0, /* tp_iter */
|
|
|
|
0, /* tp_iternext */
|
|
|
|
fileio_methods, /* tp_methods */
|
|
|
|
0, /* tp_members */
|
2007-04-08 14:44:42 -03:00
|
|
|
fileio_getsetlist, /* tp_getset */
|
2007-03-07 20:43:48 -04:00
|
|
|
0, /* tp_base */
|
|
|
|
0, /* tp_dict */
|
|
|
|
0, /* tp_descr_get */
|
|
|
|
0, /* tp_descr_set */
|
|
|
|
0, /* tp_dictoffset */
|
|
|
|
fileio_init, /* tp_init */
|
|
|
|
PyType_GenericAlloc, /* tp_alloc */
|
|
|
|
fileio_new, /* tp_new */
|
|
|
|
PyObject_Del, /* tp_free */
|
|
|
|
};
|
|
|
|
|
|
|
|
static PyMethodDef module_methods[] = {
|
|
|
|
{NULL, NULL}
|
|
|
|
};
|
|
|
|
|
2008-06-11 02:26:20 -03:00
|
|
|
static struct PyModuleDef fileiomodule = {
|
|
|
|
PyModuleDef_HEAD_INIT,
|
|
|
|
"_fileio",
|
|
|
|
"Fast implementation of io.FileIO.",
|
|
|
|
-1,
|
|
|
|
module_methods,
|
|
|
|
NULL,
|
|
|
|
NULL,
|
|
|
|
NULL,
|
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
2007-03-07 20:43:48 -04:00
|
|
|
PyMODINIT_FUNC
|
2008-06-11 02:26:20 -03:00
|
|
|
PyInit__fileio(void)
|
2007-03-07 20:43:48 -04:00
|
|
|
{
|
|
|
|
PyObject *m; /* a module object */
|
|
|
|
|
2008-06-11 02:26:20 -03:00
|
|
|
m = PyModule_Create(&fileiomodule);
|
2007-03-07 20:43:48 -04:00
|
|
|
if (m == NULL)
|
2008-06-11 02:26:20 -03:00
|
|
|
return NULL;
|
2007-03-07 20:43:48 -04:00
|
|
|
if (PyType_Ready(&PyFileIO_Type) < 0)
|
2008-06-11 02:26:20 -03:00
|
|
|
return NULL;
|
2007-03-07 20:43:48 -04:00
|
|
|
Py_INCREF(&PyFileIO_Type);
|
|
|
|
PyModule_AddObject(m, "_FileIO", (PyObject *) &PyFileIO_Type);
|
2008-06-11 02:26:20 -03:00
|
|
|
return m;
|
2007-03-07 20:43:48 -04:00
|
|
|
}
|