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

buf.c: handle variables with curly braces

Browse source 
In buf_expand_shell_variables(), corrently resolve ${foo}
rather than just $foo
This commit is contained in:
Johan Malm 2021-10-11 22:31:38 +01:00
parent aa4668c792
commit 2d4ca16db8
1 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/common/buf.c
View file

@ -1,6 +1,19 @@
#include <ctype.h> #include <ctype.h>
#include "common/buf.h" #include "common/buf.h"
static void
strip_curly_braces(char *s)
{
size_t len = strlen(s);
if (s[0] != '{' || s[len - 1] != '}') {
return;
}
len -= 2;
memcpy(s, s + 1, len);
s[len] = 0;
}
void void
buf_expand_shell_variables(struct buf *s) buf_expand_shell_variables(struct buf *s)
{ {
@ -15,15 +28,16 @@ buf_expand_shell_variables(struct buf *s)
environment_variable.len = 0; environment_variable.len = 0;
buf_add(&environment_variable, s->buf + i + 1); buf_add(&environment_variable, s->buf + i + 1);
char *p = environment_variable.buf; char *p = environment_variable.buf;
while (isalnum(*p)) { while (isalnum(*p) || *p == '{' || *p == '}') {
++p; ++p;
} }
*p = '\0'; *p = '\0';
i += strlen(environment_variable.buf);
strip_curly_braces(environment_variable.buf);
p = getenv(environment_variable.buf); p = getenv(environment_variable.buf);
if (p) { if (p) {
buf_add(&new, p); buf_add(&new, p);
} }
i += strlen(environment_variable.buf);
} else if (s->buf[i] == '~') { } else if (s->buf[i] == '~') {
/* expand tilde */ /* expand tilde */
buf_add(&new, getenv("HOME")); buf_add(&new, getenv("HOME"));