commit bash-20071011 snapshot

lib/sh/getcwd.c

@@ -255,19 +255,21 @@ getcwd (buf, size)
 
   {
     size_t len = pathbuf + pathsize - pathp;
-    if (buf == NULL)
-      {
-	if (len < (size_t) size)
-	  len = size;
-	buf = (char *) malloc (len);
-	if (buf == NULL)
-	  goto lose2;
-      }
-    else if ((size_t) size < len)
+    if (buf == NULL && size <= 0)
+      size = len;
+
+    if ((size_t) size < len)
       {
 	errno = ERANGE;
 	goto lose2;
       }
+    if (buf == NULL)
+      {
+	buf = (char *) malloc (size);
+	if (buf == NULL)
+	  goto lose2;
+      }
+
     (void) memcpy((PTR_T) buf, (PTR_T) pathp, len);
   }
 

lib/sh/getcwd.c~

@@ -26,6 +26,10 @@
   #pragma alloca
 #endif /* _AIX && RISC6000 && !__GNUC__ */
 
+#if defined (__QNX__)
+#  undef HAVE_LSTAT
+#endif
+
 #include <bashtypes.h>
 #include <errno.h>