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

path: relocate system libdir/includedir if appropriate

pull/109/head
William Pitcock 2017-01-13 20:12:38 -06:00
parent cb1dc71e23
commit 147fd80750
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libpkgconf/path.c
View File

@ -77,6 +77,8 @@ void
pkgconf_path_add(const char *text, pkgconf_list_t *dirlist, bool filter) pkgconf_path_add(const char *text, pkgconf_list_t *dirlist, bool filter)
{ {
pkgconf_path_t *node; pkgconf_path_t *node;
char path[PKGCONF_BUFSIZE];
#ifdef PKGCONF_CACHE_INODES #ifdef PKGCONF_CACHE_INODES
struct stat st; struct stat st;
@ -90,8 +92,12 @@ pkgconf_path_add(const char *text, pkgconf_list_t *dirlist, bool filter)
return; return;
#endif #endif
pkgconf_strlcpy(path, text, sizeof path);
pkgconf_path_relocate(path, sizeof path);
node = calloc(sizeof(pkgconf_path_t), 1); node = calloc(sizeof(pkgconf_path_t), 1);
node->path = strdup(text); node->path = strdup(path);
#ifdef PKGCONF_CACHE_INODES #ifdef PKGCONF_CACHE_INODES
if (filter) { if (filter) {
node->handle_path = (void *)(intptr_t) st.st_ino; node->handle_path = (void *)(intptr_t) st.st_ino;