hiro/bspwm
1
0
Fork 0
mirror of https://github.com/vale981/bspwm synced 2025-03-04 17:31:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Escape shell chars in the erc arguments"

Browse source 
This reverts commit 7a7b17ba28.
This commit is contained in:
Bastien Dejean 2020-07-31 09:45:59 +02:00
parent 7a7b17ba28
commit 7d5f0a6acc
3 changed files with 2 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/helpers.c
View file

@ -119,35 +119,6 @@ char *copy_string(char *str, size_t len)
return cpy;
}
char *shell_escape(char *s)
{
char *e = malloc(2 * strlen(s) + 1);
if (e == NULL) {
return NULL;
}
int c = 0;
int j = 0;
for (size_t i = 0; i < strlen(s); i++) {
if (s[i] == '\\') {
c += 1;
} else {
if (s[i] == '$' || s[i] == '(' || s[i] == ')') {
if (c % 2 == 0) {
e[j++] = '\\';
}
}
c = 0;
}
e[j++] = s[i];
}
e[j] = '\0';
return e;
}
char *mktempfifo(const char *template)
{
int tempfd;

1
src/helpers.h
View file

@ -79,7 +79,6 @@ void warn(char *fmt, ...);
void err(char *fmt, ...);
char *read_string(const char *file_path, size_t *tlen);
char *copy_string(char *str, size_t len);
char *shell_escape(char *s);
char *mktempfifo(const char *template);
int asprintf(char **buf, const char *fmt, ...);
int vasprintf(char **buf, const char *fmt, va_list args);

14
src/query.c
View file

@ -434,25 +434,15 @@ void print_rule_consequence(char **buf, rule_consequence_t *csq)
rect_buf = malloc(1);
*rect_buf = '\0';
}
char *monitor_desc = shell_escape(csq->monitor_desc);
char *desktop_desc = shell_escape(csq->desktop_desc);
char *node_desc = shell_escape(csq->node_desc);
char *split_dir = shell_escape(csq->split_dir);
asprintf(buf, "monitor=%s desktop=%s node=%s state=%s layer=%s split_dir=%s split_ratio=%lf hidden=%s sticky=%s private=%s locked=%s marked=%s center=%s follow=%s manage=%s focus=%s border=%s rectangle=%s",
monitor_desc == NULL ? "" : monitor_desc,
desktop_desc == NULL ? "" : desktop_desc,
node_desc == NULL ? "" : node_desc,
csq->monitor_desc, csq->desktop_desc, csq->node_desc,
csq->state == NULL ? "" : STATE_STR(*csq->state),
csq->layer == NULL ? "" : LAYER_STR(*csq->layer),
split_dir == NULL ? "" : split_dir, csq->split_ratio,
csq->split_dir, csq->split_ratio,
ON_OFF_STR(csq->hidden), ON_OFF_STR(csq->sticky), ON_OFF_STR(csq->private),
ON_OFF_STR(csq->locked), ON_OFF_STR(csq->marked), ON_OFF_STR(csq->center), ON_OFF_STR(csq->follow),
ON_OFF_STR(csq->manage), ON_OFF_STR(csq->focus), ON_OFF_STR(csq->border), rect_buf);
free(rect_buf);
free(monitor_desc);
free(desktop_desc);
free(node_desc);
free(split_dir);
}
void print_rectangle(char **buf, xcb_rectangle_t *rect)