Remoce C99:ism (Non-constant expression as array size)

darcs-hash:20060512154447-ac50b-5731603e1bf75f91703bf79cc06f6bbdb94e6a61.gz

1 files changed, 19 insertions, 7 deletions

diff --git a/wutil.c b/wutil.c
index 1cad75c9..b18d3ccd 100644
--- a/wutil.c
+++ b/wutil.c
@@ -137,16 +137,28 @@ struct wdirent *wreaddir(DIR *dir )
 
 wchar_t *wgetcwd( wchar_t *buff, size_t sz )
 {
-	char buffc[sz*MAX_UTF8_BYTES];
-	char *res = getcwd( buffc, sz*MAX_UTF8_BYTES );
-	if( !res )
+	char *buffc = malloc( sz*MAX_UTF8_BYTES);
+	char *res;
+	wchar_t *ret = 0;
+		
+	if( !buffc )
+	{
+		errno = ENOMEM;
 		return 0;
+	}
 	
-	if( (size_t)-1 == mbstowcs( buff, buffc, sizeof( wchar_t ) * sz ) )
+	res = getcwd( buffc, sz*MAX_UTF8_BYTES );
+	if( res )
 	{
-		return 0;		
-	}	
-	return buff;
+		if( (size_t)-1 != mbstowcs( buff, buffc, sizeof( wchar_t ) * sz ) )
+		{
+			ret = buff;
+		}	
+	}
+	
+	free( buffc );
+	
+	return ret;
 }
 
 int wchdir( const wchar_t * dir )