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

main: implement use of pkg_dependency_parse_str() for --atleast-version and friends (issue #20)

pull/29/head
William Pitcock 2012-07-01 21:57:49 -05:00
parent 4edd04b16b
commit 4499d272dd
1 changed files with 42 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
main.c
View File

@ -602,18 +602,23 @@ main(int argc, char *argv[])
if (required_module_version != NULL) if (required_module_version != NULL)
{ {
pkg_t *pkg; pkg_t *pkg;
const char *package; pkg_dependency_t *pkghead = NULL, *pkgiter = NULL;
package = argv[optind]; while (argv[optind])
if (package == NULL) {
return EXIT_SUCCESS; pkghead = pkg_dependency_parse_str(pkghead, argv[optind]);
optind++;
}
pkg = pkg_find(package, global_traverse_flags); PKG_FOREACH_LIST_ENTRY(pkghead, pkgiter)
if (pkg == NULL) {
return EXIT_FAILURE; pkg = pkg_find(pkgiter->package, global_traverse_flags);
if (pkg == NULL)
return EXIT_FAILURE;
if (pkg_compare_version(pkg->version, required_module_version) >= 0) if (pkg_compare_version(pkg->version, required_module_version) >= 0)
return EXIT_SUCCESS; return EXIT_SUCCESS;
}
return EXIT_FAILURE; return EXIT_FAILURE;
} }
@ -621,18 +626,23 @@ main(int argc, char *argv[])
if (required_exact_module_version != NULL) if (required_exact_module_version != NULL)
{ {
pkg_t *pkg; pkg_t *pkg;
const char *package; pkg_dependency_t *pkghead = NULL, *pkgiter = NULL;
package = argv[optind]; while (argv[optind])
if (package == NULL) {
return EXIT_SUCCESS; pkghead = pkg_dependency_parse_str(pkghead, argv[optind]);
optind++;
}
pkg = pkg_find(package, global_traverse_flags); PKG_FOREACH_LIST_ENTRY(pkghead, pkgiter)
if (pkg == NULL) {
return EXIT_FAILURE; pkg = pkg_find(pkgiter->package, global_traverse_flags);
if (pkg == NULL)
return EXIT_FAILURE;
if (pkg_compare_version(pkg->version, required_exact_module_version) == 0) if (pkg_compare_version(pkg->version, required_module_version) == 0)
return EXIT_SUCCESS; return EXIT_SUCCESS;
}
return EXIT_FAILURE; return EXIT_FAILURE;
} }
@ -640,18 +650,23 @@ main(int argc, char *argv[])
if (required_max_module_version != NULL) if (required_max_module_version != NULL)
{ {
pkg_t *pkg; pkg_t *pkg;
const char *package; pkg_dependency_t *pkghead = NULL, *pkgiter = NULL;
package = argv[optind]; while (argv[optind])
if (package == NULL) {
return EXIT_SUCCESS; pkghead = pkg_dependency_parse_str(pkghead, argv[optind]);
optind++;
}
pkg = pkg_find(package, global_traverse_flags); PKG_FOREACH_LIST_ENTRY(pkghead, pkgiter)
if (pkg == NULL) {
return EXIT_FAILURE; pkg = pkg_find(pkgiter->package, global_traverse_flags);
if (pkg == NULL)
return EXIT_FAILURE;
if (pkg_compare_version(pkg->version, required_max_module_version) <= 0) if (pkg_compare_version(pkg->version, required_module_version) <= 0)
return EXIT_SUCCESS; return EXIT_SUCCESS;
}
return EXIT_FAILURE; return EXIT_FAILURE;
} }