nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

compat.c coverage: simplify under-tested alloc_getcwd.

Browse Source 
Yes, HURD lacks PATH_MAX.  But we already limited the maximum buffer
to 4096, so why not just use that?
This commit is contained in:
Nick Mathewson 2016-06-20 10:46:53 -04:00
parent 2b74e13a7c
commit ba28da8de5
1 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/common/compat.c
View File

@ -2341,28 +2341,15 @@ get_parent_directory(char *fname)
static char *
alloc_getcwd(void)
{
int saved_errno = errno;
/* We use this as a starting path length. Not too large seems sane. */
#define START_PATH_LENGTH 128
/* Nobody has a maxpath longer than this, as far as I know. And if they
* do, they shouldn't. */
#define MAX_SANE_PATH_LENGTH 4096
size_t path_length = START_PATH_LENGTH;
char *path = tor_malloc(path_length);
#ifdef PATH_MAX
#define MAX_CWD PATH_MAX
#else
#define MAX_CWD 4096
#endif
errno = 0;
while (getcwd(path, path_length) == NULL) {
if (errno == ERANGE && path_length < MAX_SANE_PATH_LENGTH) {
path_length*=2;
path = tor_realloc(path, path_length);
} else {
tor_free(path);
path = NULL;
break;
}
}
errno = saved_errno;
return path;
char path_buf[MAX_CWD];
char *path = getcwd(path_buf, sizeof(path_buf));
return path ? tor_strdup(path) : NULL;
}
#endif
@ -2393,11 +2380,13 @@ make_path_absolute(char *fname)
tor_asprintf(&absfname, "%s/%s", path, fname);
tor_free(path);
} else {
/* LCOV_EXCL_START Can't make getcwd fail. */
/* If getcwd failed, the best we can do here is keep using the
* relative path. (Perhaps / isn't readable by this UID/GID.) */
log_warn(LD_GENERAL, "Unable to find current working directory: %s",
strerror(errno));
absfname = tor_strdup(fname);
/* LCOV_EXCL_STOP */
}
}
return absfname;