/* xgetcwd.c -- return current directory with unlimited length
- Copyright (C) 1992, 1996, 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1992, 1996, 2000, 2001, 2003 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
# define getcwd(Buf, Max) getwd (Buf)
#endif
-/* Return the current directory, newly allocated, arbitrarily long.
- Return NULL and set errno on error. */
+#include "xalloc.h"
+#include "xgetcwd.h"
+
+/* Return the current directory, newly allocated, assuming it fits
+ within PATH_MAX bytes -- this is a common system-imposed limit
+ on how getcwd works.
+ Upon an out-of-memory error, call xalloc_die.
+ Upon any other type of error, return NULL. */
char *
-xgetcwd ()
+xgetcwd (void)
{
#if HAVE_GETCWD_NULL
- return getcwd (NULL, 0);
+ char *cwd = getcwd (NULL, 0);
+ if (! cwd && errno == ENOMEM)
+ xalloc_die ();
+ return cwd;
#else
/* The initial buffer size for the working directory. A power of 2
while (1)
{
- char *cwd;
+ char *buf = xmalloc (buf_size);
+ char *cwd = getcwd (buf, buf_size);
int saved_errno;
- char *buf = malloc (buf_size);
- if (! buf)
- return NULL;
- cwd = getcwd (buf, buf_size);
if (cwd)
return cwd;
saved_errno = errno;
return NULL;
buf_size *= 2;
if (buf_size == 0)
- {
- errno = ENOMEM;
- return NULL;
- }
+ xalloc_die ();
}
#endif
}