-#if HAVE_GETCWD_NULL
- return getcwd (NULL, 0);
-#else
-
- /* 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;
-
- while (1)
- {
- char *cwd;
- int saved_errno;
- char *buf = malloc (buf_size);
- if (! buf)
- return NULL;
- cwd = getcwd (buf, buf_size);
- if (cwd)
- return cwd;
- saved_errno = errno;
- free (buf);
- if (saved_errno != ERANGE)
- return NULL;
- buf_size *= 2;
- if (buf_size == 0)
- {
- errno = ENOMEM;
- return NULL;
- }
- }
-#endif
+ char *cwd = getcwd (NULL, 0);
+ if (! cwd && errno == ENOMEM)
+ xalloc_die ();
+ return cwd;