mirror of
https://github.com/pygos/pkg-utils.git
synced 2024-11-24 05:30:42 +01:00
cleanup: split package provider code out of buildstrategy.c
Signed-off-by: David Oberhollenzer <goliath@infraroot.at>
This commit is contained in:
parent
46f340b20f
commit
b7e81c081b
4 changed files with 136 additions and 103 deletions
|
|
@ -28,6 +28,7 @@ pkg_SOURCES += main/cmd/install.c
|
|||
pkg_SOURCES += main/cmd/buildstrategy/buildstrategy.h
|
||||
pkg_SOURCES += main/cmd/buildstrategy/buildstrategy.c
|
||||
pkg_SOURCES += main/cmd/buildstrategy/srcpkg.c
|
||||
pkg_SOURCES += main/cmd/buildstrategy/provider.c
|
||||
|
||||
# depgraph command
|
||||
pkg_SOURCES += main/cmd/depgraph.c
|
||||
|
|
|
|||
|
|
@ -37,68 +37,6 @@ static int foreach_line(const char *filename, line_handler_t cb)
|
|||
|
||||
/*****************************************************************************/
|
||||
|
||||
static hash_table_t tbl_preferes;
|
||||
static hash_table_t tbl_provides;
|
||||
|
||||
static source_pkg_t *get_provider(const char *parent, const char *binpkg)
|
||||
{
|
||||
source_pkg_t *spkg, *pref;
|
||||
|
||||
spkg = hash_table_lookup(&tbl_provides, binpkg);
|
||||
if (spkg == NULL)
|
||||
goto fail_none;
|
||||
|
||||
pref = hash_table_lookup(&tbl_preferes, binpkg);
|
||||
|
||||
if (spkg->next != NULL) {
|
||||
if (pref == NULL)
|
||||
goto fail_no_pref;
|
||||
|
||||
while (spkg != NULL && strcmp(spkg->name, pref->name) != 0) {
|
||||
spkg = spkg->next;
|
||||
}
|
||||
|
||||
if (spkg == NULL) {
|
||||
spkg = hash_table_lookup(&tbl_provides, binpkg);
|
||||
goto fail_provider;
|
||||
}
|
||||
} else {
|
||||
if (pref != NULL && strcmp(spkg->name, pref->name) != 0)
|
||||
goto fail_provider;
|
||||
}
|
||||
|
||||
return spkg;
|
||||
fail_none:
|
||||
fprintf(stderr, "No source package provides binary package '%s'.\n\n",
|
||||
binpkg);
|
||||
goto fail;
|
||||
fail_provider:
|
||||
fprintf(stderr,
|
||||
"Preferred provider for binary package '%s' is set to\n"
|
||||
"source package '%s', which does not provide '%s'.\n\n",
|
||||
binpkg, pref->name, binpkg);
|
||||
goto fail_list_providers;
|
||||
fail_no_pref:
|
||||
fprintf(stderr, "No preferred provider set for "
|
||||
"binary package '%s'.\n\n", binpkg);
|
||||
goto fail_list_providers;
|
||||
fail_list_providers:
|
||||
fprintf(stderr, "The following source packages provide the "
|
||||
"binary package '%s':\n\n", binpkg);
|
||||
while (spkg != NULL) {
|
||||
fprintf(stderr, "\t%s\n", spkg->name);
|
||||
spkg = spkg->next;
|
||||
}
|
||||
fputc('\n', stderr);
|
||||
goto fail;
|
||||
fail:
|
||||
if (parent != NULL) {
|
||||
fprintf(stderr, "Binary package '%s' is required to "
|
||||
"build source package '%s'\n", binpkg, parent);
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static int handle_depends(const char *filename, size_t linenum,
|
||||
const char *sourcepkg, const char *binpkg)
|
||||
{
|
||||
|
|
@ -111,7 +49,7 @@ static int handle_depends(const char *filename, size_t linenum,
|
|||
if (src == NULL)
|
||||
return 0;
|
||||
|
||||
dep = get_provider(sourcepkg, binpkg);
|
||||
dep = provider_get(sourcepkg, binpkg);
|
||||
if (dep == NULL)
|
||||
return -1;
|
||||
|
||||
|
|
@ -134,37 +72,17 @@ static int handle_depends(const char *filename, size_t linenum,
|
|||
static int handle_provides(const char *filename, size_t linenum,
|
||||
const char *sourcepkg, const char *binpkg)
|
||||
{
|
||||
source_pkg_t *head = hash_table_lookup(&tbl_provides, binpkg), *src;
|
||||
(void)filename; (void)linenum;
|
||||
|
||||
if (head != NULL && strcmp(head->name, sourcepkg) == 0)
|
||||
return 0;
|
||||
|
||||
src = src_pkg_get(sourcepkg);
|
||||
if (src == NULL)
|
||||
return -1;
|
||||
|
||||
src->next = head;
|
||||
return hash_table_set(&tbl_provides, binpkg, src);
|
||||
return provider_add(sourcepkg, binpkg);
|
||||
}
|
||||
|
||||
static int handle_prefere(const char *filename, size_t linenum,
|
||||
const char *binpkg, const char *sourcepkg)
|
||||
{
|
||||
source_pkg_t *src = hash_table_lookup(&tbl_preferes, binpkg);
|
||||
(void)filename; (void)linenum;
|
||||
|
||||
if (src != NULL) {
|
||||
fprintf(stderr,
|
||||
"%s: %zu: preferred provider for %s already "
|
||||
"set to %s\n", filename, linenum, binpkg, src->name);
|
||||
return -1;
|
||||
}
|
||||
|
||||
src = src_pkg_get(sourcepkg);
|
||||
if (src == NULL)
|
||||
return -1;
|
||||
|
||||
return hash_table_set(&tbl_preferes, binpkg, src);
|
||||
return provider_add_prefered(binpkg, sourcepkg);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
@ -213,27 +131,16 @@ static int process_args(int argc, char **argv)
|
|||
goto fail_arg;
|
||||
}
|
||||
|
||||
if (hash_table_init(&tbl_provides, 1024))
|
||||
if (prefere != NULL && foreach_line(prefere, handle_prefere) != 0)
|
||||
return -1;
|
||||
|
||||
if (hash_table_init(&tbl_preferes, 1024))
|
||||
goto fail_provides;
|
||||
|
||||
if (prefere != NULL && foreach_line(prefere, handle_prefere) != 0)
|
||||
goto fail_prefere;
|
||||
|
||||
if (foreach_line(provides, handle_provides))
|
||||
goto fail_prefere;
|
||||
return -1;
|
||||
|
||||
if (depends != NULL && foreach_line(depends, handle_depends) != 0)
|
||||
goto fail_prefere;
|
||||
return -1;
|
||||
|
||||
return 0;
|
||||
fail_prefere:
|
||||
hash_table_cleanup(&tbl_preferes);
|
||||
fail_provides:
|
||||
hash_table_cleanup(&tbl_provides);
|
||||
return -1;
|
||||
fail_arg:
|
||||
tell_read_help(argv[0]);
|
||||
return -1;
|
||||
|
|
@ -262,13 +169,19 @@ static int cmd_buildstrategy(int argc, char **argv)
|
|||
if (src_pkg_init())
|
||||
return EXIT_FAILURE;
|
||||
|
||||
if (provider_init()) {
|
||||
src_pkg_cleanup();
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
|
||||
if (process_args(argc, argv)) {
|
||||
provider_cleanup();
|
||||
src_pkg_cleanup();
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
|
||||
for (i = optind; i < argc; ++i) {
|
||||
pkg = get_provider(NULL, argv[i]);
|
||||
pkg = provider_get(NULL, argv[i]);
|
||||
if (pkg == NULL)
|
||||
goto out;
|
||||
|
||||
|
|
@ -280,9 +193,8 @@ static int cmd_buildstrategy(int argc, char **argv)
|
|||
|
||||
ret = EXIT_SUCCESS;
|
||||
out:
|
||||
provider_cleanup();
|
||||
src_pkg_cleanup();
|
||||
hash_table_cleanup(&tbl_provides);
|
||||
hash_table_cleanup(&tbl_preferes);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -35,4 +35,14 @@ source_pkg_t *src_pkg_get(const char *name);
|
|||
|
||||
int src_pkg_output_build_order(void);
|
||||
|
||||
int provider_init(void);
|
||||
|
||||
void provider_cleanup(void);
|
||||
|
||||
int provider_add(const char *sourcepkg, const char *binpkg);
|
||||
|
||||
int provider_add_prefered(const char *binpkg, const char *sourcepkg);
|
||||
|
||||
source_pkg_t *provider_get(const char *parent, const char *binpkg);
|
||||
|
||||
#endif /* BUILDSTRATEGY_H */
|
||||
|
|
|
|||
110
main/cmd/buildstrategy/provider.c
Normal file
110
main/cmd/buildstrategy/provider.c
Normal file
|
|
@ -0,0 +1,110 @@
|
|||
/* SPDX-License-Identifier: ISC */
|
||||
#include "buildstrategy.h"
|
||||
|
||||
static hash_table_t tbl_provides;
|
||||
static hash_table_t tbl_preferes;
|
||||
|
||||
int provider_init(void)
|
||||
{
|
||||
if (hash_table_init(&tbl_provides, 1024))
|
||||
return -1;
|
||||
|
||||
if (hash_table_init(&tbl_preferes, 1024)) {
|
||||
hash_table_cleanup(&tbl_provides);
|
||||
return -1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
void provider_cleanup(void)
|
||||
{
|
||||
hash_table_cleanup(&tbl_provides);
|
||||
hash_table_cleanup(&tbl_preferes);
|
||||
}
|
||||
|
||||
int provider_add(const char *sourcepkg, const char *binpkg)
|
||||
{
|
||||
source_pkg_t *head = hash_table_lookup(&tbl_provides, binpkg), *src;
|
||||
|
||||
for (src = head; src != NULL; src = src->next) {
|
||||
if (strcmp(src->name, sourcepkg) == 0)
|
||||
return 0;
|
||||
}
|
||||
|
||||
src = src_pkg_get(sourcepkg);
|
||||
if (src == NULL)
|
||||
return -1;
|
||||
|
||||
src->next = head;
|
||||
return hash_table_set(&tbl_provides, binpkg, src);
|
||||
}
|
||||
|
||||
int provider_add_prefered(const char *binpkg, const char *sourcepkg)
|
||||
{
|
||||
source_pkg_t *src = src_pkg_get(sourcepkg);
|
||||
|
||||
if (src == NULL)
|
||||
return -1;
|
||||
|
||||
return hash_table_set(&tbl_preferes, binpkg, src);
|
||||
}
|
||||
|
||||
source_pkg_t *provider_get(const char *parent, const char *binpkg)
|
||||
{
|
||||
source_pkg_t *spkg, *pref;
|
||||
|
||||
spkg = hash_table_lookup(&tbl_provides, binpkg);
|
||||
if (spkg == NULL)
|
||||
goto fail_none;
|
||||
|
||||
pref = hash_table_lookup(&tbl_preferes, binpkg);
|
||||
|
||||
if (spkg->next != NULL) {
|
||||
if (pref == NULL)
|
||||
goto fail_no_pref;
|
||||
|
||||
while (spkg != NULL && strcmp(spkg->name, pref->name) != 0) {
|
||||
spkg = spkg->next;
|
||||
}
|
||||
|
||||
if (spkg == NULL) {
|
||||
spkg = hash_table_lookup(&tbl_provides, binpkg);
|
||||
goto fail_provider;
|
||||
}
|
||||
} else {
|
||||
if (pref != NULL && strcmp(spkg->name, pref->name) != 0)
|
||||
goto fail_provider;
|
||||
}
|
||||
|
||||
return spkg;
|
||||
fail_none:
|
||||
fprintf(stderr, "No source package provides binary package '%s'.\n\n",
|
||||
binpkg);
|
||||
goto fail;
|
||||
fail_provider:
|
||||
fprintf(stderr,
|
||||
"Preferred provider for binary package '%s' is set to\n"
|
||||
"source package '%s', which does not provide '%s'.\n\n",
|
||||
binpkg, pref->name, binpkg);
|
||||
goto fail_list_providers;
|
||||
fail_no_pref:
|
||||
fprintf(stderr, "No preferred provider set for "
|
||||
"binary package '%s'.\n\n", binpkg);
|
||||
goto fail_list_providers;
|
||||
fail_list_providers:
|
||||
fprintf(stderr, "The following source packages provide the "
|
||||
"binary package '%s':\n\n", binpkg);
|
||||
while (spkg != NULL) {
|
||||
fprintf(stderr, "\t%s\n", spkg->name);
|
||||
spkg = spkg->next;
|
||||
}
|
||||
fputc('\n', stderr);
|
||||
goto fail;
|
||||
fail:
|
||||
if (parent != NULL) {
|
||||
fprintf(stderr, "Binary package '%s' is required to "
|
||||
"build source package '%s'\n", binpkg, parent);
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
Loading…
Reference in a new issue