X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fxgetcwd.c;h=1409bcfba7d684d628e6b1283a2e7303f1d6dd4e;hb=7d8d614280a61d7bbdac8e218bfdc1aa849329c7;hp=6e775e74b26ffceb206981a1d6d8dc822dbe560f;hpb=d282959bf42afbdb856ec29cd1f0bc2883000f71;p=gnulib.git

diff --git a/lib/xgetcwd.c b/lib/xgetcwd.c
index 6e775e74b..1409bcfba 100644
--- a/lib/xgetcwd.c
+++ b/lib/xgetcwd.c
@@ -1,5 +1,5 @@
 /* xgetcwd.c -- return current directory with unlimited length
-   Copyright (C) 1992 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1996, 2000, 2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,20 +12,13 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-/* Written by David MacKenzie, djm@gnu.ai.mit.edu. */
+/* Written by David MacKenzie <djm@gnu.ai.mit.edu>.  */
 
-#ifdef HAVE_CONFIG_H
-#if defined (CONFIG_BROKETS)
-/* We use <config.h> instead of "config.h" so that a compilation
-   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
-   (which it would do because it found this file in $srcdir).  */
-#include <config.h>
-#else
-#include "config.h"
-#endif
+#if HAVE_CONFIG_H
+# include <config.h>
 #endif
 
 #include <stdio.h>
@@ -33,22 +26,26 @@
 #ifndef errno
 extern int errno;
 #endif
+
 #include <sys/types.h>
-#include "pathmax.h"
 
-#if !defined(_POSIX_VERSION) && !defined(HAVE_GETCWD)
-char *getwd ();
-#define getcwd(buf, max) getwd (buf)
-#else
-char *getcwd ();
+#if HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+#if HAVE_UNISTD_H
+# include <unistd.h>
 #endif
 
-/* Amount to increase buffer size by in each try. */
-#define PATH_INCR 32
+#if HAVE_GETCWD
+char *getcwd ();
+#else
+# include "pathmax.h"
+# define INITIAL_BUFFER_SIZE (PATH_MAX + 1)
+char *getwd ();
+# define getcwd(Buf, Max) getwd (Buf)
+#endif
 
-char *xmalloc ();
-char *xrealloc ();
-void free ();
+#include "xalloc.h"
 
 /* Return the current directory, newly allocated, arbitrarily long.
    Return NULL and set errno on error. */
@@ -56,30 +53,35 @@ void free ();
 char *
 xgetcwd ()
 {
-  char *cwd;
-  char *ret;
-  unsigned path_max;
+#if HAVE_GETCWD_NULL
+  char *cwd = getcwd (NULL, 0);
+  if (! cwd && errno == ENOMEM)
+    xalloc_die ();
+  return cwd;
+#else
 
-  errno = 0;
-  path_max = (unsigned) PATH_MAX;
-  path_max += 2;		/* The getcwd docs say to do this. */
+  /* The initial buffer size for the working directory.  A power of 2
+     detects arithmetic overflow earlier, but is not required.  */
+# ifndef INITIAL_BUFFER_SIZE
+#  define INITIAL_BUFFER_SIZE 128
+# endif
 
-  cwd = xmalloc (path_max);
+  size_t buf_size = INITIAL_BUFFER_SIZE;
 
-  errno = 0;
-  while ((ret = getcwd (cwd, path_max)) == NULL && errno == ERANGE)
+  while (1)
     {
-      path_max += PATH_INCR;
-      cwd = xrealloc (cwd, path_max);
-      errno = 0;
+      char *buf = xmalloc (buf_size);
+      char *cwd = getcwd (buf, buf_size);
+      int saved_errno;
+      if (cwd)
+	return cwd;
+      saved_errno = errno;
+      free (buf);
+      if (saved_errno != ERANGE)
+	return NULL;
+      buf_size *= 2;
+      if (buf_size == 0)
+	xalloc_die ();
     }
-
-  if (ret == NULL)
-    {
-      int save_errno = errno;
-      free (cwd);
-      errno = save_errno;
-      return NULL;
-    }
-  return cwd;
+#endif
 }