diff options
author | Victor Stinner <victor.stinner@gmail.com> | 2013-11-15 17:14:11 (GMT) |
---|---|---|
committer | Victor Stinner <victor.stinner@gmail.com> | 2013-11-15 17:14:11 (GMT) |
commit | b11d6cb711cb9b14d3580581d61bec224042feb5 (patch) | |
tree | 359718150e0f83067fc98c2ab2e2af855eab978c /Python | |
parent | 2384714819751e975f3ee8c5b57ab1f702e25cac (diff) | |
download | cpython-b11d6cb711cb9b14d3580581d61bec224042feb5.zip cpython-b11d6cb711cb9b14d3580581d61bec224042feb5.tar.gz cpython-b11d6cb711cb9b14d3580581d61bec224042feb5.tar.bz2 |
fileutils.c: use MAXPATHLEN instead of PATH_MAX
PATH_MAX is not declared on IRIX nor Windows.
Diffstat (limited to 'Python')
-rw-r--r-- | Python/fileutils.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Python/fileutils.c b/Python/fileutils.c index b7c42e8..dbcb923 100644 --- a/Python/fileutils.c +++ b/Python/fileutils.c @@ -623,7 +623,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; @@ -633,11 +633,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; } @@ -669,7 +669,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; @@ -709,11 +709,11 @@ _Py_wgetcwd(wchar_t *buf, size_t size) #ifdef MS_WINDOWS return _wgetcwd(buf, size); #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) |