Author: bapt
Date: Sat Jul 19 14:10:31 2014
New Revision: 268876
URL: http://svnweb.freebsd.org/changeset/base/268876

Log:
  Merge libucl 20140718 (fixes a bug in the parser)

Added:
  head/contrib/libucl/tests/basic/11.in
     - copied unchanged from r268875, vendor/libucl/dist/tests/basic/11.in
  head/contrib/libucl/tests/basic/11.res
     - copied unchanged from r268875, vendor/libucl/dist/tests/basic/11.res
Modified:
  head/contrib/libucl/src/ucl_parser.c
Directory Properties:
  head/contrib/libucl/   (props changed)

Modified: head/contrib/libucl/src/ucl_parser.c
==============================================================================
--- head/contrib/libucl/src/ucl_parser.c        Sat Jul 19 14:08:15 2014        
(r268875)
+++ head/contrib/libucl/src/ucl_parser.c        Sat Jul 19 14:10:31 2014        
(r268876)
@@ -1661,6 +1661,11 @@ ucl_state_machine (struct ucl_parser *pa
                                return false;
                        }
                        else {
+                               /* Skip any spaces */
+                               while (p < chunk->end && ucl_test_character (*p,
+                                               
UCL_CHARACTER_WHITESPACE_UNSAFE)) {
+                                       ucl_chunk_skipc (chunk, p);
+                               }
                                p = chunk->pos;
                                if (*p == '[') {
                                        parser->state = UCL_STATE_VALUE;

Copied: head/contrib/libucl/tests/basic/11.in (from r268875, 
vendor/libucl/dist/tests/basic/11.in)
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/contrib/libucl/tests/basic/11.in       Sat Jul 19 14:10:31 2014        
(r268876, copy of r268875, vendor/libucl/dist/tests/basic/11.in)
@@ -0,0 +1,3 @@
+
+
+   {"key": "value"}

Copied: head/contrib/libucl/tests/basic/11.res (from r268875, 
vendor/libucl/dist/tests/basic/11.res)
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/contrib/libucl/tests/basic/11.res      Sat Jul 19 14:10:31 2014        
(r268876, copy of r268875, vendor/libucl/dist/tests/basic/11.res)
@@ -0,0 +1,2 @@
+key = "value";
+
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to