From 6ef13be4e8d27f237406d6485d8dfe623db03a5f Mon Sep 17 00:00:00 2001 From: Vito Caputo Date: Fri, 2 Jun 2023 19:09:25 -0700 Subject: til: add exclusions to til_get_module_names() There's often a need to exclude specific modules, though it's often a hacky kludge. It's something relied upon currently for preventing dangerous recursion scenarios, which will likely get fixed up more robustly in the future. --- src/til.c | 13 ++++++++++++- src/til.h | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/til.c b/src/til.c index d006926..66f4870 100644 --- a/src/til.c +++ b/src/til.c @@ -167,7 +167,7 @@ void til_get_modules(const til_module_t ***res_modules, size_t *res_n_modules) } -char * til_get_module_names(unsigned flags_excluded) +char * til_get_module_names(unsigned flags_excluded, const char **exclusions) { const til_module_t **modules; size_t n_modules; @@ -183,10 +183,21 @@ char * til_get_module_names(unsigned flags_excluded) til_get_modules(&modules, &n_modules); for (size_t i = 0, j = 0; i < n_modules; i++) { const til_module_t *mod = modules[i]; + const char **exclusion = exclusions; if ((mod->flags & flags_excluded)) continue; + while (*exclusion) { + if (!strcmp(*exclusion, mod->name)) + break; + + exclusion++; + } + + if (*exclusion) + continue; + fprintf(fp, "%s%s", j ? "," : "", mod->name); j++; } diff --git a/src/til.h b/src/til.h index 0a0cd6d..f27bdde 100644 --- a/src/til.h +++ b/src/til.h @@ -42,7 +42,7 @@ void til_quiesce(void); void til_shutdown(void); const til_module_t * til_lookup_module(const char *name); void til_get_modules(const til_module_t ***res_modules, size_t *res_n_modules); -char * til_get_module_names(unsigned flags_excluded); +char * til_get_module_names(unsigned flags_excluded, const char **exclusions); void til_module_render(til_module_context_t *context, til_stream_t *stream, unsigned ticks, til_fb_fragment_t **fragment_ptr); int til_module_create_context(const til_module_t *module, til_stream_t *stream, unsigned seed, unsigned ticks, unsigned n_cpus, til_setup_t *setup, til_module_context_t **res_context); til_module_context_t * til_module_destroy_context(til_module_context_t *context, til_stream_t *stream); -- cgit v1.2.3