David MacKenzie's old code was removed, so give

credit only to Jim Meyering and adjust the copyright dates.
Do not include <limits.h>, <stdio.h>, <sys/types.h>,
<stdlib.h>, <unistd.h>, "pathmax.h".
Instead, include "xgetcwd.h" (first) and "getcwd.h".
(INITIAL_BUFFER_SIZE): Remove.
(xgetcwd): Rely on getcwd, since we now depend on a reliable one.

1 files changed, 6 insertions, 66 deletions

diff --git a/lib/xgetcwd.c b/lib/xgetcwd.c
index f08580357..89d98847e 100644
--- a/lib/xgetcwd.c
+++ b/lib/xgetcwd.c
@@ -1,7 +1,6 @@
 /* xgetcwd.c -- return current directory with unlimited length
 
-   Copyright (C) 1992, 1996, 2000, 2001, 2003, 2004 Free Software
-   Foundation, Inc.
+   Copyright (C) 2001, 2003, 2004 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,87 +16,28 @@
    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 Jim Meyering.  */
 
 #if HAVE_CONFIG_H
 # include <config.h>
 #endif
 
-#include <limits.h>
-#include <stdio.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <stdlib.h>
-
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include "xgetcwd.h"
 
-#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
+#include <errno.h>
 
+#include "getcwd.h"
 #include "xalloc.h"
-#include "xgetcwd.h"
 
-/* Return the current directory, newly allocated, assuming it fits
-   within PATH_MAX bytes -- this is a common system-imposed limit
-   on how getcwd works.
+/* Return the current directory, newly allocated.
    Upon an out-of-memory error, call xalloc_die.
    Upon any other type of error, return NULL.  */
 
 char *
 xgetcwd (void)
 {
-#if HAVE_GETCWD_NULL
   char *cwd = getcwd (NULL, 0);
   if (! cwd && errno == ENOMEM)
     xalloc_die ();
   return cwd;
-#else
-
-  int saved_errno;
-
-  /* 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
-
-  size_t buf_size = INITIAL_BUFFER_SIZE;
-
-  while (1)
-    {
-      char *buf = xmalloc (buf_size);
-      char *cwd = getcwd (buf, buf_size);
-      if (cwd)
-	return cwd;
-      saved_errno = errno;
-      free (buf);
-      if (saved_errno != ERANGE)
-	break;
-
-#ifdef PATH_MAX
-      if (PATH_MAX / 2 < buf_size)
-	{
-	  if (PATH_MAX <= buf_size)
-	    break;
-	  buf_size = PATH_MAX;
-	  continue;
-	}
-#endif
-
-      buf_size *= 2;
-      if (buf_size == 0)
-	xalloc_die ();
-    }
-
-  errno = saved_errno;
-  return NULL;
-#endif
 }