diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/common/compat.c | 25 |
2 files changed, 19 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 4092d10af6..345e499ffc 100644 --- a/configure.ac +++ b/configure.ac @@ -481,6 +481,7 @@ AC_CHECK_FUNCS( timingsafe_memcmp \ flock \ ftime \ + get_current_dir_name \ getaddrinfo \ getifaddrs \ getpass \ diff --git a/src/common/compat.c b/src/common/compat.c index 4d110aba35..8e3d97420a 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -2349,15 +2349,26 @@ get_parent_directory(char *fname) static char * alloc_getcwd(void) { -#ifdef PATH_MAX -#define MAX_CWD PATH_MAX +#ifdef HAVE_GET_CURRENT_DIR_NAME + return get_current_dir_name(); #else -#define MAX_CWD 4096 -#endif + size_t size = 1024; + char *buf = NULL; + char *ptr = NULL; + + while (ptr == NULL) { + buf = tor_realloc(buf, size); + ptr = getcwd(buf, size); - char path_buf[MAX_CWD]; - char *path = getcwd(path_buf, sizeof(path_buf)); - return path ? tor_strdup(path) : NULL; + if (ptr == NULL && errno != ERANGE) { + tor_free(buf); + return NULL; + } + + size *= 2; + } + return buf; +#endif } #endif |