like the HAVE_GETCWD_NULL code.
Include pathmax.h if not HAVE_GETCWD.
Do not include xalloc.h.
(INITIAL_BUFFER_SIZE): New symbol.
Do not use xmalloc / xrealloc, since the caller is responsible for
handling errors. Preserve errno around `free' during failure.
Do not overrun buffer when using getwd.
#if HAVE_GETCWD
char *getcwd ();
#else
#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
char *getwd ();
# define getcwd(Buf, Max) getwd (Buf)
#endif
/* Return the current directory, newly allocated, arbitrarily long.
Return NULL and set errno on error. */
/* Return the current directory, newly allocated, arbitrarily long.
Return NULL and set errno on error. */
#if HAVE_GETCWD_NULL
return getcwd (NULL, 0);
#else
#if HAVE_GETCWD_NULL
return getcwd (NULL, 0);
#else
- size_t buf_size = 128; /* must be a power of 2 */
- char *buf = NULL;
+
+ /* 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;
- buf = (char *) xrealloc (buf, buf_size);
-
+ int saved_errno;
+ char *buf = malloc (buf_size);
+ if (! buf)
+ return NULL;
cwd = getcwd (buf, buf_size);
cwd = getcwd (buf, buf_size);
+ saved_errno = errno;
+ free (buf);
+ if (saved_errno != ERANGE)
+ return NULL;
+ buf_size *= 2;
+ if (buf_size == 0)
-
- buf_size *= 2;
- if (buf_size == 0)
- xalloc_die ();