mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-03-24 09:05:48 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

config: change syntax for pipe-command in key binding

Browse source 
The pipe command can contain almost all printable characters. In
particular, we can expect it to contain '='.

Having the pipe command as part of the key breaks the key/value
splitting.

Change it so that it is instead an optional initial part of the value,
enclosed in '[]'.

I.e. instead of

    pipe-visible:cmd=binding

we now need to write

    pipe-visible=[cmd] binding
This commit is contained in:
Daniel Eklöf 2020-07-15 17:28:09 +02:00
parent be9c566622
commit 65a46be822
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

25
config.c
View file

@ -528,11 +528,21 @@ parse_section_key_bindings(
const char *key, const char *value, struct config *conf, const char *key, const char *value, struct config *conf,
const char *path, unsigned lineno) const char *path, unsigned lineno)
{ {
const char *pipe_cmd = strchr(key, ':'); const char *pipe_cmd = NULL;
if (pipe_cmd != NULL) size_t pipe_len = 0;
pipe_cmd++;
const size_t key_len = pipe_cmd != NULL ? pipe_cmd - key - 1: strlen(key); if (value[0] == '[') {
const char *pipe_cmd_end = strrchr(value, ']');
if (pipe_cmd_end == NULL) {
LOG_ERR("%s:%d: unclosed '['", path, lineno);
return false;
}
pipe_cmd = &value[1];
pipe_len = pipe_cmd_end - pipe_cmd;
value = pipe_cmd_end + 1;
}
for (enum bind_action_normal action = 0; for (enum bind_action_normal action = 0;
action < BIND_ACTION_COUNT; action < BIND_ACTION_COUNT;
@ -541,7 +551,7 @@ parse_section_key_bindings(
if (binding_action_map[action] == NULL) if (binding_action_map[action] == NULL)
continue; continue;
if (strncmp(key, binding_action_map[action], key_len) != 0) if (strcmp(key, binding_action_map[action]) != 0)
continue; continue;
if (strcasecmp(value, "none") == 0) { if (strcasecmp(value, "none") == 0) {
@ -564,14 +574,15 @@ parse_section_key_bindings(
if (it->item.action == action && if (it->item.action == action &&
((it->item.pipe_cmd == NULL && pipe_cmd == NULL) || ((it->item.pipe_cmd == NULL && pipe_cmd == NULL) ||
(it->item.pipe_cmd != NULL && pipe_cmd != NULL && (it->item.pipe_cmd != NULL && pipe_cmd != NULL &&
strcmp(it->item.pipe_cmd, pipe_cmd) == 0))) strncmp(it->item.pipe_cmd, pipe_cmd, pipe_len) == 0)))
{ {
free(it->item.key); free(it->item.key);
free(it->item.pipe_cmd); free(it->item.pipe_cmd);
it->item.key = strdup(value); it->item.key = strdup(value);
it->item.pipe_cmd = pipe_cmd != NULL ? strdup(pipe_cmd) : NULL; it->item.pipe_cmd = pipe_cmd != NULL
? strndup(pipe_cmd, pipe_len) : NULL;
already_added = true; already_added = true;
break; break;
} }