Refactor retrieving the current working directory
The GNU C Library (glibc) offers an function which allocates the necessary memory automatically [0]. When it is available, we use that. Otherwise we depend upon the `getcwd` function which requires a preallocated buffer (and its size). This function was used incorrectly by depending on the initial buffer size being big enough and otherwise failing to return the current working directory. The proper way of getting the current working directory requires a loop which doubles the buffer size if `getcwd` requires it. This code was copied from [1] with modifications to fit the context. [0] https://www.gnu.org/software/hurd/hurd/porting/guidelines.html [1] http://pubs.opengroup.org/onlinepubs/9699919799/functions/getcwd.html
This commit is contained in:
parent
0265ced02b
commit
bfe740f065
|
@ -481,6 +481,7 @@ AC_CHECK_FUNCS(
|
|||
timingsafe_memcmp \
|
||||
flock \
|
||||
ftime \
|
||||
get_current_dir_name \
|
||||
getaddrinfo \
|
||||
getifaddrs \
|
||||
getpass \
|
||||
|
|
|
@ -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;
|
||||
|
||||
char path_buf[MAX_CWD];
|
||||
char *path = getcwd(path_buf, sizeof(path_buf));
|
||||
return path ? tor_strdup(path) : NULL;
|
||||
while (ptr == NULL) {
|
||||
buf = tor_realloc(buf, size);
|
||||
ptr = getcwd(buf, size);
|
||||
|
||||
if (ptr == NULL && errno != ERANGE) {
|
||||
tor_free(buf);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
size *= 2;
|
||||
}
|
||||
return buf;
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
Loading…
Reference in New Issue