mirror/kanshi
1
0
Fork 0
mirror of https://github.com/emersion/kanshi synced 2024-11-22 15:51:58 +01:00
Code Issues Releases Activity

Parse quoted strings

Browse Source
This commit is contained in:
Simon Ser 2019-06-01 13:22:30 +03:00
parent 689c989b92
commit ab89b56785
2 changed files with 41 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kanshi.5.scd
View File

@ -24,6 +24,9 @@ Example:
# DIRECTIVES
Directives are followed by space-separated arguments. Arguments can be quoted
(with *"*) if they contain spaces.
*output* <criteria> <output-command...>
An output directive adds an output to the profile. The criteria can either
be an output name, an output description or "\*". The latter can be used to

44
parser.c
View File

@ -59,6 +59,38 @@ static int parser_peek_char(struct kanshi_parser *parser) {
return ch;
}
static bool parser_append_tok_ch(struct kanshi_parser *parser, char ch) {
// Always keep enough room for a terminating NULL char
if (parser->tok_str_len + 1 >= sizeof(parser->tok_str)) {
fprintf(stderr, "string too long\n");
return false;
}
parser->tok_str[parser->tok_str_len] = ch;
parser->tok_str_len++;
return true;
}
static bool parser_read_quoted(struct kanshi_parser *parser) {
while (1) {
int ch = parser_read_char(parser);
if (ch < 0) {
return false;
} else if (ch == '\0') {
fprintf(stderr, "unterminated quoted string\n");
return false;
}
if (ch == '"') {
parser->tok_str[parser->tok_str_len] = '\0';
return true;
}
if (!parser_append_tok_ch(parser, ch)) {
return false;
}
}
}
static bool parser_read_str(struct kanshi_parser *parser) {
while (1) {
int ch = parser_peek_char(parser);
@ -66,18 +98,14 @@ static bool parser_read_str(struct kanshi_parser *parser) {
return false;
}
if (isspace(ch) || ch == '{' || ch == '}') {
if (isspace(ch) || ch == '{' || ch == '}' || ch == '\0') {
parser->tok_str[parser->tok_str_len] = '\0';
return true;
}
// Always keep enough room for a terminating NULL char
if (parser->tok_str_len + 1 >= sizeof(parser->tok_str)) {
fprintf(stderr, "string too long\n");
if (!parser_append_tok_ch(parser, parser_read_char(parser))) {
return false;
}
parser->tok_str[parser->tok_str_len] = parser_read_char(parser);
parser->tok_str_len++;
}
}
@ -99,6 +127,10 @@ static bool parser_next_token(struct kanshi_parser *parser) {
return true;
} else if (isspace(ch)) {
continue;
} else if (ch == '"') {
parser->tok_type = KANSHI_TOKEN_STR;
parser->tok_str_len = 0;
return parser_read_quoted(parser);
} else {
parser->tok_type = KANSHI_TOKEN_STR;
parser->tok_str[0] = ch;