Fix the !HAVE_GETCWD_NULL code to behave more

[gnulib.git] / lib / xgetcwd.c

diff --git a/lib/xgetcwd.c b/lib/xgetcwd.c
index 3615161..85ac368 100644 (file)
--- a/lib/xgetcwd.c
+++ b/lib/xgetcwd.c
@@ -1,5 +1,5 @@
 /* xgetcwd.c -- return current directory with unlimited length
-   Copyright (C) 1992, 1996 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
@@ -17,7 +17,7 @@
 
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu>.  */
 
-#ifdef HAVE_CONFIG_H
+#if HAVE_CONFIG_H
 # include <config.h>
 #endif
 
@@ -26,22 +26,24 @@
 #ifndef errno
 extern int errno;
 #endif
+
 #include <sys/types.h>
-#include "pathmax.h"
 
-#ifndef 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
-
-char *xmalloc ();
-char *xrealloc ();
-void free ();
+#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
 
 /* Return the current directory, newly allocated, arbitrarily long.
    Return NULL and set errno on error. */
@@ -49,30 +51,38 @@ void free ();
 char *
 xgetcwd ()
 {
-  char *cwd;
-  char *ret;
-  unsigned path_max;
+#if HAVE_GETCWD_NULL
+  return getcwd (NULL, 0);
+#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 *cwd;
+      int saved_errno;
+      char *buf = malloc (buf_size);
+      if (! buf)
+       return NULL;
+      cwd = getcwd (buf, buf_size);
+      if (cwd)
+       return cwd;
+      saved_errno = errno;
+      free (buf);
+      if (saved_errno != ERANGE)
+       return NULL;
+      buf_size *= 2;
+      if (buf_size == 0)
+       {
+         errno = ENOMEM;
+         return NULL;
+       }
     }
-
-  if (ret == NULL)
-    {
-      int save_errno = errno;
-      free (cwd);
-      errno = save_errno;
-      return NULL;
-    }
-  return cwd;
+#endif
 }