X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fxgetcwd.c;h=1cf8cf07153f1ac1f38238c38cc7f721de78eb00;hb=620ece7758e453efebf7f52a1ab9fc1c49a5020c;hp=0af66fb88844942c178cf2b8295888a1af15005b;hpb=f16f973acda959377d8841b2aa0c2f0beb58dd2e;p=gnulib.git

diff --git a/lib/xgetcwd.c b/lib/xgetcwd.c
index 0af66fb88..1cf8cf071 100644
--- a/lib/xgetcwd.c
+++ b/lib/xgetcwd.c
@@ -1,10 +1,12 @@
 /* xgetcwd.c -- return current directory with unlimited length
-   Copyright (C) 1992, 1996, 2000, 2001 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   Copyright (C) 2001, 2003-2004, 2006-2007, 2009-2011 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
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,81 +14,28 @@
    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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/* Written by David MacKenzie <djm@gnu.ai.mit.edu>.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
+/* Written by Jim Meyering.  */
 
-#include <stdio.h>
-#include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
+#include <config.h>
 
-#include <sys/types.h>
+#include "xgetcwd.h"
 
-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
-#if HAVE_GETCWD
-char *getcwd ();
-#else
-char *getwd ();
-# define getcwd(Buf, Max) getwd (Buf)
-#endif
+#include <errno.h>
+#include <unistd.h>
 
 #include "xalloc.h"
 
-/* Return the current directory, newly allocated, arbitrarily long.
-   Return NULL and set errno on error. */
+/* 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 ()
+xgetcwd (void)
 {
-#if defined __GLIBC__ && __GLIBC__ >= 2
-  return getcwd (NULL, 0);
-#else
-  char *ret;
-  size_t path_max;
-  char buf[1024];
-
-  errno = 0;
-  ret = getcwd (buf, sizeof (buf));
-  if (ret != NULL)
-    return xstrdup (buf);
-  if (errno != ERANGE)
-    return NULL;
-
-  path_max = 1 << 10;
-
-  for (;;)
-    {
-      char *cwd = (char *) xmalloc (path_max);
-      int save_errno;
-
-      errno = 0;
-      ret = getcwd (cwd, path_max);
-      if (ret != NULL)
-	return ret;
-      save_errno = errno;
-      free (cwd);
-      if (save_errno != ERANGE)
-	{
-	  errno = save_errno;
-	  return NULL;
-	}
-
-      path_max *= 2;
-      if (path_max == 0)
-	xalloc_die ();
-    }
-#endif
+  char *cwd = getcwd (NULL, 0);
+  if (! cwd && errno == ENOMEM)
+    xalloc_die ();
+  return cwd;
 }