From 0302912b64dc50a4ee150dd21a63c2140a02c215 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Sat, 14 Dec 2013 10:41:44 +0100 Subject: [PATCH] swallows: value needs to be loaded as regular expression --- src/load_layout.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/load_layout.c b/src/load_layout.c index dbd1f0df..0489c7f9 100644 --- a/src/load_layout.c +++ b/src/load_layout.c @@ -153,10 +153,13 @@ static int json_string(void *ctx, const unsigned char *val, unsigned int len) { if (parsing_swallows) { /* TODO: the other swallowing keys */ if (strcasecmp(last_key, "class") == 0) { - current_swallow->class = scalloc((len+1) * sizeof(char)); - memcpy(current_swallow->class, val, len); + char *sval; + sasprintf(&sval, "%.*s", len, val); + current_swallow->class = regex_new(sval); + free(sval); + } else { + ELOG("swallow key %s unknown\n", last_key); } - LOG("unhandled yet: swallow\n"); } else { if (strcasecmp(last_key, "name") == 0) { json_node->name = scalloc((len+1) * sizeof(char));