git: 76e673767718 - main - libucl: Import libucl 0.10.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 13 Nov 2026 13:30:26 UTC
The branch main has been updated by bofh:
URL: https://cgit.FreeBSD.org/src/commit/?id=76e67376771892994ed44d791daf6cef3ce6c9bd
commit 76e67376771892994ed44d791daf6cef3ce6c9bd
Merge: fabdac3abcbb fa480c55e039
Author: Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2026-11-13 13:28:03 +0000
Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2026-11-13 13:28:44 +0000
libucl: Import libucl 0.10.0
Tested by: ivy
Approved by: bapt, ivy
Differential Revision: https://reviews.freebsd.org/D61099
contrib/libucl/include/ucl.h | 68 +-
contrib/libucl/klib/khash.h | 46 +-
contrib/libucl/klib/kvec.h | 35 +-
contrib/libucl/lua/lua_ucl.c | 260 +++-
contrib/libucl/src/mum.h | 32 +-
contrib/libucl/src/ucl_cbor.c | 1437 ++++++++++++++++++++
contrib/libucl/src/ucl_emitter.c | 243 +++-
contrib/libucl/src/ucl_emitter_utils.c | 71 +-
contrib/libucl/src/ucl_hash.c | 124 +-
contrib/libucl/src/ucl_hash.h | 17 +-
contrib/libucl/src/ucl_internal.h | 228 +++-
contrib/libucl/src/ucl_msgpack.c | 400 +++++-
contrib/libucl/src/ucl_parser.c | 1254 +++++++++++++----
contrib/libucl/src/ucl_schema.c | 360 +++--
contrib/libucl/src/ucl_sexp.c | 66 +-
contrib/libucl/src/ucl_util.c | 1082 +++++++++++----
contrib/libucl/tests/.gitignore | 8 +-
contrib/libucl/tests/CMakeLists.txt | 95 +-
contrib/libucl/tests/basic.test | 24 +-
contrib/libucl/tests/basic/14.res | 3 +-
contrib/libucl/tests/basic/19-merge.inc | 8 +
contrib/libucl/tests/basic/19.in | 6 +
contrib/libucl/tests/basic/19.res | 8 +
contrib/libucl/tests/basic/24-merge.inc | 54 +
contrib/libucl/tests/basic/24.in | 54 +
contrib/libucl/tests/basic/24.res | 71 +
contrib/libucl/tests/basic/26.in | 27 +
contrib/libucl/tests/basic/26.res | 23 +
contrib/libucl/tests/basic/27-braced.inc | 1 +
contrib/libucl/tests/basic/27-nested.inc | 8 +
contrib/libucl/tests/basic/27.in | 23 +
contrib/libucl/tests/basic/27.res | 38 +
contrib/libucl/tests/basic/8.res | 6 +-
contrib/libucl/tests/basic/heredoc_eod.in | 1 +
contrib/libucl/tests/basic/heredoc_eod.res | 2 +
contrib/libucl/tests/basic/squote.res | 2 +-
contrib/libucl/tests/cbor.test | 3 +
contrib/libucl/tests/cbor_vectors.test | 3 +
contrib/libucl/tests/csexp.test | 3 +
contrib/libucl/tests/empty_chunks.test | 3 +
.../libucl/tests/fuzzers/ucl_add_string_fuzzer.c | 1 +
contrib/libucl/tests/fuzzers/ucl_cbor_fuzzer.c | 26 +
contrib/libucl/tests/fuzzers/ucl_msgpack_fuzzer.c | 29 +-
contrib/libucl/tests/msgpack_malformed.test | 3 +
contrib/libucl/tests/roundtrip.test | 6 +
.../libucl/tests/schema/additionalProperties.json | 103 ++
contrib/libucl/tests/schema/anyOf.json | 11 +
contrib/libucl/tests/schema/enum.json | 42 +
contrib/libucl/tests/schema/patternProperties.json | 47 +
contrib/libucl/tests/schema/ref.json | 79 ++
contrib/libucl/tests/schema/uniqueItems.json | 26 +
contrib/libucl/tests/test_cbor.c | 468 +++++++
contrib/libucl/tests/test_cbor_vectors.c | 872 ++++++++++++
contrib/libucl/tests/test_copy_failure.c | 549 ++++++++
contrib/libucl/tests/test_csexp.c | 418 ++++++
contrib/libucl/tests/test_dup_error_key.c | 596 ++++++++
contrib/libucl/tests/test_empty_chunks.c | 964 +++++++++++++
contrib/libucl/tests/test_generate.c | 34 +
contrib/libucl/tests/test_limits.c | 1112 +++++++++++++++
contrib/libucl/tests/test_lua.c | 165 +++
contrib/libucl/tests/test_msgpack_malformed.c | 644 +++++++++
contrib/libucl/tests/test_object_free.c | 149 ++
contrib/libucl/tests/test_roundtrip.c | 566 ++++++++
contrib/libucl/tests/test_schema_refs.c | 558 ++++++++
contrib/libucl/tests/test_size_overflow.c | 422 ++++++
contrib/libucl/tests/test_special_handlers.c | 258 ++++
contrib/libucl/tests/test_strnstr.c | 82 ++
contrib/libucl/tests/test_variables.c | 410 ++++++
contrib/libucl/tests/variables.test | 3 +
contrib/libucl/utils/.gitignore | 3 +
lib/libucl/Makefile | 3 +-
71 files changed, 13974 insertions(+), 872 deletions(-)
diff --cc contrib/libucl/lua/lua_ucl.c
index 8664855b2d25,b73e132a2e47..b1908e9dfac7
--- a/contrib/libucl/lua/lua_ucl.c
+++ b/contrib/libucl/lua/lua_ucl.c
@@@ -28,10 -28,9 +28,11 @@@
#include "ucl.h"
#include "ucl_internal.h"
#include "lua_ucl.h"
+ #include <stddef.h>
#include <strings.h>
+#include "bootstrap.h"
+
/***
* @module ucl
* This lua module allows to parse objects from strings and to store data into
@@@ -656,9 -797,9 +799,9 @@@ lua_ucl_parser_init (lua_State *L
* files. Macros in the parser are very dangerous and should be used
* for trusted data only.
*/
- int flags = UCL_PARSER_NO_FILEVARS|UCL_PARSER_DISABLE_MACRO;
+ int flags = 0;
- if (lua_gettop (L) >= 1) {
+ if (lua_gettop (L) >= 1 && !lua_isnil (L, 1)) {
flags = lua_tonumber (L, 1);
}
diff --cc contrib/libucl/src/ucl_cbor.c
index 000000000000,37d40a720761..37d40a720761
mode 000000,100644..100644
--- a/contrib/libucl/src/ucl_cbor.c
+++ b/contrib/libucl/src/ucl_cbor.c
diff --cc contrib/libucl/src/ucl_util.c
index 3b732a58701c,48c108c3ae20..63a81273ebcb
--- a/contrib/libucl/src/ucl_util.c
+++ b/contrib/libucl/src/ucl_util.c
@@@ -1086,9 -1271,9 +1271,9 @@@ ucl_include_file_single(const unsigned
struct ucl_parser *parser, struct ucl_include_params *params)
{
bool res;
- struct ucl_chunk *chunk;
+ struct ucl_chunk *chunk, *outer;
unsigned char *buf = NULL;
- char *old_curfile, *ext;
+ char *old_curfile, *ext, *tmp;
size_t buflen = 0;
char filebuf[PATH_MAX], realbuf[PATH_MAX];
int prev_state;
diff --cc contrib/libucl/tests/basic/24-merge.inc
index 000000000000,d700511481cc..d700511481cc
mode 000000,100644..100644
--- a/contrib/libucl/tests/basic/24-merge.inc
+++ b/contrib/libucl/tests/basic/24-merge.inc
diff --cc contrib/libucl/tests/basic/24.in
index 000000000000,6ddcb7a887b9..6ddcb7a887b9
mode 000000,100644..100644
--- a/contrib/libucl/tests/basic/24.in
+++ b/contrib/libucl/tests/basic/24.in
diff --cc contrib/libucl/tests/basic/24.res
index 000000000000,a3fc9f3cdc6f..a3fc9f3cdc6f
mode 000000,100644..100644
--- a/contrib/libucl/tests/basic/24.res
+++ b/contrib/libucl/tests/basic/24.res
diff --cc contrib/libucl/tests/basic/26.in
index 000000000000,86696b8e8583..86696b8e8583
mode 000000,100644..100644
--- a/contrib/libucl/tests/basic/26.in
+++ b/contrib/libucl/tests/basic/26.in
diff --cc contrib/libucl/tests/basic/26.res
index 000000000000,0ae331b2ff4b..0ae331b2ff4b
mode 000000,100644..100644
--- a/contrib/libucl/tests/basic/26.res
+++ b/contrib/libucl/tests/basic/26.res
diff --cc contrib/libucl/tests/basic/27-braced.inc
index 000000000000,38f5a8708dc3..38f5a8708dc3
mode 000000,100644..100644
--- a/contrib/libucl/tests/basic/27-braced.inc
+++ b/contrib/libucl/tests/basic/27-braced.inc
diff --cc contrib/libucl/tests/basic/27-nested.inc
index 000000000000,e3711f7c285e..e3711f7c285e
mode 000000,100644..100644
--- a/contrib/libucl/tests/basic/27-nested.inc
+++ b/contrib/libucl/tests/basic/27-nested.inc
diff --cc contrib/libucl/tests/basic/27.in
index 000000000000,81f1a4bc4000..81f1a4bc4000
mode 000000,100644..100644
--- a/contrib/libucl/tests/basic/27.in
+++ b/contrib/libucl/tests/basic/27.in
diff --cc contrib/libucl/tests/basic/27.res
index 000000000000,076e814bc114..076e814bc114
mode 000000,100644..100644
--- a/contrib/libucl/tests/basic/27.res
+++ b/contrib/libucl/tests/basic/27.res
diff --cc contrib/libucl/tests/basic/heredoc_eod.in
index 000000000000,c367988819d4..c367988819d4
mode 000000,100644..100644
--- a/contrib/libucl/tests/basic/heredoc_eod.in
+++ b/contrib/libucl/tests/basic/heredoc_eod.in
diff --cc contrib/libucl/tests/basic/heredoc_eod.res
index 000000000000,de45970cb9cc..de45970cb9cc
mode 000000,100644..100644
--- a/contrib/libucl/tests/basic/heredoc_eod.res
+++ b/contrib/libucl/tests/basic/heredoc_eod.res
diff --cc contrib/libucl/tests/cbor.test
index 000000000000,92d6b4e0ea4f..92d6b4e0ea4f
mode 000000,100755..100755
--- a/contrib/libucl/tests/cbor.test
+++ b/contrib/libucl/tests/cbor.test
diff --cc contrib/libucl/tests/cbor_vectors.test
index 000000000000,79576b7d0428..79576b7d0428
mode 000000,100755..100755
--- a/contrib/libucl/tests/cbor_vectors.test
+++ b/contrib/libucl/tests/cbor_vectors.test
diff --cc contrib/libucl/tests/csexp.test
index 000000000000,70a99056f295..70a99056f295
mode 000000,100755..100755
--- a/contrib/libucl/tests/csexp.test
+++ b/contrib/libucl/tests/csexp.test
diff --cc contrib/libucl/tests/empty_chunks.test
index 000000000000,6c7b454240e0..6c7b454240e0
mode 000000,100755..100755
--- a/contrib/libucl/tests/empty_chunks.test
+++ b/contrib/libucl/tests/empty_chunks.test
diff --cc contrib/libucl/tests/fuzzers/ucl_cbor_fuzzer.c
index 000000000000,7f022244ef11..7f022244ef11
mode 000000,100644..100644
--- a/contrib/libucl/tests/fuzzers/ucl_cbor_fuzzer.c
+++ b/contrib/libucl/tests/fuzzers/ucl_cbor_fuzzer.c
diff --cc contrib/libucl/tests/msgpack_malformed.test
index 000000000000,052be5f7cf9e..052be5f7cf9e
mode 000000,100755..100755
--- a/contrib/libucl/tests/msgpack_malformed.test
+++ b/contrib/libucl/tests/msgpack_malformed.test
diff --cc contrib/libucl/tests/roundtrip.test
index 000000000000,0b87bff93aad..0b87bff93aad
mode 000000,100755..100755
--- a/contrib/libucl/tests/roundtrip.test
+++ b/contrib/libucl/tests/roundtrip.test
diff --cc contrib/libucl/tests/test_cbor.c
index 000000000000,021b8fa20ac8..021b8fa20ac8
mode 000000,100644..100644
--- a/contrib/libucl/tests/test_cbor.c
+++ b/contrib/libucl/tests/test_cbor.c
diff --cc contrib/libucl/tests/test_cbor_vectors.c
index 000000000000,b4bea738afbd..b4bea738afbd
mode 000000,100644..100644
--- a/contrib/libucl/tests/test_cbor_vectors.c
+++ b/contrib/libucl/tests/test_cbor_vectors.c
diff --cc contrib/libucl/tests/test_copy_failure.c
index 000000000000,67ef3e420e3a..67ef3e420e3a
mode 000000,100644..100644
--- a/contrib/libucl/tests/test_copy_failure.c
+++ b/contrib/libucl/tests/test_copy_failure.c
diff --cc contrib/libucl/tests/test_csexp.c
index 000000000000,66213cf19a94..66213cf19a94
mode 000000,100644..100644
--- a/contrib/libucl/tests/test_csexp.c
+++ b/contrib/libucl/tests/test_csexp.c
diff --cc contrib/libucl/tests/test_dup_error_key.c
index 000000000000,a947585aaec3..a947585aaec3
mode 000000,100644..100644
--- a/contrib/libucl/tests/test_dup_error_key.c
+++ b/contrib/libucl/tests/test_dup_error_key.c
diff --cc contrib/libucl/tests/test_empty_chunks.c
index 000000000000,a827e8ddb897..a827e8ddb897
mode 000000,100644..100644
--- a/contrib/libucl/tests/test_empty_chunks.c
+++ b/contrib/libucl/tests/test_empty_chunks.c
diff --cc contrib/libucl/tests/test_limits.c
index 000000000000,170096635212..170096635212
mode 000000,100644..100644
--- a/contrib/libucl/tests/test_limits.c
+++ b/contrib/libucl/tests/test_limits.c
diff --cc contrib/libucl/tests/test_lua.c
index 000000000000,b6ccd539ce28..b6ccd539ce28
mode 000000,100644..100644
--- a/contrib/libucl/tests/test_lua.c
+++ b/contrib/libucl/tests/test_lua.c
diff --cc contrib/libucl/tests/test_msgpack_malformed.c
index 000000000000,5a222769ddb5..5a222769ddb5
mode 000000,100644..100644
--- a/contrib/libucl/tests/test_msgpack_malformed.c
+++ b/contrib/libucl/tests/test_msgpack_malformed.c
diff --cc contrib/libucl/tests/test_object_free.c
index 000000000000,91fb2c70fdce..91fb2c70fdce
mode 000000,100644..100644
--- a/contrib/libucl/tests/test_object_free.c
+++ b/contrib/libucl/tests/test_object_free.c
diff --cc contrib/libucl/tests/test_roundtrip.c
index 000000000000,c5d230af89fd..c5d230af89fd
mode 000000,100644..100644
--- a/contrib/libucl/tests/test_roundtrip.c
+++ b/contrib/libucl/tests/test_roundtrip.c
diff --cc contrib/libucl/tests/test_schema_refs.c
index 000000000000,12fcb9523fd7..12fcb9523fd7
mode 000000,100644..100644
--- a/contrib/libucl/tests/test_schema_refs.c
+++ b/contrib/libucl/tests/test_schema_refs.c
diff --cc contrib/libucl/tests/test_size_overflow.c
index 000000000000,b5885f16e6e7..b5885f16e6e7
mode 000000,100644..100644
--- a/contrib/libucl/tests/test_size_overflow.c
+++ b/contrib/libucl/tests/test_size_overflow.c
diff --cc contrib/libucl/tests/test_special_handlers.c
index 000000000000,9fd198c047d1..9fd198c047d1
mode 000000,100644..100644
--- a/contrib/libucl/tests/test_special_handlers.c
+++ b/contrib/libucl/tests/test_special_handlers.c
diff --cc contrib/libucl/tests/test_strnstr.c
index 000000000000,875f0af49a93..875f0af49a93
mode 000000,100644..100644
--- a/contrib/libucl/tests/test_strnstr.c
+++ b/contrib/libucl/tests/test_strnstr.c
diff --cc contrib/libucl/tests/test_variables.c
index 000000000000,fe8ff86d37d9..fe8ff86d37d9
mode 000000,100644..100644
--- a/contrib/libucl/tests/test_variables.c
+++ b/contrib/libucl/tests/test_variables.c
diff --cc contrib/libucl/tests/variables.test
index 000000000000,a9efd7409cad..a9efd7409cad
mode 000000,100755..100755
--- a/contrib/libucl/tests/variables.test
+++ b/contrib/libucl/tests/variables.test
diff --cc contrib/libucl/utils/.gitignore
index 000000000000,496fd4d08a8d..496fd4d08a8d
mode 000000,100644..100644
--- a/contrib/libucl/utils/.gitignore
+++ b/contrib/libucl/utils/.gitignore
diff --cc lib/libucl/Makefile
index d4ee3e599df4,000000000000..fd5cf2b7afa4
mode 100644,000000..100644
--- a/lib/libucl/Makefile
+++ b/lib/libucl/Makefile
@@@ -1,32 -1,0 +1,33 @@@
+LIBUCL_DIR= ${SRCTOP}/contrib/libucl
+
+PACKAGE=lib${LIB}
+LIB= ucl
+PRIVATELIB= true
+SHLIB_MAJOR= 1
- SRCS= ucl_emitter_streamline.c \
++SRCS= ucl_cbor.c \
++ ucl_emitter_streamline.c \
+ ucl_emitter_utils.c \
+ ucl_emitter.c \
+ ucl_hash.c \
+ ucl_msgpack.c \
+ ucl_parser.c \
+ ucl_schema.c \
+ ucl_sexp.c \
+ ucl_util.c
+
+.PATH: ${LIBUCL_DIR}/src \
+ ${LIBUCL_DIR}/include \
+ ${LIBUCL_DIR}/doc
+
+INCS= ucl.h
+LIBADD= m
+
+WARNS?= 1
+CFLAGS+= -I${LIBUCL_DIR}/include \
+ -I${LIBUCL_DIR}/src \
+ -I${LIBUCL_DIR}/uthash \
+ -I${LIBUCL_DIR}/klib
+
+MAN+= libucl.3
+
+.include <bsd.lib.mk>