summaryrefslogtreecommitdiffstats
path: root/contrib/libucl/src/ucl_parser.c
diff options
context:
space:
mode:
authorbapt <bapt@FreeBSD.org>2014-07-18 06:58:01 +0000
committerbapt <bapt@FreeBSD.org>2014-07-18 06:58:01 +0000
commit2c479407e0afce2c05606d6d9c052858196fcea2 (patch)
tree96497f945ddb4dfe861d3b28b15907997f8d7e30 /contrib/libucl/src/ucl_parser.c
parentd8612e9432a6a6bdeb374817db86445640e36cd4 (diff)
parentf900132171b58516e797b158ec4ae0f93501bed4 (diff)
downloadFreeBSD-src-2c479407e0afce2c05606d6d9c052858196fcea2.zip
FreeBSD-src-2c479407e0afce2c05606d6d9c052858196fcea2.tar.gz
Update libucl to the 2014-07-16 snapshot
This update brings streamlined ucl emitter support
Diffstat (limited to 'contrib/libucl/src/ucl_parser.c')
-rw-r--r--contrib/libucl/src/ucl_parser.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/contrib/libucl/src/ucl_parser.c b/contrib/libucl/src/ucl_parser.c
index b4fe5af..8768574 100644
--- a/contrib/libucl/src/ucl_parser.c
+++ b/contrib/libucl/src/ucl_parser.c
@@ -393,9 +393,16 @@ ucl_expand_single_variable (struct ucl_parser *parser, const char *ptr,
/* Leave variable as is */
if (!found) {
- memcpy (d, ptr, 2);
- d += 2;
- ret --;
+ if (strict) {
+ /* Copy '${' */
+ memcpy (d, ptr, 2);
+ d += 2;
+ ret --;
+ }
+ else {
+ memcpy (d, ptr, 1);
+ d ++;
+ }
}
}
OpenPOWER on IntegriCloud