X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fxgetcwd.c;h=6787b4653cff4d19fb294a79e64d9bcb658ad242;hb=29141fc37c0fea461392ad6aa429faef85a24756;hp=85ac368738950bfd7183c944ca2eedc8871ae8ee;hpb=e6995fc57b107d86e2601d1c3f3538d42ba1bade;p=gnulib.git

diff --git a/lib/xgetcwd.c b/lib/xgetcwd.c
index 85ac36873..6787b4653 100644
--- a/lib/xgetcwd.c
+++ b/lib/xgetcwd.c
@@ -1,10 +1,11 @@
 /* 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 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,77 +13,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
+#include <errno.h>
+#include <unistd.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 "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 HAVE_GETCWD_NULL
-  return getcwd (NULL, 0);
-#else
-
-  /* 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 *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;
-	}
-    }
-#endif
+  char *cwd = getcwd (NULL, 0);
+  if (! cwd && errno == ENOMEM)
+    xalloc_die ();
+  return cwd;
 }