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

libpkgconf: path: filter out duplicate path entries by inode if possible (closes #102)

pull/109/head
William Pitcock 2016-12-30 11:01:15 -06:00
parent aa041b415e
commit bad0da0c03
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libpkgconf/libpkgconf.h
View File

@ -92,6 +92,7 @@ struct pkgconf_path_ {
pkgconf_node_t lnode; pkgconf_node_t lnode;
char *path; char *path;
void *handle;
}; };
#define PKGCONF_PKG_PROPF_NONE 0x0 #define PKGCONF_PKG_PROPF_NONE 0x0

26
libpkgconf/path.c
View File

@ -16,8 +16,17 @@
#include <libpkgconf/libpkgconf.h> #include <libpkgconf/libpkgconf.h>
#include <libpkgconf/config.h> #include <libpkgconf/config.h>
#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
# define PKGCONF_CACHE_INODES
#endif
static bool static bool
#ifdef PKGCONF_CACHE_INODES
path_list_contains_entry(const char *text, pkgconf_list_t *dirlist, struct stat *st)
#else
path_list_contains_entry(const char *text, pkgconf_list_t *dirlist) path_list_contains_entry(const char *text, pkgconf_list_t *dirlist)
#endif
{ {
pkgconf_node_t *n; pkgconf_node_t *n;
@ -25,6 +34,11 @@ path_list_contains_entry(const char *text, pkgconf_list_t *dirlist)
{ {
pkgconf_path_t *pn = n->data; pkgconf_path_t *pn = n->data;
#ifdef PKGCONF_CACHE_INODES
if (((ino_t) pn->handle) == st->st_ino)
return true;
#endif
if (!strcmp(text, pn->path)) if (!strcmp(text, pn->path))
return true; return true;
} }
@ -58,12 +72,24 @@ void
pkgconf_path_add(const char *text, pkgconf_list_t *dirlist) pkgconf_path_add(const char *text, pkgconf_list_t *dirlist)
{ {
pkgconf_path_t *node; pkgconf_path_t *node;
#ifdef PKGCONF_CACHE_INODES
struct stat st;
if (stat(text, &st) == -1)
return;
if (path_list_contains_entry(text, dirlist, &st))
return;
#else
if (path_list_contains_entry(text, dirlist)) if (path_list_contains_entry(text, dirlist))
return; return;
#endif
node = calloc(sizeof(pkgconf_path_t), 1); node = calloc(sizeof(pkgconf_path_t), 1);
node->path = strdup(text); node->path = strdup(text);
#ifdef PKGCONF_CACHE_INODES
node->handle = (void *)(intptr_t) st.st_ino;
#endif
pkgconf_node_insert_tail(&node->lnode, node, dirlist); pkgconf_node_insert_tail(&node->lnode, node, dirlist);
} }