[Boost-commit] svn:boost r48993 - trunk/tools/jam/src

Subject: [Boost-commit] svn:boost r48993 - trunk/tools/jam/src
From: grafikrobot_at_[hidden]
Date: 2008-09-28 19:10:51

Author: grafik
Date: 2008-09-28 19:10:51 EDT (Sun, 28 Sep 2008)
New Revision: 48993
URL: http://svn.boost.org/trac/boost/changeset/48993

Log:
Dynamically adjust pwd buffer query size to allow for when PATH_MAX is default defined instead of being provided by the system C library. (fixes #2206)
Text files modified: 
   trunk/tools/jam/src/pwd.c |    40 +++++++++++++++++++++++++++-------------
   1 files changed, 27 insertions(+), 13 deletions(-)

Modified: trunk/tools/jam/src/pwd.c
==============================================================================
--- trunk/tools/jam/src/pwd.c	(original)
+++ trunk/tools/jam/src/pwd.c	2008-09-28 19:10:51 EDT (Sun, 28 Sep 2008)
@@ -6,25 +6,29 @@
 #include "lists.h"
 #include "newstr.h"
 #include "pathsys.h"
+#include "mem.h"
 
 #include <limits.h>
+#include <errno.h>
 
 /* MinGW on windows declares PATH_MAX in limits.h */
 #if defined(NT) && ! defined(__GNUC__)
 #include <direct.h>
 #define PATH_MAX _MAX_PATH
 #else
-#include <limits.h>
 #include <unistd.h>
 #if defined(__COMO__)
      #include <linux/limits.h>
 #endif
 #endif
 
+#ifndef PATH_MAX
+	#define PATH_MAX 1024
+#endif
+
 /* The current directory can't change in bjam, so optimize this to cache
 ** the result.
 */
-static char pwd_buffer[PATH_MAX];
 static char * pwd_result = NULL;
 
 
@@ -33,20 +37,30 @@
 {
     if (!pwd_result)
     {
-        if (getcwd(pwd_buffer, sizeof(pwd_buffer)) == NULL)
-        {
+		int buffer_size = PATH_MAX;
+		char * result_buffer = 0;
+		do
+		{
+			char * buffer = BJAM_MALLOC_RAW(buffer_size);
+			result_buffer = getcwd(buffer,buffer_size);
+			if (result_buffer)
+			{
+				#ifdef NT
+				pwd_result = short_path_to_long_path(result_buffer);
+				#else
+				pwd_result = newstr(result_buffer);
+				#endif
+			}
+			buffer_size *= 2;
+			BJAM_FREE_RAW(buffer);
+		}
+		while (!pwd_result && errno == ERANGE);
+		
+		if (!pwd_result)
+		{
             perror("can not get current directory");
             return L0;
         }
-        else
-        {
-#ifdef NT
-            pwd_result = short_path_to_long_path(pwd_buffer);
-#else
-            pwd_result = newstr(pwd_buffer);
-#endif
-        }
     }
     return list_new(L0, pwd_result);
 }
-