[Python-checkins] r45716 - in python/branches/release24-maint: Include/osdefs.h Modules/posixmodule.c Python/getcwd.c

[thomas.wouters]

Author: thomas.wouters
Date: Tue Apr 25 17:33:48 2006
New Revision: 45716

Modified:
   python/branches/release24-maint/Include/osdefs.h
   python/branches/release24-maint/Modules/posixmodule.c
   python/branches/release24-maint/Python/getcwd.c
Log:

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.



Modified: python/branches/release24-maint/Include/osdefs.h
==============================================================================
--- python/branches/release24-maint/Include/osdefs.h	(original)
+++ python/branches/release24-maint/Include/osdefs.h	Tue Apr 25 17:33:48 2006
@@ -37,8 +37,12 @@
 
 /* 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

Modified: python/branches/release24-maint/Modules/posixmodule.c
==============================================================================
--- python/branches/release24-maint/Modules/posixmodule.c	(original)
+++ python/branches/release24-maint/Modules/posixmodule.c	Tue Apr 25 17:33:48 2006
@@ -244,7 +244,11 @@
 #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

Modified: python/branches/release24-maint/Python/getcwd.c
==============================================================================
--- python/branches/release24-maint/Python/getcwd.c	(original)
+++ python/branches/release24-maint/Python/getcwd.c	Tue Apr 25 17:33:48 2006
@@ -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 *);