diff options
Diffstat (limited to 'Python/fileutils.c')
| -rw-r--r-- | Python/fileutils.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Python/fileutils.c b/Python/fileutils.c index 074888eaf1..814f0765a3 100644 --- a/Python/fileutils.c +++ b/Python/fileutils.c @@ -566,7 +566,7 @@ _Py_stat(PyObject *path, struct stat *statbuf) #endif -int +static int get_inheritable(int fd, int raise) { #ifdef MS_WINDOWS @@ -675,7 +675,7 @@ set_inheritable(int fd, int inheritable, int raise, int *atomic_flag_works) request = FIONCLEX; else request = FIOCLEX; - err = ioctl(fd, request); + err = ioctl(fd, request, NULL); if (err) { if (raise) PyErr_SetFromErrno(PyExc_OSError); @@ -869,7 +869,7 @@ int _Py_wreadlink(const wchar_t *path, wchar_t *buf, size_t bufsiz) { char *cpath; - char cbuf[PATH_MAX]; + char cbuf[MAXPATHLEN]; wchar_t *wbuf; int res; size_t r1; @@ -879,11 +879,11 @@ _Py_wreadlink(const wchar_t *path, wchar_t *buf, size_t bufsiz) errno = EINVAL; return -1; } - res = (int)readlink(cpath, cbuf, PATH_MAX); + res = (int)readlink(cpath, cbuf, Py_ARRAY_LENGTH(cbuf)); PyMem_Free(cpath); if (res == -1) return -1; - if (res == PATH_MAX) { + if (res == Py_ARRAY_LENGTH(cbuf)) { errno = EINVAL; return -1; } @@ -915,7 +915,7 @@ _Py_wrealpath(const wchar_t *path, wchar_t *resolved_path, size_t resolved_path_size) { char *cpath; - char cresolved_path[PATH_MAX]; + char cresolved_path[MAXPATHLEN]; wchar_t *wresolved_path; char *res; size_t r; @@ -956,11 +956,11 @@ _Py_wgetcwd(wchar_t *buf, size_t size) int isize = (int)Py_MIN(size, INT_MAX); return _wgetcwd(buf, isize); #else - char fname[PATH_MAX]; + char fname[MAXPATHLEN]; wchar_t *wname; size_t len; - if (getcwd(fname, PATH_MAX) == NULL) + if (getcwd(fname, Py_ARRAY_LENGTH(fname)) == NULL) return NULL; wname = _Py_char2wchar(fname, &len); if (wname == NULL) |