nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 05:26:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Stop using MAX_PATH, it might not be defined

Browse Source 
This broke compilation on Hurd
This commit is contained in:
Sebastian Hahn 2012-03-10 16:53:01 +01:00
parent 0f7e96038d
commit d916fc38b6
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug5355 Normal file
View File

@ -0,0 +1,4 @@
o Major bugfixes:
- Fix a compilation issue on GNU Hurd, which doesn't have PATH_MAX. Fixes
bug 5355; bugfix on 0.2.3.11-alpha.

27
src/common/compat.c
View File

@ -1645,7 +1645,10 @@ make_path_absolute(char *fname)
return absfname;
#else
char path[PATH_MAX+1];
/* We use this as a starting path length. Not too large seems sane. */
#define START_PATH_LENGTH 100
size_t path_length = START_PATH_LENGTH;
char *path = tor_malloc(path_length);
char *absfname = NULL;
tor_assert(fname);
@ -1653,13 +1656,23 @@ make_path_absolute(char *fname)
if (fname[0] == '/') {
absfname = tor_strdup(fname);
} else {
if (getcwd(path, PATH_MAX) != NULL) {
tor_asprintf(&absfname, "%s/%s", path, fname);
} else {
/* If getcwd failed, the best we can do here is keep using the
* relative path. (Perhaps / isn't readable by this UID/GID.) */
absfname = tor_strdup(fname);
int save_errno = errno;
errno = 0;
while (getcwd(path, path_length) == NULL) {
if (errno == ERANGE) {
path_length*=2;
path = tor_realloc(path, path_length);
} else {
/* If getcwd failed with an error other than ERANGE, the best we can
* do here is keep using the relative path. (Perhaps / isn't readable
* by this UID/GID.) */
absfname = tor_strdup(fname);
break;
}
}
errno = save_errno;
tor_asprintf(&absfname, "%s/%s", path, fname);
tor_free(path);
}
return absfname;