emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib: move conf parsing to lib/conf.c and refactor to not rely on getcwd/chdir

Browse Source 
This fixes https://github.com/voidlinux/xbps/issues/158
This commit is contained in:
Duncaen
2019-03-06 14:34:23 +01:00
parent fa5911bb00
commit 85bf13f138
7 changed files with 587 additions and 446 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
tests/xbps/libxbps/config/main.c
View File

@@ -120,10 +120,65 @@ ATF_TC_BODY(config_include_nomatch_test, tc)
ATF_REQUIRE_EQ(xbps_array_count(xh.repositories), 0);
}
ATF_TC(config_masking);
ATF_TC_HEAD(config_masking, tc)
{
atf_tc_set_md_var(tc, "descr", "Test file masking");
}
ATF_TC_BODY(config_masking, tc)
{
struct xbps_handle xh;
const char *tcsdir, *repo;
char *buf, *buf2, pwd[PATH_MAX];
int ret;
/* get test source dir */
tcsdir = atf_tc_get_config_var(tc, "srcdir");
memset(&xh, 0, sizeof(xh));
buf = getcwd(pwd, sizeof(pwd));
xbps_strlcpy(xh.rootdir, tcsdir, sizeof(xh.rootdir));
xbps_strlcpy(xh.metadir, tcsdir, sizeof(xh.metadir));
ret = snprintf(xh.confdir, sizeof(xh.confdir), "%s/xbps.d", pwd);
ATF_REQUIRE_EQ((ret >= 0), 1);
ATF_REQUIRE_EQ(((size_t)ret < sizeof(xh.confdir)), 1);
ret = snprintf(xh.sysconfdir, sizeof(xh.sysconfdir), "%s/sys-xbps.d", pwd);
ATF_REQUIRE_EQ((ret >= 0), 1);
ATF_REQUIRE_EQ(((size_t)ret < sizeof(xh.sysconfdir)), 1);
ATF_REQUIRE_EQ(xbps_mkpath(xh.confdir, 0755), 0);
ATF_REQUIRE_EQ(xbps_mkpath(xh.sysconfdir, 0755), 0);
buf = xbps_xasprintf("%s/1.include.cf", tcsdir);
buf2 = xbps_xasprintf("%s/xbps.d/repo.conf", pwd);
ATF_REQUIRE_EQ(symlink(buf, buf2), 0);
free(buf);
free(buf2);
buf = xbps_xasprintf("%s/2.include.cf", tcsdir);
buf2 = xbps_xasprintf("%s/sys-xbps.d/repo.conf", pwd);
ATF_REQUIRE_EQ(symlink(buf, buf2), 0);
free(buf);
free(buf2);
xh.flags = XBPS_FLAG_DEBUG;
ATF_REQUIRE_EQ(xbps_init(&xh), 0);
/* should contain one repository */
ATF_REQUIRE_EQ(xbps_array_count(xh.repositories), 1);
/* should contain repository=1 */
ATF_REQUIRE_EQ(xbps_array_get_cstring_nocopy(xh.repositories, 0, &repo), true);
ATF_REQUIRE_STREQ(repo, "1");
}
ATF_TP_ADD_TCS(tp)
{
ATF_TP_ADD_TC(tp, config_include_test);
ATF_TP_ADD_TC(tp, config_include_nomatch_test);
ATF_TP_ADD_TC(tp, config_masking);
return atf_no_error();
}