mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-04 13:30:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

action: do not expand env vars in Exec action

Browse source 
...<command> argument (but still resolve tilde).

This makes it easier to write sh -c '' constructs without turning labwc
into a shell parser in order to expand environment variables, whilst
respecting single quotes and escaped characters as well as ignoring
subshells syntax like $(foo) and backticks.

Also, fix bug where buffer length+alloc get out-of-sync
This commit is contained in:
Johan Malm 2023-09-21 23:09:05 +01:00 • committed by Johan Malm
parent c6c1f8e04b
commit 881d788bee
6 changed files with 44 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/common/buf.c
View file

@ -4,6 +4,35 @@
#include "common/buf.h"
#include "common/mem.h"
static void
buf_add_one_char(struct buf *s, char ch)
{
if (s->alloc <= s->len + 1) {
s->alloc = s->alloc * 3 / 2 + 16;
s->buf = xrealloc(s->buf, s->alloc);
}
s->buf[s->len++] = ch;
s->buf[s->len] = '\0';
}
void
buf_expand_tilde(struct buf *s)
{
struct buf new;
buf_init(&new);
for (int i = 0 ; i < s->len ; i++) {
if (s->buf[i] == '~') {
buf_add(&new, getenv("HOME"));
} else {
buf_add_one_char(&new, s->buf[i]);
}
}
free(s->buf);
s->buf = new.buf;
s->len = new.len;
s->alloc = new.alloc;
}
static void
strip_curly_braces(char *s)
{
@ -46,22 +75,15 @@ buf_expand_shell_variables(struct buf *s)
if (p) {
buf_add(&new, p);
}
} else if (s->buf[i] == '~') {
/* expand tilde */
buf_add(&new, getenv("HOME"));
} else {
/* just add one character at a time */
if (new.alloc <= new.len + 1) {
new.alloc = new.alloc * 3 / 2 + 16;
new.buf = xrealloc(new.buf, new.alloc);
}
new.buf[new.len++] = s->buf[i];
new.buf[new.len] = '\0';
buf_add_one_char(&new, s->buf[i]);
}
}
free(environment_variable.buf);
free(s->buf);
s->buf = new.buf;
s->len = new.len;
s->alloc = new.alloc;
}
void