external/yambar
1
0
Fork 1
mirror of https://codeberg.org/dnkl/yambar.git synced 2025-04-23 20:35:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

module/script: script arguments

Browse source 
Add new config attribute, ‘args’. This is a list of strings, that will
be passed as arguments to the script.
This commit is contained in:
Daniel Eklöf 2020-10-25 18:29:52 +01:00
parent 8702378c74
commit 08bac77907
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 43 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
modules/script.c
View file

@ -22,6 +22,9 @@
struct private { struct private {
char *path; char *path;
size_t argc;
char **argv;
struct particle *content; struct particle *content;
struct tag_set tags; struct tag_set tags;
@ -39,6 +42,10 @@ destroy(struct module *mod)
struct private *m = mod->private; struct private *m = mod->private;
m->content->destroy(m->content); m->content->destroy(m->content);
tag_set_destroy(&m->tags); tag_set_destroy(&m->tags);
for (size_t i = 0; i < m->argc; i++)
free(m->argv[i]);
free(m->argv);
free(m->recv_buf.data); free(m->recv_buf.data);
free(m->path); free(m->path);
free(m); free(m);
@ -377,8 +384,13 @@ run(struct module *mod)
if (pid == 0) { if (pid == 0) {
/* Child */ /* Child */
/* Restore signal handlers */ char *argv[1 + m->argc + 1];
argv[0] = m->path;
for (size_t i = 0; i < m->argc; i++)
argv[i + 1] = m->argv[i];
argv[1 + m->argc] = NULL;
/* Restore signal handlers */
sigset_t mask; sigset_t mask;
sigemptyset(&mask); sigemptyset(&mask);
@ -411,7 +423,6 @@ run(struct module *mod)
close(comm_pipe[1]); close(comm_pipe[1]);
char *const argv[] = {NULL};
execvp(m->path, argv); execvp(m->path, argv);
fail: fail:
@ -458,11 +469,16 @@ run(struct module *mod)
} }
static struct module * static struct module *
script_new(const char *path, struct particle *_content) script_new(const char *path, size_t argc, const char *const argv[static argc],
struct particle *_content)
{ {
struct private *m = calloc(1, sizeof(*m)); struct private *m = calloc(1, sizeof(*m));
m->path = strdup(path); m->path = strdup(path);
m->content = _content; m->content = _content;
m->argc = argc;
m->argv = malloc(argc * sizeof(m->argv[0]));
for (size_t i = 0; i < argc; i++)
m->argv[i] = strdup(argv[i]);
struct module *mod = module_common_new(); struct module *mod = module_common_new();
mod->private = m; mod->private = m;
@ -476,8 +492,30 @@ static struct module *
from_conf(const struct yml_node *node, struct conf_inherit inherited) from_conf(const struct yml_node *node, struct conf_inherit inherited)
{ {
const struct yml_node *run = yml_get_value(node, "path"); const struct yml_node *run = yml_get_value(node, "path");
const struct yml_node *args = yml_get_value(node, "args");
const struct yml_node *c = yml_get_value(node, "content"); const struct yml_node *c = yml_get_value(node, "content");
return script_new(yml_value_as_string(run), conf_to_particle(c, inherited));
size_t argc = args != NULL ? yml_list_length(args) : 0;
const char *argv[argc];
if (args != NULL) {
size_t i = 0;
for (struct yml_list_iter iter = yml_list_iter(args);
iter.node != NULL;
yml_list_next(&iter), i++)
{
argv[i] = yml_value_as_string(iter.node);
}
}
return script_new(
yml_value_as_string(run), argc, argv, conf_to_particle(c, inherited));
}
static bool
conf_verify_args(keychain_t *chain, const struct yml_node *node)
{
return conf_verify_list(chain, node, &conf_verify_string);
} }
static bool static bool
@ -485,6 +523,7 @@ verify_conf(keychain_t *chain, const struct yml_node *node)
{ {
static const struct attr_info attrs[] = { static const struct attr_info attrs[] = {
{"path", true, &conf_verify_string}, {"path", true, &conf_verify_string},
{"args", false, &conf_verify_args},
MODULE_COMMON_ATTRS, MODULE_COMMON_ATTRS,
}; };