Imported from ../bash-2.02.tar.gz.

[thirdparty/bash.git] / builtins / command.def

diff --git a/builtins/command.def b/builtins/command.def
index 6e6e5f60b0f50acb7cec44ed2931ba03750e4c27..415b6d1507dd6802b1895d169bfbe25d7986e06b 100644 (file)
--- a/builtins/command.def
+++ b/builtins/command.def
@@ -35,6 +35,9 @@ $END
 #include <config.h>
 
 #if defined (HAVE_UNISTD_H)
+#  ifdef _MINIX
+#    include <sys/types.h>
+#  endif
 #  include <unistd.h>
 #endif
 
@@ -179,11 +182,16 @@ get_standard_path ()
   size_t len;
 
   len = (size_t)confstr (_CS_PATH, (char *)NULL, (size_t)0);
-  p = xmalloc ((int)len + 2);
-  *p = '\0';
-  confstr (_CS_PATH, p, len);
-  return (p);
-#else /* !_CSPATH || !HAVE_CONFSTR  */
+  if (len > 0)
+    {
+      p = xmalloc ((int)len + 2);
+      *p = '\0';
+      confstr (_CS_PATH, p, len);
+      return (p);
+    }
+  else
+    return (savestring (STANDARD_UTILS_PATH));
+#else /* !_CS_PATH || !HAVE_CONFSTR  */
 #  if defined (CS_PATH)
   return (savestring (CS_PATH));
 #  else