ariadne
/
pkgconf
3
6
Fork 4
Code Issues 6 Pull Requests 2 Projects Releases 2 Wiki Activity

If PKG_CONFIG_PATH element is a sym link, use the link destination instead of the link for inode caching checks. 

See issue 112 & issue 110 (https://github.com/pkgconf/pkgconf/issues)
pull/116/head
John Hein 2017-01-26 15:27:48 -07:00 committed by William Pitcock
parent 76b8e0a26b
commit 9b255d465c
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libpkgconf/path.c
View File

@ -82,11 +82,22 @@ pkgconf_path_add(const char *text, pkgconf_list_t *dirlist, bool filter)
#ifdef PKGCONF_CACHE_INODES #ifdef PKGCONF_CACHE_INODES
struct stat st; struct stat st;
if (filter && stat(text, &st) == -1) if (filter)
{
if (lstat(text, &st) == -1)
return; return;
if (S_ISLNK(st.st_mode))
{
char linkdest[PKGCONF_BUFSIZE];
ssize_t len = readlink(text, linkdest, sizeof(linkdest));
if (filter && path_list_contains_entry(text, dirlist, &st)) if (len != -1 && (size_t)len < sizeof(linkdest) &&
stat(linkdest, &st) == -1)
return; return;
}
if (path_list_contains_entry(text, dirlist, &st))
return;
}
#else #else
if (filter && path_list_contains_entry(text, dirlist)) if (filter && path_list_contains_entry(text, dirlist))
return; return;