projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(xreadlink): Add cast to avoid a warning.
[gnulib.git]
/
lib
/
xgetcwd.c
diff --git
a/lib/xgetcwd.c
b/lib/xgetcwd.c
index
0af66fb
..
1409bcf
100644
(file)
--- a/
lib/xgetcwd.c
+++ b/
lib/xgetcwd.c
@@
-39,6
+39,8
@@
extern int errno;
#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
@@
-51,41
+53,34
@@
char *getwd ();
char *
xgetcwd ()
{
char *
xgetcwd ()
{
-#if defined __GLIBC__ && __GLIBC__ >= 2
- return getcwd (NULL, 0);
+#if HAVE_GETCWD_NULL
+ char *cwd = getcwd (NULL, 0);
+ if (! cwd && errno == ENOMEM)
+ xalloc_die ();
+ return cwd;
#else
#else
- char *ret;
- size_t path_max;
- char buf[1024];
- errno = 0;
- ret = getcwd (buf, sizeof (buf));
- if (ret != NULL)
- return xstrdup (buf);
- if (errno != ERANGE)
- return 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
-
path_max = 1 << 10
;
+
size_t buf_size = INITIAL_BUFFER_SIZE
;
-
for (;;
)
+
while (1
)
{
{
- char *cwd = (char *) xmalloc (path_max);
- int save_errno;
-
- errno = 0;
- ret = getcwd (cwd, path_max);
- if (ret != NULL)
- return ret;
- save_errno = errno;
- free (cwd);
- if (save_errno != ERANGE)
- {
- errno = save_errno;
- return NULL;
- }
-
- path_max *= 2;
- if (path_max == 0)
+ char *buf = xmalloc (buf_size);
+ char *cwd = getcwd (buf, buf_size);
+ int saved_errno;
+ if (cwd)
+ return cwd;
+ saved_errno = errno;
+ free (buf);
+ if (saved_errno != ERANGE)
+ return NULL;
+ buf_size *= 2;
+ if (buf_size == 0)
xalloc_die ();
}
#endif
xalloc_die ();
}
#endif