/* xgetcwd.c -- return current directory with unlimited length
- Copyright (C) 1992, 1996, 2000, 2001 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
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. */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-/* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */
+/* Written by Jim Meyering. */
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
-#include <stdio.h>
-#include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
-
-#include <sys/types.h>
-
-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include "xgetcwd.h"
-#if HAVE_GETCWD
-char *getcwd ();
-#else
-char *getwd ();
-# define getcwd(Buf, Max) getwd (Buf)
-#endif
+#include <errno.h>
+#include "getcwd.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 HAVE_GETCWD_NULL
- return getcwd (NULL, 0);
-#else
- size_t buf_size = 128; /* must be a power of 2 */
- char *buf = NULL;
-
- while (1)
- {
- char *cwd;
- buf = (char *) xrealloc (buf, buf_size);
-
- cwd = getcwd (buf, buf_size);
- if (cwd != NULL)
- return cwd;
- if (errno != ERANGE)
- {
- free (buf);
- return NULL;
- }
-
- buf_size *= 2;
- if (buf_size == 0)
- xalloc_die ();
- }
-#endif
+ char *cwd = getcwd (NULL, 0);
+ if (! cwd && errno == ENOMEM)
+ xalloc_die ();
+ return cwd;
}