mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-26 09:51:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

stringop: Properly handle criteria strings.

Browse source 
A criteria string (e.g. '[class="something" title="something"]') is now
correctly treated as a single argument.
This commit is contained in:
S. Christoffer Eliesen 2015-11-18 15:03:20 +01:00
parent e7c0573a98
commit b7e3d05ace
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sway/stringop.c
View file

@ -117,6 +117,7 @@ char **split_args(const char *start, int *argc) {
bool in_token = false; bool in_token = false;
bool in_string = false; bool in_string = false;
bool in_char = false; bool in_char = false;
bool in_brackets = false; // brackets are used for critera
bool escaped = false; bool escaped = false;
const char *end = start; const char *end = start;
if (start) { if (start) {
@ -129,10 +130,14 @@ char **split_args(const char *start, int *argc) {
in_string = !in_string; in_string = !in_string;
} else if (*end == '\'' && !in_string && !escaped) { } else if (*end == '\'' && !in_string && !escaped) {
in_char = !in_char; in_char = !in_char;
} else if (*end == '[' && !in_string && !in_char && !in_brackets && !escaped) {
in_brackets = true;
} else if (*end == ']' && !in_string && !in_char && in_brackets && !escaped) {
in_brackets = false;
} else if (*end == '\\') { } else if (*end == '\\') {
escaped = !escaped; escaped = !escaped;
} else if (*end == '\0' || (!in_string && !in_char && !escaped } else if (*end == '\0' || (!in_string && !in_char && !in_brackets
&& strchr(whitespace, *end))) { && !escaped && strchr(whitespace, *end))) {
goto add_token; goto add_token;
} }
if (*end != '\\') { if (*end != '\\') {