X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fxgetcwd.c;h=0f798dac066d71b75e5a5b9d7f5d75e0c1367944;hb=47b3dd4ed61927c7dfc9ba870d9c0fa763ac57d8;hp=84164acb3d464043b44dc4f12b21d44490f11c17;hpb=783c1624bd8b027a65b3fba57d3213ccb1a6ddbd;p=gnulib.git diff --git a/lib/xgetcwd.c b/lib/xgetcwd.c index 84164acb3..0f798dac0 100644 --- a/lib/xgetcwd.c +++ b/lib/xgetcwd.c @@ -1,5 +1,6 @@ /* xgetcwd.c -- return current directory with unlimited length - Copyright (C) 1992 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 @@ -13,66 +14,30 @@ 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 . */ +/* 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 -char *xmalloc (); -char *xrealloc (); -void free (); +#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) { - 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; }