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

pkg: add path_split() helper function

pull/4/head
William Pitcock 2012-05-02 18:38:31 +00:00
parent 281d69eec3
commit 538317f6c5
1 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkg.c
View File

@ -30,17 +30,38 @@
#ifdef _WIN32 #ifdef _WIN32
/* pkg-config uses ';' on win32 as ':' is part of path */ /* pkg-config uses ';' on win32 as ':' is part of path */
#define PKG_CONFIG_PATH_SEP_S ";" #define PKG_CONFIG_PATH_SEP_S ";"
#define PKG_CONFIG_PATH_SEP ';' #define PKG_CONFIG_PATH_SEP ':'
#else #else
#define PKG_CONFIG_PATH_SEP_S ":" #define PKG_CONFIG_PATH_SEP_S ":"
#define PKG_CONFIG_PATH_SEP ':' #define PKG_CONFIG_PATH_SEP ':'
#endif #endif
static inline int
path_split(char *text, char ***parv)
{
int count = 0;
char *p;
if (text == NULL)
return 0;
*parv = malloc(sizeof (void *));
p = text;
while ((*parv[count] = strtok(p, " ")) != NULL)
{
count++, p = NULL;
*parv = realloc(*parv, sizeof (void *) * count);
}
return count;
}
pkg_t * pkg_t *
pkg_find(const char *name) pkg_find(const char *name)
{ {
char locbuf[BUFSIZ]; char locbuf[PKG_CONFIG_PATH_SZ];
char path[BUFSIZ]; char *path;
const char *env_path; const char *env_path;
int count = 0, pcount = 0; int count = 0, pcount = 0;
FILE *f; FILE *f;
@ -51,6 +72,7 @@ pkg_find(const char *name)
{ {
while (1) while (1)
{ {
if (env_path[count] && env_path[count] != PKG_CONFIG_PATH_SEP) if (env_path[count] && env_path[count] != PKG_CONFIG_PATH_SEP)
{ {
path[pcount] = env_path[count]; path[pcount] = env_path[count];