From 323843d00385820215f70f11e390e14ab44ccf09 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sat, 24 Nov 2012 13:59:00 +0000 Subject: [PATCH] Allow closing curly braces as part of action values as long as they are escaped --- actions.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/actions.c b/actions.c index adb2f3c8..f0898367 100644 --- a/actions.c +++ b/actions.c @@ -1,4 +1,4 @@ -const char actions_rcs[] = "$Id: actions.c,v 1.85 2012/11/11 12:36:45 fabiankeil Exp $"; +const char actions_rcs[] = "$Id: actions.c,v 1.86 2012/11/11 12:37:10 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/actions.c,v $ @@ -395,7 +395,17 @@ jb_err get_action_token(char **line, char **name, char **value) str++; *value = str; - str = strchr(str, '}'); + /* The value ends with the first non-escaped closing curly brace */ + while ((str = strchr(str, '}')) != NULL) + { + if (str[-1] == '\\') + { + /* Overwrite the '\' so the action doesn't see it. */ + string_move(str-1, str); + continue; + } + break; + } if (str == NULL) { /* error */ -- 2.39.2