From: Paul Eggert Date: Wed, 29 Aug 2001 06:36:20 +0000 (+0000) Subject: ("pathmax.h"): Do not include; no longer needed. X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;h=07c3d5fe321be9931cc9132c5783ef5a7dddde57;p=chaz%2Ftar ("pathmax.h"): Do not include; no longer needed. (, ): Include if available. ("xalloc.h"): Include. (xmalloc, xstrdup, free): Remove decls; no longer needed. (xgetcwd): Don't assume sizes fit in 'unsigned'. Check for overflow when path size gets too large. Simplify failure code. --- diff --git a/lib/xgetcwd.c b/lib/xgetcwd.c index 95d0ab9..0af66fb 100644 --- a/lib/xgetcwd.c +++ b/lib/xgetcwd.c @@ -28,7 +28,13 @@ extern int errno; #endif #include -#include "pathmax.h" + +#if HAVE_STDLIB_H +# include +#endif +#if HAVE_UNISTD_H +# include +#endif #if HAVE_GETCWD char *getcwd (); @@ -37,9 +43,7 @@ char *getwd (); # define getcwd(Buf, Max) getwd (Buf) #endif -extern void *xmalloc (); -extern char *xstrdup (); -extern void free (); +#include "xalloc.h" /* Return the current directory, newly allocated, arbitrarily long. Return NULL and set errno on error. */ @@ -51,7 +55,7 @@ xgetcwd () return getcwd (NULL, 0); #else char *ret; - unsigned path_max; + size_t path_max; char buf[1024]; errno = 0; @@ -61,29 +65,28 @@ xgetcwd () if (errno != ERANGE) return NULL; - path_max = 1300; - path_max += 2; /* The getcwd docs say to do this. */ + 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; - if (errno != ERANGE) + save_errno = errno; + free (cwd); + if (save_errno != ERANGE) { - int save_errno = errno; - free (cwd); errno = save_errno; return NULL; } - free (cwd); - - path_max += path_max / 16; - path_max += 32; + path_max *= 2; + if (path_max == 0) + xalloc_die (); } #endif }