diff options
| author | Thomas Wouters <thomas@python.org> | 2006-04-25 15:33:48 +0000 |
|---|---|---|
| committer | Thomas Wouters <thomas@python.org> | 2006-04-25 15:33:48 +0000 |
| commit | eba52802cdde6ffc622ea3f8e12e4f55e43cc79b (patch) | |
| tree | 7046e8d609bd56f018550b7b3e03606cf63eec53 | |
| parent | 87cc7a0fba4417d921c91785c4cdf85797c1c1cf (diff) | |
| download | cpython-git-eba52802cdde6ffc622ea3f8e12e4f55e43cc79b.tar.gz | |
Backport trunk's r45715:
Define MAXPATHLEN to be at least PATH_MAX, if that's defined. Python uses
MAXPATHLEN-sized buffers for various output-buffers (like to realpath()),
and that's correct on BSD platforms, but not Linux (which uses PATH_MAX, and
does not define MAXPATHLEN.) Cursory googling suggests Linux is following a
newer standard than BSD, but in cases like this, who knows. Using the
greater of PATH_MAX and 1024 as a fallback for MAXPATHLEN seems to be the
most portable solution.
| -rw-r--r-- | Include/osdefs.h | 4 | ||||
| -rw-r--r-- | Modules/posixmodule.c | 4 | ||||
| -rw-r--r-- | Python/getcwd.c | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/Include/osdefs.h b/Include/osdefs.h index 8190a752ea..6937659325 100644 --- a/Include/osdefs.h +++ b/Include/osdefs.h @@ -37,8 +37,12 @@ extern "C" { /* Max pathname length */ #ifndef MAXPATHLEN +#if defined(PATH_MAX) && PATH_MAX > 1024 +#define MAXPATHLEN PATH_MAX +#else #define MAXPATHLEN 1024 #endif +#endif /* Search path entry delimiter */ #ifndef DELIM diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index 089b40a964..cec6b3b06c 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -244,7 +244,11 @@ extern int lstat(const char *, struct stat *); #endif /* OS2 */ #ifndef MAXPATHLEN +#if defined(PATH_MAX) && PATH_MAX > 1024 +#define MAXPATHLEN PATH_MAX +#else #define MAXPATHLEN 1024 +#endif #endif /* MAXPATHLEN */ #ifdef UNION_WAIT diff --git a/Python/getcwd.c b/Python/getcwd.c index 5c57291459..967d484b35 100644 --- a/Python/getcwd.c +++ b/Python/getcwd.c @@ -14,8 +14,12 @@ #endif #ifndef MAXPATHLEN +#if defined(PATH_MAX) && PATH_MAX > 1024 +#define MAXPATHLEN PATH_MAX +#else #define MAXPATHLEN 1024 #endif +#endif extern char *getwd(char *); |