X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fxgetcwd.c;h=1cf8cf07153f1ac1f38238c38cc7f721de78eb00;hb=64ee293cdac319d0f38cd0d31e758a823b7163ad;hp=7aa04efa414dce97dff389c20185e8e7265fccad;hpb=6d8337bfc808cddc275899c03482eceb6aff8547;p=gnulib.git
diff --git a/lib/xgetcwd.c b/lib/xgetcwd.c
index 7aa04efa4..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 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,67 +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. */
+ along with this program. If not, see . */
-/* Written by David MacKenzie . */
+/* Written by Jim Meyering. */
-#ifdef HAVE_CONFIG_H
#include
-#endif
-
-#include
-#include
-#ifndef errno
-extern int errno;
-#endif
-#include
-#include "pathmax.h"
-#ifndef HAVE_GETCWD
-char *getwd ();
-#define getcwd(buf, max) getwd (buf)
-#else
-char *getcwd ();
-#endif
+#include "xgetcwd.h"
-/* Amount to increase buffer size by in each try. */
-#define PATH_INCR 32
+#include
+#include
-char *xmalloc ();
-char *xrealloc ();
-void free ();
+#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)
{
- char *cwd;
- char *ret;
- unsigned path_max;
-
- errno = 0;
- path_max = (unsigned) PATH_MAX;
- path_max += 2; /* The getcwd docs say to do this. */
-
- cwd = xmalloc (path_max);
-
- errno = 0;
- while ((ret = getcwd (cwd, path_max)) == NULL && errno == ERANGE)
- {
- path_max += PATH_INCR;
- cwd = xrealloc (cwd, path_max);
- errno = 0;
- }
-
- if (ret == NULL)
- {
- int save_errno = errno;
- free (cwd);
- errno = save_errno;
- return NULL;
- }
+ char *cwd = getcwd (NULL, 0);
+ if (! cwd && errno == ENOMEM)
+ xalloc_die ();
return cwd;
}