dcbaker
/
pkgconf
forked from ariadne/pkgconf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pkg: bug fixes

feature/tap-sh
William Pitcock 2012-07-26 00:01:40 -05:00
parent 3e1858320c
commit 0ac7978ee2
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg.c
View File

@ -286,16 +286,24 @@ pkg_scan_dir(const char *path, pkg_iteration_func_t func)
for (dirent = readdir(dir); dirent != NULL; dirent = readdir(dir)) for (dirent = readdir(dir); dirent != NULL; dirent = readdir(dir))
{ {
static char filebuf[PKG_BUFSIZE];
pkg_t *pkg; pkg_t *pkg;
FILE *f; FILE *f;
f = fopen(dirent->d_name, "r"); strlcpy(filebuf, path, sizeof filebuf);
strlcat(filebuf, "/", sizeof filebuf);
strlcat(filebuf, dirent->d_name, sizeof filebuf);
f = fopen(filebuf, "r");
if (f == NULL) if (f == NULL)
continue; continue;
pkg = pkg_new_from_file(dirent->d_name, f); pkg = pkg_new_from_file(filebuf, f);
if (pkg != NULL) if (pkg != NULL)
{
func(pkg); func(pkg);
pkg_free(pkg);
}
} }
closedir(dir); closedir(dir);
@ -327,11 +335,11 @@ pkg_scan_all(pkg_iteration_func_t func)
path = getenv("PKG_CONFIG_PATH"); path = getenv("PKG_CONFIG_PATH");
if (path) if (path)
{ {
pkg_scan_dir(path, func); pkg_scan(path, func);
return; return;
} }
pkg_scan_dir(get_pkgconfig_path(), func); pkg_scan(get_pkgconfig_path(), func);
} }
#ifdef _WIN32 #ifdef _WIN32