diff --git a/contrib/libucl/CMakeLists.txt b/contrib/libucl/CMakeLists.txt index 7b55faf8243f..5fe772a30f88 100644 --- a/contrib/libucl/CMakeLists.txt +++ b/contrib/libucl/CMakeLists.txt @@ -1,259 +1,314 @@ PROJECT(libucl C) CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0 FATAL_ERROR) SET(LIBUCL_VERSION_MAJOR 0) SET(LIBUCL_VERSION_MINOR 5) SET(LIBUCL_VERSION_PATCH 0) SET(LIBUCL_VERSION "${LIBUCL_VERSION_MAJOR}.${LIBUCL_VERSION_MINOR}.${LIBUCL_VERSION_PATCH}") INCLUDE(CheckCCompilerFlag) +INCLUDE(CheckCSourceCompiles) INCLUDE(FindOpenSSL) +INCLUDE(GNUInstallDirs) OPTION(ENABLE_URL_INCLUDE "Enable urls in ucl includes (requires libcurl or libfetch) [default: OFF]" OFF) OPTION(ENABLE_URL_SIGN "Enable signatures check in ucl includes (requires openssl) [default: OFF]" OFF) OPTION(BUILD_SHARED_LIBS "Build Shared Libraries [default: OFF]" OFF) OPTION(ENABLE_LUA "Enable lua support [default: OFF]" OFF) OPTION(ENABLE_LUAJIT "Enable luajit support [default: OFF]" OFF) +OPTION(ENABLE_UTILS "Enable building utility binaries [default: OFF]" OFF) # Find lua installation MACRO(FindLua) # Find lua libraries UNSET(LUA_INCLUDE_DIR CACHE) UNSET(LUA_LIBRARY CACHE) CMAKE_PARSE_ARGUMENTS(LUA "" "VERSION_MAJOR;VERSION_MINOR;ROOT" "" ${ARGN}) IF(NOT LUA_VERSION_MAJOR OR NOT LUA_VERSION_MINOR) MESSAGE(FATAL_ERROR "Invalid FindLua invocation: ${ARGN}") ENDIF() IF(ENABLE_LUAJIT MATCHES "ON") MESSAGE(STATUS "Check for luajit ${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}") FIND_PATH(LUA_INCLUDE_DIR luajit.h HINTS "${RSPAMD_SEARCH_PATH}" "${LUA_ROOT}" $ENV{LUA_DIR} PATH_SUFFIXES "include/luajit-2.0" "include/luajit${LUA_VERSION_MAJOR}${LUA_VERSION_MINOR}" "include/luajit${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}" "include/luajit-${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}" "include/luajit" "include/lua${LUA_VERSION_MAJOR}${LUA_VERSION_MINOR}" "include/lua${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}" "include/lua-${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}" include/lua include PATHS ${RSPAMD_DEFAULT_INCLUDE_PATHS} ) FIND_LIBRARY(LUA_LIBRARY NAMES luajit "luajit-2.0" "luajit2.0" "luajit${LUA_VERSION_MAJOR}${LUA_VERSION_MINOR}" "luajit${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}" "luajit-${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}" HINTS "${RSPAMD_SEARCH_PATH}" "${LUA_ROOT}" $ENV{LUA_DIR} PATH_SUFFIXES lib64 lib PATHS ${RSPAMD_DEFAULT_LIBRARY_PATHS} DOC "Lua library" ) IF(NOT LUA_LIBRARY OR NOT LUA_INCLUDE_DIR) MESSAGE(STATUS "Fallback from luajit to plain lua") SET(ENABLE_LUAJIT "OFF") MESSAGE(STATUS "Check for lua ${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}") FIND_PATH(LUA_INCLUDE_DIR lua.h HINTS "${RSPAMD_SEARCH_PATH}" "${LUA_ROOT}" $ENV{LUA_DIR} PATH_SUFFIXES "include/lua${LUA_VERSION_MAJOR}${LUA_VERSION_MINOR}" "include/lua${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}" "include/lua-${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}" include/lua include PATHS ${RSPAMD_DEFAULT_INCLUDE_PATHS} ) FIND_LIBRARY(LUA_LIBRARY NAMES lua "lua${LUA_VERSION_MAJOR}${LUA_VERSION_MINOR}" "lua${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}" "lua-${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}" HINTS "${RSPAMD_SEARCH_PATH}" "${LUA_ROOT}" $ENV{LUA_DIR} PATH_SUFFIXES lib64 lib PATHS ${RSPAMD_DEFAULT_LIBRARY_PATHS} DOC "Lua library" ) ENDIF() ELSE(ENABLE_LUAJIT MATCHES "ON") MESSAGE(STATUS "Check for lua ${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}") FIND_PATH(LUA_INCLUDE_DIR lua.h HINTS "${RSPAMD_SEARCH_PATH}" "${LUA_ROOT}" $ENV{LUA_DIR} PATH_SUFFIXES "include/lua${LUA_VERSION_MAJOR}${LUA_VERSION_MINOR}" "include/lua${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}" "include/lua-${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}" include/lua include PATHS ${RSPAMD_DEFAULT_INCLUDE_PATHS} ) FIND_LIBRARY(LUA_LIBRARY NAMES lua "lua${LUA_VERSION_MAJOR}${LUA_VERSION_MINOR}" "lua${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}" "lua-${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}" HINTS "${RSPAMD_SEARCH_PATH}" "${LUA_ROOT}" $ENV{LUA_DIR} PATH_SUFFIXES lib64 lib PATHS ${RSPAMD_DEFAULT_LIBRARY_PATHS} DOC "Lua library" ) ENDIF(ENABLE_LUAJIT MATCHES "ON") IF(LUA_LIBRARY AND LUA_INCLUDE_DIR) SET(LUA_FOUND 1) IF(NOT LUA_VERSION_MAJOR OR NOT LUA_VERSION_MINOR) SET(LUA_VERSION_MAJOR ${LUA_VERSION_MAJOR}) SET(LUA_VERSION_MINOR ${LUA_VERSION_MINOR}) ENDIF(NOT LUA_VERSION_MAJOR OR NOT LUA_VERSION_MINOR) IF(ENABLE_LUAJIT MATCHES "ON") MESSAGE(STATUS "Found luajit ${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}") ELSE(ENABLE_LUAJIT MATCHES "ON") MESSAGE(STATUS "Found lua ${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}") ENDIF(ENABLE_LUAJIT MATCHES "ON") ENDIF(LUA_LIBRARY AND LUA_INCLUDE_DIR) ENDMACRO() IF(CMAKE_SYSTEM_NAME STREQUAL "Linux") LIST(APPEND CMAKE_REQUIRED_LIBRARIES rt) ENDIF(CMAKE_SYSTEM_NAME STREQUAL "Linux") IF(ENABLE_URL_INCLUDE MATCHES "ON") FIND_LIBRARY(LIBFETCH_LIBRARY NAMES fetch PATHS PATH_SUFFIXES lib64 lib PATHS ~/Library/Frameworks /Library/Frameworks /usr/local /usr /sw /opt/local /opt/csw /opt DOC "Path where the libfetch library can be found") IF(LIBFETCH_LIBRARY) FIND_FILE(HAVE_FETCH_H NAMES fetch.h PATHS /usr/include /opt/include /usr/local/include DOC "Path to libfetch header") ELSE(LIBFETCH_LIBRARY) # Try to find libcurl - ProcessPackage(CURL libcurl) + FIND_PACKAGE(CURL) IF(NOT CURL_FOUND) MESSAGE(WARNING "Neither libcurl nor libfetch were found, no support of URL includes in configuration") ENDIF(NOT CURL_FOUND) ENDIF(LIBFETCH_LIBRARY) ENDIF(ENABLE_URL_INCLUDE MATCHES "ON") +set(SYNC_BUILTINS_TEST_SOURCE [====[ +int main() +{ + unsigned long val; + + __sync_bool_compare_and_swap(&val, 0, 1); + __sync_add_and_fetch(&val, 1); + __sync_fetch_and_add(&val, 0); + __sync_sub_and_fetch(&val, 1); + + return 0; +} +]====]) + +CHECK_C_SOURCE_COMPILES("${SYNC_BUILTINS_TEST_SOURCE}" HAVE_ATOMIC_BUILTINS) +IF(NOT HAVE_ATOMIC_BUILTINS) + MESSAGE(WARNING "Libucl references could be thread-unsafe because atomic builtins are missing") +ENDIF(NOT HAVE_ATOMIC_BUILTINS) + SET(CMAKE_C_WARN_FLAGS "") -CHECK_C_COMPILER_FLAG(-Wall SUPPORT_WALL) CHECK_C_COMPILER_FLAG(-W SUPPORT_W) -CHECK_C_COMPILER_FLAG(-Wno-unused-parameter SUPPORT_WPARAM) CHECK_C_COMPILER_FLAG(-Wno-pointer-sign SUPPORT_WPOINTER_SIGN) -CHECK_C_COMPILER_FLAG(-Wstrict-prototypes SUPPORT_WSTRICT_PROTOTYPES) -IF(NOT "${CMAKE_C_COMPILER_ID}" MATCHES SunPro) - CHECK_C_COMPILER_FLAG("-std=c99" SUPPORT_STD_FLAG) -ENDIF(NOT "${CMAKE_C_COMPILER_ID}" MATCHES SunPro) +CHECK_C_COMPILER_FLAG(-Wno-unused-parameter SUPPORT_WUNUSED_PARAMETER) IF(SUPPORT_W) - SET(CMAKE_C_WARN_FLAGS "${CMAKE_C_WARN_FLAGS} -W") + SET(CMAKE_C_WARN_FLAGS "${CMAKE_C_WARN_FLAGS} -W") ENDIF(SUPPORT_W) -IF(SUPPORT_WALL) - SET(CMAKE_C_WARN_FLAGS "${CMAKE_C_WARN_FLAGS} -Wall") -ENDIF(SUPPORT_WALL) -IF(SUPPORT_WPARAM) - SET(CMAKE_C_WARN_FLAGS "${CMAKE_C_WARN_FLAGS} -Wno-unused-parameter") -ENDIF(SUPPORT_WPARAM) IF(SUPPORT_WPOINTER_SIGN) SET(CMAKE_C_WARN_FLAGS "${CMAKE_C_WARN_FLAGS} -Wno-pointer-sign") ENDIF(SUPPORT_WPOINTER_SIGN) -IF(SUPPORT_WSTRICT_PROTOTYPES) - SET(CMAKE_C_WARN_FLAGS "${CMAKE_C_WARN_FLAGS} -Wstrict-prototypes") -ENDIF(SUPPORT_WSTRICT_PROTOTYPES) -IF(SUPPORT_STD_FLAG) - SET(CMAKE_C_WARN_FLAGS "${CMAKE_C_WARN_FLAGS} -std=c99") -ENDIF(SUPPORT_STD_FLAG) +IF(SUPPORT_WUNUSED_PARAMETER) + SET(CMAKE_C_WARN_FLAGS "${CMAKE_C_WARN_FLAGS} -Wno-unused-parameter") +ENDIF(SUPPORT_WUNUSED_PARAMETER) + +SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_WARN_FLAGS}" ) IF(ENABLE_URL_SIGN MATCHES "ON") IF(OPENSSL_FOUND) SET(HAVE_OPENSSL 1) INCLUDE_DIRECTORIES("${OPENSSL_INCLUDE_DIR}") ENDIF(OPENSSL_FOUND) ENDIF(ENABLE_URL_SIGN MATCHES "ON") -INCLUDE_DIRECTORIES("src") -INCLUDE_DIRECTORIES("include") -INCLUDE_DIRECTORIES("uthash") -INCLUDE_DIRECTORIES("klib") +SET(UCL_COMPILE_DEFS) +IF(HAVE_FETCH_H) + LIST(APPEND UCL_COMPILE_DEFS -DHAVE_FETCH_H=1) +ENDIF(HAVE_FETCH_H) +IF(CURL_FOUND) + LIST(APPEND UCL_COMPILE_DEFS -DCURL_FOUND=1) +ENDIF(CURL_FOUND) +IF(HAVE_OPENSSL) + LIST(APPEND UCL_COMPILE_DEFS -DHAVE_OPENSSL=1) +ENDIF(HAVE_OPENSSL) +IF(HAVE_ATOMIC_BUILTINS) + LIST(APPEND UCL_COMPILE_DEFS -DHAVE_ATOMIC_BUILTINS=1) +ENDIF(HAVE_ATOMIC_BUILTINS) SET(UCLSRC src/ucl_util.c src/ucl_parser.c src/ucl_emitter.c src/ucl_emitter_streamline.c src/ucl_emitter_utils.c src/ucl_hash.c src/ucl_schema.c src/ucl_msgpack.c src/ucl_sexp.c) +SET(UCLHDR include/ucl.h + include/ucl++.h) SET (LIB_TYPE STATIC) IF (BUILD_SHARED_LIBS) SET (LIB_TYPE SHARED) ENDIF (BUILD_SHARED_LIBS) ADD_LIBRARY(ucl ${LIB_TYPE} ${UCLSRC}) +ADD_LIBRARY(ucl::ucl ALIAS ucl) SET_TARGET_PROPERTIES(ucl PROPERTIES VERSION ${LIBUCL_VERSION} SOVERSION ${LIBUCL_VERSION_MAJOR}) +TARGET_INCLUDE_DIRECTORIES(ucl + PUBLIC + include + PRIVATE + src + uthash + klib) +TARGET_COMPILE_DEFINITIONS(ucl + PRIVATE + ${UCL_COMPILE_DEFS} +) IF(ENABLE_LUA MATCHES "ON") IF(ENABLE_LUAJIT MATCHES "ON") FindLua(VERSION_MAJOR "5" VERSION_MINOR "1" ROOT "${LUA_ROOT}") IF(NOT LUA_FOUND) MESSAGE(FATAL_ERROR "Lua not found, lua support is required") ELSE(NOT LUA_FOUND) INCLUDE_DIRECTORIES("${LUA_INCLUDE_DIR}") ENDIF(NOT LUA_FOUND) ELSE(ENABLE_LUAJIT MATCHES "ON") FindLua(VERSION_MAJOR "5" VERSION_MINOR "2" ROOT "${LUA_ROOT}") IF(NOT LUA_FOUND) FindLua(VERSION_MAJOR "5" VERSION_MINOR "1" ROOT "${LUA_ROOT}") ENDIF(NOT LUA_FOUND) IF(NOT LUA_FOUND) MESSAGE(FATAL_ERROR "Lua not found, lua support is required") ELSE(NOT LUA_FOUND) INCLUDE_DIRECTORIES("${LUA_INCLUDE_DIR}") ENDIF(NOT LUA_FOUND) ENDIF(ENABLE_LUAJIT MATCHES "ON") SET(UCL_LUA_SRC lua/lua_ucl.c) ADD_LIBRARY(lua-ucl ${LIB_TYPE} ${UCL_LUA_SRC}) + ADD_LIBRARY(ucl::lua ALIAS lua-ucl) IF(ENABLE_LUAJIT MATCHES "ON") TARGET_LINK_LIBRARIES(lua-ucl "${LUAJIT_LIBRARY}") ELSE(ENABLE_LUAJIT MATCHES "ON") TARGET_LINK_LIBRARIES(lua-ucl "${LUA_LIBRARY}") ENDIF(ENABLE_LUAJIT MATCHES "ON") TARGET_LINK_LIBRARIES(lua-ucl ucl) - SET_TARGET_PROPERTIES(lua-ucl PROPERTIES VERSION ${LIBUCL_VERSION} SOVERSION ${LIBUCL_VERSION_MAJOR}) + TARGET_INCLUDE_DIRECTORIES(lua-ucl PUBLIC include PRIVATE src uthash) + SET_TARGET_PROPERTIES(lua-ucl PROPERTIES + VERSION ${LIBUCL_VERSION} + SOVERSION ${LIBUCL_VERSION_MAJOR} + PUBLIC_HEADER include/lua_ucl.h) + INSTALL(TARGETS lua-ucl DESTINATION ${CMAKE_INSTALL_LIBDIR} + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) ENDIF() IF(HAVE_FETCH_H) TARGET_LINK_LIBRARIES(ucl fetch) ELSE(HAVE_FETCH_H) IF(CURL_FOUND) TARGET_LINK_LIBRARIES(ucl ${CURL_LIBRARIES}) ENDIF(CURL_FOUND) ENDIF(HAVE_FETCH_H) IF(ENABLE_URL_SIGN MATCHES "ON") IF(OPENSSL_FOUND) TARGET_LINK_LIBRARIES(ucl ${OPENSSL_LIBRARIES}) ENDIF(OPENSSL_FOUND) ENDIF(ENABLE_URL_SIGN MATCHES "ON") + +IF(UNIX) + TARGET_LINK_LIBRARIES(ucl -lm) +ENDIF(UNIX) + +SET_TARGET_PROPERTIES(ucl PROPERTIES + PUBLIC_HEADER "${UCLHDR}") + +INSTALL(TARGETS ucl DESTINATION ${CMAKE_INSTALL_LIBDIR} + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + +IF(ENABLE_UTILS MATCHES "ON") + ADD_SUBDIRECTORY(utils) +ENDIF() + diff --git a/contrib/libucl/ChangeLog.md b/contrib/libucl/ChangeLog.md index e4c1263bccb7..cba29aa9a7b5 100644 --- a/contrib/libucl/ChangeLog.md +++ b/contrib/libucl/ChangeLog.md @@ -1,67 +1,103 @@ # Version history ## Libucl 0.5 - Streamline emitter has been added, so it is now possible to output partial `ucl` objects - Emitter now is more flexible due to emitter_context structure ### 0.5.1 - Fixed number of bugs and memory leaks ### 0.5.2 - Allow userdata objects to be emitted and destructed - Use userdata objects to store lua function references ### Libucl 0.6 - Reworked macro interface ### Libucl 0.6.1 - Various utilities fixes ### Libucl 0.7.0 - Move to klib library from uthash to reduce memory overhead and increase performance ### Libucl 0.7.1 - Added safe iterators API ### Libucl 0.7.2 - Fixed serious bugs in schema and arrays iteration ### Libucl 0.7.3 - Fixed a bug with macros that come after an empty object - Fixed a bug in include processing when an incorrect variable has been destroyed (use-after-free) ### Libucl 0.8.0 - Allow to save comments and macros when parsing UCL documents - C++ API - Python bindings (by Eitan Adler) - Add msgpack support for parser and emitter - Add Canonical S-expressions parser for libucl - CLI interface for parsing and validation (by Maxim Ignatenko) - Implement include with priority - Add 'nested' functionality to .include macro (by Allan Jude) - Allow searching an array of paths for includes (by Allan Jude) - Add new .load macro (by Allan Jude) - Implement .inherit macro (#100) - Add merge strategies - Add schema validation to lua API - Add support for external references to schema validation - Add coveralls integration to libucl - Implement tests for 80% of libucl code lines - Fix tonns of minor and major bugs - Improve documentation - Rework function names to the common conventions (old names are preserved for backwards compatibility) - Add Coverity scan integration - Add fuzz tests **Incompatible changes**: -- `ucl_object_emit_full` now accepts additional argument `comments` that could be used to emit comments with UCL output \ No newline at end of file +- `ucl_object_emit_full` now accepts additional argument `comments` that could be used to emit comments with UCL output + +### Libucl 0.8.1 + +- Create ucl_parser_add_file_full() to be able to specify merge mode and parser type (by Allan Jude) +- C++ wrapper improvements (by @ftilde) +- C++ wrapper: add convenience method at() and lookup() (by Yonghee Kim) +- C++ wrapper: add assignment operator to Ucl class (by Yonghee Kim) +- C++ wrapper: support variables in parser (by Yonghee Kim) +- C++ wrapper: refactoring C++ interface (by Yonghee Kim): + - use auto variables (if possible) + - remove dangling expressions + - use std::set::emplace instead of std::set::insert + - not use std::move in return statement; considering copy elision +- C++ wrapper: fix compilation error and warnings (by Zhe Wang) +- C++ wrapper: fix iteration over objects in which the first value is `false` (by Zhe Wang) +- C++ wrapper: Macro helper functions (by Chris Meacham) +- C++ wrapper: Changing the duplicate strategy in the C++ API (by Chris Meacham) +- C++ wrapper: Added access functions for the size of a UCL_ARRAY (by Chris Meacham) +- Fix caseless comparison +- Fix include when EPERM is issued +- Fix Windows build +- Allow to reserve space in arrays and hashes +- Fix bug with including of empty files +- Move to mum_hash from xxhash +- Fix msgpack on non-x86 +- python: Add support to Python 3 (by Denis Volpato Martins) +- python: Add support for Python 2.6 tests (by Denis Volpato Martins) +- python: Implement validation function and tests (by Denis Volpato Martins) +- python: Added UCL_NULL handling and tests (by Denis Volpato Martins) +- Fix schema validation for patternProperties with object data (by Denis Volpato Martins) +- Remove the dependency on NBBY, add missing include (by Ed Schouten) +- Allow to emit msgpack from Lua +- Performance improvements in Lua API +- Allow to pass opaque objects in Lua API for transparent C passthrough +- Various bugs fixed +- Couple of memory leaks plugged \ No newline at end of file diff --git a/contrib/libucl/README.md b/contrib/libucl/README.md index 44983c57d643..53d8a651d73b 100644 --- a/contrib/libucl/README.md +++ b/contrib/libucl/README.md @@ -1,384 +1,418 @@ # LIBUCL -[![Build Status](https://travis-ci.org/vstakhov/libucl.svg?branch=master)](https://travis-ci.org/vstakhov/libucl) +[![CircleCI](https://circleci.com/gh/vstakhov/libucl.svg?style=svg)](https://circleci.com/gh/vstakhov/libucl) [![Coverity](https://scan.coverity.com/projects/4138/badge.svg)](https://scan.coverity.com/projects/4138) [![Coverage Status](https://coveralls.io/repos/github/vstakhov/libucl/badge.svg?branch=master)](https://coveralls.io/github/vstakhov/libucl?branch=master) **Table of Contents** *generated with [DocToc](http://doctoc.herokuapp.com/)* - [Introduction](#introduction) - [Basic structure](#basic-structure) - [Improvements to the json notation](#improvements-to-the-json-notation) - [General syntax sugar](#general-syntax-sugar) - [Automatic arrays creation](#automatic-arrays-creation) - [Named keys hierarchy](#named-keys-hierarchy) - [Convenient numbers and booleans](#convenient-numbers-and-booleans) - [General improvements](#general-improvements) - [Comments](#comments) - [Macros support](#macros-support) - [Variables support](#variables-support) - [Multiline strings](#multiline-strings) + - [Single quoted strings](#single-quoted-strings) - [Emitter](#emitter) - [Validation](#validation) - [Performance](#performance) - [Conclusion](#conclusion) ## Introduction This document describes the main features and principles of the configuration language called `UCL` - universal configuration language. If you are looking for the libucl API documentation you can find it at [this page](doc/api.md). ## Basic structure UCL is heavily infused by `nginx` configuration as the example of a convenient configuration system. However, UCL is fully compatible with `JSON` format and is able to parse json files. For example, you can write the same configuration in the following ways: * in nginx like: ```nginx param = value; section { param = value; param1 = value1; flag = true; number = 10k; time = 0.2s; string = "something"; subsection { host = { host = "hostname"; port = 900; } host = { host = "hostname"; port = 901; } } } ``` * or in JSON: ```json { "param": "value", - "param1": "value1", - "flag": true, - "subsection": { - "host": [ - { - "host": "hostname", - "port": 900 - }, - { - "host": "hostname", - "port": 901 + "section": { + "param": "value", + "param1": "value1", + "flag": true, + "number": 10000, + "time": "0.2s", + "string": "something", + "subsection": { + "host": [ + { + "host": "hostname", + "port": 900 + }, + { + "host": "hostname", + "port": 901 + } + ] } - ] } } ``` ## Improvements to the json notation. There are various things that make ucl configuration more convenient for editing than strict json: ### General syntax sugar * Braces are not necessary to enclose a top object: it is automatically treated as an object: ```json "key": "value" ``` is equal to: ```json {"key": "value"} ``` * There is no requirement of quotes for strings and keys, moreover, `:` may be replaced `=` or even be skipped for objects: ```nginx key = value; section { key = value; } ``` is equal to: ```json { "key": "value", "section": { "key": "value" } } ``` * No commas mess: you can safely place a comma or semicolon for the last element in an array or an object: ```json { "key1": "value", "key2": "value", } ``` ### Automatic arrays creation * Non-unique keys in an object are allowed and are automatically converted to the arrays internally: ```json { "key": "value1", "key": "value2" } ``` is converted to: ```json { "key": ["value1", "value2"] } ``` ### Named keys hierarchy UCL accepts named keys and organize them into objects hierarchy internally. Here is an example of this process: ```nginx section "blah" { key = value; } section foo { key = value; } ``` is converted to the following object: ```nginx section { blah { key = value; } foo { key = value; } } ``` Plain definitions may be more complex and contain more than a single level of nested objects: ```nginx section "blah" "foo" { key = value; } ``` is presented as: ```nginx section { blah { foo { key = value; } } } ``` ### Convenient numbers and booleans * Numbers can have suffixes to specify standard multipliers: + `[kKmMgG]` - standard 10 base multipliers (so `1k` is translated to 1000) + `[kKmMgG]b` - 2 power multipliers (so `1kb` is translated to 1024) + `[s|min|d|w|y]` - time multipliers, all time values are translated to float number of seconds, for example `10min` is translated to 600.0 and `10ms` is translated to 0.01 * Hexadecimal integers can be used by `0x` prefix, for example `key = 0xff`. However, floating point values can use decimal base only. * Booleans can be specified as `true` or `yes` or `on` and `false` or `no` or `off`. * It is still possible to treat numbers and booleans as strings by enclosing them in double quotes. ## General improvements ### Comments UCL supports different style of comments: * single line: `#` * multiline: `/* ... */` Multiline comments may be nested: ```c # Sample single line comment /* some comment /* nested comment */ end of comment */ ``` ### Macros support UCL supports external macros both multiline and single line ones: ```nginx .macro_name "sometext"; .macro_name { Some long text .... }; ``` Moreover, each macro can accept an optional list of arguments in braces. These arguments themselves are the UCL object that is parsed and passed to a macro as options: ```nginx .macro_name(param=value) "something"; .macro_name(param={key=value}) "something"; .macro_name(.include "params.conf") "something"; .macro_name(#this is multiline macro param = [value1, value2]) "something"; .macro_name(key="()") "something"; ``` UCL also provide a convenient `include` macro to load content from another files to the current UCL object. This macro accepts either path to file: ```nginx .include "/full/path.conf" .include "./relative/path.conf" .include "${CURDIR}/path.conf" ``` or URL (if ucl is built with url support provided by either `libcurl` or `libfetch`): .include "http://example.com/file.conf" `.include` macro supports a set of options: * `try` (default: **false**) - if this option is `true` than UCL treats errors on loading of this file as non-fatal. For example, such a file can be absent but it won't stop the parsing of the top-level document. * `sign` (default: **false**) - if this option is `true` UCL loads and checks the signature for a file from path named `.sig`. Trusted public keys should be provided for UCL API after parser is created but before any configurations are parsed. * `glob` (default: **false**) - if this option is `true` UCL treats the filename as GLOB pattern and load all files that matches the specified pattern (normally the format of patterns is defined in `glob` manual page for your operating system). This option is meaningless for URL includes. * `url` (default: **true**) - allow URL includes. * `path` (default: empty) - A UCL_ARRAY of directories to search for the include file. Search ends after the first match, unless `glob` is true, then all matches are included. * `prefix` (default false) - Put included contents inside an object, instead of loading them into the root. If no `key` is provided, one is automatically generated based on each files basename() * `key` (default: ) - Key to load contents of include into. If the key already exists, it must be the correct type * `target` (default: object) - Specify if the `prefix` `key` should be an object or an array. * `priority` (default: 0) - specify priority for the include (see below). * `duplicate` (default: 'append') - specify policy of duplicates resolving: - `append` - default strategy, if we have new object of higher priority then it replaces old one, if we have new object with less priority it is ignored completely, and if we have two duplicate objects with the same priority then we have a multi-value key (implicit array) - `merge` - if we have object or array, then new keys are merged inside, if we have a plain object then an implicit array is formed (regardless of priorities) - `error` - create error on duplicate keys and stop parsing - `rewrite` - always rewrite an old value with new one (ignoring priorities) Priorities are used by UCL parser to manage the policy of objects rewriting during including other files as following: * If we have two objects with the same priority then we form an implicit array * If a new object has bigger priority then we overwrite an old one * If a new object has lower priority then we ignore it By default, the priority of top-level object is set to zero (lowest priority). Currently, you can define up to 16 priorities (from 0 to 15). Includes with bigger priorities will -rewrite keys from the objects with lower priorities as specified by the policy. +rewrite keys from the objects with lower priorities as specified by the policy. The priority +of the top-level or any other object can be changed with the `.priority` macro, which has no +options and takes the new priority: + +``` +# Default priority: 0. +foo = 6 +.priority 5 +# The following will have priority 5. +bar = 6 +baz = 7 +# The following will be included with a priority of 3, 5, and 6 respectively. +.include(priority=3) "path.conf" +.include(priority=5) "equivalent-path.conf" +.include(priority=6) "highpriority-path.conf" +``` ### Variables support UCL supports variables in input. Variables are registered by a user of the UCL parser and can be presented in the following forms: * `${VARIABLE}` * `$VARIABLE` UCL currently does not support nested variables. To escape variables one could use double dollar signs: * `$${VARIABLE}` is converted to `${VARIABLE}` * `$$VARIABLE` is converted to `$VARIABLE` However, if no valid variables are found in a string, no expansion will be performed (and `$$` thus remains unchanged). This may be a subject to change in future libucl releases. ### Multiline strings UCL can handle multiline strings as well as single line ones. It uses shell/perl like notation for such objects: ``` key = <@]), [], [enable_urls=no]) AC_ARG_ENABLE([regex], AS_HELP_STRING([--enable-regex], [Enable regex checking for schema @<:@default=yes@:>@]), [], [enable_regex=yes]) AC_ARG_ENABLE([signatures], AS_HELP_STRING([--enable-signatures], [Enable signatures check (requires openssl) @<:@default=no@:>@]), [], [enable_signatures=no]) AC_ARG_ENABLE([lua], AS_HELP_STRING([--enable-lua], [Enable lua API build (requires lua libraries and headers) @<:@default=no@:>@]), [], [enable_lua=no]) AC_ARG_ENABLE([utils], AS_HELP_STRING([--enable-utils], [Build and install utils @<:@default=no@:>@]), [case "${enableval}" in yes) utils=true ;; no) utils=false ;; *) AC_MSG_ERROR([bad value ${enableval} for --enable-utils]) ;; esac],[utils=false]) AM_CONDITIONAL([UTILS], [test x$utils = xtrue]) AS_IF([test "x$enable_signatures" = "xyes"], [ - AC_SEARCH_LIBS([EVP_MD_CTX_create], [crypto], [ + AC_SEARCH_LIBS([CRYPTO_new_ex_data], [crypto], [ AC_DEFINE(HAVE_OPENSSL, 1, [Define to 1 if you have the 'crypto' library (-lcrypto).]) LIBCRYPTO_LIB="-lcrypto" LIBS_EXTRA="${LIBS_EXTRA} -lcrypto" - ], [AC_MSG_ERROR([unable to find the EVP_MD_CTX_create() function])]) + ], [AC_MSG_ERROR([unable to find the CRYPTO_new_ex_data() function])]) ]) AC_SUBST(LIBCRYPTO_LIB) AC_PATH_PROG(PANDOC, pandoc, [/non/existent]) AC_SEARCH_LIBS([clock_gettime], [rt], [], [ AC_CHECK_HEADER([mach/mach_time.h], [ AC_DEFINE(HAVE_MACH_MACH_TIME_H, 1, [Define to 1 on Darwin]) ], [AC_MSG_ERROR([unable to find clock_gettime or mach_absolute_time])]) ]) AC_SEARCH_LIBS([remainder], [m], [], [AC_MSG_ERROR([unable to find remainder() function])]) AS_IF([test "x$enable_regex" = "xyes"], [ AC_CHECK_HEADER([regex.h], [ AC_DEFINE(HAVE_REGEX_H, 1, [Define to 1 if you have the header file.]) AC_SEARCH_LIBS([regexec], [regex], [ AS_IF([test "x$ac_cv_search_regexec" = "x-lregex"], [ LIBREGEX_LIB="-lregex" LIBS_EXTRA="${LIBS_EXTRA} -lregex" ] )], [AC_MSG_ERROR([unable to find the regexec() function])])], [AC_MSG_ERROR([unable to find the regex.h header]) ], [#include ]) ]) AC_SUBST(LIBREGEX_LIB) AS_IF([test "x$enable_lua" = "xyes"], [ AX_PROG_LUA([5.1], [], [ AX_LUA_HEADERS([ AX_LUA_LIBS([ AC_DEFINE(HAVE_LUA, 1, [Define to 1 for lua support.]) with_lua="yes" ], [AC_MSG_ERROR([unable to find the lua libraries]) ]) ], [AC_MSG_ERROR([unable to find the lua header files]) ]) ], [AC_MSG_ERROR([unable to find the lua interpreter])]) ], [with_lua="no"]) AM_CONDITIONAL([LUA_SUB], [test "$with_lua" = "yes"]) AS_IF([test "x$enable_urls" = "xyes"], [ AC_CHECK_HEADER([fetch.h], [ AC_DEFINE(HAVE_FETCH_H, 1, [Define to 1 if you have the header file.]) AC_CHECK_LIB(fetch, fetchXGet, [ AC_DEFINE(HAVE_LIBFETCH, 1, [Define to 1 if you have the 'fetch' library (-lfetch).]) LIBFETCH_LIBS="-lfetch" have_libfetch="yes" LIBS_EXTRA="${LIBS_EXTRA} -lfetch" ]) ], [],[ #include #ifdef HAVE_SYS_PARAM_H #include #endif ]) AC_SUBST(LIBFETCH_LIBS) AS_IF([ test "x$have_libfetch" != "xyes"], [ dnl Fallback to libcurl PKG_CHECK_MODULES([CURL], [libcurl], [ AC_DEFINE(CURL_FOUND, 1, [Use libcurl]) LIBS_EXTRA="${LIBS_EXTRA} -lcurl"], [AC_MSG_ERROR([unable to find neither libfetch nor libcurl])]) ]) AC_SUBST(CURL_FOUND) AC_SUBST(CURL_LIBS) AC_SUBST(CURL_CFLAGS) ]) AC_SUBST(LIBS_EXTRA) AC_MSG_CHECKING(for GCC atomic builtins) AC_LINK_IFELSE([ AC_LANG_SOURCE([[ int main() { volatile unsigned long val = 1; __sync_synchronize(); __sync_val_compare_and_swap(&val, 1, 0); __sync_add_and_fetch(&val, 1); __sync_sub_and_fetch(&val, 1); return 0; } ]]) ], [ AC_MSG_RESULT([yes]) AC_DEFINE([HAVE_ATOMIC_BUILTINS], [1], [Has gcc/MSVC atomic intrinsics]) ], [ AC_MSG_RESULT([no]) AC_DEFINE([HAVE_ATOMIC_BUILTINS], [0], [Has gcc/MSVC atomic intrinsics]) AC_MSG_WARN([Libucl references could be thread-unsafe because atomic builtins are missing]) ]) AX_CODE_COVERAGE AC_CONFIG_FILES(Makefile \ src/Makefile \ lua/Makefile tests/Makefile \ utils/Makefile \ doc/Makefile \ lua/libucl.rockspec \ libucl.pc) AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h]) AC_OUTPUT diff --git a/contrib/libucl/doc/api.md b/contrib/libucl/doc/api.md index 75b954bb302c..a0d33c0e68a9 100644 --- a/contrib/libucl/doc/api.md +++ b/contrib/libucl/doc/api.md @@ -1,495 +1,506 @@ # API documentation **Table of Contents** *generated with [DocToc](http://doctoc.herokuapp.com/)* - [Synopsis](#synopsis) - [Description](#description) - [Parser functions](#parser-functions) - [Emitting functions](#emitting-functions) - [Conversion functions](#conversion-functions) - [Generation functions](#generation-functions) - [Iteration functions](#iteration-functions) - [Validation functions](#validation-functions) - [Utility functions](#utility-functions) - [Parser functions](#parser-functions-1) - [ucl_parser_new](#ucl_parser_new) - [ucl_parser_register_macro](#ucl_parser_register_macro) - [ucl_parser_register_variable](#ucl_parser_register_variable) - [ucl_parser_add_chunk](#ucl_parser_add_chunk) - [ucl_parser_add_string](#ucl_parser_add_string) - [ucl_parser_add_file](#ucl_parser_add_file) - [ucl_parser_get_object](#ucl_parser_get_object) - [ucl_parser_get_error](#ucl_parser_get_error) - [ucl_parser_free](#ucl_parser_free) - [ucl_pubkey_add](#ucl_pubkey_add) - [ucl_parser_set_filevars](#ucl_parser_set_filevars) - [Parser usage example](#parser-usage-example) - [Emitting functions](#emitting-functions-1) - [ucl_object_emit](#ucl_object_emit) - [ucl_object_emit_full](#ucl_object_emit_full) - [Conversion functions](#conversion-functions-1) - [Generation functions](#generation-functions-1) - [ucl_object_new](#ucl_object_new) - [ucl_object_typed_new](#ucl_object_typed_new) - [Primitive objects generation](#primitive-objects-generation) - [ucl_object_fromstring_common](#ucl_object_fromstring_common) - [Iteration functions](#iteration-functions-1) - [ucl_iterate_object](#ucl_iterate_object) - [Validation functions](#validation-functions-1) - [ucl_object_validate](#ucl_object_validate) # Synopsis `#include ` # Description Libucl is a parser and `C` API to parse and generate `ucl` objects. Libucl consist of several groups of functions: ### Parser functions Used to parse `ucl` files and provide interface to extract `ucl` object. Currently, `libucl` can parse only full `ucl` documents, for instance, it is impossible to parse a part of document and therefore it is impossible to use `libucl` as a streaming parser. In future, this limitation can be removed. ### Emitting functions Convert `ucl` objects to some textual or binary representation. Currently, libucl supports the following exports: - `JSON` - valid json format (can possibly lose some original data, such as implicit arrays) - `Config` - human-readable configuration format (lossless) - `YAML` - embedded yaml format (has the same limitations as `json` output) ### Conversion functions Help to convert `ucl` objects to C types. These functions are used to convert `ucl_object_t` to C primitive types, such as numbers, strings or boolean values. ### Generation functions Allow creation of `ucl` objects from C types and creating of complex `ucl` objects, such as hashes or arrays from primitive `ucl` objects, such as numbers or strings. ### Iteration functions Iterate over `ucl` complex objects or over a chain of values, for example when a key in an object has multiple values (that can be treated as implicit array or implicit consolidation). ### Validation functions Validation functions are used to validate some object `obj` using json-schema compatible object `schema`. Both input and schema must be UCL objects to perform validation. ### Utility functions Provide basic utilities to manage `ucl` objects: creating, removing, retaining and releasing reference count and so on. # Parser functions Parser functions operates with `struct ucl_parser`. ### ucl_parser_new ~~~C struct ucl_parser* ucl_parser_new (int flags); ~~~ Creates new parser with the specified flags: - `UCL_PARSER_KEY_LOWERCASE` - lowercase keys parsed - `UCL_PARSER_ZEROCOPY` - try to use zero-copy mode when reading files (in zero-copy mode text chunk being parsed without copying strings so it should exist till any object parsed is used) - `UCL_PARSER_NO_TIME` - treat time values as strings without parsing them as floats ### ucl_parser_register_macro ~~~C void ucl_parser_register_macro (struct ucl_parser *parser, const char *macro, ucl_macro_handler handler, void* ud); ~~~ Register new macro with name .`macro` parsed by handler `handler` that accepts opaque data pointer `ud`. Macro handler should be of the following type: ~~~C bool (*ucl_macro_handler) (const unsigned char *data, size_t len, void* ud);` ~~~ Handler function accepts macro text `data` of length `len` and the opaque pointer `ud`. If macro is parsed successfully the handler should return `true`. `false` indicates parsing failure and the parser can be terminated. ### ucl_parser_register_variable ~~~C void ucl_parser_register_variable (struct ucl_parser *parser, const char *var, const char *value); ~~~ Register new variable $`var` that should be replaced by the parser to the `value` string. ### ucl_parser_add_chunk ~~~C bool ucl_parser_add_chunk (struct ucl_parser *parser, const unsigned char *data, size_t len); ~~~ Add new text chunk with `data` of length `len` to the parser. At the moment, `libucl` parser is not a streamlined parser and chunk *must* contain the *valid* ucl object. For example, this object should be valid: ~~~json { "var": "value" } ~~~ while this one won't be parsed correctly: ~~~json { "var": ~~~ This limitation may possible be removed in future. ### ucl_parser_add_string ~~~C bool ucl_parser_add_string (struct ucl_parser *parser, const char *data, size_t len); ~~~ This function acts exactly like `ucl_parser_add_chunk` does but if `len` argument is zero, then the string `data` must be zero-terminated and the actual length is calculated up to `\0` character. ### ucl_parser_add_file ~~~C bool ucl_parser_add_file (struct ucl_parser *parser, const char *filename); ~~~ Load file `filename` and parse it with the specified `parser`. This function uses `mmap` call to load file, therefore, it should not be `shrunk` during parsing. Otherwise, `libucl` can cause memory corruption and terminate the calling application. This function is also used by the internal handler of `include` macro, hence, this macro has the same limitation. ### ucl_parser_get_object ~~~C ucl_object_t* ucl_parser_get_object (struct ucl_parser *parser); ~~~ If the `ucl` data has been parsed correctly this function returns the top object for the parser. Otherwise, this function returns the `NULL` pointer. The reference count for `ucl` object returned is increased by one, therefore, a caller should decrease reference by using `ucl_object_unref` to free object after usage. ### ucl_parser_get_error ~~~C const char *ucl_parser_get_error(struct ucl_parser *parser); ~~~ Returns the constant error string for the parser object. If no error occurred during parsing a `NULL` object is returned. A caller should not try to free or modify this string. ### ucl_parser_free ~~~C void ucl_parser_free (struct ucl_parser *parser); ~~~ Frees memory occupied by the parser object. The reference count for top object is decreased as well, however if the function `ucl_parser_get_object` was called previously then the top object won't be freed. ### ucl_pubkey_add ~~~C bool ucl_pubkey_add (struct ucl_parser *parser, const unsigned char *key, size_t len); ~~~ This function adds a public key from text blob `key` of length `len` to the `parser` object. This public key should be in the `PEM` format and can be used by `.includes` macro for checking signatures of files included. `Openssl` support should be enabled to make this function working. If a key cannot be added (e.g. due to format error) or `openssl` was not linked to `libucl` then this function returns `false`. ### ucl_parser_set_filevars ~~~C bool ucl_parser_set_filevars (struct ucl_parser *parser, const char *filename, bool need_expand); ~~~ Add the standard file variables to the `parser` based on the `filename` specified: - `$FILENAME` - a filename of `ucl` input - `$CURDIR` - a current directory of the input For example, if a `filename` param is `../something.conf` then the variables will have the following values: - `$FILENAME` - "../something.conf" - `$CURDIR` - ".." if `need_expand` parameter is `true` then all relative paths are expanded using `realpath` call. In this example if `..` is `/etc/dir` then variables will have these values: - `$FILENAME` - "/etc/something.conf" - `$CURDIR` - "/etc" ## Parser usage example The following example loads, parses and extracts `ucl` object from stdin using `libucl` parser functions (the length of input is limited to 8K): ~~~C char inbuf[8192]; struct ucl_parser *parser = NULL; int ret = 0, r = 0; ucl_object_t *obj = NULL; FILE *in; in = stdin; parser = ucl_parser_new (0); while (!feof (in) && r < (int)sizeof (inbuf)) { r += fread (inbuf + r, 1, sizeof (inbuf) - r, in); } ucl_parser_add_chunk (parser, inbuf, r); fclose (in); if (ucl_parser_get_error (parser)) { printf ("Error occurred: %s\n", ucl_parser_get_error (parser)); ret = 1; } else { obj = ucl_parser_get_object (parser); } if (parser != NULL) { ucl_parser_free (parser); } if (obj != NULL) { ucl_object_unref (obj); } return ret; ~~~ # Emitting functions -Libucl can transform UCL objects to a number of tectual formats: +Libucl can transform UCL objects to a number of textual formats: - configuration (`UCL_EMIT_CONFIG`) - nginx like human readable configuration file where implicit arrays are transformed to the duplicate keys - compact json: `UCL_EMIT_JSON_COMPACT` - single line valid json without spaces - formatted json: `UCL_EMIT_JSON` - pretty formatted JSON with newlines and spaces - compact yaml: `UCL_EMIT_YAML` - compact YAML output Moreover, libucl API allows to select a custom set of emitting functions allowing efficient and zero-copy output of libucl objects. Libucl uses the following structure to support this feature: ~~~C struct ucl_emitter_functions { /** Append a single character */ int (*ucl_emitter_append_character) (unsigned char c, size_t nchars, void *ud); /** Append a string of a specified length */ int (*ucl_emitter_append_len) (unsigned const char *str, size_t len, void *ud); /** Append a 64 bit integer */ int (*ucl_emitter_append_int) (int64_t elt, void *ud); /** Append floating point element */ int (*ucl_emitter_append_double) (double elt, void *ud); /** Opaque userdata pointer */ void *ud; }; ~~~ This structure defines the following callbacks: - `ucl_emitter_append_character` - a function that is called to append `nchars` characters equal to `c` - `ucl_emitter_append_len` - used to append a string of length `len` starting from pointer `str` - `ucl_emitter_append_int` - this function applies to integer numbers - `ucl_emitter_append_double` - this function is intended to output floating point variable The set of these functions could be used to output text formats of `UCL` objects to different structures or streams. Libucl provides the following functions for emitting UCL objects: ### ucl_object_emit ~~~C unsigned char *ucl_object_emit (const ucl_object_t *obj, enum ucl_emitter emit_type); ~~~ Allocate a string that is suitable to fit the underlying UCL object `obj` and fill it with the textual representation of the object `obj` according to style `emit_type`. The caller should free the returned string after using. ### ucl_object_emit_full ~~~C bool ucl_object_emit_full (const ucl_object_t *obj, enum ucl_emitter emit_type, struct ucl_emitter_functions *emitter); ~~~ This function is similar to the previous with the exception that it accepts the additional argument `emitter` that defines the concrete set of output functions. This emit function could be useful for custom structures or streams emitters (including C++ ones, for example). # Conversion functions Conversion functions are used to convert UCL objects to primitive types, such as strings, numbers, or boolean values. There are two types of conversion functions: - safe: try to convert an ucl object to a primitive type and fail if such a conversion is not possible - unsafe: return primitive type without additional checks, if the object cannot be converted then some reasonable default is returned (NULL for strings and 0 for numbers) Also there is a single `ucl_object_tostring_forced` function that converts any UCL object (including compound types - arrays and objects) to a string representation. For objects, arrays, booleans and numeric types this function performs emitting to a compact json format actually. Here is a list of all conversion functions: - `ucl_object_toint` - returns `int64_t` of UCL object - `ucl_object_todouble` - returns `double` of UCL object - `ucl_object_toboolean` - returns `bool` of UCL object - `ucl_object_tostring` - returns `const char *` of UCL object (this string is NULL terminated) - `ucl_object_tolstring` - returns `const char *` and `size_t` len of UCL object (string does not need to be NULL terminated) - `ucl_object_tostring_forced` - returns string representation of any UCL object Strings returned by these pointers are associated with the UCL object and exist over its lifetime. A caller should not free this memory. # Generation functions It is possible to generate UCL objects from C primitive types. Moreover, libucl allows creation and modifying complex UCL objects, such as arrays or associative objects. ## ucl_object_new ~~~C ucl_object_t * ucl_object_new (void) ~~~ Creates new object of type `UCL_NULL`. This object should be released by caller. ## ucl_object_typed_new ~~~C ucl_object_t * ucl_object_typed_new (unsigned int type) ~~~ Create an object of a specified type: - `UCL_OBJECT` - UCL object - key/value pairs - `UCL_ARRAY` - UCL array - `UCL_INT` - integer number - `UCL_FLOAT` - floating point number - `UCL_STRING` - NULL terminated string - `UCL_BOOLEAN` - boolean value - `UCL_TIME` - time value (floating point number of seconds) - `UCL_USERDATA` - opaque userdata pointer (may be used in macros) - `UCL_NULL` - null value This object should be released by caller. ## Primitive objects generation Libucl provides the functions similar to inverse conversion functions called with the specific C type: - `ucl_object_fromint` - converts `int64_t` to UCL object - `ucl_object_fromdouble` - converts `double` to UCL object -- `ucl_object_fromboolean` - converts `bool` to UCL object +- `ucl_object_frombool` - converts `bool` to UCL object - `ucl_object_fromstring` - converts `const char *` to UCL object (this string should be NULL terminated) - `ucl_object_fromlstring` - converts `const char *` and `size_t` len to UCL object (string does not need to be NULL terminated) Also there is a function to generate UCL object from a string performing various parsing or conversion operations called `ucl_object_fromstring_common`. ## ucl_object_fromstring_common ~~~C ucl_object_t * ucl_object_fromstring_common (const char *str, size_t len, enum ucl_string_flags flags) ~~~ This function is used to convert a string `str` of size `len` to a UCL object applying `flags` conversions. If `len` is equal to zero then a `str` is assumed as NULL-terminated. This function supports the following flags (a set of flags can be specified using logical `OR` operation): - `UCL_STRING_ESCAPE` - perform JSON escape - `UCL_STRING_TRIM` - trim leading and trailing whitespaces - `UCL_STRING_PARSE_BOOLEAN` - parse passed string and detect boolean - `UCL_STRING_PARSE_INT` - parse passed string and detect integer number - `UCL_STRING_PARSE_DOUBLE` - parse passed string and detect integer or float number - `UCL_STRING_PARSE_TIME` - parse time values as floating point numbers - `UCL_STRING_PARSE_NUMBER` - parse passed string and detect number (both float, integer and time types) - `UCL_STRING_PARSE` - parse passed string (and detect booleans, numbers and time values) - `UCL_STRING_PARSE_BYTES` - assume that numeric multipliers are in bytes notation, for example `10k` means `10*1024` and not `10*1000` as assumed without this flag If parsing operations fail then the resulting UCL object will be a `UCL_STRING`. A caller should always check the type of the returned object and release it after using. # Iteration functions Iteration are used to iterate over UCL compound types: arrays and objects. Moreover, iterations could be performed over the keys with multiple values (implicit arrays). There are two types of iterators API: old and unsafe one via `ucl_iterate_object` and the proposed interface of safe iterators. ## ucl_iterate_object ~~~C const ucl_object_t* ucl_iterate_object (const ucl_object_t *obj, ucl_object_iter_t *iter, bool expand_values); ~~~ This function accepts opaque iterator pointer `iter`. In the first call this iterator *must* be initialized to `NULL`. Iterator is changed by this function call. `ucl_iterate_object` returns the next UCL object in the compound object `obj` or `NULL` if all objects have been iterated. The reference count of the object returned is not increased, so a caller should not unref the object or modify its content (e.g. by inserting to another compound object). The object `obj` should not be changed during the iteration process as well. `expand_values` flag speicifies whether `ucl_iterate_object` should expand keys with multiple values. The general rule is that if you need to iterate through the *object* or *explicit array*, then you always need to set this flag to `true`. However, if you get some key in the object and want to extract all its values then you should set `expand_values` to `false`. Mixing of iteration types is not permitted since the iterator is set according to the iteration type and cannot be reused. Here is an example of iteration over the objects using libucl API (assuming that `top` is `UCL_OBJECT` in this example): ~~~C ucl_object_iter_t it = NULL, it_obj = NULL; const ucl_object_t *cur, *tmp; /* Iterate over the object */ while ((obj = ucl_iterate_object (top, &it, true))) { printf ("key: \"%s\"\n", ucl_object_key (obj)); /* Iterate over the values of a key */ while ((cur = ucl_iterate_object (obj, &it_obj, false))) { printf ("value: \"%s\"\n", ucl_object_tostring_forced (cur)); } } ~~~ ## Safe iterators API Safe iterators are defined to clarify iterating over UCL objects and simplify flattening of UCL objects in non-trivial cases. For example, if there is an implicit array that contains another array and a boolean value it is extremely unclear how to iterate over such an object. Safe iterators are desinged to define two sorts of iteration: 1. Iteration over complex objects with expanding all values 2. Iteration over complex objects without expanding of values The following example demonstrates the difference between these two types of iteration: ~~~ key = 1; key = [2, 3, 4]; Iteration with expansion: 1, 2, 3, 4 Iteration without expansion: 1, [2, 3, 4] ~~~ UCL defines the following functions to manage safe iterators: - `ucl_object_iterate_new` - creates new safe iterator - `ucl_object_iterate_reset` - resets iterator to a new object -- `ucl_object_iterate_safe` - safely iterate the object inside iterator +- `ucl_object_iterate_safe` - safely iterate the object inside iterator. Note: function may allocate and free memory during its operation. Therefore it returns `NULL` either while trying to access item after the last one or when exception (such as memory allocation failure) happens. +- `ucl_object_iter_chk_excpn` - check if the last call to `ucl_object_iterate_safe` ended up in unrecoverable exception (e.g. `ENOMEM`). - `ucl_object_iterate_free` - free memory associated with the safe iterator Please note that unlike unsafe iterators, safe iterators *must* be explicitly initialized and freed. An assert is likely generated if you use uninitialized or `NULL` iterator in all safe iterators functions. ~~~C ucl_object_iter_t it; const ucl_object_t *cur; it = ucl_object_iterate_new (obj); while ((cur = ucl_object_iterate_safe (it, true)) != NULL) { /* Do something */ } +/* Check error condition */ +if (ucl_object_iter_chk_excpn (it)) { + ucl_object_iterate_free (it); + exit (1); +} /* Switch to another object */ it = ucl_object_iterate_reset (it, another_obj); while ((cur = ucl_object_iterate_safe (it, true)) != NULL) { /* Do something else */ } +/* Check error condition */ +if (ucl_object_iter_chk_excpn (it)) { + ucl_object_iterate_free (it); + exit (1); +} ucl_object_iterate_free (it); ~~~ # Validation functions Currently, there is only one validation function called `ucl_object_validate`. It performs validation of object using the specified schema. This function is defined as following: ## ucl_object_validate ~~~C bool ucl_object_validate (const ucl_object_t *schema, const ucl_object_t *obj, struct ucl_schema_error *err); ~~~ This function uses ucl object `schema`, that must be valid in terms of `json-schema` draft v4, to validate input object `obj`. If this function returns `true` then validation procedure has been succeed. Otherwise, `false` is returned and `err` is set to a specific value. If a caller sets `err` to NULL then this function does not set any error just returning `false`. Error is the structure defined as following: ~~~C struct ucl_schema_error { enum ucl_schema_error_code code; /* error code */ char msg[128]; /* error message */ ucl_object_t *obj; /* object where error occurred */ }; ~~~ Caller may use `code` field to get a numeric error code: ~~~C enum ucl_schema_error_code { UCL_SCHEMA_OK = 0, /* no error */ UCL_SCHEMA_TYPE_MISMATCH, /* type of object is incorrect */ UCL_SCHEMA_INVALID_SCHEMA, /* schema is invalid */ UCL_SCHEMA_MISSING_PROPERTY,/* missing properties */ UCL_SCHEMA_CONSTRAINT, /* constraint found */ UCL_SCHEMA_MISSING_DEPENDENCY, /* missing dependency */ UCL_SCHEMA_UNKNOWN /* generic error */ }; ~~~ `msg` is a string description of an error and `obj` is an object where error has occurred. Error object is not allocated by libucl, so there is no need to free it after validation (a static object should thus be used). diff --git a/contrib/libucl/doc/libucl.3 b/contrib/libucl/doc/libucl.3 index ec5046325700..b5fef09f7691 100644 --- a/contrib/libucl/doc/libucl.3 +++ b/contrib/libucl/doc/libucl.3 @@ -1,708 +1,726 @@ .TH "LIBUCL" "3" "27 December, 2014" "Libucl manual" "" .SH NAME .PP \f[B]ucl_parser_new\f[], \f[B]ucl_parser_register_macro\f[], \f[B]ucl_parser_register_variable\f[], \f[B]ucl_parser_add_chunk\f[], \f[B]ucl_parser_add_string\f[], \f[B]ucl_parser_add_file\f[], \f[B]ucl_parser_get_object\f[], \f[B]ucl_parser_get_error\f[], \f[B]ucl_parser_free\f[], \f[B]ucl_pubkey_add\f[], \f[B]ucl_parser_set_filevars\f[] \- universal configuration library parser and utility functions .SH LIBRARY .PP UCL library (libucl, \-lucl) .SH SYNOPSIS .PP \f[C]#include\ \f[] .SH DESCRIPTION .PP Libucl is a parser and \f[C]C\f[] API to parse and generate \f[C]ucl\f[] objects. Libucl consist of several groups of functions: .SS Parser functions .PP Used to parse \f[C]ucl\f[] files and provide interface to extract \f[C]ucl\f[] object. Currently, \f[C]libucl\f[] can parse only full \f[C]ucl\f[] documents, for instance, it is impossible to parse a part of document and therefore it is impossible to use \f[C]libucl\f[] as a streaming parser. In future, this limitation can be removed. .SS Emitting functions .PP Convert \f[C]ucl\f[] objects to some textual or binary representation. Currently, libucl supports the following exports: .IP \[bu] 2 \f[C]JSON\f[] \- valid json format (can possibly lose some original data, such as implicit arrays) .IP \[bu] 2 \f[C]Config\f[] \- human\-readable configuration format (lossless) .IP \[bu] 2 \f[C]YAML\f[] \- embedded yaml format (has the same limitations as \f[C]json\f[] output) .SS Conversion functions .PP Help to convert \f[C]ucl\f[] objects to C types. These functions are used to convert \f[C]ucl_object_t\f[] to C primitive types, such as numbers, strings or boolean values. .SS Generation functions .PP Allow creation of \f[C]ucl\f[] objects from C types and creating of complex \f[C]ucl\f[] objects, such as hashes or arrays from primitive \f[C]ucl\f[] objects, such as numbers or strings. .SS Iteration functions .PP Iterate over \f[C]ucl\f[] complex objects or over a chain of values, for example when a key in an object has multiple values (that can be treated as implicit array or implicit consolidation). .SS Validation functions .PP Validation functions are used to validate some object \f[C]obj\f[] using json\-schema compatible object \f[C]schema\f[]. Both input and schema must be UCL objects to perform validation. .SS Utility functions .PP Provide basic utilities to manage \f[C]ucl\f[] objects: creating, removing, retaining and releasing reference count and so on. .SH PARSER FUNCTIONS .PP Parser functions operates with \f[C]struct\ ucl_parser\f[]. .SS ucl_parser_new .IP .nf \f[C] struct\ ucl_parser*\ ucl_parser_new\ (int\ flags); \f[] .fi .PP Creates new parser with the specified flags: .IP \[bu] 2 \f[C]UCL_PARSER_KEY_LOWERCASE\f[] \- lowercase keys parsed .IP \[bu] 2 \f[C]UCL_PARSER_ZEROCOPY\f[] \- try to use zero\-copy mode when reading files (in zero\-copy mode text chunk being parsed without copying strings so it should exist till any object parsed is used) .IP \[bu] 2 \f[C]UCL_PARSER_NO_TIME\f[] \- treat time values as strings without parsing them as floats .SS ucl_parser_register_macro .IP .nf \f[C] void\ ucl_parser_register_macro\ (struct\ ucl_parser\ *parser, \ \ \ \ const\ char\ *macro,\ ucl_macro_handler\ handler,\ void*\ ud); \f[] .fi .PP Register new macro with name .\f[C]macro\f[] parsed by handler \f[C]handler\f[] that accepts opaque data pointer \f[C]ud\f[]. Macro handler should be of the following type: .IP .nf \f[C] bool\ (*ucl_macro_handler)\ (const\ unsigned\ char\ *data, \ \ \ \ size_t\ len,\ void*\ ud);` \f[] .fi .PP Handler function accepts macro text \f[C]data\f[] of length \f[C]len\f[] and the opaque pointer \f[C]ud\f[]. If macro is parsed successfully the handler should return \f[C]true\f[]. \f[C]false\f[] indicates parsing failure and the parser can be terminated. .SS ucl_parser_register_variable .IP .nf \f[C] void\ ucl_parser_register_variable\ (struct\ ucl_parser\ *parser, \ \ \ \ const\ char\ *var,\ const\ char\ *value); \f[] .fi .PP Register new variable $\f[C]var\f[] that should be replaced by the parser to the \f[C]value\f[] string. .SS ucl_parser_add_chunk .IP .nf \f[C] bool\ ucl_parser_add_chunk\ (struct\ ucl_parser\ *parser,\ \ \ \ \ const\ unsigned\ char\ *data,\ size_t\ len); \f[] .fi .PP Add new text chunk with \f[C]data\f[] of length \f[C]len\f[] to the parser. At the moment, \f[C]libucl\f[] parser is not a streamlined parser and chunk \f[I]must\f[] contain the \f[I]valid\f[] ucl object. For example, this object should be valid: .IP .nf \f[C] {\ "var":\ "value"\ } \f[] .fi .PP while this one won\[aq]t be parsed correctly: .IP .nf \f[C] {\ "var":\ \f[] .fi .PP This limitation may possible be removed in future. .SS ucl_parser_add_string .IP .nf \f[C] bool\ ucl_parser_add_string\ (struct\ ucl_parser\ *parser,\ \ \ \ \ const\ char\ *data,\ size_t\ len); \f[] .fi .PP This function acts exactly like \f[C]ucl_parser_add_chunk\f[] does but if \f[C]len\f[] argument is zero, then the string \f[C]data\f[] must be zero\-terminated and the actual length is calculated up to \f[C]\\0\f[] character. .SS ucl_parser_add_file .IP .nf \f[C] bool\ ucl_parser_add_file\ (struct\ ucl_parser\ *parser,\ \ \ \ \ const\ char\ *filename); \f[] .fi .PP Load file \f[C]filename\f[] and parse it with the specified \f[C]parser\f[]. This function uses \f[C]mmap\f[] call to load file, therefore, it should not be \f[C]shrunk\f[] during parsing. Otherwise, \f[C]libucl\f[] can cause memory corruption and terminate the calling application. This function is also used by the internal handler of \f[C]include\f[] macro, hence, this macro has the same limitation. .SS ucl_parser_get_object .IP .nf \f[C] ucl_object_t*\ ucl_parser_get_object\ (struct\ ucl_parser\ *parser); \f[] .fi .PP If the \f[C]ucl\f[] data has been parsed correctly this function returns the top object for the parser. Otherwise, this function returns the \f[C]NULL\f[] pointer. The reference count for \f[C]ucl\f[] object returned is increased by one, therefore, a caller should decrease reference by using \f[C]ucl_object_unref\f[] to free object after usage. .SS ucl_parser_get_error .IP .nf \f[C] const\ char\ *ucl_parser_get_error(struct\ ucl_parser\ *parser); \f[] .fi .PP Returns the constant error string for the parser object. If no error occurred during parsing a \f[C]NULL\f[] object is returned. A caller should not try to free or modify this string. .SS ucl_parser_free .IP .nf \f[C] void\ ucl_parser_free\ (struct\ ucl_parser\ *parser); \f[] .fi .PP Frees memory occupied by the parser object. The reference count for top object is decreased as well, however if the function \f[C]ucl_parser_get_object\f[] was called previously then the top object won\[aq]t be freed. .SS ucl_pubkey_add .IP .nf \f[C] bool\ ucl_pubkey_add\ (struct\ ucl_parser\ *parser,\ \ \ \ \ const\ unsigned\ char\ *key,\ size_t\ len); \f[] .fi .PP This function adds a public key from text blob \f[C]key\f[] of length \f[C]len\f[] to the \f[C]parser\f[] object. This public key should be in the \f[C]PEM\f[] format and can be used by \f[C]\&.includes\f[] macro for checking signatures of files included. \f[C]Openssl\f[] support should be enabled to make this function working. If a key cannot be added (e.g. due to format error) or \f[C]openssl\f[] was not linked to \f[C]libucl\f[] then this function returns \f[C]false\f[]. .SS ucl_parser_set_filevars .IP .nf \f[C] bool\ ucl_parser_set_filevars\ (struct\ ucl_parser\ *parser,\ \ \ \ \ const\ char\ *filename,\ bool\ need_expand); \f[] .fi .PP Add the standard file variables to the \f[C]parser\f[] based on the \f[C]filename\f[] specified: .IP \[bu] 2 \f[C]$FILENAME\f[] \- a filename of \f[C]ucl\f[] input .IP \[bu] 2 \f[C]$CURDIR\f[] \- a current directory of the input .PP For example, if a \f[C]filename\f[] param is \f[C]\&../something.conf\f[] then the variables will have the following values: .IP \[bu] 2 \f[C]$FILENAME\f[] \- "../something.conf" .IP \[bu] 2 \f[C]$CURDIR\f[] \- ".." .PP if \f[C]need_expand\f[] parameter is \f[C]true\f[] then all relative paths are expanded using \f[C]realpath\f[] call. In this example if \f[C]\&..\f[] is \f[C]/etc/dir\f[] then variables will have these values: .IP \[bu] 2 \f[C]$FILENAME\f[] \- "/etc/something.conf" .IP \[bu] 2 \f[C]$CURDIR\f[] \- "/etc" .SS Parser usage example .PP The following example loads, parses and extracts \f[C]ucl\f[] object from stdin using \f[C]libucl\f[] parser functions (the length of input is limited to 8K): .IP .nf \f[C] char\ inbuf[8192]; struct\ ucl_parser\ *parser\ =\ NULL; int\ ret\ =\ 0,\ r\ =\ 0; ucl_object_t\ *obj\ =\ NULL; FILE\ *in; in\ =\ stdin; parser\ =\ ucl_parser_new\ (0); while\ (!feof\ (in)\ &&\ r\ <\ (int)sizeof\ (inbuf))\ { \ \ \ \ r\ +=\ fread\ (inbuf\ +\ r,\ 1,\ sizeof\ (inbuf)\ \-\ r,\ in); } ucl_parser_add_chunk\ (parser,\ inbuf,\ r); fclose\ (in); if\ (ucl_parser_get_error\ (parser))\ { \ \ \ \ printf\ ("Error\ occurred:\ %s\\n",\ ucl_parser_get_error\ (parser)); \ \ \ \ ret\ =\ 1; } else\ { \ \ \ \ obj\ =\ ucl_parser_get_object\ (parser); } if\ (parser\ !=\ NULL)\ { \ \ \ \ ucl_parser_free\ (parser); } if\ (obj\ !=\ NULL)\ { \ \ \ \ ucl_object_unref\ (obj); } return\ ret; \f[] .fi .SH EMITTING FUNCTIONS .PP Libucl can transform UCL objects to a number of tectual formats: .IP \[bu] 2 configuration (\f[C]UCL_EMIT_CONFIG\f[]) \- nginx like human readable configuration file where implicit arrays are transformed to the duplicate keys .IP \[bu] 2 compact json: \f[C]UCL_EMIT_JSON_COMPACT\f[] \- single line valid json without spaces .IP \[bu] 2 formatted json: \f[C]UCL_EMIT_JSON\f[] \- pretty formatted JSON with newlines and spaces .IP \[bu] 2 compact yaml: \f[C]UCL_EMIT_YAML\f[] \- compact YAML output .PP Moreover, libucl API allows to select a custom set of emitting functions allowing efficient and zero\-copy output of libucl objects. Libucl uses the following structure to support this feature: .IP .nf \f[C] struct\ ucl_emitter_functions\ { \ \ \ \ /**\ Append\ a\ single\ character\ */ \ \ \ \ int\ (*ucl_emitter_append_character)\ (unsigned\ char\ c,\ size_t\ nchars,\ void\ *ud); \ \ \ \ /**\ Append\ a\ string\ of\ a\ specified\ length\ */ \ \ \ \ int\ (*ucl_emitter_append_len)\ (unsigned\ const\ char\ *str,\ size_t\ len,\ void\ *ud); \ \ \ \ /**\ Append\ a\ 64\ bit\ integer\ */ \ \ \ \ int\ (*ucl_emitter_append_int)\ (int64_t\ elt,\ void\ *ud); \ \ \ \ /**\ Append\ floating\ point\ element\ */ \ \ \ \ int\ (*ucl_emitter_append_double)\ (double\ elt,\ void\ *ud); \ \ \ \ /**\ Opaque\ userdata\ pointer\ */ \ \ \ \ void\ *ud; }; \f[] .fi .PP This structure defines the following callbacks: .IP \[bu] 2 \f[C]ucl_emitter_append_character\f[] \- a function that is called to append \f[C]nchars\f[] characters equal to \f[C]c\f[] .IP \[bu] 2 \f[C]ucl_emitter_append_len\f[] \- used to append a string of length \f[C]len\f[] starting from pointer \f[C]str\f[] .IP \[bu] 2 \f[C]ucl_emitter_append_int\f[] \- this function applies to integer numbers .IP \[bu] 2 \f[C]ucl_emitter_append_double\f[] \- this function is intended to output floating point variable .PP The set of these functions could be used to output text formats of \f[C]UCL\f[] objects to different structures or streams. .PP Libucl provides the following functions for emitting UCL objects: .SS ucl_object_emit .IP .nf \f[C] unsigned\ char\ *ucl_object_emit\ (const\ ucl_object_t\ *obj,\ enum\ ucl_emitter\ emit_type); \f[] .fi .PP Allocate a string that is suitable to fit the underlying UCL object \f[C]obj\f[] and fill it with the textual representation of the object \f[C]obj\f[] according to style \f[C]emit_type\f[]. The caller should free the returned string after using. .SS ucl_object_emit_full .IP .nf \f[C] bool\ ucl_object_emit_full\ (const\ ucl_object_t\ *obj,\ enum\ ucl_emitter\ emit_type, \ \ \ \ \ \ \ \ struct\ ucl_emitter_functions\ *emitter); \f[] .fi .PP This function is similar to the previous with the exception that it accepts the additional argument \f[C]emitter\f[] that defines the concrete set of output functions. This emit function could be useful for custom structures or streams emitters (including C++ ones, for example). .SH CONVERSION FUNCTIONS .PP Conversion functions are used to convert UCL objects to primitive types, such as strings, numbers, or boolean values. There are two types of conversion functions: .IP \[bu] 2 safe: try to convert an ucl object to a primitive type and fail if such a conversion is not possible .IP \[bu] 2 unsafe: return primitive type without additional checks, if the object cannot be converted then some reasonable default is returned (NULL for strings and 0 for numbers) .PP Also there is a single \f[C]ucl_object_tostring_forced\f[] function that converts any UCL object (including compound types \- arrays and objects) to a string representation. For objects, arrays, booleans and numeric types this function performs emitting to a compact json format actually. .PP Here is a list of all conversion functions: .IP \[bu] 2 \f[C]ucl_object_toint\f[] \- returns \f[C]int64_t\f[] of UCL object .IP \[bu] 2 \f[C]ucl_object_todouble\f[] \- returns \f[C]double\f[] of UCL object .IP \[bu] 2 \f[C]ucl_object_toboolean\f[] \- returns \f[C]bool\f[] of UCL object .IP \[bu] 2 \f[C]ucl_object_tostring\f[] \- returns \f[C]const\ char\ *\f[] of UCL object (this string is NULL terminated) .IP \[bu] 2 \f[C]ucl_object_tolstring\f[] \- returns \f[C]const\ char\ *\f[] and \f[C]size_t\f[] len of UCL object (string does not need to be NULL terminated) .IP \[bu] 2 \f[C]ucl_object_tostring_forced\f[] \- returns string representation of any UCL object .PP Strings returned by these pointers are associated with the UCL object and exist over its lifetime. A caller should not free this memory. .SH GENERATION FUNCTIONS .PP It is possible to generate UCL objects from C primitive types. Moreover, libucl allows creation and modifying complex UCL objects, such as arrays or associative objects. .SS ucl_object_new .IP .nf \f[C] ucl_object_t\ *\ ucl_object_new\ (void) \f[] .fi .PP Creates new object of type \f[C]UCL_NULL\f[]. This object should be released by caller. .SS ucl_object_typed_new .IP .nf \f[C] ucl_object_t\ *\ ucl_object_typed_new\ (unsigned\ int\ type) \f[] .fi .PP Create an object of a specified type: \- \f[C]UCL_OBJECT\f[] \- UCL object \- key/value pairs \- \f[C]UCL_ARRAY\f[] \- UCL array \- \f[C]UCL_INT\f[] \- integer number \- \f[C]UCL_FLOAT\f[] \- floating point number \- \f[C]UCL_STRING\f[] \- NULL terminated string \- \f[C]UCL_BOOLEAN\f[] \- boolean value \- \f[C]UCL_TIME\f[] \- time value (floating point number of seconds) \- \f[C]UCL_USERDATA\f[] \- opaque userdata pointer (may be used in macros) \- \f[C]UCL_NULL\f[] \- null value .PP This object should be released by caller. .SS Primitive objects generation .PP Libucl provides the functions similar to inverse conversion functions called with the specific C type: \- \f[C]ucl_object_fromint\f[] \- converts \f[C]int64_t\f[] to UCL object \- \f[C]ucl_object_fromdouble\f[] \- converts \f[C]double\f[] to UCL object \- \f[C]ucl_object_fromboolean\f[] \- converts \f[C]bool\f[] to UCL object \- \f[C]ucl_object_fromstring\f[] \- converts \f[C]const\ char\ *\f[] to UCL object (this string should be NULL terminated) \- \f[C]ucl_object_fromlstring\f[] \- converts \f[C]const\ char\ *\f[] and \f[C]size_t\f[] len to UCL object (string does not need to be NULL terminated) .PP Also there is a function to generate UCL object from a string performing various parsing or conversion operations called \f[C]ucl_object_fromstring_common\f[]. .SS ucl_object_fromstring_common .IP .nf \f[C] ucl_object_t\ *\ ucl_object_fromstring_common\ (const\ char\ *str,\ \ \ \ \ size_t\ len,\ enum\ ucl_string_flags\ flags) \f[] .fi .PP This function is used to convert a string \f[C]str\f[] of size \f[C]len\f[] to a UCL object applying \f[C]flags\f[] conversions. If \f[C]len\f[] is equal to zero then a \f[C]str\f[] is assumed as NULL\-terminated. This function supports the following flags (a set of flags can be specified using logical \f[C]OR\f[] operation): .IP \[bu] 2 \f[C]UCL_STRING_ESCAPE\f[] \- perform JSON escape .IP \[bu] 2 \f[C]UCL_STRING_TRIM\f[] \- trim leading and trailing whitespaces .IP \[bu] 2 \f[C]UCL_STRING_PARSE_BOOLEAN\f[] \- parse passed string and detect boolean .IP \[bu] 2 \f[C]UCL_STRING_PARSE_INT\f[] \- parse passed string and detect integer number .IP \[bu] 2 \f[C]UCL_STRING_PARSE_DOUBLE\f[] \- parse passed string and detect integer or float number .IP \[bu] 2 \f[C]UCL_STRING_PARSE_TIME\f[] \- parse time values as floating point numbers .IP \[bu] 2 \f[C]UCL_STRING_PARSE_NUMBER\f[] \- parse passed string and detect number (both float, integer and time types) .IP \[bu] 2 \f[C]UCL_STRING_PARSE\f[] \- parse passed string (and detect booleans, numbers and time values) .IP \[bu] 2 \f[C]UCL_STRING_PARSE_BYTES\f[] \- assume that numeric multipliers are in bytes notation, for example \f[C]10k\f[] means \f[C]10*1024\f[] and not \f[C]10*1000\f[] as assumed without this flag .PP If parsing operations fail then the resulting UCL object will be a \f[C]UCL_STRING\f[]. A caller should always check the type of the returned object and release it after using. .SH ITERATION FUNCTIONS .PP Iteration are used to iterate over UCL compound types: arrays and objects. Moreover, iterations could be performed over the keys with multiple values (implicit arrays). There are two types of iterators API: old and unsafe one via \f[C]ucl_iterate_object\f[] and the proposed interface of safe iterators. .SS ucl_iterate_object .IP .nf \f[C] const\ ucl_object_t*\ ucl_iterate_object\ (const\ ucl_object_t\ *obj,\ \ \ \ \ ucl_object_iter_t\ *iter,\ bool\ expand_values); \f[] .fi .PP This function accepts opaque iterator pointer \f[C]iter\f[]. In the first call this iterator \f[I]must\f[] be initialized to \f[C]NULL\f[]. Iterator is changed by this function call. \f[C]ucl_iterate_object\f[] returns the next UCL object in the compound object \f[C]obj\f[] or \f[C]NULL\f[] if all objects have been iterated. The reference count of the object returned is not increased, so a caller should not unref the object or modify its content (e.g. by inserting to another compound object). The object \f[C]obj\f[] should not be changed during the iteration process as well. \f[C]expand_values\f[] flag speicifies whether \f[C]ucl_iterate_object\f[] should expand keys with multiple values. The general rule is that if you need to iterate through the \f[I]object\f[] or \f[I]explicit array\f[], then you always need to set this flag to \f[C]true\f[]. However, if you get some key in the object and want to extract all its values then you should set \f[C]expand_values\f[] to \f[C]false\f[]. Mixing of iteration types is not permitted since the iterator is set according to the iteration type and cannot be reused. Here is an example of iteration over the objects using libucl API (assuming that \f[C]top\f[] is \f[C]UCL_OBJECT\f[] in this example): .IP .nf \f[C] ucl_object_iter_t\ it\ =\ NULL,\ it_obj\ =\ NULL; const\ ucl_object_t\ *cur,\ *tmp; /*\ Iterate\ over\ the\ object\ */ while\ ((obj\ =\ ucl_iterate_object\ (top,\ &it,\ true)))\ { \ \ \ \ printf\ ("key:\ \\"%s\\"\\n",\ ucl_object_key\ (obj)); \ \ \ \ /*\ Iterate\ over\ the\ values\ of\ a\ key\ */ \ \ \ \ while\ ((cur\ =\ ucl_iterate_object\ (obj,\ &it_obj,\ false)))\ { \ \ \ \ \ \ \ \ printf\ ("value:\ \\"%s\\"\\n",\ \ \ \ \ \ \ \ \ \ \ \ \ ucl_object_tostring_forced\ (cur)); \ \ \ \ } } \f[] .fi .SS Safe iterators API .PP Safe iterators are defined to clarify iterating over UCL objects and simplify flattening of UCL objects in non\-trivial cases. For example, if there is an implicit array that contains another array and a boolean value it is extremely unclear how to iterate over such an object. Safe iterators are desinged to define two sorts of iteration: .IP "1." 3 Iteration over complex objects with expanding all values .IP "2." 3 Iteration over complex objects without expanding of values .PP The following example demonstrates the difference between these two types of iteration: .IP .nf \f[C] key\ =\ 1; key\ =\ [2,\ 3,\ 4]; Iteration\ with\ expansion: 1,\ 2,\ 3,\ 4 Iteration\ without\ expansion: 1,\ [2,\ 3,\ 4] \f[] .fi .PP UCL defines the following functions to manage safe iterators: .IP \[bu] 2 -\f[C]ucl_object_iterate_new\f[] \- creates new safe iterator +\f[C]ucl_object_iterate_new\f[] \- creates new safe iterator. .IP \[bu] 2 -\f[C]ucl_object_iterate_reset\f[] \- resets iterator to a new object +\f[C]ucl_object_iterate_reset\f[] \- resets iterator to a new object. .IP \[bu] 2 \f[C]ucl_object_iterate_safe\f[] \- safely iterate the object inside -iterator +iterator. +Note: function may allocate and free memory during its operation. +Therefore it returns \f[C]NULL\f[] either while trying to access item +after the last one or when exception (such as memory allocation +failure) happens. +.IP \[bu] 2 +\f[C]ucl_object_iter_chk_excpn\f[] \- check if the last call to +\f[C]ucl_object_iterate_safe\f[] ended up in unrecoverable exception +(e.g. \f[C]ENOMEM\f[]). .IP \[bu] 2 \f[C]ucl_object_iterate_free\f[] \- free memory associated with the safe -iterator +iterator. .PP Please note that unlike unsafe iterators, safe iterators \f[I]must\f[] be explicitly initialized and freed. An assert is likely generated if you use uninitialized or \f[C]NULL\f[] iterator in all safe iterators functions. .IP .nf \f[C] ucl_object_iter_t\ it; const\ ucl_object_t\ *cur; it\ =\ ucl_object_iterate_new\ (obj); while\ ((cur\ =\ ucl_object_iterate_safe\ (it,\ true))\ !=\ NULL)\ { \ \ \ \ /*\ Do\ something\ */ } +/*\ Check\ error\ condition\ */ +if\ (ucl_object_iter_chk_excpn\ (it))\ { +\ \ \ \ ucl_object_iterate_free\ (it); +\ \ \ \ exit\ (1); +} /*\ Switch\ to\ another\ object\ */ it\ =\ ucl_object_iterate_reset\ (it,\ another_obj); while\ ((cur\ =\ ucl_object_iterate_safe\ (it,\ true))\ !=\ NULL)\ { \ \ \ \ /*\ Do\ something\ else\ */ } +/*\ Check\ error\ condition\ */ +if\ (ucl_object_iter_chk_excpn\ (it))\ { +\ \ \ \ ucl_object_iterate_free\ (it); +\ \ \ \ exit\ (1); +} ucl_object_iterate_free\ (it); \f[] .fi .SH VALIDATION FUNCTIONS .PP Currently, there is only one validation function called \f[C]ucl_object_validate\f[]. It performs validation of object using the specified schema. This function is defined as following: .SS ucl_object_validate .IP .nf \f[C] bool\ ucl_object_validate\ (const\ ucl_object_t\ *schema, \ \ \ \ const\ ucl_object_t\ *obj,\ struct\ ucl_schema_error\ *err); \f[] .fi .PP This function uses ucl object \f[C]schema\f[], that must be valid in terms of \f[C]json\-schema\f[] draft v4, to validate input object \f[C]obj\f[]. If this function returns \f[C]true\f[] then validation procedure has been succeed. Otherwise, \f[C]false\f[] is returned and \f[C]err\f[] is set to a specific value. If a caller sets \f[C]err\f[] to NULL then this function does not set any error just returning \f[C]false\f[]. Error is the structure defined as following: .IP .nf \f[C] struct\ ucl_schema_error\ { \ \ \ \ enum\ ucl_schema_error_code\ code;\ \ \ \ /*\ error\ code\ */ \ \ \ \ char\ msg[128];\ \ \ \ \ \ \ \ \ \ \ \ \ \ /*\ error\ message\ */ \ \ \ \ ucl_object_t\ *obj;\ \ \ \ \ \ \ \ \ \ /*\ object\ where\ error\ occurred\ */ }; \f[] .fi .PP Caller may use \f[C]code\f[] field to get a numeric error code: .IP .nf \f[C] enum\ ucl_schema_error_code\ { \ \ \ \ UCL_SCHEMA_OK\ =\ 0,\ \ \ \ \ \ \ \ \ \ /*\ no\ error\ */ \ \ \ \ UCL_SCHEMA_TYPE_MISMATCH,\ \ \ /*\ type\ of\ object\ is\ incorrect\ */ \ \ \ \ UCL_SCHEMA_INVALID_SCHEMA,\ \ /*\ schema\ is\ invalid\ */ \ \ \ \ UCL_SCHEMA_MISSING_PROPERTY,/*\ missing\ properties\ */ \ \ \ \ UCL_SCHEMA_CONSTRAINT,\ \ \ \ \ \ /*\ constraint\ found\ */ \ \ \ \ UCL_SCHEMA_MISSING_DEPENDENCY,\ /*\ missing\ dependency\ */ \ \ \ \ UCL_SCHEMA_UNKNOWN\ \ \ \ \ \ \ \ \ \ /*\ generic\ error\ */ }; \f[] .fi .PP \f[C]msg\f[] is a string description of an error and \f[C]obj\f[] is an object where error has occurred. Error object is not allocated by libucl, so there is no need to free it after validation (a static object should thus be used). .SH AUTHORS Vsevolod Stakhov . diff --git a/contrib/libucl/doc/lua_api.md b/contrib/libucl/doc/lua_api.md index f7af3caffff4..7da414903b01 100644 --- a/contrib/libucl/doc/lua_api.md +++ b/contrib/libucl/doc/lua_api.md @@ -1,196 +1,196 @@ ## Module `ucl` This lua module allows to parse objects from strings and to store data into ucl objects. It uses `libucl` C library to parse and manipulate with ucl objects. Example: ~~~lua local ucl = require("ucl") local parser = ucl.parser() local res,err = parser:parse_string('{key=value}') if not res then print('parser error: ' .. err) else local obj = parser:get_object() local got = ucl.to_format(obj, 'json') end local table = { str = 'value', num = 100500, null = ucl.null, func = function () return 'huh' end } print(ucl.to_format(table, 'ucl')) -- Output: --[[ num = 100500; str = "value"; null = null; func = "huh"; --]] ~~~ ###Brief content: **Functions**: > [`ucl_object_push_lua(L, obj, allow_array)`](#function-ucl_object_push_lual-obj-allow_array) > [`ucl.to_format(var, format)`](#function-uclto_formatvar-format) **Methods**: > [`parser:parse_file(name)`](#method-parserparse_filename) > [`parser:parse_string(input)`](#method-parserparse_stringinput) > [`parser:get_object()`](#method-parserget_object) ## Functions The module `ucl` defines the following functions. ### Function `ucl_object_push_lua(L, obj, allow_array)` This is a `C` function to push `UCL` object as lua variable. This function converts `obj` to lua representation using the following conversions: - *scalar* values are directly presented by lua objects - *userdata* values are converted to lua function objects using `LUA_REGISTRYINDEX`, this can be used to pass functions from lua to c and vice-versa -- *arrays* are converted to lua tables with numeric indicies suitable for `ipairs` iterations -- *objects* are converted to lua tables with string indicies +- *arrays* are converted to lua tables with numeric indices suitable for `ipairs` iterations +- *objects* are converted to lua tables with string indices **Parameters:** - `L {lua_State}`: lua state pointer - `obj {ucl_object_t}`: object to push - `allow_array {bool}`: expand implicit arrays (should be true for all but partial arrays) **Returns:** - `{int}`: `1` if an object is pushed to lua Back to [module description](#module-ucl). ### Function `ucl.to_format(var, format)` Converts lua variable `var` to the specified `format`. Formats supported are: - `json` - fine printed json - `json-compact` - compacted json - `config` - fine printed configuration - `ucl` - same as `config` - `yaml` - embedded yaml If `var` contains function, they are called during output formatting and if they return string value, then this value is used for ouptut. **Parameters:** - `var {variant}`: any sort of lua variable (if userdata then metafield `__to_ucl` is searched for output) - `format {string}`: any available format **Returns:** - `{string}`: string representation of `var` in the specific `format`. Example: ~~~lua local table = { str = 'value', num = 100500, null = ucl.null, func = function () return 'huh' end } print(ucl.to_format(table, 'ucl')) -- Output: --[[ num = 100500; str = "value"; null = null; func = "huh"; --]] ~~~ Back to [module description](#module-ucl). ## Methods The module `ucl` defines the following methods. ### Method `parser:parse_file(name)` Parse UCL object from file. **Parameters:** - `name {string}`: filename to parse **Returns:** - `{bool[, string]}`: if res is `true` then file has been parsed successfully, otherwise an error string is also returned Example: ~~~lua local parser = ucl.parser() local res,err = parser:parse_file('/some/file.conf') if not res then print('parser error: ' .. err) else -- Do something with object end ~~~ Back to [module description](#module-ucl). ### Method `parser:parse_string(input)` Parse UCL object from file. **Parameters:** - `input {string}`: string to parse **Returns:** - `{bool[, string]}`: if res is `true` then file has been parsed successfully, otherwise an error string is also returned Back to [module description](#module-ucl). ### Method `parser:get_object()` Get top object from parser and export it to lua representation. **Parameters:** nothing **Returns:** - `{variant or nil}`: ucl object as lua native variable Back to [module description](#module-ucl). Back to [top](#). diff --git a/contrib/libucl/include/lua_ucl.h b/contrib/libucl/include/lua_ucl.h index 38e74d3f619d..5b7f88e031e1 100644 --- a/contrib/libucl/include/lua_ucl.h +++ b/contrib/libucl/include/lua_ucl.h @@ -1,69 +1,85 @@ /* Copyright (c) 2014, Vsevolod Stakhov * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED ''AS IS'' AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL AUTHOR BE LIABLE FOR ANY * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifndef LUA_UCL_H_ #define LUA_UCL_H_ #ifdef HAVE_CONFIG_H #include "config.h" #endif #include #include #include #include "ucl.h" /** * Closure structure for lua function storing inside UCL */ struct ucl_lua_funcdata { lua_State *L; int idx; char *ret; }; /** * Initialize lua UCL API */ UCL_EXTERN int luaopen_ucl (lua_State *L); /** * Import UCL object from lua state * @param L lua state * @param idx index of object at the lua stack to convert to UCL * @return new UCL object or NULL, the caller should unref object after using */ UCL_EXTERN ucl_object_t* ucl_object_lua_import (lua_State *L, int idx); +/** + * Import UCL object from lua state, escaping JSON strings + * @param L lua state + * @param idx index of object at the lua stack to convert to UCL + * @return new UCL object or NULL, the caller should unref object after using + */ +UCL_EXTERN ucl_object_t* ucl_object_lua_import_escape (lua_State *L, int idx); + /** * Push an object to lua * @param L lua state * @param obj object to push * @param allow_array traverse over implicit arrays */ UCL_EXTERN int ucl_object_push_lua (lua_State *L, const ucl_object_t *obj, bool allow_array); +/** + * Push an object to lua replacing all ucl.null with `false` + * @param L lua state + * @param obj object to push + * @param allow_array traverse over implicit arrays + */ +UCL_EXTERN int ucl_object_push_lua_filter_nil (lua_State *L, + const ucl_object_t *obj, + bool allow_array); -UCL_EXTERN struct ucl_lua_funcdata* ucl_object_toclosure ( - const ucl_object_t *obj); +UCL_EXTERN struct ucl_lua_funcdata* ucl_object_toclosure (const ucl_object_t *obj); #endif /* LUA_UCL_H_ */ diff --git a/contrib/libucl/include/ucl++.h b/contrib/libucl/include/ucl++.h index 2c2bdde51559..fb63430d400d 100644 --- a/contrib/libucl/include/ucl++.h +++ b/contrib/libucl/include/ucl++.h @@ -1,612 +1,739 @@ /* * Copyright (c) 2015, Vsevolod Stakhov * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY AUTHOR ''AS IS'' AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL AUTHOR BE LIABLE FOR ANY * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #pragma once #include #include #include #include #include #include +#include #include "ucl.h" // C++11 API inspired by json11: https://github.com/dropbox/json11/ namespace ucl { struct ucl_map_construct_t { }; constexpr ucl_map_construct_t ucl_map_construct = ucl_map_construct_t(); struct ucl_array_construct_t { }; constexpr ucl_array_construct_t ucl_array_construct = ucl_array_construct_t(); class Ucl final { private: struct ucl_deleter { void operator() (ucl_object_t *obj) { ucl_object_unref (obj); } }; static int append_char (unsigned char c, size_t nchars, void *ud) { std::string *out = reinterpret_cast(ud); out->append (nchars, (char)c); return nchars; } static int append_len (unsigned const char *str, size_t len, void *ud) { std::string *out = reinterpret_cast(ud); out->append ((const char *)str, len); return len; } static int append_int (int64_t elt, void *ud) { std::string *out = reinterpret_cast(ud); auto nstr = std::to_string (elt); out->append (nstr); return nstr.size (); } static int append_double (double elt, void *ud) { std::string *out = reinterpret_cast(ud); auto nstr = std::to_string (elt); out->append (nstr); return nstr.size (); } static struct ucl_emitter_functions default_emit_funcs() { struct ucl_emitter_functions func = { Ucl::append_char, Ucl::append_len, Ucl::append_int, Ucl::append_double, nullptr, nullptr }; return func; }; static bool ucl_variable_getter(const unsigned char *data, size_t len, unsigned char ** /*replace*/, size_t * /*replace_len*/, bool *need_free, void* ud) { - *need_free = false; + *need_free = false; auto vars = reinterpret_cast *>(ud); if (vars && data && len != 0) { vars->emplace (data, data + len); } return false; } static bool ucl_variable_replacer (const unsigned char *data, size_t len, unsigned char **replace, size_t *replace_len, bool *need_free, void* ud) { *need_free = false; auto replacer = reinterpret_cast(ud); if (!replacer) { return false; - } + } std::string var_name (data, data + len); if (!replacer->is_variable (var_name)) { return false; - } + } std::string var_value = replacer->replace (var_name); if (var_value.empty ()) { return false; - } + } *replace = (unsigned char *)UCL_ALLOC (var_value.size ()); memcpy (*replace, var_value.data (), var_value.size ()); *replace_len = var_value.size (); *need_free = true; return true; } template static Ucl parse_with_strategy_function (C config_func, P parse_func, std::string &err) { auto parser = ucl_parser_new (UCL_PARSER_DEFAULT); config_func (parser); if (!parse_func (parser)) { - err.assign (ucl_parser_get_error (parser)); + const char *error = ucl_parser_get_error (parser); //Assigning here without checking result first causes a + if( error != NULL ) err.assign(error); // crash if ucl_parser_get_error returns NULL ucl_parser_free (parser); return nullptr; } auto obj = ucl_parser_get_object (parser); ucl_parser_free (parser); // Obj will handle ownership return Ucl (obj); } std::unique_ptr obj; public: + struct macro_handler_s { + ucl_macro_handler handler; + ucl_context_macro_handler ctx_handler; + }; + + struct macro_userdata_s { + ucl_parser *parser; + void *userdata; + }; + class const_iterator { private: struct ucl_iter_deleter { void operator() (ucl_object_iter_t it) { ucl_object_iterate_free (it); } }; std::shared_ptr it; std::unique_ptr cur; public: typedef std::forward_iterator_tag iterator_category; const_iterator(const Ucl &obj) { it = std::shared_ptr(ucl_object_iterate_new (obj.obj.get()), ucl_iter_deleter()); cur.reset (new Ucl(ucl_object_iterate_safe (it.get(), true))); - if (cur->type() == UCL_NULL) { + if (!cur->obj) { it.reset (); cur.reset (); } } const_iterator() {} const_iterator(const const_iterator &other) = delete; const_iterator(const_iterator &&other) = default; ~const_iterator() {} const_iterator& operator=(const const_iterator &other) = delete; const_iterator& operator=(const_iterator &&other) = default; bool operator==(const const_iterator &other) const { if (cur && other.cur) { return cur->obj.get() == other.cur->obj.get(); } return !cur && !other.cur; } bool operator!=(const const_iterator &other) const { return !(*this == other); } const_iterator& operator++() { if (it) { cur.reset (new Ucl(ucl_object_iterate_safe (it.get(), true))); } - if (cur && cur->type() == UCL_NULL) { + if (cur && !cur->obj) { it.reset (); cur.reset (); } return *this; } const Ucl& operator*() const { return *cur; } const Ucl* operator->() const { return cur.get(); } }; struct variable_replacer { virtual ~variable_replacer() {} virtual bool is_variable (const std::string &str) const { return !str.empty (); } virtual std::string replace (const std::string &var) const = 0; }; // We grab ownership if get non-const ucl_object_t Ucl(ucl_object_t *other) { obj.reset (other); } // Shared ownership Ucl(const ucl_object_t *other) { obj.reset (ucl_object_ref (other)); } Ucl(const Ucl &other) { obj.reset (ucl_object_ref (other.obj.get())); } Ucl(Ucl &&other) { obj.swap (other.obj); } Ucl() noexcept { obj.reset (ucl_object_typed_new (UCL_NULL)); } Ucl(std::nullptr_t) noexcept { obj.reset (ucl_object_typed_new (UCL_NULL)); } Ucl(double value) { obj.reset (ucl_object_typed_new (UCL_FLOAT)); obj->value.dv = value; } Ucl(int64_t value) { obj.reset (ucl_object_typed_new (UCL_INT)); obj->value.iv = value; } Ucl(bool value) { obj.reset (ucl_object_typed_new (UCL_BOOLEAN)); obj->value.iv = static_cast(value); } Ucl(const std::string &value) { obj.reset (ucl_object_fromstring_common (value.data (), value.size (), UCL_STRING_RAW)); } Ucl(const char *value) { obj.reset (ucl_object_fromstring_common (value, 0, UCL_STRING_RAW)); } // Implicit constructor: anything with a to_json() function. template Ucl(const T &t) : Ucl(t.to_ucl()) {} // Implicit constructor: map-like objects (std::map, std::unordered_map, etc) template ::value && std::is_constructible::value, int>::type = 0> Ucl(const M &m) { obj.reset (ucl_object_typed_new (UCL_OBJECT)); auto cobj = obj.get (); for (const auto &e : m) { ucl_object_insert_key (cobj, ucl_object_ref (e.second.obj.get()), e.first.data (), e.first.size (), true); } } // Implicit constructor: vector-like objects (std::list, std::vector, std::set, etc) template ::value, int>::type = 0> Ucl(const V &v) { obj.reset (ucl_object_typed_new (UCL_ARRAY)); auto cobj = obj.get (); for (const auto &e : v) { ucl_array_append (cobj, ucl_object_ref (e.obj.get())); } } ucl_type_t type () const { if (obj) { return ucl_object_type (obj.get ()); } return UCL_NULL; } - const std::string key () const { + std::string key () const { std::string res; if (obj->key) { res.assign (obj->key, obj->keylen); } return res; } double number_value (const double default_val = 0.0) const { double res; if (ucl_object_todouble_safe(obj.get(), &res)) { return res; } return default_val; } int64_t int_value (const int64_t default_val = 0) const { int64_t res; if (ucl_object_toint_safe(obj.get(), &res)) { return res; } return default_val; } bool bool_value (const bool default_val = false) const { bool res; if (ucl_object_toboolean_safe(obj.get(), &res)) { return res; } return default_val; } - const std::string string_value (const std::string& default_val = "") const + std::string string_value (const std::string& default_val = "") const { const char* res = nullptr; if (ucl_object_tostring_safe(obj.get(), &res)) { return res; } return default_val; } - const Ucl at (size_t i) const + size_t size () const + { + if (type () == UCL_ARRAY) { + return ucl_array_size (obj.get()); + } + + return 0; + } + + Ucl at (size_t i) const { if (type () == UCL_ARRAY) { return Ucl (ucl_array_find_index (obj.get(), i)); } return Ucl (nullptr); } - const Ucl lookup (const std::string &key) const + Ucl lookup (const std::string &key) const { if (type () == UCL_OBJECT) { return Ucl (ucl_object_lookup_len (obj.get(), key.data (), key.size ())); } return Ucl (nullptr); } - inline const Ucl operator[] (size_t i) const + inline Ucl operator[] (size_t i) const { return at(i); } - inline const Ucl operator[](const std::string &key) const + inline Ucl operator[](const std::string &key) const { return lookup(key); } // Serialize. void dump (std::string &out, ucl_emitter_t type = UCL_EMIT_JSON) const { struct ucl_emitter_functions cbdata; cbdata = Ucl::default_emit_funcs(); cbdata.ud = reinterpret_cast(&out); ucl_object_emit_full (obj.get(), type, &cbdata, nullptr); } std::string dump (ucl_emitter_t type = UCL_EMIT_JSON) const { std::string out; dump (out, type); return out; } - static Ucl parse (const std::string &in, std::string &err) + static Ucl parse (const std::string &in, std::string &err, enum ucl_duplicate_strategy duplicate_strategy = UCL_DUPLICATE_APPEND) { - return parse (in, std::map(), err); + return parse (in, std::map(), err, duplicate_strategy); } - static Ucl parse (const std::string &in, const std::map &vars, std::string &err) + static Ucl parse (const std::string &in, const std::map &vars, + std::string &err, enum ucl_duplicate_strategy duplicate_strategy = UCL_DUPLICATE_APPEND) { - auto config_func = [&vars] (ucl_parser *parser) { + std::vector< std::tuple< std::string, macro_handler_s, void * > > emptyVector; + return parse ( in, vars, emptyVector, err, duplicate_strategy ); + } + + //Macro handler will receive a macro_userdata_s as void *ud + static Ucl parse (const std::string &in, + std::vector< std::tuple< std::string /*name*/, macro_handler_s, void * /*userdata*/ > > ¯os, + std::string &err, enum ucl_duplicate_strategy duplicate_strategy = UCL_DUPLICATE_APPEND) + { + return parse (in, std::map(), macros, err, duplicate_strategy); + } + + //Macro handler will receive a macro_userdata_s as void *ud + static Ucl parse (const std::string &in, const std::map &vars, + std::vector< std::tuple< std::string /*name*/, macro_handler_s, void * /*userdata*/ > > ¯os, + std::string &err, enum ucl_duplicate_strategy duplicate_strategy = UCL_DUPLICATE_APPEND) + { + //Preserve macro_userdata_s memory for later use in parse_with_strategy_function() + std::vector userdata_list; + userdata_list.reserve (macros.size()); + auto config_func = [&userdata_list, &vars, ¯os] (ucl_parser *parser) { for (const auto & item : vars) { ucl_parser_register_variable (parser, item.first.c_str (), item.second.c_str ()); - } + } + for (auto & macro : macros) { + userdata_list.push_back ({parser, std::get<2>(macro)}); + if (std::get<1>(macro).handler != NULL) { + ucl_parser_register_macro (parser, + std::get<0>(macro).c_str(), + std::get<1>(macro).handler, + reinterpret_cast(&userdata_list.back())); + } + else if (std::get<1>(macro).ctx_handler != NULL) { + ucl_parser_register_context_macro (parser, + std::get<0>(macro).c_str(), + std::get<1>(macro).ctx_handler, + reinterpret_cast(&userdata_list.back())); + } + } }; - auto parse_func = [&in] (ucl_parser *parser) { - return ucl_parser_add_chunk (parser, (unsigned char *)in.data (), in.size ()); + auto parse_func = [&in, &duplicate_strategy] (struct ucl_parser *parser) -> bool { + return ucl_parser_add_chunk_full (parser, + (unsigned char *) in.data (), + in.size (), + (unsigned int)ucl_parser_get_default_priority (parser), + duplicate_strategy, + UCL_PARSE_UCL); }; return parse_with_strategy_function (config_func, parse_func, err); } - static Ucl parse (const std::string &in, const variable_replacer &replacer, std::string &err) - { - auto config_func = [&replacer] (ucl_parser *parser) { - ucl_parser_set_variables_handler (parser, ucl_variable_replacer, - &const_cast(replacer)); + static Ucl parse (const std::string &in, const variable_replacer &replacer, + std::string &err, enum ucl_duplicate_strategy duplicate_strategy = UCL_DUPLICATE_APPEND) + { + std::vector< std::tuple< std::string, macro_handler_s, void * > > emptyVector; + return parse ( in, replacer, emptyVector, err, duplicate_strategy ); + } + + //Macro handler will receive a macro_userdata_s as void *ud + static Ucl parse (const std::string &in, const variable_replacer &replacer, + std::vector< std::tuple< std::string /*name*/, macro_handler_s, void * /*userdata*/ > > ¯os, + std::string &err, enum ucl_duplicate_strategy duplicate_strategy = UCL_DUPLICATE_APPEND) + { + //Preserve macro_userdata_s memory for later use in parse_with_strategy_function() + std::vector userdata_list; + userdata_list.reserve (macros.size()); + auto config_func = [&userdata_list, &replacer, ¯os] (ucl_parser *parser) { + ucl_parser_set_variables_handler (parser, ucl_variable_replacer, &const_cast(replacer)); + for (auto & macro : macros) { + userdata_list.push_back ({parser, std::get<2>(macro)}); + if (std::get<1>(macro).handler != NULL) { + ucl_parser_register_macro (parser, + std::get<0>(macro).c_str(), + std::get<1>(macro).handler, + reinterpret_cast(&userdata_list.back())); + } + else if (std::get<1>(macro).ctx_handler != NULL) { + ucl_parser_register_context_macro (parser, + std::get<0>(macro).c_str(), + std::get<1>(macro).ctx_handler, + reinterpret_cast(&userdata_list.back())); + } + } }; - auto parse_func = [&in] (ucl_parser *parser) { - return ucl_parser_add_chunk (parser, (unsigned char *) in.data (), in.size ()); + auto parse_func = [&in, &duplicate_strategy] (struct ucl_parser *parser) -> bool { + return ucl_parser_add_chunk_full (parser, + (unsigned char *) in.data (), + in.size (), + (unsigned int)ucl_parser_get_default_priority (parser), + duplicate_strategy, + UCL_PARSE_UCL); }; return parse_with_strategy_function (config_func, parse_func, err); } - static Ucl parse (const char *in, std::string &err) + static Ucl parse (const char *in, std::string &err, enum ucl_duplicate_strategy duplicate_strategy = UCL_DUPLICATE_APPEND) { - return parse (in, std::map(), err); + return parse (in, std::map(), err, duplicate_strategy); } static Ucl parse (const char *in, const std::map &vars, std::string &err) { if (!in) { err = "null input"; return nullptr; } return parse (std::string (in), vars, err); } - static Ucl parse (const char *in, const variable_replacer &replacer, std::string &err) + //Macro handler will receive a macro_userdata_s as void *ud + static Ucl parse (const char *in, + std::vector< std::tuple< std::string /*name*/, macro_handler_s, void * /*userdata*/ > > ¯os, + std::string &err, enum ucl_duplicate_strategy duplicate_strategy = UCL_DUPLICATE_APPEND) + { + return parse (in, std::map(), macros, err, duplicate_strategy); + } + + //Macro handler will receive a macro_userdata_s as void *ud + static Ucl parse (const char *in, const std::map &vars, + std::vector< std::tuple< std::string /*name*/, macro_handler_s, void * /*userdata*/ > > ¯os, + std::string &err, enum ucl_duplicate_strategy duplicate_strategy = UCL_DUPLICATE_APPEND) { if (!in) { err = "null input"; return nullptr; } - return parse (std::string(in), replacer, err); + return parse (std::string (in), vars, macros, err, duplicate_strategy); + } + + static Ucl parse (const char *in, const variable_replacer &replacer, + std::string &err, enum ucl_duplicate_strategy duplicate_strategy = UCL_DUPLICATE_APPEND) + { + if (!in) { + err = "null input"; + return nullptr; + } + return parse (std::string(in), replacer, err, duplicate_strategy); + } + + //Macro handler will receive a macro_userdata_s as void *ud + static Ucl parse (const char *in, const variable_replacer &replacer, + std::vector< std::tuple< std::string /*name*/, macro_handler_s, void * /*userdata*/ > > ¯os, + std::string &err, enum ucl_duplicate_strategy duplicate_strategy = UCL_DUPLICATE_APPEND) + { + if (!in) { + err = "null input"; + return nullptr; + } + return parse (std::string (in), replacer, macros, err, duplicate_strategy); } static Ucl parse_from_file (const std::string &filename, std::string &err) { return parse_from_file (filename, std::map(), err); } static Ucl parse_from_file (const std::string &filename, const std::map &vars, std::string &err) { auto config_func = [&vars] (ucl_parser *parser) { for (const auto & item : vars) { ucl_parser_register_variable (parser, item.first.c_str (), item.second.c_str ()); } }; auto parse_func = [&filename] (ucl_parser *parser) { return ucl_parser_add_file (parser, filename.c_str ()); }; return parse_with_strategy_function (config_func, parse_func, err); } static Ucl parse_from_file (const std::string &filename, const variable_replacer &replacer, std::string &err) { auto config_func = [&replacer] (ucl_parser *parser) { ucl_parser_set_variables_handler (parser, ucl_variable_replacer, &const_cast(replacer)); }; auto parse_func = [&filename] (ucl_parser *parser) { return ucl_parser_add_file (parser, filename.c_str ()); }; return parse_with_strategy_function (config_func, parse_func, err); } static std::vector find_variable (const std::string &in) { auto parser = ucl_parser_new (UCL_PARSER_DEFAULT); std::set vars; ucl_parser_set_variables_handler (parser, ucl_variable_getter, &vars); ucl_parser_add_chunk (parser, (const unsigned char *)in.data (), in.size ()); ucl_parser_free (parser); std::vector result; std::move (vars.begin (), vars.end (), std::back_inserter (result)); return result; } static std::vector find_variable (const char *in) { if (!in) { return std::vector(); } return find_variable (std::string (in)); } static std::vector find_variable_from_file (const std::string &filename) { auto parser = ucl_parser_new (UCL_PARSER_DEFAULT); std::set vars; ucl_parser_set_variables_handler (parser, ucl_variable_getter, &vars); ucl_parser_add_file (parser, filename.c_str ()); ucl_parser_free (parser); std::vector result; std::move (vars.begin (), vars.end (), std::back_inserter (result)); - return std::move (result); + return result; } Ucl& operator= (Ucl rhs) { obj.swap (rhs.obj); return *this; } bool operator== (const Ucl &rhs) const { return ucl_object_compare (obj.get(), rhs.obj.get ()) == 0; } bool operator< (const Ucl &rhs) const { return ucl_object_compare (obj.get(), rhs.obj.get ()) < 0; } bool operator!= (const Ucl &rhs) const { return !(*this == rhs); } bool operator<= (const Ucl &rhs) const { return !(rhs < *this); } bool operator> (const Ucl &rhs) const { return (rhs < *this); } bool operator>= (const Ucl &rhs) const { return !(*this < rhs); } explicit operator bool () const { if (!obj || type() == UCL_NULL) { return false; } if (type () == UCL_BOOLEAN) { return bool_value (); } return true; } const_iterator begin() const { return const_iterator(*this); } const_iterator cbegin() const { return const_iterator(*this); } const_iterator end() const { return const_iterator(); } const_iterator cend() const { return const_iterator(); } }; }; diff --git a/contrib/libucl/include/ucl.h b/contrib/libucl/include/ucl.h index fccf6fcb2237..39da2593648d 100644 --- a/contrib/libucl/include/ucl.h +++ b/contrib/libucl/include/ucl.h @@ -1,1494 +1,1653 @@ /* Copyright (c) 2013-2015, Vsevolod Stakhov * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED ''AS IS'' AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL AUTHOR BE LIABLE FOR ANY * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifndef UCL_H_ #define UCL_H_ #include #include #include #include #include #include #include #ifdef _WIN32 # define UCL_EXTERN __declspec(dllexport) #else # define UCL_EXTERN #endif /** * @mainpage * This is a reference manual for UCL API. You may find the description of UCL format by following this * [github repository](https://github.com/vstakhov/libucl). * * This manual has several main sections: * - @ref structures * - @ref utils * - @ref parser * - @ref emitter */ /** * @file ucl.h * @brief UCL parsing and emitting functions * * UCL is universal configuration language, which is a form of * JSON with less strict rules that make it more comfortable for * using as a configuration language */ #ifdef __cplusplus extern "C" { #endif /* * Memory allocation utilities * UCL_ALLOC(size) - allocate memory for UCL * UCL_FREE(size, ptr) - free memory of specified size at ptr * Default: malloc and free */ #ifndef UCL_ALLOC #define UCL_ALLOC(size) malloc(size) #endif #ifndef UCL_FREE #define UCL_FREE(size, ptr) free(ptr) #endif #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) #define UCL_WARN_UNUSED_RESULT \ __attribute__((warn_unused_result)) #else #define UCL_WARN_UNUSED_RESULT #endif #ifdef __GNUC__ #define UCL_DEPRECATED(func) func __attribute__ ((deprecated)) #elif defined(_MSC_VER) #define UCL_DEPRECATED(func) __declspec(deprecated) func #else #define UCL_DEPRECATED(func) func #endif /** * @defgroup structures Structures and types * UCL defines several enumeration types used for error reporting or specifying flags and attributes. * * @{ */ /** * The common error codes returned by ucl parser */ typedef enum ucl_error { UCL_EOK = 0, /**< No error */ UCL_ESYNTAX, /**< Syntax error occurred during parsing */ UCL_EIO, /**< IO error occurred during parsing */ UCL_ESTATE, /**< Invalid state machine state */ UCL_ENESTED, /**< Input has too many recursion levels */ + UCL_EUNPAIRED, /**< Input has too many recursion levels */ UCL_EMACRO, /**< Error processing a macro */ UCL_EINTERNAL, /**< Internal unclassified error */ UCL_ESSL, /**< SSL error */ - UCL_EMERGE /**< A merge error occured */ + UCL_EMERGE /**< A merge error occurred */ } ucl_error_t; /** * #ucl_object_t may have one of specified types, some types are compatible with each other and some are not. * For example, you can always convert #UCL_TIME to #UCL_FLOAT. Also you can convert #UCL_FLOAT to #UCL_INTEGER * by loosing floating point. Every object may be converted to a string by #ucl_object_tostring_forced() function. * */ typedef enum ucl_type { UCL_OBJECT = 0, /**< UCL object - key/value pairs */ UCL_ARRAY, /**< UCL array */ UCL_INT, /**< Integer number */ UCL_FLOAT, /**< Floating point number */ UCL_STRING, /**< Null terminated string */ UCL_BOOLEAN, /**< Boolean value */ UCL_TIME, /**< Time value (floating point number of seconds) */ UCL_USERDATA, /**< Opaque userdata pointer (may be used in macros) */ UCL_NULL /**< Null value */ } ucl_type_t; /** * You can use one of these types to serialise #ucl_object_t by using ucl_object_emit(). */ typedef enum ucl_emitter { UCL_EMIT_JSON = 0, /**< Emit fine formatted JSON */ UCL_EMIT_JSON_COMPACT, /**< Emit compacted JSON */ UCL_EMIT_CONFIG, /**< Emit human readable config format */ UCL_EMIT_YAML, /**< Emit embedded YAML format */ UCL_EMIT_MSGPACK, /**< Emit msgpack output */ UCL_EMIT_MAX /**< Unsupported emitter type */ } ucl_emitter_t; /** * These flags defines parser behaviour. If you specify #UCL_PARSER_ZEROCOPY you must ensure * that the input memory is not freed if an object is in use. Moreover, if you want to use * zero-terminated keys and string values then you should not use zero-copy mode, as in this case * UCL still has to perform copying implicitly. */ typedef enum ucl_parser_flags { UCL_PARSER_DEFAULT = 0, /**< No special flags */ UCL_PARSER_KEY_LOWERCASE = (1 << 0), /**< Convert all keys to lower case */ UCL_PARSER_ZEROCOPY = (1 << 1), /**< Parse input in zero-copy mode if possible */ UCL_PARSER_NO_TIME = (1 << 2), /**< Do not parse time and treat time values as strings */ UCL_PARSER_NO_IMPLICIT_ARRAYS = (1 << 3), /** Create explicit arrays instead of implicit ones */ UCL_PARSER_SAVE_COMMENTS = (1 << 4), /** Save comments in the parser context */ UCL_PARSER_DISABLE_MACRO = (1 << 5), /** Treat macros as comments */ UCL_PARSER_NO_FILEVARS = (1 << 6) /** Do not set file vars */ } ucl_parser_flags_t; /** * String conversion flags, that are used in #ucl_object_fromstring_common function. */ typedef enum ucl_string_flags { UCL_STRING_RAW = 0x0, /**< Treat string as is */ UCL_STRING_ESCAPE = (1 << 0), /**< Perform JSON escape */ UCL_STRING_TRIM = (1 << 1), /**< Trim leading and trailing whitespaces */ UCL_STRING_PARSE_BOOLEAN = (1 << 2), /**< Parse passed string and detect boolean */ UCL_STRING_PARSE_INT = (1 << 3), /**< Parse passed string and detect integer number */ UCL_STRING_PARSE_DOUBLE = (1 << 4), /**< Parse passed string and detect integer or float number */ UCL_STRING_PARSE_TIME = (1 << 5), /**< Parse time strings */ UCL_STRING_PARSE_NUMBER = UCL_STRING_PARSE_INT|UCL_STRING_PARSE_DOUBLE|UCL_STRING_PARSE_TIME, /**< Parse passed string and detect number */ UCL_STRING_PARSE = UCL_STRING_PARSE_BOOLEAN|UCL_STRING_PARSE_NUMBER, /**< Parse passed string (and detect booleans and numbers) */ UCL_STRING_PARSE_BYTES = (1 << 6) /**< Treat numbers as bytes */ } ucl_string_flags_t; /** - * Basic flags for an object + * Basic flags for an object (can use up to 12 bits as higher 4 bits are used + * for priorities) */ typedef enum ucl_object_flags { UCL_OBJECT_ALLOCATED_KEY = (1 << 0), /**< An object has key allocated internally */ UCL_OBJECT_ALLOCATED_VALUE = (1 << 1), /**< An object has a string value allocated internally */ UCL_OBJECT_NEED_KEY_ESCAPE = (1 << 2), /**< The key of an object need to be escaped on output */ UCL_OBJECT_EPHEMERAL = (1 << 3), /**< Temporary object that does not need to be freed really */ UCL_OBJECT_MULTILINE = (1 << 4), /**< String should be displayed as multiline string */ UCL_OBJECT_MULTIVALUE = (1 << 5), /**< Object is a key with multiple values */ UCL_OBJECT_INHERITED = (1 << 6), /**< Object has been inherited from another */ - UCL_OBJECT_BINARY = (1 << 7) /**< Object contains raw binary data */ + UCL_OBJECT_BINARY = (1 << 7), /**< Object contains raw binary data */ + UCL_OBJECT_SQUOTED = (1 << 8) /**< Object has been enclosed in single quotes */ } ucl_object_flags_t; /** * Duplicate policy types */ enum ucl_duplicate_strategy { UCL_DUPLICATE_APPEND = 0, /**< Default policy to merge based on priorities */ UCL_DUPLICATE_MERGE, /**< Merge new object with old one */ UCL_DUPLICATE_REWRITE, /**< Rewrite old keys */ UCL_DUPLICATE_ERROR /**< Stop parsing on duplicate found */ }; /** * Input format type */ enum ucl_parse_type { UCL_PARSE_UCL = 0, /**< Default ucl format */ UCL_PARSE_MSGPACK, /**< Message pack input format */ UCL_PARSE_CSEXP, /**< Canonical S-expressions */ UCL_PARSE_AUTO /**< Try to detect parse type */ }; /** * UCL object structure. Please mention that the most of fields should not be touched by * UCL users. In future, this structure may be converted to private one. */ typedef struct ucl_object_s { /** * Variant value type */ union { int64_t iv; /**< Int value of an object */ const char *sv; /**< String value of an object */ double dv; /**< Double value of an object */ void *av; /**< Array */ void *ov; /**< Object */ void* ud; /**< Opaque user data */ } value; const char *key; /**< Key of an object */ struct ucl_object_s *next; /**< Array handle */ struct ucl_object_s *prev; /**< Array handle */ uint32_t keylen; /**< Length of a key */ uint32_t len; /**< Size of an object */ uint32_t ref; /**< Reference count */ uint16_t flags; /**< Object flags */ uint16_t type; /**< Real type */ unsigned char* trash_stack[2]; /**< Pointer to allocated chunks */ } ucl_object_t; /** * Destructor type for userdata objects * @param ud user specified data pointer */ typedef void (*ucl_userdata_dtor)(void *ud); typedef const char* (*ucl_userdata_emitter)(void *ud); /** @} */ /** * @defgroup utils Utility functions * A number of utility functions simplify handling of UCL objects * * @{ */ /** * Copy and return a key of an object, returned key is zero-terminated * @param obj CL object * @return zero terminated key */ UCL_EXTERN char* ucl_copy_key_trash (const ucl_object_t *obj); /** * Copy and return a string value of an object, returned key is zero-terminated * @param obj CL object * @return zero terminated string representation of object value */ UCL_EXTERN char* ucl_copy_value_trash (const ucl_object_t *obj); /** * Creates a new object * @return new object */ UCL_EXTERN ucl_object_t* ucl_object_new (void) UCL_WARN_UNUSED_RESULT; /** * Create new object with type specified * @param type type of a new object * @return new object */ UCL_EXTERN ucl_object_t* ucl_object_typed_new (ucl_type_t type) UCL_WARN_UNUSED_RESULT; /** * Create new object with type and priority specified * @param type type of a new object * @param priority priority of an object * @return new object */ UCL_EXTERN ucl_object_t* ucl_object_new_full (ucl_type_t type, unsigned priority) UCL_WARN_UNUSED_RESULT; /** * Create new object with userdata dtor * @param dtor destructor function * @param emitter emitter for userdata * @param ptr opaque pointer * @return new object */ UCL_EXTERN ucl_object_t* ucl_object_new_userdata (ucl_userdata_dtor dtor, ucl_userdata_emitter emitter, void *ptr) UCL_WARN_UNUSED_RESULT; /** * Perform deep copy of an object copying everything * @param other object to copy * @return new object with refcount equal to 1 */ UCL_EXTERN ucl_object_t * ucl_object_copy (const ucl_object_t *other) UCL_WARN_UNUSED_RESULT; /** * Return the type of an object * @return the object type */ UCL_EXTERN ucl_type_t ucl_object_type (const ucl_object_t *obj); /** * Converts ucl object type to its string representation * @param type type of object * @return constant string describing type */ UCL_EXTERN const char * ucl_object_type_to_string (ucl_type_t type); /** * Converts string that represents ucl type to real ucl type enum * @param input C string with name of type * @param res resulting target * @return true if `input` is a name of type stored in `res` */ UCL_EXTERN bool ucl_object_string_to_type (const char *input, ucl_type_t *res); /** * Convert any string to an ucl object making the specified transformations * @param str fixed size or NULL terminated string * @param len length (if len is zero, than str is treated as NULL terminated) * @param flags conversion flags * @return new object */ UCL_EXTERN ucl_object_t * ucl_object_fromstring_common (const char *str, size_t len, enum ucl_string_flags flags) UCL_WARN_UNUSED_RESULT; /** * Create a UCL object from the specified string * @param str NULL terminated string, will be json escaped * @return new object */ UCL_EXTERN ucl_object_t *ucl_object_fromstring (const char *str) UCL_WARN_UNUSED_RESULT; /** * Create a UCL object from the specified string * @param str fixed size string, will be json escaped * @param len length of a string * @return new object */ UCL_EXTERN ucl_object_t *ucl_object_fromlstring (const char *str, size_t len) UCL_WARN_UNUSED_RESULT; /** * Create an object from an integer number * @param iv number * @return new object */ UCL_EXTERN ucl_object_t* ucl_object_fromint (int64_t iv) UCL_WARN_UNUSED_RESULT; /** * Create an object from a float number * @param dv number * @return new object */ UCL_EXTERN ucl_object_t* ucl_object_fromdouble (double dv) UCL_WARN_UNUSED_RESULT; /** * Create an object from a boolean * @param bv bool value * @return new object */ UCL_EXTERN ucl_object_t* ucl_object_frombool (bool bv) UCL_WARN_UNUSED_RESULT; /** * Insert a object 'elt' to the hash 'top' and associate it with key 'key' * @param top destination object (must be of type UCL_OBJECT) * @param elt element to insert (must NOT be NULL) * @param key key to associate with this object (either const or preallocated) * @param keylen length of the key (or 0 for NULL terminated keys) * @param copy_key make an internal copy of key * @return true if key has been inserted */ UCL_EXTERN bool ucl_object_insert_key (ucl_object_t *top, ucl_object_t *elt, const char *key, size_t keylen, bool copy_key); /** * Replace a object 'elt' to the hash 'top' and associate it with key 'key', old object will be unrefed, * if no object has been found this function works like ucl_object_insert_key() * @param top destination object (must be of type UCL_OBJECT) * @param elt element to insert (must NOT be NULL) * @param key key to associate with this object (either const or preallocated) * @param keylen length of the key (or 0 for NULL terminated keys) * @param copy_key make an internal copy of key * @return true if key has been inserted */ UCL_EXTERN bool ucl_object_replace_key (ucl_object_t *top, ucl_object_t *elt, const char *key, size_t keylen, bool copy_key); /** * Merge the keys from one object to another object. Overwrite on conflict * @param top destination object (must be of type UCL_OBJECT) * @param elt element to insert (must be of type UCL_OBJECT) * @param copy copy rather than reference the elements * @return true if all keys have been merged */ UCL_EXTERN bool ucl_object_merge (ucl_object_t *top, ucl_object_t *elt, bool copy); /** * Delete a object associated with key 'key', old object will be unrefered, * @param top object * @param key key associated to the object to remove * @param keylen length of the key (or 0 for NULL terminated keys) */ UCL_EXTERN bool ucl_object_delete_keyl (ucl_object_t *top, const char *key, size_t keylen); /** * Delete a object associated with key 'key', old object will be unrefered, * @param top object * @param key key associated to the object to remove */ UCL_EXTERN bool ucl_object_delete_key (ucl_object_t *top, const char *key); /** * Removes `key` from `top` object, returning the object that was removed. This * object is not released, caller must unref the returned object when it is no * longer needed. * @param top object * @param key key to remove * @param keylen length of the key (or 0 for NULL terminated keys) * @return removed object or NULL if object has not been found */ UCL_EXTERN ucl_object_t* ucl_object_pop_keyl (ucl_object_t *top, const char *key, size_t keylen) UCL_WARN_UNUSED_RESULT; /** * Removes `key` from `top` object returning the object that was removed. This * object is not released, caller must unref the returned object when it is no * longer needed. * @param top object * @param key key to remove * @return removed object or NULL if object has not been found */ UCL_EXTERN ucl_object_t* ucl_object_pop_key (ucl_object_t *top, const char *key) UCL_WARN_UNUSED_RESULT; /** * Insert a object 'elt' to the hash 'top' and associate it with key 'key', if * the specified key exist, try to merge its content * @param top destination object (must be of type UCL_OBJECT) * @param elt element to insert (must NOT be NULL) * @param key key to associate with this object (either const or preallocated) * @param keylen length of the key (or 0 for NULL terminated keys) * @param copy_key make an internal copy of key * @return true if key has been inserted */ UCL_EXTERN bool ucl_object_insert_key_merged (ucl_object_t *top, ucl_object_t *elt, const char *key, size_t keylen, bool copy_key); +/** + * Reserve space in ucl array or object for `elt` elements + * @param obj object to reserve + * @param reserved size to reserve in an object + * @return 0 on success, -1 on failure (i.e. ENOMEM) + */ +UCL_EXTERN bool ucl_object_reserve (ucl_object_t *obj, size_t reserved); + /** * Append an element to the end of array object * @param top destination object (must NOT be NULL) * @param elt element to append (must NOT be NULL) * @return true if value has been inserted */ UCL_EXTERN bool ucl_array_append (ucl_object_t *top, ucl_object_t *elt); /** * Append an element to the start of array object * @param top destination object (must NOT be NULL) * @param elt element to append (must NOT be NULL) * @return true if value has been inserted */ UCL_EXTERN bool ucl_array_prepend (ucl_object_t *top, ucl_object_t *elt); /** * Merge all elements of second array into the first array * @param top destination array (must be of type UCL_ARRAY) * @param elt array to copy elements from (must be of type UCL_ARRAY) * @param copy copy elements instead of referencing them * @return true if arrays were merged */ UCL_EXTERN bool ucl_array_merge (ucl_object_t *top, ucl_object_t *elt, bool copy); /** * Removes an element `elt` from the array `top`, returning the object that was * removed. This object is not released, caller must unref the returned object * when it is no longer needed. * @param top array ucl object * @param elt element to remove * @return removed element or NULL if `top` is NULL or not an array */ UCL_EXTERN ucl_object_t* ucl_array_delete (ucl_object_t *top, ucl_object_t *elt); /** * Returns the first element of the array `top` * @param top array ucl object * @return element or NULL if `top` is NULL or not an array */ UCL_EXTERN const ucl_object_t* ucl_array_head (const ucl_object_t *top); /** * Returns the last element of the array `top` * @param top array ucl object * @return element or NULL if `top` is NULL or not an array */ UCL_EXTERN const ucl_object_t* ucl_array_tail (const ucl_object_t *top); /** * Removes the last element from the array `top`, returning the object that was * removed. This object is not released, caller must unref the returned object * when it is no longer needed. * @param top array ucl object * @return removed element or NULL if `top` is NULL or not an array */ UCL_EXTERN ucl_object_t* ucl_array_pop_last (ucl_object_t *top); /** * Removes the first element from the array `top`, returning the object that was * removed. This object is not released, caller must unref the returned object * when it is no longer needed. * @param top array ucl object * @return removed element or NULL if `top` is NULL or not an array */ UCL_EXTERN ucl_object_t* ucl_array_pop_first (ucl_object_t *top); +/** + * Return size of the array `top` + * @param top object to get size from (must be of type UCL_ARRAY) + * @return size of the array + */ +UCL_EXTERN unsigned int ucl_array_size (const ucl_object_t *top); + /** * Return object identified by index of the array `top` * @param top object to get a key from (must be of type UCL_ARRAY) * @param index array index to return * @return object at the specified index or NULL if index is not found */ UCL_EXTERN const ucl_object_t* ucl_array_find_index (const ucl_object_t *top, unsigned int index); /** * Return the index of `elt` in the array `top` * @param top object to get a key from (must be of type UCL_ARRAY) * @param elt element to find index of (must NOT be NULL) * @return index of `elt` in the array `top or (unsigned int)-1 if `elt` is not found */ UCL_EXTERN unsigned int ucl_array_index_of (ucl_object_t *top, ucl_object_t *elt); /** * Replace an element in an array with a different element, returning the object * that was replaced. This object is not released, caller must unref the * returned object when it is no longer needed. * @param top destination object (must be of type UCL_ARRAY) * @param elt element to append (must NOT be NULL) * @param index array index in destination to overwrite with elt * @return object that was replaced or NULL if index is not found */ ucl_object_t * ucl_array_replace_index (ucl_object_t *top, ucl_object_t *elt, unsigned int index); /** * Append a element to another element forming an implicit array * @param head head to append (may be NULL) * @param elt new element * @return the new implicit array */ UCL_EXTERN ucl_object_t * ucl_elt_append (ucl_object_t *head, ucl_object_t *elt); /** * Converts an object to double value * @param obj CL object * @param target target double variable * @return true if conversion was successful */ UCL_EXTERN bool ucl_object_todouble_safe (const ucl_object_t *obj, double *target); /** * Unsafe version of \ref ucl_obj_todouble_safe * @param obj CL object * @return double value */ UCL_EXTERN double ucl_object_todouble (const ucl_object_t *obj); /** * Converts an object to integer value * @param obj CL object * @param target target integer variable * @return true if conversion was successful */ UCL_EXTERN bool ucl_object_toint_safe (const ucl_object_t *obj, int64_t *target); /** * Unsafe version of \ref ucl_obj_toint_safe * @param obj CL object * @return int value */ UCL_EXTERN int64_t ucl_object_toint (const ucl_object_t *obj); /** * Converts an object to boolean value * @param obj CL object * @param target target boolean variable * @return true if conversion was successful */ UCL_EXTERN bool ucl_object_toboolean_safe (const ucl_object_t *obj, bool *target); /** * Unsafe version of \ref ucl_obj_toboolean_safe * @param obj CL object * @return boolean value */ UCL_EXTERN bool ucl_object_toboolean (const ucl_object_t *obj); /** * Converts an object to string value * @param obj CL object * @param target target string variable, no need to free value * @return true if conversion was successful */ UCL_EXTERN bool ucl_object_tostring_safe (const ucl_object_t *obj, const char **target); /** * Unsafe version of \ref ucl_obj_tostring_safe * @param obj CL object * @return string value */ UCL_EXTERN const char* ucl_object_tostring (const ucl_object_t *obj); /** * Convert any object to a string in JSON notation if needed * @param obj CL object * @return string value */ UCL_EXTERN const char* ucl_object_tostring_forced (const ucl_object_t *obj); /** * Return string as char * and len, string may be not zero terminated, more efficient that \ref ucl_obj_tostring as it * allows zero-copy (if #UCL_PARSER_ZEROCOPY has been used during parsing) * @param obj CL object * @param target target string variable, no need to free value * @param tlen target length * @return true if conversion was successful */ UCL_EXTERN bool ucl_object_tolstring_safe (const ucl_object_t *obj, const char **target, size_t *tlen); /** * Unsafe version of \ref ucl_obj_tolstring_safe * @param obj CL object * @return string value */ UCL_EXTERN const char* ucl_object_tolstring (const ucl_object_t *obj, size_t *tlen); /** * Return object identified by a key in the specified object * @param obj object to get a key from (must be of type UCL_OBJECT) * @param key key to search * @return object matching the specified key or NULL if key was not found */ UCL_EXTERN const ucl_object_t* ucl_object_lookup (const ucl_object_t *obj, const char *key); #define ucl_object_find_key ucl_object_lookup /** * Return object identified by a key in the specified object, if the first key is * not found then look for the next one. This process is repeated unless * the next argument in the list is not NULL. So, `ucl_object_find_any_key(obj, key, NULL)` * is equal to `ucl_object_find_key(obj, key)` * @param obj object to get a key from (must be of type UCL_OBJECT) * @param key key to search * @param ... list of alternative keys to search (NULL terminated) * @return object matching the specified key or NULL if key was not found */ UCL_EXTERN const ucl_object_t* ucl_object_lookup_any (const ucl_object_t *obj, const char *key, ...); #define ucl_object_find_any_key ucl_object_lookup_any /** * Return object identified by a fixed size key in the specified object * @param obj object to get a key from (must be of type UCL_OBJECT) * @param key key to search * @param klen length of a key * @return object matching the specified key or NULL if key was not found */ UCL_EXTERN const ucl_object_t* ucl_object_lookup_len (const ucl_object_t *obj, const char *key, size_t klen); #define ucl_object_find_keyl ucl_object_lookup_len /** * Return object identified by dot notation string * @param obj object to search in * @param path dot.notation.path to the path to lookup. May use numeric .index on arrays * @return object matched the specified path or NULL if path is not found */ UCL_EXTERN const ucl_object_t *ucl_object_lookup_path (const ucl_object_t *obj, const char *path); #define ucl_lookup_path ucl_object_lookup_path /** * Return object identified by object notation string using arbitrary delimiter * @param obj object to search in * @param path dot.notation.path to the path to lookup. May use numeric .index on arrays * @param sep the sepatorator to use in place of . (incase keys have . in them) * @return object matched the specified path or NULL if path is not found */ UCL_EXTERN const ucl_object_t *ucl_object_lookup_path_char (const ucl_object_t *obj, const char *path, char sep); #define ucl_lookup_path_char ucl_object_lookup_path_char /** * Returns a key of an object as a NULL terminated string * @param obj CL object * @return key or NULL if there is no key */ UCL_EXTERN const char* ucl_object_key (const ucl_object_t *obj); /** * Returns a key of an object as a fixed size string (may be more efficient) * @param obj CL object * @param len target key length * @return key pointer */ UCL_EXTERN const char* ucl_object_keyl (const ucl_object_t *obj, size_t *len); /** * Increase reference count for an object * @param obj object to ref * @return the referenced object */ UCL_EXTERN ucl_object_t* ucl_object_ref (const ucl_object_t *obj); /** * Free ucl object * @param obj ucl object to free */ UCL_DEPRECATED(UCL_EXTERN void ucl_object_free (ucl_object_t *obj)); /** * Decrease reference count for an object * @param obj object to unref */ UCL_EXTERN void ucl_object_unref (ucl_object_t *obj); /** * Compare objects `o1` and `o2` * @param o1 the first object * @param o2 the second object * @return values >0, 0 and <0 if `o1` is more than, equal and less than `o2`. * The order of comparison: * 1) Type of objects * 2) Size of objects * 3) Content of objects */ UCL_EXTERN int ucl_object_compare (const ucl_object_t *o1, const ucl_object_t *o2); /** * Compare objects `o1` and `o2` useful for sorting * @param o1 the first object * @param o2 the second object * @return values >0, 0 and <0 if `o1` is more than, equal and less than `o2`. * The order of comparison: * 1) Type of objects * 2) Size of objects * 3) Content of objects */ UCL_EXTERN int ucl_object_compare_qsort (const ucl_object_t **o1, const ucl_object_t **o2); /** * Sort UCL array using `cmp` compare function * @param ar * @param cmp */ UCL_EXTERN void ucl_object_array_sort (ucl_object_t *ar, int (*cmp)(const ucl_object_t **o1, const ucl_object_t **o2)); +enum ucl_object_keys_sort_flags { + UCL_SORT_KEYS_DEFAULT = 0, + UCL_SORT_KEYS_ICASE = (1u << 0u), + UCL_SORT_KEYS_RECURSIVE = (1u << 1u), +}; +/*** + * Sorts keys in object in place + * @param obj + * @param how + */ +UCL_EXTERN void ucl_object_sort_keys (ucl_object_t *obj, + enum ucl_object_keys_sort_flags how); + /** * Get the priority for specific UCL object * @param obj any ucl object * @return priority of an object */ UCL_EXTERN unsigned int ucl_object_get_priority (const ucl_object_t *obj); /** * Set explicit priority of an object. * @param obj any ucl object * @param priority new priroity value (only 4 least significant bits are considred) */ UCL_EXTERN void ucl_object_set_priority (ucl_object_t *obj, unsigned int priority); /** * Opaque iterator object */ typedef void* ucl_object_iter_t; /** * Get next key from an object * @param obj object to iterate * @param iter opaque iterator, must be set to NULL on the first call: * ucl_object_iter_t it = NULL; * while ((cur = ucl_iterate_object (obj, &it)) != NULL) ... + * @param ep pointer record exception (such as ENOMEM), could be NULL * @return the next object or NULL */ -UCL_EXTERN const ucl_object_t* ucl_object_iterate (const ucl_object_t *obj, - ucl_object_iter_t *iter, bool expand_values); +UCL_EXTERN const ucl_object_t* ucl_object_iterate_with_error (const ucl_object_t *obj, + ucl_object_iter_t *iter, bool expand_values, int *ep); + #define ucl_iterate_object ucl_object_iterate +#define ucl_object_iterate(ob, it, ev) ucl_object_iterate_with_error((ob), (it), (ev), NULL) /** * Create new safe iterator for the specified object * @param obj object to iterate * @return new iterator object that should be used with safe iterators API only */ UCL_EXTERN ucl_object_iter_t ucl_object_iterate_new (const ucl_object_t *obj) UCL_WARN_UNUSED_RESULT; +/** + * Check safe iterator object after performing some operations on it + * (such as ucl_object_iterate_safe()) to see if operation has encountered + * fatal exception while performing that operation (e.g. ENOMEM). + * @param iter opaque iterator + * @return true if exception has occured, false otherwise + */ +UCL_EXTERN bool ucl_object_iter_chk_excpn(ucl_object_iter_t *it); + /** * Reset initialized iterator to a new object * @param obj new object to iterate * @return modified iterator object */ UCL_EXTERN ucl_object_iter_t ucl_object_iterate_reset (ucl_object_iter_t it, const ucl_object_t *obj); /** - * Get the next object from the `obj`. This fucntion iterates over arrays, objects + * Get the next object from the `obj`. This function iterates over arrays, objects * and implicit arrays * @param iter safe iterator * @param expand_values expand explicit arrays and objects * @return the next object in sequence */ UCL_EXTERN const ucl_object_t* ucl_object_iterate_safe (ucl_object_iter_t iter, bool expand_values); /** * Iteration type enumerator */ enum ucl_iterate_type { UCL_ITERATE_EXPLICIT = 1 << 0, /**< Iterate just explicit arrays and objects */ UCL_ITERATE_IMPLICIT = 1 << 1, /**< Iterate just implicit arrays */ UCL_ITERATE_BOTH = (1 << 0) | (1 << 1), /**< Iterate both explicit and implicit arrays*/ }; /** - * Get the next object from the `obj`. This fucntion iterates over arrays, objects + * Get the next object from the `obj`. This function iterates over arrays, objects * and implicit arrays if needed * @param iter safe iterator * @param * @return the next object in sequence */ UCL_EXTERN const ucl_object_t* ucl_object_iterate_full (ucl_object_iter_t iter, enum ucl_iterate_type type); /** * Free memory associated with the safe iterator * @param it safe iterator object */ UCL_EXTERN void ucl_object_iterate_free (ucl_object_iter_t it); /** @} */ /** * @defgroup parser Parsing functions * These functions are used to parse UCL objects * * @{ */ /** * Macro handler for a parser * @param data the content of macro * @param len the length of content * @param arguments arguments object * @param ud opaque user data * @param err error pointer * @return true if macro has been parsed */ typedef bool (*ucl_macro_handler) (const unsigned char *data, size_t len, const ucl_object_t *arguments, void* ud); /** * Context dependent macro handler for a parser * @param data the content of macro * @param len the length of content * @param arguments arguments object * @param context previously parsed context * @param ud opaque user data * @param err error pointer * @return true if macro has been parsed */ typedef bool (*ucl_context_macro_handler) (const unsigned char *data, size_t len, const ucl_object_t *arguments, const ucl_object_t *context, void* ud); /* Opaque parser */ struct ucl_parser; /** * Creates new parser object * @param pool pool to allocate memory from * @return new parser object */ UCL_EXTERN struct ucl_parser* ucl_parser_new (int flags); /** - * Sets the default priority for the parser applied to chunks that does not + * Sets the default priority for the parser applied to chunks that do not * specify priority explicitly * @param parser parser object * @param prio default priority (0 .. 16) * @return true if parser's default priority was set */ UCL_EXTERN bool ucl_parser_set_default_priority (struct ucl_parser *parser, unsigned prio); +/** + * Gets the default priority for the parser applied to chunks that do not + * specify priority explicitly + * @param parser parser object + * @return true default priority (0 .. 16), -1 for failure + */ +UCL_EXTERN int ucl_parser_get_default_priority (struct ucl_parser *parser); + /** * Register new handler for a macro * @param parser parser object * @param macro macro name (without leading dot) * @param handler handler (it is called immediately after macro is parsed) * @param ud opaque user data for a handler + * @return true on success, false on failure (i.e. ENOMEM) */ -UCL_EXTERN void ucl_parser_register_macro (struct ucl_parser *parser, +UCL_EXTERN bool ucl_parser_register_macro (struct ucl_parser *parser, const char *macro, ucl_macro_handler handler, void* ud); /** * Register new context dependent handler for a macro * @param parser parser object * @param macro macro name (without leading dot) * @param handler handler (it is called immediately after macro is parsed) * @param ud opaque user data for a handler + * @return true on success, false on failure (i.e. ENOMEM) */ -UCL_EXTERN void ucl_parser_register_context_macro (struct ucl_parser *parser, +UCL_EXTERN bool ucl_parser_register_context_macro (struct ucl_parser *parser, const char *macro, ucl_context_macro_handler handler, void* ud); /** * Handler to detect unregistered variables * @param data variable data * @param len length of variable * @param replace (out) replace value for variable * @param replace_len (out) replace length for variable * @param need_free (out) UCL will free `dest` after usage * @param ud opaque userdata * @return true if variable */ typedef bool (*ucl_variable_handler) (const unsigned char *data, size_t len, unsigned char **replace, size_t *replace_len, bool *need_free, void* ud); /** * Register new parser variable * @param parser parser object * @param var variable name * @param value variable value */ UCL_EXTERN void ucl_parser_register_variable (struct ucl_parser *parser, const char *var, const char *value); /** * Set handler for unknown variables * @param parser parser structure * @param handler desired handler * @param ud opaque data for the handler */ UCL_EXTERN void ucl_parser_set_variables_handler (struct ucl_parser *parser, ucl_variable_handler handler, void *ud); /** * Load new chunk to a parser * @param parser parser structure * @param data the pointer to the beginning of a chunk * @param len the length of a chunk * @return true if chunk has been added and false in case of error */ UCL_EXTERN bool ucl_parser_add_chunk (struct ucl_parser *parser, const unsigned char *data, size_t len); /** * Load new chunk to a parser with the specified priority * @param parser parser structure * @param data the pointer to the beginning of a chunk * @param len the length of a chunk * @param priority the desired priority of a chunk (only 4 least significant bits * are considered for this parameter) * @return true if chunk has been added and false in case of error */ UCL_EXTERN bool ucl_parser_add_chunk_priority (struct ucl_parser *parser, const unsigned char *data, size_t len, unsigned priority); +/** + * Insert new chunk to a parser (must have previously processed data with an existing top object) + * @param parser parser structure + * @param data the pointer to the beginning of a chunk + * @param len the length of a chunk + * @return true if chunk has been added and false in case of error + */ +UCL_EXTERN bool ucl_parser_insert_chunk (struct ucl_parser *parser, + const unsigned char *data, size_t len); + /** * Full version of ucl_add_chunk with priority and duplicate strategy * @param parser parser structure * @param data the pointer to the beginning of a chunk * @param len the length of a chunk * @param priority the desired priority of a chunk (only 4 least significant bits * are considered for this parameter) * @param strat duplicates merging strategy * @param parse_type input format * @return true if chunk has been added and false in case of error */ UCL_EXTERN bool ucl_parser_add_chunk_full (struct ucl_parser *parser, const unsigned char *data, size_t len, unsigned priority, enum ucl_duplicate_strategy strat, enum ucl_parse_type parse_type); /** * Load ucl object from a string * @param parser parser structure * @param data the pointer to the string * @param len the length of the string, if `len` is 0 then `data` must be zero-terminated string * @return true if string has been added and false in case of error */ UCL_EXTERN bool ucl_parser_add_string (struct ucl_parser *parser, - const char *data,size_t len); + const char *data, size_t len); /** * Load ucl object from a string * @param parser parser structure * @param data the pointer to the string * @param len the length of the string, if `len` is 0 then `data` must be zero-terminated string * @param priority the desired priority of a chunk (only 4 least significant bits * are considered for this parameter) * @return true if string has been added and false in case of error */ UCL_EXTERN bool ucl_parser_add_string_priority (struct ucl_parser *parser, const char *data, size_t len, unsigned priority); /** * Load and add data from a file * @param parser parser structure * @param filename the name of file * @param err if *err is NULL it is set to parser error * @return true if chunk has been added and false in case of error */ UCL_EXTERN bool ucl_parser_add_file (struct ucl_parser *parser, const char *filename); /** * Load and add data from a file * @param parser parser structure * @param filename the name of file * @param err if *err is NULL it is set to parser error * @param priority the desired priority of a chunk (only 4 least significant bits * are considered for this parameter) * @return true if chunk has been added and false in case of error */ UCL_EXTERN bool ucl_parser_add_file_priority (struct ucl_parser *parser, const char *filename, unsigned priority); /** * Load and add data from a file * @param parser parser structure * @param filename the name of file * @param priority the desired priority of a chunk (only 4 least significant bits * are considered for this parameter) * @param strat Merge strategy to use while parsing this file * @param parse_type Parser type to use while parsing this file * @return true if chunk has been added and false in case of error */ UCL_EXTERN bool ucl_parser_add_file_full (struct ucl_parser *parser, const char *filename, unsigned priority, enum ucl_duplicate_strategy strat, enum ucl_parse_type parse_type); /** * Load and add data from a file descriptor * @param parser parser structure * @param filename the name of file * @param err if *err is NULL it is set to parser error * @return true if chunk has been added and false in case of error */ UCL_EXTERN bool ucl_parser_add_fd (struct ucl_parser *parser, int fd); /** * Load and add data from a file descriptor * @param parser parser structure * @param filename the name of file * @param err if *err is NULL it is set to parser error * @param priority the desired priority of a chunk (only 4 least significant bits * are considered for this parameter) * @return true if chunk has been added and false in case of error */ UCL_EXTERN bool ucl_parser_add_fd_priority (struct ucl_parser *parser, int fd, unsigned priority); /** * Load and add data from a file descriptor * @param parser parser structure * @param filename the name of file * @param err if *err is NULL it is set to parser error * @param priority the desired priority of a chunk (only 4 least significant bits * are considered for this parameter) * @param strat Merge strategy to use while parsing this file * @param parse_type Parser type to use while parsing this file * @return true if chunk has been added and false in case of error */ UCL_EXTERN bool ucl_parser_add_fd_full (struct ucl_parser *parser, int fd, unsigned priority, enum ucl_duplicate_strategy strat, enum ucl_parse_type parse_type); /** * Provide a UCL_ARRAY of paths to search for include files. The object is * copied so caller must unref the object. * @param parser parser structure * @param paths UCL_ARRAY of paths to search * @return true if the path search array was replaced in the parser */ UCL_EXTERN bool ucl_set_include_path (struct ucl_parser *parser, ucl_object_t *paths); /** * Get a top object for a parser (refcount is increased) * @param parser parser structure * @param err if *err is NULL it is set to parser error * @return top parser object or NULL */ UCL_EXTERN ucl_object_t* ucl_parser_get_object (struct ucl_parser *parser); +/** + * Get the current stack object as stack accessor function for use in macro + * functions (refcount is increased) + * @param parser parser object + * @param depth depth of stack to retrieve (top is 0) + * @return current stack object or NULL + */ +UCL_EXTERN ucl_object_t* ucl_parser_get_current_stack_object (struct ucl_parser *parser, unsigned int depth); + +/** + * Peek at the character at the current chunk position + * @param parser parser structure + * @return current chunk position character + */ +UCL_EXTERN unsigned char ucl_parser_chunk_peek (struct ucl_parser *parser); + +/** + * Skip the character at the current chunk position + * @param parser parser structure + * @return success boolean + */ +UCL_EXTERN bool ucl_parser_chunk_skip (struct ucl_parser *parser); + /** * Get the error string if parsing has been failed * @param parser parser object * @return error description */ UCL_EXTERN const char *ucl_parser_get_error (struct ucl_parser *parser); /** * Get the code of the last error * @param parser parser object * @return error code */ UCL_EXTERN int ucl_parser_get_error_code (struct ucl_parser *parser); /** * Get the current column number within parser * @param parser parser object * @return current column number */ UCL_EXTERN unsigned ucl_parser_get_column (struct ucl_parser *parser); /** * Get the current line number within parser * @param parser parser object * @return current line number */ UCL_EXTERN unsigned ucl_parser_get_linenum (struct ucl_parser *parser); /** * Clear the error in the parser * @param parser parser object */ UCL_EXTERN void ucl_parser_clear_error (struct ucl_parser *parser); /** * Free ucl parser object * @param parser parser object */ UCL_EXTERN void ucl_parser_free (struct ucl_parser *parser); /** * Get constant opaque pointer to comments structure for this parser. Increase * refcount to prevent this object to be destroyed on parser's destruction * @param parser parser structure * @return ucl comments pointer or NULL */ UCL_EXTERN const ucl_object_t * ucl_parser_get_comments (struct ucl_parser *parser); /** * Utility function to find a comment object for the specified object in the input * @param comments comments object * @param srch search object * @return string comment enclosed in ucl_object_t */ UCL_EXTERN const ucl_object_t * ucl_comments_find (const ucl_object_t *comments, const ucl_object_t *srch); /** * Move comment from `from` object to `to` object * @param comments comments object * @param what source object - * @param whith destination object + * @param with destination object * @return `true` if `from` has comment and it has been moved to `to` */ UCL_EXTERN bool ucl_comments_move (ucl_object_t *comments, const ucl_object_t *from, const ucl_object_t *to); /** * Adds a new comment for an object * @param comments comments object * @param obj object to add comment to * @param comment string representation of a comment */ UCL_EXTERN void ucl_comments_add (ucl_object_t *comments, const ucl_object_t *obj, const char *comment); /** * Add new public key to parser for signatures check * @param parser parser object * @param key PEM representation of a key * @param len length of the key * @param err if *err is NULL it is set to parser error * @return true if a key has been successfully added */ UCL_EXTERN bool ucl_parser_pubkey_add (struct ucl_parser *parser, const unsigned char *key, size_t len); /** * Set FILENAME and CURDIR variables in parser * @param parser parser object * @param filename filename to set or NULL to set FILENAME to "undef" and CURDIR to getcwd() * @param need_expand perform realpath() if this variable is true and filename is not NULL * @return true if variables has been set */ UCL_EXTERN bool ucl_parser_set_filevars (struct ucl_parser *parser, const char *filename, bool need_expand); +/** + * Returns current file for the parser + * @param parser parser object + * @return current file or NULL if parsing memory + */ +UCL_EXTERN const char *ucl_parser_get_cur_file (struct ucl_parser *parser); + +/** + * Defines special handler for certain types of data (identified by magic) + */ +typedef bool (*ucl_parser_special_handler_t) (struct ucl_parser *parser, + const unsigned char *source, size_t source_len, + unsigned char **destination, size_t *dest_len, + void *user_data); + +/** + * Special handler flags + */ +enum ucl_special_handler_flags { + UCL_SPECIAL_HANDLER_DEFAULT = 0, + UCL_SPECIAL_HANDLER_PREPROCESS_ALL = (1u << 0), +}; + +/** + * Special handler structure + */ +struct ucl_parser_special_handler { + const unsigned char *magic; + size_t magic_len; + enum ucl_special_handler_flags flags; + ucl_parser_special_handler_t handler; + void (*free_function) (unsigned char *data, size_t len, void *user_data); + void *user_data; + struct ucl_parser_special_handler *next; /* Used internally */ +}; + +/** + * Add special handler for a parser, handles special sequences identified by magic + * @param parser parser structure + * @param handler handler structure + */ +UCL_EXTERN void ucl_parser_add_special_handler (struct ucl_parser *parser, + struct ucl_parser_special_handler *handler); + +/** + * Handler for include traces: + * @param parser parser object + * @param parent where include is done from + * @param args arguments to an include + * @param path path of the include + * @param pathlen length of the path + * @param user_data opaque userdata + */ +typedef void (ucl_include_trace_func_t) (struct ucl_parser *parser, + const ucl_object_t *parent, + const ucl_object_t *args, + const char *path, + size_t pathlen, + void *user_data); + +/** + * Register trace function for an include handler + * @param parser parser object + * @param func function to trace includes + * @param user_data opaque data + */ +UCL_EXTERN void ucl_parser_set_include_tracer (struct ucl_parser *parser, + ucl_include_trace_func_t func, + void *user_data); + /** @} */ /** * @defgroup emitter Emitting functions * These functions are used to serialise UCL objects to some string representation. * * @{ */ struct ucl_emitter_context; /** * Structure using for emitter callbacks */ struct ucl_emitter_functions { /** Append a single character */ int (*ucl_emitter_append_character) (unsigned char c, size_t nchars, void *ud); /** Append a string of a specified length */ int (*ucl_emitter_append_len) (unsigned const char *str, size_t len, void *ud); /** Append a 64 bit integer */ int (*ucl_emitter_append_int) (int64_t elt, void *ud); /** Append floating point element */ int (*ucl_emitter_append_double) (double elt, void *ud); /** Free userdata */ void (*ucl_emitter_free_func)(void *ud); /** Opaque userdata pointer */ void *ud; }; struct ucl_emitter_operations { /** Write a primitive element */ void (*ucl_emitter_write_elt) (struct ucl_emitter_context *ctx, const ucl_object_t *obj, bool first, bool print_key); /** Start ucl object */ void (*ucl_emitter_start_object) (struct ucl_emitter_context *ctx, const ucl_object_t *obj, bool print_key); /** End ucl object */ void (*ucl_emitter_end_object) (struct ucl_emitter_context *ctx, const ucl_object_t *obj); /** Start ucl array */ void (*ucl_emitter_start_array) (struct ucl_emitter_context *ctx, const ucl_object_t *obj, bool print_key); void (*ucl_emitter_end_array) (struct ucl_emitter_context *ctx, const ucl_object_t *obj); }; /** * Structure that defines emitter functions */ struct ucl_emitter_context { /** Name of emitter (e.g. json, compact_json) */ const char *name; /** Unique id (e.g. UCL_EMIT_JSON for standard emitters */ int id; /** A set of output functions */ const struct ucl_emitter_functions *func; /** A set of output operations */ const struct ucl_emitter_operations *ops; /** Current amount of indent tabs */ unsigned int indent; /** Top level object */ const ucl_object_t *top; /** Optional comments */ const ucl_object_t *comments; }; /** * Emit object to a string * @param obj object * @param emit_type if type is #UCL_EMIT_JSON then emit json, if type is * #UCL_EMIT_CONFIG then emit config like object * @return dump of an object (must be freed after using) or NULL in case of error */ UCL_EXTERN unsigned char *ucl_object_emit (const ucl_object_t *obj, enum ucl_emitter emit_type); /** * Emit object to a string that can contain `\0` inside * @param obj object * @param emit_type if type is #UCL_EMIT_JSON then emit json, if type is * #UCL_EMIT_CONFIG then emit config like object * @param len the resulting length * @return dump of an object (must be freed after using) or NULL in case of error */ UCL_EXTERN unsigned char *ucl_object_emit_len (const ucl_object_t *obj, enum ucl_emitter emit_type, size_t *len); /** * Emit object to a string * @param obj object * @param emit_type if type is #UCL_EMIT_JSON then emit json, if type is * #UCL_EMIT_CONFIG then emit config like object * @param emitter a set of emitter functions * @param comments optional comments for the parser * @return dump of an object (must be freed after using) or NULL in case of error */ UCL_EXTERN bool ucl_object_emit_full (const ucl_object_t *obj, enum ucl_emitter emit_type, struct ucl_emitter_functions *emitter, const ucl_object_t *comments); /** * Start streamlined UCL object emitter * @param obj top UCL object * @param emit_type emit type * @param emitter a set of emitter functions * @return new streamlined context that should be freed by * `ucl_object_emit_streamline_finish` */ UCL_EXTERN struct ucl_emitter_context* ucl_object_emit_streamline_new ( const ucl_object_t *obj, enum ucl_emitter emit_type, struct ucl_emitter_functions *emitter); /** * Start object or array container for the streamlined output * @param ctx streamlined context * @param obj container object */ UCL_EXTERN void ucl_object_emit_streamline_start_container ( struct ucl_emitter_context *ctx, const ucl_object_t *obj); /** * Add a complete UCL object to streamlined output * @param ctx streamlined context * @param obj object to output */ UCL_EXTERN void ucl_object_emit_streamline_add_object ( struct ucl_emitter_context *ctx, const ucl_object_t *obj); /** * End previously added container * @param ctx streamlined context */ UCL_EXTERN void ucl_object_emit_streamline_end_container ( struct ucl_emitter_context *ctx); /** * Terminate streamlined container finishing all containers in it * @param ctx streamlined context */ UCL_EXTERN void ucl_object_emit_streamline_finish ( struct ucl_emitter_context *ctx); /** * Returns functions to emit object to memory * @param pmem target pointer (should be freed by caller) * @return emitter functions structure */ UCL_EXTERN struct ucl_emitter_functions* ucl_object_emit_memory_funcs ( void **pmem); /** * Returns functions to emit object to FILE * * @param fp FILE * object * @return emitter functions structure */ UCL_EXTERN struct ucl_emitter_functions* ucl_object_emit_file_funcs ( FILE *fp); /** * Returns functions to emit object to a file descriptor * @param fd file descriptor * @return emitter functions structure */ UCL_EXTERN struct ucl_emitter_functions* ucl_object_emit_fd_funcs ( int fd); /** * Free emitter functions * @param f pointer to functions */ UCL_EXTERN void ucl_object_emit_funcs_free (struct ucl_emitter_functions *f); /** @} */ /** * @defgroup schema Schema functions * These functions are used to validate UCL objects using json schema format * * @{ */ /** * Used to define UCL schema error */ enum ucl_schema_error_code { UCL_SCHEMA_OK = 0, /**< no error */ UCL_SCHEMA_TYPE_MISMATCH, /**< type of object is incorrect */ UCL_SCHEMA_INVALID_SCHEMA, /**< schema is invalid */ UCL_SCHEMA_MISSING_PROPERTY,/**< one or more missing properties */ UCL_SCHEMA_CONSTRAINT, /**< constraint found */ UCL_SCHEMA_MISSING_DEPENDENCY, /**< missing dependency */ UCL_SCHEMA_EXTERNAL_REF_MISSING, /**< cannot fetch external ref */ UCL_SCHEMA_EXTERNAL_REF_INVALID, /**< invalid external ref */ UCL_SCHEMA_INTERNAL_ERROR, /**< something bad happened */ UCL_SCHEMA_UNKNOWN /**< generic error */ }; /** * Generic ucl schema error */ struct ucl_schema_error { enum ucl_schema_error_code code; /**< error code */ char msg[128]; /**< error message */ - const ucl_object_t *obj; /**< object where error occured */ + const ucl_object_t *obj; /**< object where error occurred */ }; /** * Validate object `obj` using schema object `schema`. * @param schema schema object * @param obj object to validate * @param err error pointer, if this parameter is not NULL and error has been - * occured, then `err` is filled with the exact error definition. + * occurred, then `err` is filled with the exact error definition. * @return true if `obj` is valid using `schema` */ UCL_EXTERN bool ucl_object_validate (const ucl_object_t *schema, const ucl_object_t *obj, struct ucl_schema_error *err); /** * Validate object `obj` using schema object `schema` and root schema at `root`. * @param schema schema object * @param obj object to validate * @param root root schema object * @param err error pointer, if this parameter is not NULL and error has been - * occured, then `err` is filled with the exact error definition. + * occurred, then `err` is filled with the exact error definition. * @return true if `obj` is valid using `schema` */ UCL_EXTERN bool ucl_object_validate_root (const ucl_object_t *schema, const ucl_object_t *obj, const ucl_object_t *root, struct ucl_schema_error *err); /** * Validate object `obj` using schema object `schema` and root schema at `root` * using some external references provided. * @param schema schema object * @param obj object to validate * @param root root schema object * @param ext_refs external references (might be modified during validation) * @param err error pointer, if this parameter is not NULL and error has been - * occured, then `err` is filled with the exact error definition. + * occurred, then `err` is filled with the exact error definition. * @return true if `obj` is valid using `schema` */ UCL_EXTERN bool ucl_object_validate_root_ext (const ucl_object_t *schema, const ucl_object_t *obj, const ucl_object_t *root, ucl_object_t *ext_refs, struct ucl_schema_error *err); /** @} */ #ifdef __cplusplus } #endif /* * XXX: Poorly named API functions, need to replace them with the appropriate * named function. All API functions *must* use naming ucl_object_*. Usage of * ucl_obj* should be avoided. */ #define ucl_obj_todouble_safe ucl_object_todouble_safe #define ucl_obj_todouble ucl_object_todouble #define ucl_obj_tostring ucl_object_tostring #define ucl_obj_tostring_safe ucl_object_tostring_safe #define ucl_obj_tolstring ucl_object_tolstring #define ucl_obj_tolstring_safe ucl_object_tolstring_safe #define ucl_obj_toint ucl_object_toint #define ucl_obj_toint_safe ucl_object_toint_safe #define ucl_obj_toboolean ucl_object_toboolean #define ucl_obj_toboolean_safe ucl_object_toboolean_safe #define ucl_obj_get_key ucl_object_find_key #define ucl_obj_get_keyl ucl_object_find_keyl #define ucl_obj_unref ucl_object_unref #define ucl_obj_ref ucl_object_ref #define ucl_obj_free ucl_object_free +#define UCL_PRIORITY_MIN 0 +#define UCL_PRIORITY_MAX 15 + #endif /* UCL_H_ */ diff --git a/contrib/libucl/klib/kvec.h b/contrib/libucl/klib/kvec.h index b0a7504b2268..ce6a53640df9 100644 --- a/contrib/libucl/klib/kvec.h +++ b/contrib/libucl/klib/kvec.h @@ -1,103 +1,161 @@ /* The MIT License Copyright (c) 2008, by Attractive Chaos Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /* An example: #include "kvec.h" int main() { kvec_t(int) array; kv_init(array); - kv_push(int, array, 10); // append + kv_push_safe(int, array, 10, e0); // append kv_a(int, array, 20) = 5; // dynamic kv_A(array, 20) = 4; // static kv_destroy(array); return 0; +e0: + return 1; } */ /* 2008-09-22 (0.1.0): * The initial version. */ #ifndef AC_KVEC_H #define AC_KVEC_H #include #define kv_roundup32(x) (--(x), (x)|=(x)>>1, (x)|=(x)>>2, (x)|=(x)>>4, (x)|=(x)>>8, (x)|=(x)>>16, ++(x)) #define kvec_t(type) struct { size_t n, m; type *a; } #define kv_init(v) ((v).n = (v).m = 0, (v).a = 0) #define kv_destroy(v) free((v).a) #define kv_A(v, i) ((v).a[(i)]) #define kv_pop(v) ((v).a[--(v).n]) #define kv_size(v) ((v).n) #define kv_max(v) ((v).m) -#define kv_resize(type, v, s) ((v).m = (s), (v).a = (type*)realloc((v).a, sizeof(type) * (v).m)) +#define kv_resize_safe(type, v, s, el) do { \ + type *_tp = (type*)realloc((v).a, sizeof(type) * (s)); \ + if (_tp == NULL) { \ + goto el; \ + } else { \ + (v).a = _tp; \ + (v).m = (s); \ + } \ + } while (0) + #define kv_grow_factor 1.5 +#define kv_grow_safe(type, v, el) do { \ + size_t _ts = ((v).m > 1 ? (v).m * kv_grow_factor : 2); \ + type *_tp = (type*)realloc((v).a, sizeof(type) * _ts); \ + if (_tp == NULL) { \ + goto el; \ + } else { \ + (v).a = _tp; \ + (v).m = _ts; \ + } \ + } while (0) + +#define kv_copy_safe(type, v1, v0, el) do { \ + if ((v1).m < (v0).n) kv_resize_safe(type, v1, (v0).n, el); \ + (v1).n = (v0).n; \ + memcpy((v1).a, (v0).a, sizeof(type) * (v0).n); \ + } while (0) + +#define kv_push_safe(type, v, x, el) do { \ + if ((v).n == (v).m) { \ + kv_grow_safe(type, v, el); \ + } \ + (v).a[(v).n++] = (x); \ + } while (0) + +#define kv_prepend_safe(type, v, x, el) do { \ + if ((v).n == (v).m) { \ + kv_grow_safe(type, v, el); \ + } \ + memmove((v).a + 1, (v).a, sizeof(type) * (v).n); \ + (v).a[0] = (x); \ + (v).n ++; \ + } while (0) + +#define kv_concat_safe(type, v1, v0, el) do { \ + if ((v1).m < (v0).n + (v1).n) \ + kv_resize_safe(type, v1, (v0).n + (v1).n, el); \ + memcpy((v1).a + (v1).n, (v0).a, sizeof(type) * (v0).n); \ + (v1).n = (v0).n + (v1).n; \ + } while (0) + +#define kv_del(type, v, i) do { \ + if ((i) < (v).n) { \ + memmove((v).a + (i), (v).a + ((i) + 1), sizeof(type) * ((v).n - (i) - 1)); \ + (v).n --; \ + } \ +} while (0) + +/* + * Old (ENOMEM-unsafe) version of kv_xxx macros. Compat-only, not for use in + * the new library code. + */ + +#define kv_resize(type, v, s) ((v).m = (s), (v).a = (type*)realloc((v).a, sizeof(type) * (v).m)) + #define kv_grow(type, v) ((v).m = ((v).m > 1 ? (v).m * kv_grow_factor : 2), \ (v).a = (type*)realloc((v).a, sizeof(type) * (v).m)) #define kv_copy(type, v1, v0) do { \ if ((v1).m < (v0).n) kv_resize(type, v1, (v0).n); \ (v1).n = (v0).n; \ memcpy((v1).a, (v0).a, sizeof(type) * (v0).n); \ } while (0) \ #define kv_push(type, v, x) do { \ if ((v).n == (v).m) { \ kv_grow(type, v); \ } \ (v).a[(v).n++] = (x); \ } while (0) #define kv_prepend(type, v, x) do { \ if ((v).n == (v).m) { \ kv_grow(type, v); \ } \ memmove((v).a + 1, (v).a, sizeof(type) * (v).n); \ (v).a[0] = (x); \ (v).n ++; \ } while (0) #define kv_concat(type, v1, v0) do { \ if ((v1).m < (v0).n + (v1).n) kv_resize(type, v1, (v0).n + (v1).n); \ memcpy((v1).a + (v1).n, (v0).a, sizeof(type) * (v0).n); \ (v1).n = (v0).n + (v1).n; \ } while (0) -#define kv_del(type, v, i) do { \ - if ((i) < (v).n) { \ - memmove((v).a + (i), (v).a + ((i) + 1), sizeof(type) * ((v).n - (i) - 1)); \ - (v).n --; \ - } \ -} while (0) - -#endif +#endif /* AC_KVEC_H */ diff --git a/contrib/libucl/lua/lua_ucl.c b/contrib/libucl/lua/lua_ucl.c index 62b0652f564a..b34fd56878b8 100644 --- a/contrib/libucl/lua/lua_ucl.c +++ b/contrib/libucl/lua/lua_ucl.c @@ -1,1214 +1,1530 @@ /* Copyright (c) 2014, Vsevolod Stakhov * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED ''AS IS'' AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL AUTHOR BE LIABLE FOR ANY * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ /** * @file lua ucl bindings */ #include "ucl.h" #include "ucl_internal.h" #include "lua_ucl.h" #include /*** * @module ucl * This lua module allows to parse objects from strings and to store data into * ucl objects. It uses `libucl` C library to parse and manipulate with ucl objects. * @example local ucl = require("ucl") local parser = ucl.parser() local res,err = parser:parse_string('{key=value}') if not res then print('parser error: ' .. err) else local obj = parser:get_object() local got = ucl.to_format(obj, 'json') endif local table = { str = 'value', num = 100500, null = ucl.null, func = function () return 'huh' end } print(ucl.to_format(table, 'ucl')) -- Output: --[[ num = 100500; str = "value"; null = null; func = "huh"; --]] */ #define PARSER_META "ucl.parser.meta" #define EMITTER_META "ucl.emitter.meta" -#define NULL_META "null.emitter.meta" +#define NULL_META "ucl.null.meta" #define OBJECT_META "ucl.object.meta" +#define UCL_OBJECT_TYPE_META "ucl.type.object" +#define UCL_ARRAY_TYPE_META "ucl.type.array" +#define UCL_IMPL_ARRAY_TYPE_META "ucl.type.impl_array" -static int ucl_object_lua_push_array (lua_State *L, const ucl_object_t *obj); -static int ucl_object_lua_push_scalar (lua_State *L, const ucl_object_t *obj, bool allow_array); -static ucl_object_t* ucl_object_lua_fromtable (lua_State *L, int idx); -static ucl_object_t* ucl_object_lua_fromelt (lua_State *L, int idx); +static int ucl_object_lua_push_array (lua_State *L, const ucl_object_t *obj, int flags); +static int ucl_object_lua_push_scalar (lua_State *L, const ucl_object_t *obj, int flags); +static int ucl_object_push_lua_common (lua_State *L, const ucl_object_t *obj, int flags); +static ucl_object_t* ucl_object_lua_fromtable (lua_State *L, int idx, ucl_string_flags_t flags); +static ucl_object_t* ucl_object_lua_fromelt (lua_State *L, int idx, ucl_string_flags_t flags); static void *ucl_null; + +enum lua_ucl_push_flags { + LUA_UCL_DEFAULT_FLAGS = 0, + LUA_UCL_ALLOW_ARRAY = (1u << 0u), + LUA_UCL_CONVERT_NIL = (1u << 1u), +}; + /** * Push a single element of an object to lua * @param L * @param key * @param obj */ static void ucl_object_lua_push_element (lua_State *L, const char *key, - const ucl_object_t *obj) + const ucl_object_t *obj, int flags) { lua_pushstring (L, key); - ucl_object_push_lua (L, obj, true); + ucl_object_push_lua_common (L, obj, flags|LUA_UCL_ALLOW_ARRAY); lua_settable (L, -3); } static void lua_ucl_userdata_dtor (void *ud) { struct ucl_lua_funcdata *fd = (struct ucl_lua_funcdata *)ud; luaL_unref (fd->L, LUA_REGISTRYINDEX, fd->idx); if (fd->ret != NULL) { free (fd->ret); } free (fd); } static const char * lua_ucl_userdata_emitter (void *ud) { struct ucl_lua_funcdata *fd = (struct ucl_lua_funcdata *)ud; const char *out = ""; lua_rawgeti (fd->L, LUA_REGISTRYINDEX, fd->idx); lua_pcall (fd->L, 0, 1, 0); out = lua_tostring (fd->L, -1); if (out != NULL) { /* We need to store temporary string in a more appropriate place */ if (fd->ret) { free (fd->ret); } fd->ret = strdup (out); } lua_settop (fd->L, 0); return fd->ret; } /** * Push a single object to lua * @param L * @param obj * @return */ static int ucl_object_lua_push_object (lua_State *L, const ucl_object_t *obj, - bool allow_array) + int flags) { const ucl_object_t *cur; ucl_object_iter_t it = NULL; - int nelt = 0; - if (allow_array && obj->next != NULL) { + if ((flags & LUA_UCL_ALLOW_ARRAY) && obj->next != NULL) { /* Actually we need to push this as an array */ - return ucl_object_lua_push_array (L, obj); - } - - /* Optimize allocation by preallocation of table */ - while (ucl_object_iterate (obj, &it, true) != NULL) { - nelt ++; + return ucl_object_lua_push_array (L, obj, flags); } - lua_createtable (L, 0, nelt); + lua_createtable (L, 0, obj->len); it = NULL; while ((cur = ucl_object_iterate (obj, &it, true)) != NULL) { - ucl_object_lua_push_element (L, ucl_object_key (cur), cur); + ucl_object_lua_push_element (L, ucl_object_key (cur), cur, flags); } + luaL_getmetatable (L, UCL_OBJECT_TYPE_META); + lua_setmetatable (L, -2); + return 1; } /** * Push an array to lua as table indexed by integers * @param L * @param obj * @return */ static int -ucl_object_lua_push_array (lua_State *L, const ucl_object_t *obj) +ucl_object_lua_push_array (lua_State *L, const ucl_object_t *obj, int flags) { const ucl_object_t *cur; ucl_object_iter_t it; int i = 1, nelt = 0; if (obj->type == UCL_ARRAY) { nelt = obj->len; it = ucl_object_iterate_new (obj); lua_createtable (L, nelt, 0); while ((cur = ucl_object_iterate_safe (it, true))) { - ucl_object_push_lua (L, cur, false); + ucl_object_push_lua (L, cur, (flags & ~LUA_UCL_ALLOW_ARRAY)); lua_rawseti (L, -2, i); i ++; } + luaL_getmetatable (L, UCL_ARRAY_TYPE_META); + lua_setmetatable (L, -2); + ucl_object_iterate_free (it); } else { /* Optimize allocation by preallocation of table */ LL_FOREACH (obj, cur) { nelt ++; } lua_createtable (L, nelt, 0); LL_FOREACH (obj, cur) { - ucl_object_push_lua (L, cur, false); + ucl_object_push_lua (L, cur, (flags & ~LUA_UCL_ALLOW_ARRAY)); lua_rawseti (L, -2, i); i ++; } + + luaL_getmetatable (L, UCL_IMPL_ARRAY_TYPE_META); + lua_setmetatable (L, -2); } return 1; } /** * Push a simple object to lua depending on its actual type */ static int ucl_object_lua_push_scalar (lua_State *L, const ucl_object_t *obj, - bool allow_array) + int flags) { struct ucl_lua_funcdata *fd; - if (allow_array && obj->next != NULL) { + if ((flags & LUA_UCL_ALLOW_ARRAY) && obj->next != NULL) { /* Actually we need to push this as an array */ - return ucl_object_lua_push_array (L, obj); + return ucl_object_lua_push_array (L, obj, flags); } switch (obj->type) { case UCL_BOOLEAN: lua_pushboolean (L, ucl_obj_toboolean (obj)); break; case UCL_STRING: lua_pushstring (L, ucl_obj_tostring (obj)); break; case UCL_INT: #if LUA_VERSION_NUM >= 501 lua_pushinteger (L, ucl_obj_toint (obj)); #else lua_pushnumber (L, ucl_obj_toint (obj)); #endif break; case UCL_FLOAT: case UCL_TIME: lua_pushnumber (L, ucl_obj_todouble (obj)); break; case UCL_NULL: - lua_getfield (L, LUA_REGISTRYINDEX, "ucl.null"); + if (flags & LUA_UCL_CONVERT_NIL) { + lua_pushboolean (L, false); + } + else { + lua_getfield (L, LUA_REGISTRYINDEX, "ucl.null"); + } break; case UCL_USERDATA: fd = (struct ucl_lua_funcdata *)obj->value.ud; lua_rawgeti (L, LUA_REGISTRYINDEX, fd->idx); break; default: lua_pushnil (L); break; } return 1; } +static int +ucl_object_push_lua_common (lua_State *L, const ucl_object_t *obj, int flags) +{ + switch (obj->type) { + case UCL_OBJECT: + return ucl_object_lua_push_object (L, obj, flags); + case UCL_ARRAY: + return ucl_object_lua_push_array (L, obj, flags); + default: + return ucl_object_lua_push_scalar (L, obj, flags); + } +} + /*** * @function ucl_object_push_lua(L, obj, allow_array) * This is a `C` function to push `UCL` object as lua variable. This function * converts `obj` to lua representation using the following conversions: * * - *scalar* values are directly presented by lua objects * - *userdata* values are converted to lua function objects using `LUA_REGISTRYINDEX`, * this can be used to pass functions from lua to c and vice-versa * - *arrays* are converted to lua tables with numeric indicies suitable for `ipairs` iterations * - *objects* are converted to lua tables with string indicies * @param {lua_State} L lua state pointer * @param {ucl_object_t} obj object to push * @param {bool} allow_array expand implicit arrays (should be true for all but partial arrays) * @return {int} `1` if an object is pushed to lua */ int ucl_object_push_lua (lua_State *L, const ucl_object_t *obj, bool allow_array) { - switch (obj->type) { - case UCL_OBJECT: - return ucl_object_lua_push_object (L, obj, allow_array); - case UCL_ARRAY: - return ucl_object_lua_push_array (L, obj); - default: - return ucl_object_lua_push_scalar (L, obj, allow_array); - } + return ucl_object_push_lua_common (L, obj, + allow_array ? LUA_UCL_ALLOW_ARRAY : LUA_UCL_DEFAULT_FLAGS); +} + +int +ucl_object_push_lua_filter_nil (lua_State *L, const ucl_object_t *obj, bool allow_array) +{ + return ucl_object_push_lua_common (L, obj, + allow_array ? (LUA_UCL_ALLOW_ARRAY|LUA_UCL_CONVERT_NIL) : + (LUA_UCL_DEFAULT_FLAGS|LUA_UCL_CONVERT_NIL)); } /** * Parse lua table into object top * @param L * @param top * @param idx */ static ucl_object_t * -ucl_object_lua_fromtable (lua_State *L, int idx) +ucl_object_lua_fromtable (lua_State *L, int idx, ucl_string_flags_t flags) { - ucl_object_t *obj, *top = NULL; + ucl_object_t *obj, *top = NULL, *cur; size_t keylen; const char *k; - bool is_array = true; - int max = INT_MIN; + bool is_array = true, is_implicit = false, found_mt = false; + size_t max = 0, nelts = 0; if (idx < 0) { /* For negative indicies we want to invert them */ idx = lua_gettop (L) + idx + 1; } - /* Check for array */ - lua_pushnil (L); - while (lua_next (L, idx) != 0) { - if (lua_type (L, -2) == LUA_TNUMBER) { - double num = lua_tonumber (L, -2); - if (num == (int)num) { - if (num > max) { - max = num; + + /* First, we check from metatable */ + if (luaL_getmetafield (L, idx, "class") != 0) { + + if (lua_type (L, -1) == LUA_TSTRING) { + const char *classname = lua_tostring (L, -1); + + if (strcmp (classname, UCL_OBJECT_TYPE_META) == 0) { + is_array = false; + found_mt = true; + } else if (strcmp (classname, UCL_ARRAY_TYPE_META) == 0) { + is_array = true; + found_mt = true; +#if LUA_VERSION_NUM >= 502 + max = lua_rawlen (L, idx); +#else + max = lua_objlen (L, idx); +#endif + nelts = max; + } else if (strcmp (classname, UCL_IMPL_ARRAY_TYPE_META) == 0) { + is_array = true; + is_implicit = true; + found_mt = true; +#if LUA_VERSION_NUM >= 502 + max = lua_rawlen (L, idx); +#else + max = lua_objlen (L, idx); +#endif + nelts = max; + } + } + + lua_pop (L, 1); + } + + if (!found_mt) { + /* Check for array (it is all inefficient) */ + lua_pushnil (L); + + while (lua_next (L, idx) != 0) { + lua_pushvalue (L, -2); + + if (lua_type (L, -1) == LUA_TNUMBER) { + double num = lua_tonumber (L, -1); + if (num == (int) num) { + if (num > max) { + max = num; + } + } + else { + /* Keys are not integer */ + is_array = false; } } else { - /* Keys are not integer */ - lua_pop (L, 2); + /* Keys are not numeric */ is_array = false; - break; } - } - else { - /* Keys are not numeric */ + lua_pop (L, 2); - is_array = false; - break; + nelts ++; } - lua_pop (L, 1); } /* Table iterate */ if (is_array) { int i; - top = ucl_object_typed_new (UCL_ARRAY); + if (!is_implicit) { + top = ucl_object_typed_new (UCL_ARRAY); + ucl_object_reserve (top, nelts); + } + else { + top = NULL; + } + for (i = 1; i <= max; i ++) { lua_pushinteger (L, i); lua_gettable (L, idx); - obj = ucl_object_lua_fromelt (L, lua_gettop (L)); + + obj = ucl_object_lua_fromelt (L, lua_gettop (L), flags); + if (obj != NULL) { - ucl_array_append (top, obj); + if (is_implicit) { + DL_APPEND (top, obj); + } + else { + ucl_array_append (top, obj); + } } lua_pop (L, 1); } } else { lua_pushnil (L); top = ucl_object_typed_new (UCL_OBJECT); + ucl_object_reserve (top, nelts); + while (lua_next (L, idx) != 0) { /* copy key to avoid modifications */ - k = lua_tolstring (L, -2, &keylen); - obj = ucl_object_lua_fromelt (L, lua_gettop (L)); + lua_pushvalue (L, -2); + k = lua_tolstring (L, -1, &keylen); + obj = ucl_object_lua_fromelt (L, lua_gettop (L) - 1, flags); if (obj != NULL) { ucl_object_insert_key (top, obj, k, keylen, true); + + DL_FOREACH (obj, cur) { + if (cur->keylen == 0) { + cur->keylen = obj->keylen; + cur->key = obj->key; + } + } } - lua_pop (L, 1); + lua_pop (L, 2); } } return top; } /** * Get a single element from lua to object obj * @param L * @param obj * @param idx */ static ucl_object_t * -ucl_object_lua_fromelt (lua_State *L, int idx) +ucl_object_lua_fromelt (lua_State *L, int idx, ucl_string_flags_t flags) { int type; double num; ucl_object_t *obj = NULL; struct ucl_lua_funcdata *fd; + const char *str; + size_t sz; type = lua_type (L, idx); switch (type) { case LUA_TSTRING: - obj = ucl_object_fromstring_common (lua_tostring (L, idx), 0, 0); + str = lua_tolstring (L, idx, &sz); + + if (str) { + obj = ucl_object_fromstring_common (str, sz, flags); + } + else { + obj = ucl_object_typed_new (UCL_NULL); + } break; case LUA_TNUMBER: num = lua_tonumber (L, idx); if (num == (int64_t)num) { obj = ucl_object_fromint (num); } else { obj = ucl_object_fromdouble (num); } break; case LUA_TBOOLEAN: obj = ucl_object_frombool (lua_toboolean (L, idx)); break; case LUA_TUSERDATA: if (lua_topointer (L, idx) == ucl_null) { obj = ucl_object_typed_new (UCL_NULL); } break; case LUA_TTABLE: case LUA_TFUNCTION: case LUA_TTHREAD: if (luaL_getmetafield (L, idx, "__gen_ucl")) { if (lua_isfunction (L, -1)) { lua_settop (L, 3); /* gen, obj, func */ lua_insert (L, 1); /* func, gen, obj */ lua_insert (L, 2); /* func, obj, gen */ lua_call(L, 2, 1); - obj = ucl_object_lua_fromelt (L, 1); + obj = ucl_object_lua_fromelt (L, 1, flags); } lua_pop (L, 2); } else { if (type == LUA_TTABLE) { - obj = ucl_object_lua_fromtable (L, idx); + obj = ucl_object_lua_fromtable (L, idx, flags); } else if (type == LUA_TFUNCTION) { fd = malloc (sizeof (*fd)); if (fd != NULL) { lua_pushvalue (L, idx); fd->L = L; fd->ret = NULL; fd->idx = luaL_ref (L, LUA_REGISTRYINDEX); obj = ucl_object_new_userdata (lua_ucl_userdata_dtor, lua_ucl_userdata_emitter, (void *)fd); } } } break; } return obj; } /** * @function ucl_object_lua_import(L, idx) * Extracts ucl object from lua variable at `idx` position, * @see ucl_object_push_lua for conversion definitions * @param {lua_state} L lua state machine pointer * @param {int} idx index where the source variable is placed * @return {ucl_object_t} new ucl object extracted from lua variable. Reference count of this object is 1, * this object thus needs to be unref'ed after usage. */ ucl_object_t * ucl_object_lua_import (lua_State *L, int idx) { ucl_object_t *obj; int t; t = lua_type (L, idx); switch (t) { case LUA_TTABLE: - obj = ucl_object_lua_fromtable (L, idx); + obj = ucl_object_lua_fromtable (L, idx, 0); + break; + default: + obj = ucl_object_lua_fromelt (L, idx, 0); + break; + } + + return obj; +} + +/** + * @function ucl_object_lua_import_escape(L, idx) + * Extracts ucl object from lua variable at `idx` position escaping JSON strings + * @see ucl_object_push_lua for conversion definitions + * @param {lua_state} L lua state machine pointer + * @param {int} idx index where the source variable is placed + * @return {ucl_object_t} new ucl object extracted from lua variable. Reference count of this object is 1, + * this object thus needs to be unref'ed after usage. + */ +ucl_object_t * +ucl_object_lua_import_escape (lua_State *L, int idx) +{ + ucl_object_t *obj; + int t; + + t = lua_type (L, idx); + switch (t) { + case LUA_TTABLE: + obj = ucl_object_lua_fromtable (L, idx, UCL_STRING_RAW); break; default: - obj = ucl_object_lua_fromelt (L, idx); + obj = ucl_object_lua_fromelt (L, idx, UCL_STRING_RAW); break; } return obj; } static int lua_ucl_to_string (lua_State *L, const ucl_object_t *obj, enum ucl_emitter type) { unsigned char *result; result = ucl_object_emit (obj, type); if (result != NULL) { lua_pushstring (L, (const char *)result); free (result); } else { lua_pushnil (L); } return 1; } static int lua_ucl_parser_init (lua_State *L) { struct ucl_parser *parser, **pparser; int flags = UCL_PARSER_NO_FILEVARS; if (lua_gettop (L) >= 1) { flags = lua_tonumber (L, 1); } parser = ucl_parser_new (flags); if (parser == NULL) { lua_pushnil (L); + return 1; } pparser = lua_newuserdata (L, sizeof (parser)); *pparser = parser; luaL_getmetatable (L, PARSER_META); lua_setmetatable (L, -2); return 1; } static struct ucl_parser * lua_ucl_parser_get (lua_State *L, int index) { return *((struct ucl_parser **) luaL_checkudata(L, index, PARSER_META)); } static ucl_object_t * lua_ucl_object_get (lua_State *L, int index) { return *((ucl_object_t **) luaL_checkudata(L, index, OBJECT_META)); } static void lua_ucl_push_opaque (lua_State *L, ucl_object_t *obj) { ucl_object_t **pobj; pobj = lua_newuserdata (L, sizeof (*pobj)); *pobj = obj; luaL_getmetatable (L, OBJECT_META); lua_setmetatable (L, -2); } static inline enum ucl_parse_type lua_ucl_str_to_parse_type (const char *str) { enum ucl_parse_type type = UCL_PARSE_UCL; if (str != NULL) { if (strcasecmp (str, "msgpack") == 0) { type = UCL_PARSE_MSGPACK; } else if (strcasecmp (str, "sexp") == 0 || strcasecmp (str, "csexp") == 0) { type = UCL_PARSE_CSEXP; } else if (strcasecmp (str, "auto") == 0) { type = UCL_PARSE_AUTO; } } return type; } /*** * @method parser:parse_file(name) * Parse UCL object from file. * @param {string} name filename to parse * @return {bool[, string]} if res is `true` then file has been parsed successfully, otherwise an error string is also returned @example local parser = ucl.parser() local res,err = parser:parse_file('/some/file.conf') if not res then print('parser error: ' .. err) else -- Do something with object end */ static int lua_ucl_parser_parse_file (lua_State *L) { struct ucl_parser *parser; const char *file; int ret = 2; parser = lua_ucl_parser_get (L, 1); file = luaL_checkstring (L, 2); if (parser != NULL && file != NULL) { if (ucl_parser_add_file (parser, file)) { lua_pushboolean (L, true); ret = 1; } else { lua_pushboolean (L, false); lua_pushstring (L, ucl_parser_get_error (parser)); } } else { lua_pushboolean (L, false); lua_pushstring (L, "invalid arguments"); } return ret; } +/*** + * @method parser:register_variable(name, value) + * Register parser variable + * @param {string} name name of variable + * @param {string} value value of variable + * @return {bool} success +@example +local parser = ucl.parser() +local res = parser:register_variable('CONFDIR', '/etc/foo') + */ +static int +lua_ucl_parser_register_variable (lua_State *L) +{ + struct ucl_parser *parser; + const char *name, *value; + int ret = 2; + + parser = lua_ucl_parser_get (L, 1); + name = luaL_checkstring (L, 2); + value = luaL_checkstring (L, 3); + + if (parser != NULL && name != NULL && value != NULL) { + ucl_parser_register_variable (parser, name, value); + lua_pushboolean (L, true); + ret = 1; + } + else { + return luaL_error (L, "invalid arguments"); + } + + return ret; +} + +/*** + * @method parser:register_variables(vars) + * Register parser variables + * @param {table} vars names/values of variables + * @return {bool} success +@example +local parser = ucl.parser() +local res = parser:register_variables({CONFDIR = '/etc/foo', VARDIR = '/var'}) + */ +static int +lua_ucl_parser_register_variables (lua_State *L) +{ + struct ucl_parser *parser; + const char *name, *value; + int ret = 2; + + parser = lua_ucl_parser_get (L, 1); + + if (parser != NULL && lua_type (L, 2) == LUA_TTABLE) { + for (lua_pushnil (L); lua_next (L, 2); lua_pop (L, 1)) { + lua_pushvalue (L, -2); + name = luaL_checkstring (L, -1); + value = luaL_checkstring (L, -2); + ucl_parser_register_variable (parser, name, value); + lua_pop (L, 1); + } + + lua_pushboolean (L, true); + ret = 1; + } + else { + return luaL_error (L, "invalid arguments"); + } + + return ret; +} + /*** * @method parser:parse_string(input) * Parse UCL object from file. * @param {string} input string to parse * @return {bool[, string]} if res is `true` then file has been parsed successfully, otherwise an error string is also returned */ static int lua_ucl_parser_parse_string (lua_State *L) { struct ucl_parser *parser; const char *string; size_t llen; enum ucl_parse_type type = UCL_PARSE_UCL; int ret = 2; parser = lua_ucl_parser_get (L, 1); string = luaL_checklstring (L, 2, &llen); if (lua_type (L, 3) == LUA_TSTRING) { type = lua_ucl_str_to_parse_type (lua_tostring (L, 3)); } if (parser != NULL && string != NULL) { if (ucl_parser_add_chunk_full (parser, (const unsigned char *)string, llen, 0, UCL_DUPLICATE_APPEND, type)) { lua_pushboolean (L, true); ret = 1; } else { lua_pushboolean (L, false); lua_pushstring (L, ucl_parser_get_error (parser)); } } else { lua_pushboolean (L, false); lua_pushstring (L, "invalid arguments"); } return ret; } +struct _rspamd_lua_text { + const char *start; + unsigned int len; + unsigned int flags; +}; + +/*** + * @method parser:parse_text(input) + * Parse UCL object from text object (Rspamd specific). + * @param {rspamd_text} input text to parse + * @return {bool[, string]} if res is `true` then file has been parsed successfully, otherwise an error string is also returned + */ +static int +lua_ucl_parser_parse_text (lua_State *L) +{ + struct ucl_parser *parser; + struct _rspamd_lua_text *t; + enum ucl_parse_type type = UCL_PARSE_UCL; + int ret = 2; + + parser = lua_ucl_parser_get (L, 1); + t = lua_touserdata (L, 2); + + if (lua_type (L, 3) == LUA_TSTRING) { + type = lua_ucl_str_to_parse_type (lua_tostring (L, 3)); + } + + if (parser != NULL && t != NULL) { + if (ucl_parser_add_chunk_full (parser, (const unsigned char *)t->start, + t->len, 0, UCL_DUPLICATE_APPEND, type)) { + lua_pushboolean (L, true); + ret = 1; + } + else { + lua_pushboolean (L, false); + lua_pushstring (L, ucl_parser_get_error (parser)); + } + } + else { + lua_pushboolean (L, false); + lua_pushstring (L, "invalid arguments"); + } + + return ret; +} + /*** * @method parser:get_object() * Get top object from parser and export it to lua representation. * @return {variant or nil} ucl object as lua native variable */ static int lua_ucl_parser_get_object (lua_State *L) { struct ucl_parser *parser; ucl_object_t *obj; int ret = 1; parser = lua_ucl_parser_get (L, 1); obj = ucl_parser_get_object (parser); if (obj != NULL) { ret = ucl_object_push_lua (L, obj, false); /* no need to keep reference */ ucl_object_unref (obj); } else { lua_pushnil (L); } return ret; } /*** * @method parser:get_object_wrapped() * Get top object from parser and export it to userdata object without * unwrapping to lua. * @return {ucl.object or nil} ucl object wrapped variable */ static int lua_ucl_parser_get_object_wrapped (lua_State *L) { struct ucl_parser *parser; ucl_object_t *obj; int ret = 1; parser = lua_ucl_parser_get (L, 1); obj = ucl_parser_get_object (parser); if (obj != NULL) { lua_ucl_push_opaque (L, obj); } else { lua_pushnil (L); } return ret; } /*** * @method parser:validate(schema) * Validates the top object in the parser against schema. Schema might be * another object or a string that represents file to load schema from. * * @param {string/table} schema input schema * @return {result,err} two values: boolean result and the corresponding error * */ static int lua_ucl_parser_validate (lua_State *L) { struct ucl_parser *parser, *schema_parser; ucl_object_t *schema; const char *schema_file; struct ucl_schema_error err; parser = lua_ucl_parser_get (L, 1); if (parser && parser->top_obj) { if (lua_type (L, 2) == LUA_TTABLE) { schema = ucl_object_lua_import (L, 2); if (schema == NULL) { lua_pushboolean (L, false); lua_pushstring (L, "cannot load schema from lua table"); return 2; } } else if (lua_type (L, 2) == LUA_TSTRING) { schema_parser = ucl_parser_new (0); schema_file = luaL_checkstring (L, 2); if (!ucl_parser_add_file (schema_parser, schema_file)) { lua_pushboolean (L, false); lua_pushfstring (L, "cannot parse schema file \"%s\": " "%s", schema_file, ucl_parser_get_error (parser)); ucl_parser_free (schema_parser); return 2; } schema = ucl_parser_get_object (schema_parser); ucl_parser_free (schema_parser); } else { lua_pushboolean (L, false); lua_pushstring (L, "invalid schema argument"); return 2; } if (!ucl_object_validate (schema, parser->top_obj, &err)) { lua_pushboolean (L, false); lua_pushfstring (L, "validation error: " "%s", err.msg); } else { lua_pushboolean (L, true); lua_pushnil (L); } ucl_object_unref (schema); } else { lua_pushboolean (L, false); lua_pushstring (L, "invalid parser or empty top object"); } return 2; } static int lua_ucl_parser_gc (lua_State *L) { struct ucl_parser *parser; parser = lua_ucl_parser_get (L, 1); ucl_parser_free (parser); return 0; } /*** * @method object:unwrap() * Unwraps opaque ucl object to the native lua object (performing copying) * @return {variant} any lua object */ static int lua_ucl_object_unwrap (lua_State *L) { ucl_object_t *obj; obj = lua_ucl_object_get (L, 1); if (obj) { ucl_object_push_lua (L, obj, true); } else { lua_pushnil (L); } return 1; } static inline enum ucl_emitter lua_ucl_str_to_emit_type (const char *strtype) { enum ucl_emitter format = UCL_EMIT_JSON_COMPACT; if (strcasecmp (strtype, "json") == 0) { format = UCL_EMIT_JSON; } else if (strcasecmp (strtype, "json-compact") == 0) { format = UCL_EMIT_JSON_COMPACT; } else if (strcasecmp (strtype, "yaml") == 0) { format = UCL_EMIT_YAML; } else if (strcasecmp (strtype, "config") == 0 || strcasecmp (strtype, "ucl") == 0) { format = UCL_EMIT_CONFIG; } return format; } /*** * @method object:tostring(type) * Unwraps opaque ucl object to string (json by default). Optionally you can * specify output format: * * - `json` - fine printed json * - `json-compact` - compacted json * - `config` - fine printed configuration * - `ucl` - same as `config` * - `yaml` - embedded yaml * @param {string} type optional * @return {string} string representation of the opaque ucl object */ static int lua_ucl_object_tostring (lua_State *L) { ucl_object_t *obj; enum ucl_emitter format = UCL_EMIT_JSON_COMPACT; obj = lua_ucl_object_get (L, 1); if (obj) { if (lua_gettop (L) > 1) { if (lua_type (L, 2) == LUA_TSTRING) { const char *strtype = lua_tostring (L, 2); format = lua_ucl_str_to_emit_type (strtype); } } return lua_ucl_to_string (L, obj, format); } else { lua_pushnil (L); } return 1; } /*** * @method object:validate(schema[, path[, ext_refs]]) * Validates the given ucl object using schema object represented as another * opaque ucl object. You can also specify path in the form `#/path/def` to * specify the specific schema element to perform validation. * * @param {ucl.object} schema schema object * @param {string} path optional path for validation procedure * @return {result,err} two values: boolean result and the corresponding * error, if `ext_refs` are also specified, then they are returned as opaque * ucl object as {result,err,ext_refs} */ static int lua_ucl_object_validate (lua_State *L) { ucl_object_t *obj, *schema, *ext_refs = NULL; const ucl_object_t *schema_elt; bool res = false; struct ucl_schema_error err; const char *path = NULL; obj = lua_ucl_object_get (L, 1); schema = lua_ucl_object_get (L, 2); if (schema && obj && ucl_object_type (schema) == UCL_OBJECT) { if (lua_gettop (L) > 2) { if (lua_type (L, 3) == LUA_TSTRING) { path = lua_tostring (L, 3); if (path[0] == '#') { path++; } } else if (lua_type (L, 3) == LUA_TUSERDATA || lua_type (L, 3) == LUA_TTABLE) { /* External refs */ ext_refs = lua_ucl_object_get (L, 3); } if (lua_gettop (L) > 3) { if (lua_type (L, 4) == LUA_TUSERDATA || lua_type (L, 4) == LUA_TTABLE) { /* External refs */ ext_refs = lua_ucl_object_get (L, 4); } } } if (path) { schema_elt = ucl_object_lookup_path_char (schema, path, '/'); } else { /* Use the top object */ schema_elt = schema; } if (schema_elt) { res = ucl_object_validate_root_ext (schema_elt, obj, schema, ext_refs, &err); if (res) { lua_pushboolean (L, res); lua_pushnil (L); if (ext_refs) { lua_ucl_push_opaque (L, ext_refs); } } else { lua_pushboolean (L, res); lua_pushfstring (L, "validation error: %s", err.msg); if (ext_refs) { lua_ucl_push_opaque (L, ext_refs); } } } else { lua_pushboolean (L, res); lua_pushfstring (L, "cannot find the requested path: %s", path); if (ext_refs) { lua_ucl_push_opaque (L, ext_refs); } } } else { lua_pushboolean (L, res); lua_pushstring (L, "invalid object or schema"); } if (ext_refs) { return 3; } return 2; } static int lua_ucl_object_gc (lua_State *L) { ucl_object_t *obj; obj = lua_ucl_object_get (L, 1); ucl_object_unref (obj); return 0; } static void lua_ucl_parser_mt (lua_State *L) { luaL_newmetatable (L, PARSER_META); lua_pushvalue(L, -1); lua_setfield(L, -2, "__index"); lua_pushcfunction (L, lua_ucl_parser_gc); lua_setfield (L, -2, "__gc"); lua_pushcfunction (L, lua_ucl_parser_parse_file); lua_setfield (L, -2, "parse_file"); lua_pushcfunction (L, lua_ucl_parser_parse_string); lua_setfield (L, -2, "parse_string"); + lua_pushcfunction (L, lua_ucl_parser_parse_text); + lua_setfield (L, -2, "parse_text"); + + lua_pushcfunction (L, lua_ucl_parser_register_variable); + lua_setfield (L, -2, "register_variable"); + + lua_pushcfunction (L, lua_ucl_parser_register_variables); + lua_setfield (L, -2, "register_variables"); + lua_pushcfunction (L, lua_ucl_parser_get_object); lua_setfield (L, -2, "get_object"); lua_pushcfunction (L, lua_ucl_parser_get_object_wrapped); lua_setfield (L, -2, "get_object_wrapped"); lua_pushcfunction (L, lua_ucl_parser_validate); lua_setfield (L, -2, "validate"); lua_pop (L, 1); } static void lua_ucl_object_mt (lua_State *L) { luaL_newmetatable (L, OBJECT_META); lua_pushvalue(L, -1); lua_setfield(L, -2, "__index"); lua_pushcfunction (L, lua_ucl_object_gc); lua_setfield (L, -2, "__gc"); lua_pushcfunction (L, lua_ucl_object_tostring); lua_setfield (L, -2, "__tostring"); lua_pushcfunction (L, lua_ucl_object_tostring); lua_setfield (L, -2, "tostring"); lua_pushcfunction (L, lua_ucl_object_unwrap); lua_setfield (L, -2, "unwrap"); lua_pushcfunction (L, lua_ucl_object_unwrap); lua_setfield (L, -2, "tolua"); lua_pushcfunction (L, lua_ucl_object_validate); lua_setfield (L, -2, "validate"); lua_pushstring (L, OBJECT_META); lua_setfield (L, -2, "class"); lua_pop (L, 1); } +static void +lua_ucl_types_mt (lua_State *L) +{ + luaL_newmetatable (L, UCL_OBJECT_TYPE_META); + + lua_pushcfunction (L, lua_ucl_object_tostring); + lua_setfield (L, -2, "__tostring"); + + lua_pushcfunction (L, lua_ucl_object_tostring); + lua_setfield (L, -2, "tostring"); + + lua_pushstring (L, UCL_OBJECT_TYPE_META); + lua_setfield (L, -2, "class"); + + lua_pop (L, 1); + + luaL_newmetatable (L, UCL_ARRAY_TYPE_META); + + lua_pushcfunction (L, lua_ucl_object_tostring); + lua_setfield (L, -2, "__tostring"); + + lua_pushcfunction (L, lua_ucl_object_tostring); + lua_setfield (L, -2, "tostring"); + + lua_pushstring (L, UCL_ARRAY_TYPE_META); + lua_setfield (L, -2, "class"); + + lua_pop (L, 1); + + luaL_newmetatable (L, UCL_IMPL_ARRAY_TYPE_META); + + lua_pushcfunction (L, lua_ucl_object_tostring); + lua_setfield (L, -2, "__tostring"); + + lua_pushcfunction (L, lua_ucl_object_tostring); + lua_setfield (L, -2, "tostring"); + + lua_pushstring (L, UCL_IMPL_ARRAY_TYPE_META); + lua_setfield (L, -2, "class"); + + lua_pop (L, 1); +} + static int lua_ucl_to_json (lua_State *L) { ucl_object_t *obj; int format = UCL_EMIT_JSON; if (lua_gettop (L) > 1) { if (lua_toboolean (L, 2)) { format = UCL_EMIT_JSON_COMPACT; } } obj = ucl_object_lua_import (L, 1); if (obj != NULL) { lua_ucl_to_string (L, obj, format); ucl_object_unref (obj); } else { lua_pushnil (L); } return 1; } static int lua_ucl_to_config (lua_State *L) { ucl_object_t *obj; obj = ucl_object_lua_import (L, 1); if (obj != NULL) { lua_ucl_to_string (L, obj, UCL_EMIT_CONFIG); ucl_object_unref (obj); } else { lua_pushnil (L); } return 1; } /*** * @function ucl.to_format(var, format) * Converts lua variable `var` to the specified `format`. Formats supported are: * * - `json` - fine printed json * - `json-compact` - compacted json * - `config` - fine printed configuration * - `ucl` - same as `config` * - `yaml` - embedded yaml * * If `var` contains function, they are called during output formatting and if - * they return string value, then this value is used for ouptut. + * they return string value, then this value is used for output. * @param {variant} var any sort of lua variable (if userdata then metafield `__to_ucl` is searched for output) * @param {string} format any available format * @return {string} string representation of `var` in the specific `format`. * @example local table = { str = 'value', num = 100500, null = ucl.null, func = function () return 'huh' end } print(ucl.to_format(table, 'ucl')) -- Output: --[[ num = 100500; str = "value"; null = null; func = "huh"; --]] */ static int lua_ucl_to_format (lua_State *L) { ucl_object_t *obj; int format = UCL_EMIT_JSON; + bool sort = false; if (lua_gettop (L) > 1) { if (lua_type (L, 2) == LUA_TNUMBER) { format = lua_tonumber (L, 2); if (format < 0 || format >= UCL_EMIT_YAML) { lua_pushnil (L); return 1; } } else if (lua_type (L, 2) == LUA_TSTRING) { const char *strtype = lua_tostring (L, 2); if (strcasecmp (strtype, "json") == 0) { format = UCL_EMIT_JSON; } else if (strcasecmp (strtype, "json-compact") == 0) { format = UCL_EMIT_JSON_COMPACT; } else if (strcasecmp (strtype, "yaml") == 0) { format = UCL_EMIT_YAML; } else if (strcasecmp (strtype, "config") == 0 || strcasecmp (strtype, "ucl") == 0) { format = UCL_EMIT_CONFIG; } else if (strcasecmp (strtype, "msgpack") == 0) { format = UCL_EMIT_MSGPACK; } } + + if (lua_isboolean (L, 3)) { + sort = lua_toboolean (L, 3); + } } obj = ucl_object_lua_import (L, 1); + if (obj != NULL) { + + if (sort) { + if (ucl_object_type (obj) == UCL_OBJECT) { + ucl_object_sort_keys (obj, UCL_SORT_KEYS_RECURSIVE); + } + } + lua_ucl_to_string (L, obj, format); ucl_object_unref (obj); } else { lua_pushnil (L); } return 1; } static int lua_ucl_null_tostring (lua_State* L) { lua_pushstring (L, "null"); return 1; } static void lua_ucl_null_mt (lua_State *L) { luaL_newmetatable (L, NULL_META); lua_pushcfunction (L, lua_ucl_null_tostring); lua_setfield (L, -2, "__tostring"); lua_pop (L, 1); } int luaopen_ucl (lua_State *L) { lua_ucl_parser_mt (L); lua_ucl_null_mt (L); lua_ucl_object_mt (L); + lua_ucl_types_mt (L); /* Create the refs weak table: */ lua_createtable (L, 0, 2); lua_pushliteral (L, "v"); /* tbl, "v" */ lua_setfield (L, -2, "__mode"); lua_pushvalue (L, -1); /* tbl, tbl */ lua_setmetatable (L, -2); /* tbl */ lua_setfield (L, LUA_REGISTRYINDEX, "ucl.refs"); lua_newtable (L); lua_pushcfunction (L, lua_ucl_parser_init); lua_setfield (L, -2, "parser"); lua_pushcfunction (L, lua_ucl_to_json); lua_setfield (L, -2, "to_json"); lua_pushcfunction (L, lua_ucl_to_config); lua_setfield (L, -2, "to_config"); lua_pushcfunction (L, lua_ucl_to_format); lua_setfield (L, -2, "to_format"); ucl_null = lua_newuserdata (L, 0); luaL_getmetatable (L, NULL_META); lua_setmetatable (L, -2); lua_pushvalue (L, -1); lua_setfield (L, LUA_REGISTRYINDEX, "ucl.null"); lua_setfield (L, -2, "null"); return 1; } struct ucl_lua_funcdata* ucl_object_toclosure (const ucl_object_t *obj) { if (obj == NULL || obj->type != UCL_USERDATA) { return NULL; } return (struct ucl_lua_funcdata*)obj->value.ud; } diff --git a/contrib/libucl/python/MANIFEST.in b/contrib/libucl/python/MANIFEST.in new file mode 100644 index 000000000000..336a4b3a7a07 --- /dev/null +++ b/contrib/libucl/python/MANIFEST.in @@ -0,0 +1,5 @@ +include COPYING +recursive-include include *.h +recursive-include src *.h +recursive-include klib *.h +recursive-include uthash *.h diff --git a/contrib/libucl/python/setup.py b/contrib/libucl/python/setup.py index 9e1151a1323a..8da832bac381 100644 --- a/contrib/libucl/python/setup.py +++ b/contrib/libucl/python/setup.py @@ -1,43 +1,75 @@ try: from setuptools import setup, Extension + # setuptools doesn't support template param for MANIFEST.in + from setuptools.command.egg_info import manifest_maker + manifest_maker.template = 'python/MANIFEST.in' except ImportError: from distutils.core import setup, Extension import os import sys +LIB_ROOT = os.path.abspath(os.path.join(__file__, os.pardir, os.pardir)) +if os.getcwd() != LIB_ROOT: + os.chdir(LIB_ROOT) +if LIB_ROOT not in sys.path: + sys.path.append(LIB_ROOT) + tests_require = [] if sys.version < '2.7': tests_require.append('unittest2') uclmodule = Extension( 'ucl', - libraries = ['ucl'], - sources = ['src/uclmodule.c'], - language = 'c' + libraries=['ucl', 'curl'], + sources=['python/src/uclmodule.c'], + include_dirs=['include'], + language='c', ) +ucl_lib = { + 'sources': ['src/' + fn for fn in os.listdir('src') if fn.endswith('.c')], + 'include_dirs': ['include', 'src', 'uthash', 'klib'], + 'macros': [('CURL_FOUND', '1')], +} + +# sdist setup() will pull in the *.c files automatically, but not headers +# MANIFEST.in will include the headers for sdist only +template = 'python/MANIFEST.in' + +# distutils assume setup.py is in the root of the project +# we need to include C source from the parent so trick it +in_ucl_root = 'setup.py' in os.listdir('python') +if in_ucl_root: + os.link('python/setup.py', 'setup.py') + setup( name = 'ucl', - version = '0.8', - description = 'ucl parser and emmitter', + version = '0.8.1', + description = 'ucl parser and emitter', ext_modules = [uclmodule], + template=template, # no longer supported with setuptools but doesn't hurt + libraries = [('ucl', ucl_lib)], test_suite = 'tests', tests_require = tests_require, author = "Eitan Adler, Denis Volpato Martins", author_email = "lists@eitanadler.com", url = "https://github.com/vstakhov/libucl/", license = "MIT", classifiers = [ "Development Status :: 3 - Alpha", "Intended Audience :: Developers", "License :: DFSG approved", "License :: OSI Approved :: MIT License", "Programming Language :: C", "Programming Language :: Python :: 2", "Programming Language :: Python :: 3", "Programming Language :: Python :: Implementation :: CPython", "Topic :: Software Development :: Libraries", ] ) + +# clean up the trick after the build +if in_ucl_root: + os.unlink("setup.py") diff --git a/contrib/libucl/python/src/uclmodule.c b/contrib/libucl/python/src/uclmodule.c index fce0dab14a44..d1051fbb0d12 100644 --- a/contrib/libucl/python/src/uclmodule.c +++ b/contrib/libucl/python/src/uclmodule.c @@ -1,334 +1,335 @@ // Attempts to load a UCL structure from a string #include #include static PyObject *SchemaError; static PyObject * _basic_ucl_type (ucl_object_t const *obj) { switch (obj->type) { case UCL_INT: return Py_BuildValue ("L", (long long)ucl_object_toint (obj)); case UCL_FLOAT: return Py_BuildValue ("d", ucl_object_todouble (obj)); case UCL_STRING: return Py_BuildValue ("s", ucl_object_tostring (obj)); case UCL_BOOLEAN: return PyBool_FromLong (ucl_object_toboolean (obj)); case UCL_TIME: return Py_BuildValue ("d", ucl_object_todouble (obj)); case UCL_NULL: Py_RETURN_NONE; } return NULL; } static PyObject * _iterate_valid_ucl (ucl_object_t const *obj) { const ucl_object_t *tmp; ucl_object_iter_t it = NULL; tmp = obj; while ((obj = ucl_object_iterate (tmp, &it, false))) { PyObject *val; val = _basic_ucl_type(obj); if (!val) { PyObject *key = NULL; if (obj->key != NULL) { key = Py_BuildValue("s", ucl_object_key(obj)); } if (obj->type == UCL_OBJECT) { const ucl_object_t *cur; ucl_object_iter_t it_obj = NULL; val = PyDict_New(); while ((cur = ucl_object_iterate (obj, &it_obj, true))) { PyObject *keyobj = Py_BuildValue("s",ucl_object_key(cur)); PyDict_SetItem(val, keyobj, _iterate_valid_ucl(cur)); } } else if (obj->type == UCL_ARRAY) { const ucl_object_t *cur; ucl_object_iter_t it_obj = NULL; val = PyList_New(0); while ((cur = ucl_object_iterate (obj, &it_obj, true))) { PyList_Append(val, _iterate_valid_ucl(cur)); } } else if (obj->type == UCL_USERDATA) { // XXX: this should be // PyBytes_FromStringAndSize; where is the // length from? val = PyBytes_FromString(obj->value.ud); } } return val; } PyErr_SetString(PyExc_SystemError, "unhandled type"); return NULL; } static PyObject * _internal_load_ucl (char *uclstr) { PyObject *ret; - struct ucl_parser *parser = ucl_parser_new (UCL_PARSER_NO_TIME); + struct ucl_parser *parser = + ucl_parser_new (UCL_PARSER_NO_TIME|UCL_PARSER_NO_IMPLICIT_ARRAYS); bool r = ucl_parser_add_string(parser, uclstr, 0); if (r) { if (ucl_parser_get_error (parser)) { PyErr_SetString(PyExc_ValueError, ucl_parser_get_error(parser)); ucl_parser_free(parser); ret = NULL; goto return_with_parser; } else { ucl_object_t *uclobj = ucl_parser_get_object(parser); ret = _iterate_valid_ucl(uclobj); ucl_object_unref(uclobj); goto return_with_parser; } } else { PyErr_SetString(PyExc_ValueError, ucl_parser_get_error (parser)); ret = NULL; goto return_with_parser; } return_with_parser: ucl_parser_free(parser); return ret; } static PyObject* ucl_load (PyObject *self, PyObject *args) { char *uclstr; if (PyArg_ParseTuple(args, "z", &uclstr)) { if (!uclstr) { Py_RETURN_NONE; } return _internal_load_ucl(uclstr); } return NULL; } static ucl_object_t * _iterate_python (PyObject *obj) { if (obj == Py_None) { return ucl_object_new(); } else if (PyBool_Check (obj)) { return ucl_object_frombool (obj == Py_True); } #if PY_MAJOR_VERSION < 3 else if (PyInt_Check (obj)) { return ucl_object_fromint (PyInt_AsLong (obj)); } #endif else if (PyLong_Check (obj)) { return ucl_object_fromint (PyLong_AsLong (obj)); } else if (PyFloat_Check (obj)) { return ucl_object_fromdouble (PyFloat_AsDouble (obj)); } else if (PyUnicode_Check (obj)) { ucl_object_t *ucl_str; PyObject *str = PyUnicode_AsASCIIString(obj); ucl_str = ucl_object_fromstring (PyBytes_AsString (str)); Py_DECREF(str); return ucl_str; } #if PY_MAJOR_VERSION < 3 else if (PyString_Check (obj)) { return ucl_object_fromstring (PyString_AsString (obj)); } #endif else if (PyDict_Check(obj)) { PyObject *key, *value; Py_ssize_t pos = 0; ucl_object_t *top, *elm; char *keystr = NULL; top = ucl_object_typed_new (UCL_OBJECT); while (PyDict_Next(obj, &pos, &key, &value)) { elm = _iterate_python(value); if (PyUnicode_Check(key)) { PyObject *keyascii = PyUnicode_AsASCIIString(key); keystr = PyBytes_AsString(keyascii); Py_DECREF(keyascii); } #if PY_MAJOR_VERSION < 3 else if (PyString_Check(key)) { keystr = PyString_AsString(key); } #endif else { PyErr_SetString(PyExc_TypeError, "Unknown key type"); return NULL; } ucl_object_insert_key (top, elm, keystr, 0, true); } return top; } else if (PySequence_Check(obj)) { PyObject *value; Py_ssize_t len, pos; ucl_object_t *top, *elm; len = PySequence_Length(obj); top = ucl_object_typed_new (UCL_ARRAY); for (pos = 0; pos < len; pos++) { value = PySequence_GetItem(obj, pos); elm = _iterate_python(value); ucl_array_append(top, elm); } return top; } else { PyErr_SetString(PyExc_TypeError, "Unhandled object type"); return NULL; } return NULL; } static PyObject * ucl_dump (PyObject *self, PyObject *args) { PyObject *obj; ucl_emitter_t emitter; ucl_object_t *root = NULL; emitter = UCL_EMIT_CONFIG; if (!PyArg_ParseTuple(args, "O|i", &obj, &emitter)) { PyErr_SetString(PyExc_TypeError, "Unhandled object type"); return NULL; } if (emitter >= UCL_EMIT_MAX) { PyErr_SetString(PyExc_TypeError, "Invalid emitter type"); return NULL; } if (obj == Py_None) { Py_RETURN_NONE; } root = _iterate_python(obj); if (root) { PyObject *ret; char *buf; buf = (char *) ucl_object_emit (root, emitter); ucl_object_unref (root); #if PY_MAJOR_VERSION < 3 ret = PyString_FromString (buf); #else ret = PyUnicode_FromString (buf); #endif free(buf); return ret; } return NULL; } static PyObject * ucl_validate (PyObject *self, PyObject *args) { PyObject *dataobj, *schemaobj; ucl_object_t *data, *schema; bool r; struct ucl_schema_error err; if (!PyArg_ParseTuple (args, "OO", &schemaobj, &dataobj)) { PyErr_SetString (PyExc_TypeError, "Unhandled object type"); return NULL; } schema = _iterate_python(schemaobj); if (!schema) return NULL; data = _iterate_python(dataobj); if (!data) return NULL; // validation r = ucl_object_validate (schema, data, &err); ucl_object_unref (schema); ucl_object_unref (data); if (!r) { PyErr_SetString (SchemaError, err.msg); return NULL; } Py_RETURN_TRUE; } static PyMethodDef uclMethods[] = { {"load", ucl_load, METH_VARARGS, "Load UCL from stream"}, {"dump", ucl_dump, METH_VARARGS, "Dump UCL to stream"}, {"validate", ucl_validate, METH_VARARGS, "Validate ucl stream against schema"}, {NULL, NULL, 0, NULL} }; static void init_macros(PyObject *mod) { PyModule_AddIntMacro(mod, UCL_EMIT_JSON); PyModule_AddIntMacro(mod, UCL_EMIT_JSON_COMPACT); PyModule_AddIntMacro(mod, UCL_EMIT_CONFIG); PyModule_AddIntMacro(mod, UCL_EMIT_YAML); PyModule_AddIntMacro(mod, UCL_EMIT_MSGPACK); SchemaError = PyErr_NewException("ucl.SchemaError", NULL, NULL); Py_INCREF(SchemaError); PyModule_AddObject(mod, "SchemaError", SchemaError); } #if PY_MAJOR_VERSION >= 3 static struct PyModuleDef uclmodule = { PyModuleDef_HEAD_INIT, "ucl", NULL, -1, uclMethods }; PyMODINIT_FUNC PyInit_ucl (void) { PyObject *mod = PyModule_Create (&uclmodule); init_macros (mod); return mod; } #else void initucl (void) { PyObject *mod = Py_InitModule ("ucl", uclMethods); init_macros (mod); } #endif diff --git a/contrib/libucl/python/tests/test_example.py b/contrib/libucl/python/tests/test_example.py new file mode 100644 index 000000000000..f0785531f4e2 --- /dev/null +++ b/contrib/libucl/python/tests/test_example.py @@ -0,0 +1,59 @@ +from .compat import unittest +import json +import ucl + +_ucl_inp = ''' +param = value; +section { + param = value; + param1 = value1; + flag = true; + number = 10k; + time = 0.2s; + string = "something"; + subsection { + host = { + host = "hostname"; + port = 900; + } + host = { + host = "hostname"; + port = 901; + } + } +} +''' + +_json_res = { + 'param': 'value', + 'section': { + 'param': 'value', + 'param1': 'value1', + 'flag': True, + 'number': 10000, + 'time': '0.2s', + 'string': 'something', + 'subsection': { + 'host': [ + { + 'host': 'hostname', + 'port': 900, + }, + { + 'host': 'hostname', + 'port': 901, + } + ] + } + } +} + +class TestExample(unittest.TestCase): + def test_example(self): + # load in sample UCL + u = ucl.load(_ucl_inp) + + # Output and read back the JSON + uj = json.loads(json.dumps(u)) + + self.assertEqual(uj, _json_res) diff --git a/contrib/libucl/python/tests/test_load.py b/contrib/libucl/python/tests/test_load.py index 786587a67f3d..73d43188f3d5 100644 --- a/contrib/libucl/python/tests/test_load.py +++ b/contrib/libucl/python/tests/test_load.py @@ -1,107 +1,122 @@ from .compat import unittest import ucl class LoadTest(unittest.TestCase): def test_no_args(self): with self.assertRaises(TypeError): ucl.load() def test_multi_args(self): with self.assertRaises(TypeError): ucl.load(0,0) def test_none(self): self.assertEqual(ucl.load(None), None) def test_null(self): data = "a: null" valid = { "a" : None } self.assertEqual(ucl.load(data), valid) def test_int(self): data = "a : 1" valid = { "a" : 1 } self.assertEqual(ucl.load(data), valid) def test_braced_int(self): data = "{a : 1}" valid = { "a" : 1 } self.assertEqual(ucl.load(data), valid) def test_nested_int(self): data = "a : { b : 1 }" valid = { "a" : { "b" : 1 } } self.assertEqual(ucl.load(data), valid) def test_str(self): data = "a : b" valid = { "a" : "b" } self.assertEqual(ucl.load(data), valid) def test_float(self): data = "a : 1.1" valid = {"a" : 1.1} self.assertEqual(ucl.load(data), valid) def test_boolean(self): data = ( "a : True;" \ "b : False" ) valid = { "a" : True, "b" : False } self.assertEqual(ucl.load(data), valid) def test_empty_ucl(self): self.assertEqual(ucl.load("{}"), {}) def test_single_brace(self): self.assertEqual(ucl.load("{"), {}) def test_single_back_brace(self): self.assertEqual(ucl.load("}"), {}) def test_single_square_forward(self): self.assertEqual(ucl.load("["), []) def test_invalid_ucl(self): with self.assertRaisesRegex(ValueError, "unfinished key$"): ucl.load('{ "var"') def test_comment_ignored(self): self.assertEqual(ucl.load("{/*1*/}"), {}) def test_1_in(self): - valid = { 'key1': 'value' } + valid = { + 'key1': [ + 'value', + 'value2', + 'value;', + 1.0, + -0xdeadbeef, + '0xdeadbeef.1', + '0xreadbeef', + -1e-10, + 1, + True, + False, + True, + ] + } with open("../tests/basic/1.in", "r") as in1: self.assertEqual(ucl.load(in1.read()), valid) def test_every_type(self): data = ("""{ "key1": value; "key2": value2; "key3": "value;" "key4": 1.0, "key5": -0xdeadbeef "key6": 0xdeadbeef.1 "key7": 0xreadbeef "key8": -1e-10, "key9": 1 "key10": true "key11": no "key12": yes }""") valid = { 'key1': 'value', 'key2': 'value2', 'key3': 'value;', 'key4': 1.0, 'key5': -3735928559, 'key6': '0xdeadbeef.1', 'key7': '0xreadbeef', 'key8': -1e-10, 'key9': 1, 'key10': True, 'key11': False, 'key12': True, } self.assertEqual(ucl.load(data), valid) diff --git a/contrib/libucl/src/mum.h b/contrib/libucl/src/mum.h index 9c719e515538..148161a3ec58 100644 --- a/contrib/libucl/src/mum.h +++ b/contrib/libucl/src/mum.h @@ -1,419 +1,419 @@ /* Copyright (c) 2016 Vladimir Makarov Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /* This file implements MUM (MUltiply and Mix) hashing. We randomize input data by 64x64-bit multiplication and mixing hi- and low-parts of the multiplication result by using an addition and then mix it into the current state. We use prime numbers randomly generated with the equal probability of their bit values for the multiplication. When all primes are used once, the state is randomized and the same prime numbers are used again for data randomization. The MUM hashing passes all SMHasher tests. Pseudo Random Number Generator based on MUM also passes NIST Statistical Test Suite for Random and Pseudorandom Number Generators for Cryptographic Applications (version 2.2.1) with 1000 bitstreams each containing 1M bits. MUM hashing is also faster Spooky64 and City64 on small - strings (at least upto 512-bit) on Haswell and Power7. The MUM bulk + strings (at least up to 512-bit) on Haswell and Power7. The MUM bulk speed (speed on very long data) is bigger than Spooky and City on Power7. On Haswell the bulk speed is bigger than Spooky one and close to City speed. */ #ifndef __MUM_HASH__ #define __MUM_HASH__ #include #include #include #include #ifdef _MSC_VER typedef unsigned __int16 uint16_t; typedef unsigned __int32 uint32_t; typedef unsigned __int64 uint64_t; #else #include #endif /* Macro saying to use 128-bit integers implemented by GCC for some targets. */ #ifndef _MUM_USE_INT128 /* In GCC uint128_t is defined if HOST_BITS_PER_WIDE_INT >= 64. HOST_WIDE_INT is long if HOST_BITS_PER_LONG > HOST_BITS_PER_INT, otherwise int. */ #if defined(__GNUC__) && UINT_MAX != ULONG_MAX #define _MUM_USE_INT128 1 #else #define _MUM_USE_INT128 0 #endif #endif #if 0 #if defined(__GNUC__) && ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 9) || (__GNUC__ > 4)) #define _MUM_FRESH_GCC #endif #endif #if defined(__GNUC__) && !defined(__llvm__) && defined(_MUM_FRESH_GCC) #define _MUM_ATTRIBUTE_UNUSED __attribute__((unused)) #define _MUM_OPTIMIZE(opts) __attribute__((__optimize__ (opts))) #define _MUM_TARGET(opts) __attribute__((__target__ (opts))) #else #define _MUM_ATTRIBUTE_UNUSED #define _MUM_OPTIMIZE(opts) #define _MUM_TARGET(opts) #endif /* Here are different primes randomly generated with the equal probability of their bit values. They are used to randomize input values. */ static uint64_t _mum_hash_step_prime = 0x2e0bb864e9ea7df5ULL; static uint64_t _mum_key_step_prime = 0xcdb32970830fcaa1ULL; static uint64_t _mum_block_start_prime = 0xc42b5e2e6480b23bULL; static uint64_t _mum_unroll_prime = 0x7b51ec3d22f7096fULL; static uint64_t _mum_tail_prime = 0xaf47d47c99b1461bULL; static uint64_t _mum_finish_prime1 = 0xa9a7ae7ceff79f3fULL; static uint64_t _mum_finish_prime2 = 0xaf47d47c99b1461bULL; static uint64_t _mum_primes [] = { 0X9ebdcae10d981691, 0X32b9b9b97a27ac7d, 0X29b5584d83d35bbd, 0X4b04e0e61401255f, 0X25e8f7b1f1c9d027, 0X80d4c8c000f3e881, 0Xbd1255431904b9dd, 0X8a3bd4485eee6d81, 0X3bc721b2aad05197, 0X71b1a19b907d6e33, 0X525e6c1084a8534b, 0X9e4c2cd340c1299f, 0Xde3add92e94caa37, 0X7e14eadb1f65311d, 0X3f5aa40f89812853, 0X33b15a3b587d15c9, }; /* Multiply 64-bit V and P and return sum of high and low parts of the result. */ static inline uint64_t _mum (uint64_t v, uint64_t p) { uint64_t hi, lo; #if _MUM_USE_INT128 #if defined(__aarch64__) /* AARCH64 needs 2 insns to calculate 128-bit result of the multiplication. If we use a generic code we actually call a function doing 128x128->128 bit multiplication. The function is very slow. */ lo = v * p, hi; asm ("umulh %0, %1, %2" : "=r" (hi) : "r" (v), "r" (p)); #else __uint128_t r = (__uint128_t) v * (__uint128_t) p; hi = (uint64_t) (r >> 64); lo = (uint64_t) r; #endif #else /* Implementation of 64x64->128-bit multiplication by four 32x32->64 bit multiplication. */ uint64_t hv = v >> 32, hp = p >> 32; uint64_t lv = (uint32_t) v, lp = (uint32_t) p; uint64_t rh = hv * hp; uint64_t rm_0 = hv * lp; uint64_t rm_1 = hp * lv; uint64_t rl = lv * lp; uint64_t t, carry = 0; /* We could ignore a carry bit here if we did not care about the same hash for 32-bit and 64-bit targets. */ t = rl + (rm_0 << 32); #ifdef MUM_TARGET_INDEPENDENT_HASH carry = t < rl; #endif lo = t + (rm_1 << 32); #ifdef MUM_TARGET_INDEPENDENT_HASH carry += lo < t; #endif hi = rh + (rm_0 >> 32) + (rm_1 >> 32) + carry; #endif /* We could use XOR here too but, for some reasons, on Haswell and Power7 using an addition improves hashing performance by 10% for small strings. */ return hi + lo; } #if defined(_MSC_VER) #define _mum_bswap_32(x) _byteswap_uint32_t (x) #define _mum_bswap_64(x) _byteswap_uint64_t (x) #elif defined(__APPLE__) #include #define _mum_bswap_32(x) OSSwapInt32 (x) #define _mum_bswap_64(x) OSSwapInt64 (x) #elif defined(__GNUC__) #define _mum_bswap32(x) __builtin_bswap32 (x) #define _mum_bswap64(x) __builtin_bswap64 (x) #else #include #define _mum_bswap32(x) bswap32 (x) #define _mum_bswap64(x) bswap64 (x) #endif static inline uint64_t _mum_le (uint64_t v) { #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ || !defined(MUM_TARGET_INDEPENDENT_HASH) return v; #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ return _mum_bswap64 (v); #else -#error "Unknown endianess" +#error "Unknown endianness" #endif } static inline uint32_t _mum_le32 (uint32_t v) { #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ || !defined(MUM_TARGET_INDEPENDENT_HASH) return v; #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ return _mum_bswap32 (v); #else -#error "Unknown endianess" +#error "Unknown endianness" #endif } /* Macro defining how many times the most nested loop in _mum_hash_aligned will be unrolled by the compiler (although it can make an own decision:). Use only a constant here to help a compiler to unroll a major loop. The macro value affects the result hash for strings > 128 bit. The unroll factor greatly affects the hashing speed. We prefer the speed. */ #ifndef _MUM_UNROLL_FACTOR_POWER #if defined(__PPC64__) && !defined(MUM_TARGET_INDEPENDENT_HASH) #define _MUM_UNROLL_FACTOR_POWER 3 #elif defined(__aarch64__) && !defined(MUM_TARGET_INDEPENDENT_HASH) #define _MUM_UNROLL_FACTOR_POWER 4 #else #define _MUM_UNROLL_FACTOR_POWER 2 #endif #endif #if _MUM_UNROLL_FACTOR_POWER < 1 #error "too small unroll factor" #elif _MUM_UNROLL_FACTOR_POWER > 4 #error "We have not enough primes for such unroll factor" #endif #define _MUM_UNROLL_FACTOR (1 << _MUM_UNROLL_FACTOR_POWER) static inline uint64_t _MUM_OPTIMIZE("unroll-loops") _mum_hash_aligned (uint64_t start, const void *key, size_t len) { uint64_t result = start; const unsigned char *str = (const unsigned char *) key; uint64_t u64; int i; size_t n; result = _mum (result, _mum_block_start_prime); while (len > _MUM_UNROLL_FACTOR * sizeof (uint64_t)) { /* This loop could be vectorized when we have vector insns for 64x64->128-bit multiplication. AVX2 currently only have a vector insn for 4 32x32->64-bit multiplication. */ for (i = 0; i < _MUM_UNROLL_FACTOR; i++) result ^= _mum (_mum_le (((uint64_t *) str)[i]), _mum_primes[i]); len -= _MUM_UNROLL_FACTOR * sizeof (uint64_t); str += _MUM_UNROLL_FACTOR * sizeof (uint64_t); /* We will use the same prime numbers on the next iterations -- randomize the state. */ result = _mum (result, _mum_unroll_prime); } n = len / sizeof (uint64_t); for (i = 0; i < (int)n; i++) result ^= _mum (_mum_le (((uint64_t *) str)[i]), _mum_primes[i]); len -= n * sizeof (uint64_t); str += n * sizeof (uint64_t); switch (len) { case 7: u64 = _mum_le32 (*(uint32_t *) str); u64 |= (uint64_t) str[4] << 32; u64 |= (uint64_t) str[5] << 40; u64 |= (uint64_t) str[6] << 48; return result ^ _mum (u64, _mum_tail_prime); case 6: u64 = _mum_le32 (*(uint32_t *) str); u64 |= (uint64_t) str[4] << 32; u64 |= (uint64_t) str[5] << 40; return result ^ _mum (u64, _mum_tail_prime); case 5: u64 = _mum_le32 (*(uint32_t *) str); u64 |= (uint64_t) str[4] << 32; return result ^ _mum (u64, _mum_tail_prime); case 4: u64 = _mum_le32 (*(uint32_t *) str); return result ^ _mum (u64, _mum_tail_prime); case 3: u64 = str[0]; u64 |= (uint64_t) str[1] << 8; u64 |= (uint64_t) str[2] << 16; return result ^ _mum (u64, _mum_tail_prime); case 2: u64 = str[0]; u64 |= (uint64_t) str[1] << 8; return result ^ _mum (u64, _mum_tail_prime); case 1: u64 = str[0]; return result ^ _mum (u64, _mum_tail_prime); } return result; } /* Final randomization of H. */ static inline uint64_t _mum_final (uint64_t h) { h ^= _mum (h, _mum_finish_prime1); h ^= _mum (h, _mum_finish_prime2); return h; } #if defined(__x86_64__) && defined(_MUM_FRESH_GCC) /* We want to use AVX2 insn MULX instead of generic x86-64 MULQ where it is possible. Although on modern Intel processors MULQ takes 3-cycles vs. 4 for MULX, MULX permits more freedom in insn scheduling as it uses less fixed registers. */ static inline uint64_t _MUM_TARGET("arch=haswell") _mum_hash_avx2 (const void * key, size_t len, uint64_t seed) { return _mum_final (_mum_hash_aligned (seed + len, key, len)); } #endif #ifndef _MUM_UNALIGNED_ACCESS #if defined(__x86_64__) || defined(__i386__) || defined(__PPC64__) \ || defined(__s390__) || defined(__m32c__) || defined(cris) \ || defined(__CR16__) || defined(__vax__) || defined(__m68k__) \ || defined(__aarch64__) #define _MUM_UNALIGNED_ACCESS 1 #else #define _MUM_UNALIGNED_ACCESS 0 #endif #endif /* When we need an aligned access to data being hashed we move part of the unaligned data to an aligned block of given size and then process it, repeating processing the data by the block. */ #ifndef _MUM_BLOCK_LEN #define _MUM_BLOCK_LEN 1024 #endif #if _MUM_BLOCK_LEN < 8 #error "too small block length" #endif static inline uint64_t #if defined(__x86_64__) _MUM_TARGET("inline-all-stringops") #endif _mum_hash_default (const void *key, size_t len, uint64_t seed) { uint64_t result; const unsigned char *str = (const unsigned char *) key; size_t block_len; uint64_t buf[_MUM_BLOCK_LEN / sizeof (uint64_t)]; result = seed + len; if (_MUM_UNALIGNED_ACCESS || ((size_t) str & 0x7) == 0) result = _mum_hash_aligned (result, key, len); else { while (len != 0) { block_len = len < _MUM_BLOCK_LEN ? len : _MUM_BLOCK_LEN; memmove (buf, str, block_len); result = _mum_hash_aligned (result, buf, block_len); len -= block_len; str += block_len; } } return _mum_final (result); } static inline uint64_t _mum_next_factor (void) { uint64_t start = 0; int i; for (i = 0; i < 8; i++) start = (start << 8) | rand() % 256; return start; } /* ++++++++++++++++++++++++++ Interface functions: +++++++++++++++++++ */ /* Set random multiplicators depending on SEED. */ static inline void mum_hash_randomize (uint64_t seed) { int i; srand (seed); _mum_hash_step_prime = _mum_next_factor (); _mum_key_step_prime = _mum_next_factor (); _mum_finish_prime1 = _mum_next_factor (); _mum_finish_prime2 = _mum_next_factor (); _mum_block_start_prime = _mum_next_factor (); _mum_unroll_prime = _mum_next_factor (); _mum_tail_prime = _mum_next_factor (); for (i = 0; i < (int)(sizeof (_mum_primes) / sizeof (uint64_t)); i++) _mum_primes[i] = _mum_next_factor (); } /* Start hashing data with SEED. Return the state. */ static inline uint64_t mum_hash_init (uint64_t seed) { return seed; } /* Process data KEY with the state H and return the updated state. */ static inline uint64_t mum_hash_step (uint64_t h, uint64_t key) { return _mum (h, _mum_hash_step_prime) ^ _mum (key, _mum_key_step_prime); } /* Return the result of hashing using the current state H. */ static inline uint64_t mum_hash_finish (uint64_t h) { return _mum_final (h); } /* Fast hashing of KEY with SEED. The hash is always the same for the same key on any target. */ static inline size_t mum_hash64 (uint64_t key, uint64_t seed) { return mum_hash_finish (mum_hash_step (mum_hash_init (seed), key)); } /* Hash data KEY of length LEN and SEED. The hash depends on the - target endianess and the unroll factor. */ + target endianness and the unroll factor. */ static inline uint64_t mum_hash (const void *key, size_t len, uint64_t seed) { #if defined(__x86_64__) && defined(_MUM_FRESH_GCC) static int avx2_support = 0; if (avx2_support > 0) return _mum_hash_avx2 (key, len, seed); else if (! avx2_support) { __builtin_cpu_init (); avx2_support = __builtin_cpu_supports ("avx2") ? 1 : -1; if (avx2_support > 0) return _mum_hash_avx2 (key, len, seed); } #endif return _mum_hash_default (key, len, seed); } #endif diff --git a/contrib/libucl/src/ucl_chartable.h b/contrib/libucl/src/ucl_chartable.h index db9f02900c02..7571a1d91549 100644 --- a/contrib/libucl/src/ucl_chartable.h +++ b/contrib/libucl/src/ucl_chartable.h @@ -1,268 +1,268 @@ /* Copyright (c) 2013, Vsevolod Stakhov * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED ''AS IS'' AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL AUTHOR BE LIABLE FOR ANY * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifndef UCL_CHARTABLE_H_ #define UCL_CHARTABLE_H_ #include "ucl_internal.h" static const unsigned int ucl_chartable[256] = { -UCL_CHARACTER_VALUE_END, UCL_CHARACTER_DENIED, UCL_CHARACTER_DENIED, +UCL_CHARACTER_JSON_UNSAFE|UCL_CHARACTER_VALUE_END|UCL_CHARACTER_UCL_UNSAFE, UCL_CHARACTER_DENIED, UCL_CHARACTER_DENIED, UCL_CHARACTER_DENIED, UCL_CHARACTER_DENIED, UCL_CHARACTER_DENIED, UCL_CHARACTER_DENIED, UCL_CHARACTER_DENIED, UCL_CHARACTER_JSON_UNSAFE|UCL_CHARACTER_UCL_UNSAFE, UCL_CHARACTER_WHITESPACE|UCL_CHARACTER_WHITESPACE_UNSAFE|UCL_CHARACTER_KEY_SEP|UCL_CHARACTER_JSON_UNSAFE|UCL_CHARACTER_UCL_UNSAFE, UCL_CHARACTER_WHITESPACE_UNSAFE|UCL_CHARACTER_VALUE_END|UCL_CHARACTER_JSON_UNSAFE|UCL_CHARACTER_UCL_UNSAFE, UCL_CHARACTER_WHITESPACE_UNSAFE, UCL_CHARACTER_WHITESPACE_UNSAFE|UCL_CHARACTER_JSON_UNSAFE|UCL_CHARACTER_UCL_UNSAFE, UCL_CHARACTER_WHITESPACE_UNSAFE|UCL_CHARACTER_VALUE_END|UCL_CHARACTER_JSON_UNSAFE|UCL_CHARACTER_UCL_UNSAFE, UCL_CHARACTER_DENIED, UCL_CHARACTER_DENIED, UCL_CHARACTER_DENIED, UCL_CHARACTER_DENIED, UCL_CHARACTER_DENIED, UCL_CHARACTER_DENIED, UCL_CHARACTER_DENIED, UCL_CHARACTER_DENIED, UCL_CHARACTER_DENIED, UCL_CHARACTER_DENIED, UCL_CHARACTER_DENIED, UCL_CHARACTER_DENIED, UCL_CHARACTER_DENIED, UCL_CHARACTER_DENIED, UCL_CHARACTER_DENIED, UCL_CHARACTER_DENIED, UCL_CHARACTER_DENIED, UCL_CHARACTER_DENIED, UCL_CHARACTER_WHITESPACE|UCL_CHARACTER_WHITESPACE_UNSAFE|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_KEY_SEP|UCL_CHARACTER_UCL_UNSAFE /* */, UCL_CHARACTER_VALUE_STR /* ! */, UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_ESCAPE|UCL_CHARACTER_JSON_UNSAFE|UCL_CHARACTER_UCL_UNSAFE /* " */, UCL_CHARACTER_VALUE_END /* # */, UCL_CHARACTER_VALUE_STR /* $ */, UCL_CHARACTER_VALUE_STR /* % */, UCL_CHARACTER_VALUE_STR /* & */, UCL_CHARACTER_VALUE_STR /* ' */, UCL_CHARACTER_VALUE_STR /* ( */, UCL_CHARACTER_VALUE_STR /* ) */, UCL_CHARACTER_VALUE_STR /* * */, -UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT /* + */, +UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT|UCL_CHARACTER_UCL_UNSAFE /* + */, UCL_CHARACTER_VALUE_END /* , */, UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT_START|UCL_CHARACTER_VALUE_DIGIT /* - */, UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT /* . */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_ESCAPE /* / */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT_START|UCL_CHARACTER_VALUE_DIGIT /* 0 */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT_START|UCL_CHARACTER_VALUE_DIGIT /* 1 */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT_START|UCL_CHARACTER_VALUE_DIGIT /* 2 */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT_START|UCL_CHARACTER_VALUE_DIGIT /* 3 */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT_START|UCL_CHARACTER_VALUE_DIGIT /* 4 */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT_START|UCL_CHARACTER_VALUE_DIGIT /* 5 */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT_START|UCL_CHARACTER_VALUE_DIGIT /* 6 */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT_START|UCL_CHARACTER_VALUE_DIGIT /* 7 */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT_START|UCL_CHARACTER_VALUE_DIGIT /* 8 */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT_START|UCL_CHARACTER_VALUE_DIGIT /* 9 */, UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_KEY_SEP|UCL_CHARACTER_UCL_UNSAFE /* : */, UCL_CHARACTER_VALUE_END /* ; */, UCL_CHARACTER_VALUE_STR /* < */, UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_KEY_SEP|UCL_CHARACTER_UCL_UNSAFE /* = */, UCL_CHARACTER_VALUE_STR /* > */, UCL_CHARACTER_VALUE_STR /* ? */, UCL_CHARACTER_VALUE_STR /* @ */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT /* A */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT /* B */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT /* C */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT /* D */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT /* E */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT /* F */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT /* G */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT /* H */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT /* I */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT /* J */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT /* K */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT /* L */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT /* M */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT /* N */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT /* O */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT /* P */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT /* Q */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT /* R */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT /* S */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT /* T */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT /* U */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT /* V */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT /* W */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT /* X */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT /* Y */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT /* Z */, UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_UCL_UNSAFE /* [ */, UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_ESCAPE|UCL_CHARACTER_JSON_UNSAFE|UCL_CHARACTER_UCL_UNSAFE /* \ */, UCL_CHARACTER_VALUE_END /* ] */, UCL_CHARACTER_VALUE_STR /* ^ */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR /* _ */, UCL_CHARACTER_VALUE_STR /* ` */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT /* a */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT|UCL_CHARACTER_ESCAPE /* b */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT /* c */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT /* d */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT /* e */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT|UCL_CHARACTER_ESCAPE /* f */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT /* g */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT /* h */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT /* i */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT /* j */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT /* k */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT /* l */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT /* m */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT|UCL_CHARACTER_ESCAPE /* n */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT /* o */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT /* p */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT /* q */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT|UCL_CHARACTER_ESCAPE /* r */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT /* s */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT|UCL_CHARACTER_ESCAPE /* t */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT|UCL_CHARACTER_ESCAPE /* u */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT /* v */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT /* w */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT /* x */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT /* y */, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_VALUE_DIGIT /* z */, UCL_CHARACTER_VALUE_STR|UCL_CHARACTER_UCL_UNSAFE /* { */, UCL_CHARACTER_VALUE_STR /* | */, UCL_CHARACTER_VALUE_END /* } */, UCL_CHARACTER_VALUE_STR /* ~ */, UCL_CHARACTER_DENIED, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR, UCL_CHARACTER_KEY_START|UCL_CHARACTER_KEY|UCL_CHARACTER_VALUE_STR }; static inline bool ucl_test_character (unsigned char c, int type_flags) { return (ucl_chartable[c] & type_flags) != 0; } #endif /* UCL_CHARTABLE_H_ */ diff --git a/contrib/libucl/src/ucl_emitter.c b/contrib/libucl/src/ucl_emitter.c index a15cd08cfb98..4f4465dfbf4a 100644 --- a/contrib/libucl/src/ucl_emitter.c +++ b/contrib/libucl/src/ucl_emitter.c @@ -1,678 +1,686 @@ /* Copyright (c) 2013, Vsevolod Stakhov * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED ''AS IS'' AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL AUTHOR BE LIABLE FOR ANY * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifdef HAVE_CONFIG_H #include "config.h" #endif #include "ucl.h" #include "ucl_internal.h" #include "ucl_chartable.h" #ifdef HAVE_FLOAT_H #include #endif #ifdef HAVE_MATH_H #include #endif /** * @file ucl_emitter.c * Serialise UCL object to various of output formats */ static void ucl_emitter_common_elt (struct ucl_emitter_context *ctx, const ucl_object_t *obj, bool first, bool print_key, bool compact); #define UCL_EMIT_TYPE_OPS(type) \ static void ucl_emit_ ## type ## _elt (struct ucl_emitter_context *ctx, \ const ucl_object_t *obj, bool first, bool print_key); \ static void ucl_emit_ ## type ## _start_obj (struct ucl_emitter_context *ctx, \ const ucl_object_t *obj, bool print_key); \ static void ucl_emit_ ## type## _start_array (struct ucl_emitter_context *ctx, \ const ucl_object_t *obj, bool print_key); \ static void ucl_emit_ ##type## _end_object (struct ucl_emitter_context *ctx, \ const ucl_object_t *obj); \ static void ucl_emit_ ##type## _end_array (struct ucl_emitter_context *ctx, \ const ucl_object_t *obj) /* * JSON format operations */ UCL_EMIT_TYPE_OPS(json); UCL_EMIT_TYPE_OPS(json_compact); UCL_EMIT_TYPE_OPS(config); UCL_EMIT_TYPE_OPS(yaml); UCL_EMIT_TYPE_OPS(msgpack); #define UCL_EMIT_TYPE_CONTENT(type) { \ .ucl_emitter_write_elt = ucl_emit_ ## type ## _elt, \ .ucl_emitter_start_object = ucl_emit_ ## type ##_start_obj, \ .ucl_emitter_start_array = ucl_emit_ ## type ##_start_array, \ .ucl_emitter_end_object = ucl_emit_ ## type ##_end_object, \ .ucl_emitter_end_array = ucl_emit_ ## type ##_end_array \ } const struct ucl_emitter_operations ucl_standartd_emitter_ops[] = { [UCL_EMIT_JSON] = UCL_EMIT_TYPE_CONTENT(json), [UCL_EMIT_JSON_COMPACT] = UCL_EMIT_TYPE_CONTENT(json_compact), [UCL_EMIT_CONFIG] = UCL_EMIT_TYPE_CONTENT(config), [UCL_EMIT_YAML] = UCL_EMIT_TYPE_CONTENT(yaml), [UCL_EMIT_MSGPACK] = UCL_EMIT_TYPE_CONTENT(msgpack) }; /* * Utility to check whether we need a top object */ #define UCL_EMIT_IDENT_TOP_OBJ(ctx, obj) ((ctx)->top != (obj) || \ ((ctx)->id == UCL_EMIT_JSON_COMPACT || (ctx)->id == UCL_EMIT_JSON)) /** * Add tabulation to the output buffer * @param buf target buffer * @param tabs number of tabs to add */ static inline void ucl_add_tabs (const struct ucl_emitter_functions *func, unsigned int tabs, bool compact) { if (!compact && tabs > 0) { func->ucl_emitter_append_character (' ', tabs * 4, func->ud); } } /** * Print key for the element * @param ctx * @param obj */ static void ucl_emitter_print_key (bool print_key, struct ucl_emitter_context *ctx, const ucl_object_t *obj, bool compact) { const struct ucl_emitter_functions *func = ctx->func; if (!print_key) { return; } if (ctx->id == UCL_EMIT_CONFIG) { if (obj->flags & UCL_OBJECT_NEED_KEY_ESCAPE) { ucl_elt_string_write_json (obj->key, obj->keylen, ctx); } else { func->ucl_emitter_append_len (obj->key, obj->keylen, func->ud); } if (obj->type != UCL_OBJECT && obj->type != UCL_ARRAY) { func->ucl_emitter_append_len (" = ", 3, func->ud); } else { func->ucl_emitter_append_character (' ', 1, func->ud); } } else if (ctx->id == UCL_EMIT_YAML) { if (obj->keylen > 0 && (obj->flags & UCL_OBJECT_NEED_KEY_ESCAPE)) { ucl_elt_string_write_json (obj->key, obj->keylen, ctx); } else if (obj->keylen > 0) { func->ucl_emitter_append_len (obj->key, obj->keylen, func->ud); } else { func->ucl_emitter_append_len ("null", 4, func->ud); } func->ucl_emitter_append_len (": ", 2, func->ud); } else { if (obj->keylen > 0) { ucl_elt_string_write_json (obj->key, obj->keylen, ctx); } else { func->ucl_emitter_append_len ("null", 4, func->ud); } if (compact) { func->ucl_emitter_append_character (':', 1, func->ud); } else { func->ucl_emitter_append_len (": ", 2, func->ud); } } } static void ucl_emitter_finish_object (struct ucl_emitter_context *ctx, const ucl_object_t *obj, bool compact, bool is_array) { const struct ucl_emitter_functions *func = ctx->func; if (ctx->id == UCL_EMIT_CONFIG && obj != ctx->top) { if (obj->type != UCL_OBJECT && obj->type != UCL_ARRAY) { if (!is_array) { /* Objects are split by ';' */ func->ucl_emitter_append_len (";\n", 2, func->ud); } else { /* Use commas for arrays */ func->ucl_emitter_append_len (",\n", 2, func->ud); } } else { func->ucl_emitter_append_character ('\n', 1, func->ud); } } } /** * End standard ucl object * @param ctx emitter context * @param compact compact flag */ static void ucl_emitter_common_end_object (struct ucl_emitter_context *ctx, const ucl_object_t *obj, bool compact) { const struct ucl_emitter_functions *func = ctx->func; if (UCL_EMIT_IDENT_TOP_OBJ(ctx, obj)) { ctx->indent --; if (compact) { func->ucl_emitter_append_character ('}', 1, func->ud); } else { if (ctx->id != UCL_EMIT_CONFIG) { /* newline is already added for this format */ func->ucl_emitter_append_character ('\n', 1, func->ud); } ucl_add_tabs (func, ctx->indent, compact); func->ucl_emitter_append_character ('}', 1, func->ud); } } ucl_emitter_finish_object (ctx, obj, compact, false); } /** * End standard ucl array * @param ctx emitter context * @param compact compact flag */ static void ucl_emitter_common_end_array (struct ucl_emitter_context *ctx, const ucl_object_t *obj, bool compact) { const struct ucl_emitter_functions *func = ctx->func; ctx->indent --; if (compact) { func->ucl_emitter_append_character (']', 1, func->ud); } else { if (ctx->id != UCL_EMIT_CONFIG) { /* newline is already added for this format */ func->ucl_emitter_append_character ('\n', 1, func->ud); } ucl_add_tabs (func, ctx->indent, compact); func->ucl_emitter_append_character (']', 1, func->ud); } ucl_emitter_finish_object (ctx, obj, compact, true); } /** * Start emit standard UCL array * @param ctx emitter context * @param obj object to write * @param compact compact flag */ static void ucl_emitter_common_start_array (struct ucl_emitter_context *ctx, const ucl_object_t *obj, bool print_key, bool compact) { const ucl_object_t *cur; ucl_object_iter_t iter = NULL; const struct ucl_emitter_functions *func = ctx->func; bool first = true; ucl_emitter_print_key (print_key, ctx, obj, compact); if (compact) { func->ucl_emitter_append_character ('[', 1, func->ud); } else { func->ucl_emitter_append_len ("[\n", 2, func->ud); } ctx->indent ++; if (obj->type == UCL_ARRAY) { /* explicit array */ while ((cur = ucl_object_iterate (obj, &iter, true)) != NULL) { ucl_emitter_common_elt (ctx, cur, first, false, compact); first = false; } } else { /* implicit array */ cur = obj; while (cur) { ucl_emitter_common_elt (ctx, cur, first, false, compact); first = false; cur = cur->next; } } } /** * Start emit standard UCL object * @param ctx emitter context * @param obj object to write * @param compact compact flag */ static void ucl_emitter_common_start_object (struct ucl_emitter_context *ctx, const ucl_object_t *obj, bool print_key, bool compact) { ucl_hash_iter_t it = NULL; const ucl_object_t *cur, *elt; const struct ucl_emitter_functions *func = ctx->func; bool first = true; ucl_emitter_print_key (print_key, ctx, obj, compact); /* * Print { * */ if (UCL_EMIT_IDENT_TOP_OBJ(ctx, obj)) { if (compact) { func->ucl_emitter_append_character ('{', 1, func->ud); } else { func->ucl_emitter_append_len ("{\n", 2, func->ud); } ctx->indent ++; } while ((cur = ucl_hash_iterate (obj->value.ov, &it))) { if (ctx->id == UCL_EMIT_CONFIG) { LL_FOREACH (cur, elt) { ucl_emitter_common_elt (ctx, elt, first, true, compact); } } else { /* Expand implicit arrays */ if (cur->next != NULL) { if (!first) { if (compact) { func->ucl_emitter_append_character (',', 1, func->ud); } else { func->ucl_emitter_append_len (",\n", 2, func->ud); } } ucl_add_tabs (func, ctx->indent, compact); ucl_emitter_common_start_array (ctx, cur, true, compact); ucl_emitter_common_end_array (ctx, cur, compact); } else { ucl_emitter_common_elt (ctx, cur, first, true, compact); } } first = false; } } /** * Common choice of object emitting * @param ctx emitter context * @param obj object to print * @param first flag to mark the first element * @param print_key print key of an object * @param compact compact output */ static void ucl_emitter_common_elt (struct ucl_emitter_context *ctx, const ucl_object_t *obj, bool first, bool print_key, bool compact) { const struct ucl_emitter_functions *func = ctx->func; bool flag; struct ucl_object_userdata *ud; const ucl_object_t *comment = NULL, *cur_comment; const char *ud_out = ""; if (ctx->id != UCL_EMIT_CONFIG && !first) { if (compact) { func->ucl_emitter_append_character (',', 1, func->ud); } else { if (ctx->id == UCL_EMIT_YAML && ctx->indent == 0) { func->ucl_emitter_append_len ("\n", 1, func->ud); } else { func->ucl_emitter_append_len (",\n", 2, func->ud); } } } ucl_add_tabs (func, ctx->indent, compact); if (ctx->comments && ctx->id == UCL_EMIT_CONFIG) { comment = ucl_object_lookup_len (ctx->comments, (const char *)&obj, sizeof (void *)); if (comment) { if (!(comment->flags & UCL_OBJECT_INHERITED)) { DL_FOREACH (comment, cur_comment) { func->ucl_emitter_append_len (cur_comment->value.sv, cur_comment->len, func->ud); func->ucl_emitter_append_character ('\n', 1, func->ud); ucl_add_tabs (func, ctx->indent, compact); } comment = NULL; } } } switch (obj->type) { case UCL_INT: ucl_emitter_print_key (print_key, ctx, obj, compact); func->ucl_emitter_append_int (ucl_object_toint (obj), func->ud); ucl_emitter_finish_object (ctx, obj, compact, !print_key); break; case UCL_FLOAT: case UCL_TIME: ucl_emitter_print_key (print_key, ctx, obj, compact); func->ucl_emitter_append_double (ucl_object_todouble (obj), func->ud); ucl_emitter_finish_object (ctx, obj, compact, !print_key); break; case UCL_BOOLEAN: ucl_emitter_print_key (print_key, ctx, obj, compact); flag = ucl_object_toboolean (obj); if (flag) { func->ucl_emitter_append_len ("true", 4, func->ud); } else { func->ucl_emitter_append_len ("false", 5, func->ud); } ucl_emitter_finish_object (ctx, obj, compact, !print_key); break; case UCL_STRING: ucl_emitter_print_key (print_key, ctx, obj, compact); - if (ctx->id == UCL_EMIT_CONFIG && ucl_maybe_long_string (obj)) { - ucl_elt_string_write_multiline (obj->value.sv, obj->len, ctx); + if (ctx->id == UCL_EMIT_CONFIG) { + if (ucl_maybe_long_string (obj)) { + ucl_elt_string_write_multiline (obj->value.sv, obj->len, ctx); + } else { + if (obj->flags & UCL_OBJECT_SQUOTED) { + ucl_elt_string_write_squoted (obj->value.sv, obj->len, ctx); + } else { + ucl_elt_string_write_json (obj->value.sv, obj->len, ctx); + } + } } else { ucl_elt_string_write_json (obj->value.sv, obj->len, ctx); } ucl_emitter_finish_object (ctx, obj, compact, !print_key); break; case UCL_NULL: ucl_emitter_print_key (print_key, ctx, obj, compact); func->ucl_emitter_append_len ("null", 4, func->ud); ucl_emitter_finish_object (ctx, obj, compact, !print_key); break; case UCL_OBJECT: ucl_emitter_common_start_object (ctx, obj, print_key, compact); ucl_emitter_common_end_object (ctx, obj, compact); break; case UCL_ARRAY: ucl_emitter_common_start_array (ctx, obj, print_key, compact); ucl_emitter_common_end_array (ctx, obj, compact); break; case UCL_USERDATA: ud = (struct ucl_object_userdata *)obj; ucl_emitter_print_key (print_key, ctx, obj, compact); if (ud->emitter) { ud_out = ud->emitter (obj->value.ud); if (ud_out == NULL) { ud_out = "null"; } } ucl_elt_string_write_json (ud_out, strlen (ud_out), ctx); ucl_emitter_finish_object (ctx, obj, compact, !print_key); break; } if (comment) { DL_FOREACH (comment, cur_comment) { func->ucl_emitter_append_len (cur_comment->value.sv, cur_comment->len, func->ud); func->ucl_emitter_append_character ('\n', 1, func->ud); if (cur_comment->next) { ucl_add_tabs (func, ctx->indent, compact); } } } } /* * Specific standard implementations of the emitter functions */ #define UCL_EMIT_TYPE_IMPL(type, compact) \ static void ucl_emit_ ## type ## _elt (struct ucl_emitter_context *ctx, \ const ucl_object_t *obj, bool first, bool print_key) { \ ucl_emitter_common_elt (ctx, obj, first, print_key, (compact)); \ } \ static void ucl_emit_ ## type ## _start_obj (struct ucl_emitter_context *ctx, \ const ucl_object_t *obj, bool print_key) { \ ucl_emitter_common_start_object (ctx, obj, print_key, (compact)); \ } \ static void ucl_emit_ ## type## _start_array (struct ucl_emitter_context *ctx, \ const ucl_object_t *obj, bool print_key) { \ ucl_emitter_common_start_array (ctx, obj, print_key, (compact)); \ } \ static void ucl_emit_ ##type## _end_object (struct ucl_emitter_context *ctx, \ const ucl_object_t *obj) { \ ucl_emitter_common_end_object (ctx, obj, (compact)); \ } \ static void ucl_emit_ ##type## _end_array (struct ucl_emitter_context *ctx, \ const ucl_object_t *obj) { \ ucl_emitter_common_end_array (ctx, obj, (compact)); \ } UCL_EMIT_TYPE_IMPL(json, false) UCL_EMIT_TYPE_IMPL(json_compact, true) UCL_EMIT_TYPE_IMPL(config, false) UCL_EMIT_TYPE_IMPL(yaml, false) static void ucl_emit_msgpack_elt (struct ucl_emitter_context *ctx, const ucl_object_t *obj, bool first, bool print_key) { ucl_object_iter_t it; struct ucl_object_userdata *ud; const char *ud_out; const ucl_object_t *cur, *celt; switch (obj->type) { case UCL_INT: ucl_emitter_print_key_msgpack (print_key, ctx, obj); ucl_emitter_print_int_msgpack (ctx, ucl_object_toint (obj)); break; case UCL_FLOAT: case UCL_TIME: ucl_emitter_print_key_msgpack (print_key, ctx, obj); ucl_emitter_print_double_msgpack (ctx, ucl_object_todouble (obj)); break; case UCL_BOOLEAN: ucl_emitter_print_key_msgpack (print_key, ctx, obj); ucl_emitter_print_bool_msgpack (ctx, ucl_object_toboolean (obj)); break; case UCL_STRING: ucl_emitter_print_key_msgpack (print_key, ctx, obj); if (obj->flags & UCL_OBJECT_BINARY) { ucl_emitter_print_binary_string_msgpack (ctx, obj->value.sv, obj->len); } else { ucl_emitter_print_string_msgpack (ctx, obj->value.sv, obj->len); } break; case UCL_NULL: ucl_emitter_print_key_msgpack (print_key, ctx, obj); ucl_emitter_print_null_msgpack (ctx); break; case UCL_OBJECT: ucl_emitter_print_key_msgpack (print_key, ctx, obj); ucl_emit_msgpack_start_obj (ctx, obj, print_key); it = NULL; while ((cur = ucl_object_iterate (obj, &it, true)) != NULL) { LL_FOREACH (cur, celt) { ucl_emit_msgpack_elt (ctx, celt, false, true); /* XXX: * in msgpack the length of objects is encoded within a single elt * so in case of multi-value keys we are using merely the first * element ignoring others */ break; } } break; case UCL_ARRAY: ucl_emitter_print_key_msgpack (print_key, ctx, obj); ucl_emit_msgpack_start_array (ctx, obj, print_key); it = NULL; while ((cur = ucl_object_iterate (obj, &it, true)) != NULL) { ucl_emit_msgpack_elt (ctx, cur, false, false); } break; case UCL_USERDATA: ud = (struct ucl_object_userdata *)obj; ucl_emitter_print_key_msgpack (print_key, ctx, obj); if (ud->emitter) { ud_out = ud->emitter (obj->value.ud); if (ud_out == NULL) { ud_out = "null"; } } ucl_emitter_print_string_msgpack (ctx, obj->value.sv, obj->len); break; } } static void ucl_emit_msgpack_start_obj (struct ucl_emitter_context *ctx, const ucl_object_t *obj, bool print_key) { ucl_emitter_print_object_msgpack (ctx, obj->len); } static void ucl_emit_msgpack_start_array (struct ucl_emitter_context *ctx, const ucl_object_t *obj, bool print_key) { ucl_emitter_print_array_msgpack (ctx, obj->len); } static void ucl_emit_msgpack_end_object (struct ucl_emitter_context *ctx, const ucl_object_t *obj) { } static void ucl_emit_msgpack_end_array (struct ucl_emitter_context *ctx, const ucl_object_t *obj) { } unsigned char * ucl_object_emit (const ucl_object_t *obj, enum ucl_emitter emit_type) { return ucl_object_emit_len (obj, emit_type, NULL); } unsigned char * ucl_object_emit_len (const ucl_object_t *obj, enum ucl_emitter emit_type, size_t *outlen) { unsigned char *res = NULL; struct ucl_emitter_functions *func; UT_string *s; if (obj == NULL) { return NULL; } func = ucl_object_emit_memory_funcs ((void **)&res); if (func != NULL) { s = func->ud; ucl_object_emit_full (obj, emit_type, func, NULL); if (outlen != NULL) { *outlen = s->i; } ucl_object_emit_funcs_free (func); } return res; } bool ucl_object_emit_full (const ucl_object_t *obj, enum ucl_emitter emit_type, struct ucl_emitter_functions *emitter, const ucl_object_t *comments) { const struct ucl_emitter_context *ctx; struct ucl_emitter_context my_ctx; bool res = false; ctx = ucl_emit_get_standard_context (emit_type); if (ctx != NULL) { memcpy (&my_ctx, ctx, sizeof (my_ctx)); my_ctx.func = emitter; my_ctx.indent = 0; my_ctx.top = obj; my_ctx.comments = comments; my_ctx.ops->ucl_emitter_write_elt (&my_ctx, obj, true, false); res = true; } return res; } diff --git a/contrib/libucl/src/ucl_emitter_utils.c b/contrib/libucl/src/ucl_emitter_utils.c index 3559eb63df92..b9f7de8f0224 100644 --- a/contrib/libucl/src/ucl_emitter_utils.c +++ b/contrib/libucl/src/ucl_emitter_utils.c @@ -1,499 +1,548 @@ /* Copyright (c) 2014, Vsevolod Stakhov * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED ''AS IS'' AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL AUTHOR BE LIABLE FOR ANY * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifdef HAVE_CONFIG_H #include "config.h" #endif #include "ucl.h" #include "ucl_internal.h" #include "ucl_chartable.h" #ifdef HAVE_FLOAT_H #include #endif #ifdef HAVE_MATH_H #include #endif extern const struct ucl_emitter_operations ucl_standartd_emitter_ops[]; static const struct ucl_emitter_context ucl_standard_emitters[] = { [UCL_EMIT_JSON] = { .name = "json", .id = UCL_EMIT_JSON, .func = NULL, .ops = &ucl_standartd_emitter_ops[UCL_EMIT_JSON] }, [UCL_EMIT_JSON_COMPACT] = { .name = "json_compact", .id = UCL_EMIT_JSON_COMPACT, .func = NULL, .ops = &ucl_standartd_emitter_ops[UCL_EMIT_JSON_COMPACT] }, [UCL_EMIT_CONFIG] = { .name = "config", .id = UCL_EMIT_CONFIG, .func = NULL, .ops = &ucl_standartd_emitter_ops[UCL_EMIT_CONFIG] }, [UCL_EMIT_YAML] = { .name = "yaml", .id = UCL_EMIT_YAML, .func = NULL, .ops = &ucl_standartd_emitter_ops[UCL_EMIT_YAML] }, [UCL_EMIT_MSGPACK] = { .name = "msgpack", .id = UCL_EMIT_MSGPACK, .func = NULL, .ops = &ucl_standartd_emitter_ops[UCL_EMIT_MSGPACK] } }; +static inline void +_ucl_emitter_free(void *p) +{ + + free(p); +} + /** * Get standard emitter context for a specified emit_type * @param emit_type type of emitter * @return context or NULL if input is invalid */ const struct ucl_emitter_context * ucl_emit_get_standard_context (enum ucl_emitter emit_type) { if (emit_type >= UCL_EMIT_JSON && emit_type < UCL_EMIT_MAX) { return &ucl_standard_emitters[emit_type]; } return NULL; } /** * Serialise string * @param str string to emit * @param buf target buffer */ void ucl_elt_string_write_json (const char *str, size_t size, struct ucl_emitter_context *ctx) { const char *p = str, *c = str; size_t len = 0; const struct ucl_emitter_functions *func = ctx->func; func->ucl_emitter_append_character ('"', 1, func->ud); while (size) { - if (ucl_test_character (*p, UCL_CHARACTER_JSON_UNSAFE|UCL_CHARACTER_DENIED)) { + if (ucl_test_character (*p, (UCL_CHARACTER_JSON_UNSAFE| + UCL_CHARACTER_DENIED| + UCL_CHARACTER_WHITESPACE_UNSAFE))) { if (len > 0) { func->ucl_emitter_append_len (c, len, func->ud); } switch (*p) { case '\n': func->ucl_emitter_append_len ("\\n", 2, func->ud); break; case '\r': func->ucl_emitter_append_len ("\\r", 2, func->ud); break; case '\b': func->ucl_emitter_append_len ("\\b", 2, func->ud); break; case '\t': func->ucl_emitter_append_len ("\\t", 2, func->ud); break; case '\f': func->ucl_emitter_append_len ("\\f", 2, func->ud); break; + case '\v': + func->ucl_emitter_append_len ("\\u000B", 6, func->ud); + break; case '\\': func->ucl_emitter_append_len ("\\\\", 2, func->ud); break; + case ' ': + func->ucl_emitter_append_character (' ', 1, func->ud); + break; case '"': func->ucl_emitter_append_len ("\\\"", 2, func->ud); break; default: /* Emit unicode unknown character */ - func->ucl_emitter_append_len ("\\uFFFD", 5, func->ud); + func->ucl_emitter_append_len ("\\uFFFD", 6, func->ud); break; } len = 0; c = ++p; } else { p ++; len ++; } size --; } if (len > 0) { func->ucl_emitter_append_len (c, len, func->ud); } func->ucl_emitter_append_character ('"', 1, func->ud); } +void +ucl_elt_string_write_squoted (const char *str, size_t size, + struct ucl_emitter_context *ctx) +{ + const char *p = str, *c = str; + size_t len = 0; + const struct ucl_emitter_functions *func = ctx->func; + + func->ucl_emitter_append_character ('\'', 1, func->ud); + + while (size) { + if (*p == '\'') { + if (len > 0) { + func->ucl_emitter_append_len (c, len, func->ud); + } + + len = 0; + c = ++p; + func->ucl_emitter_append_len ("\\\'", 2, func->ud); + } + else { + p ++; + len ++; + } + size --; + } + + if (len > 0) { + func->ucl_emitter_append_len (c, len, func->ud); + } + + func->ucl_emitter_append_character ('\'', 1, func->ud); +} + void ucl_elt_string_write_multiline (const char *str, size_t size, struct ucl_emitter_context *ctx) { const struct ucl_emitter_functions *func = ctx->func; func->ucl_emitter_append_len ("<ud); func->ucl_emitter_append_len (str, size, func->ud); func->ucl_emitter_append_len ("\nEOD", sizeof ("\nEOD") - 1, func->ud); } /* * Generic utstring output */ static int ucl_utstring_append_character (unsigned char c, size_t len, void *ud) { UT_string *buf = ud; if (len == 1) { utstring_append_c (buf, c); } else { utstring_reserve (buf, len + 1); memset (&buf->d[buf->i], c, len); buf->i += len; buf->d[buf->i] = '\0'; } return 0; } static int ucl_utstring_append_len (const unsigned char *str, size_t len, void *ud) { UT_string *buf = ud; utstring_append_len (buf, str, len); return 0; } static int ucl_utstring_append_int (int64_t val, void *ud) { UT_string *buf = ud; utstring_printf (buf, "%jd", (intmax_t)val); return 0; } static int ucl_utstring_append_double (double val, void *ud) { UT_string *buf = ud; const double delta = 0.0000001; if (val == (double)(int)val) { utstring_printf (buf, "%.1lf", val); } else if (fabs (val - (double)(int)val) < delta) { /* Write at maximum precision */ utstring_printf (buf, "%.*lg", DBL_DIG, val); } else { utstring_printf (buf, "%lf", val); } return 0; } /* * Generic file output */ static int ucl_file_append_character (unsigned char c, size_t len, void *ud) { FILE *fp = ud; while (len --) { fputc (c, fp); } return 0; } static int ucl_file_append_len (const unsigned char *str, size_t len, void *ud) { FILE *fp = ud; fwrite (str, len, 1, fp); return 0; } static int ucl_file_append_int (int64_t val, void *ud) { FILE *fp = ud; fprintf (fp, "%jd", (intmax_t)val); return 0; } static int ucl_file_append_double (double val, void *ud) { FILE *fp = ud; const double delta = 0.0000001; if (val == (double)(int)val) { fprintf (fp, "%.1lf", val); } else if (fabs (val - (double)(int)val) < delta) { /* Write at maximum precision */ fprintf (fp, "%.*lg", DBL_DIG, val); } else { fprintf (fp, "%lf", val); } return 0; } /* * Generic file descriptor writing functions */ static int ucl_fd_append_character (unsigned char c, size_t len, void *ud) { int fd = *(int *)ud; unsigned char *buf; if (len == 1) { return write (fd, &c, 1); } else { buf = malloc (len); if (buf == NULL) { /* Fallback */ while (len --) { if (write (fd, &c, 1) == -1) { return -1; } } } else { memset (buf, c, len); if (write (fd, buf, len) == -1) { free(buf); return -1; } free (buf); } } return 0; } static int ucl_fd_append_len (const unsigned char *str, size_t len, void *ud) { int fd = *(int *)ud; return write (fd, str, len); } static int ucl_fd_append_int (int64_t val, void *ud) { int fd = *(int *)ud; char intbuf[64]; snprintf (intbuf, sizeof (intbuf), "%jd", (intmax_t)val); return write (fd, intbuf, strlen (intbuf)); } static int ucl_fd_append_double (double val, void *ud) { int fd = *(int *)ud; const double delta = 0.0000001; char nbuf[64]; if (val == (double)(int)val) { snprintf (nbuf, sizeof (nbuf), "%.1lf", val); } else if (fabs (val - (double)(int)val) < delta) { /* Write at maximum precision */ snprintf (nbuf, sizeof (nbuf), "%.*lg", DBL_DIG, val); } else { snprintf (nbuf, sizeof (nbuf), "%lf", val); } return write (fd, nbuf, strlen (nbuf)); } struct ucl_emitter_functions* ucl_object_emit_memory_funcs (void **pmem) { struct ucl_emitter_functions *f; UT_string *s; f = calloc (1, sizeof (*f)); if (f != NULL) { f->ucl_emitter_append_character = ucl_utstring_append_character; f->ucl_emitter_append_double = ucl_utstring_append_double; f->ucl_emitter_append_int = ucl_utstring_append_int; f->ucl_emitter_append_len = ucl_utstring_append_len; - f->ucl_emitter_free_func = free; + f->ucl_emitter_free_func = _ucl_emitter_free; utstring_new (s); f->ud = s; *pmem = s->d; s->pd = pmem; } return f; } struct ucl_emitter_functions* ucl_object_emit_file_funcs (FILE *fp) { struct ucl_emitter_functions *f; f = calloc (1, sizeof (*f)); if (f != NULL) { f->ucl_emitter_append_character = ucl_file_append_character; f->ucl_emitter_append_double = ucl_file_append_double; f->ucl_emitter_append_int = ucl_file_append_int; f->ucl_emitter_append_len = ucl_file_append_len; f->ucl_emitter_free_func = NULL; f->ud = fp; } return f; } struct ucl_emitter_functions* ucl_object_emit_fd_funcs (int fd) { struct ucl_emitter_functions *f; int *ip; f = calloc (1, sizeof (*f)); if (f != NULL) { ip = malloc (sizeof (fd)); if (ip == NULL) { free (f); return NULL; } memcpy (ip, &fd, sizeof (fd)); f->ucl_emitter_append_character = ucl_fd_append_character; f->ucl_emitter_append_double = ucl_fd_append_double; f->ucl_emitter_append_int = ucl_fd_append_int; f->ucl_emitter_append_len = ucl_fd_append_len; - f->ucl_emitter_free_func = free; + f->ucl_emitter_free_func = _ucl_emitter_free; f->ud = ip; } return f; } void ucl_object_emit_funcs_free (struct ucl_emitter_functions *f) { if (f != NULL) { if (f->ucl_emitter_free_func != NULL) { f->ucl_emitter_free_func (f->ud); } free (f); } } unsigned char * ucl_object_emit_single_json (const ucl_object_t *obj) { UT_string *buf = NULL; unsigned char *res = NULL; if (obj == NULL) { return NULL; } utstring_new (buf); if (buf != NULL) { switch (obj->type) { case UCL_OBJECT: ucl_utstring_append_len ("object", 6, buf); break; case UCL_ARRAY: ucl_utstring_append_len ("array", 5, buf); break; case UCL_INT: ucl_utstring_append_int (obj->value.iv, buf); break; case UCL_FLOAT: case UCL_TIME: ucl_utstring_append_double (obj->value.dv, buf); break; case UCL_NULL: ucl_utstring_append_len ("null", 4, buf); break; case UCL_BOOLEAN: if (obj->value.iv) { ucl_utstring_append_len ("true", 4, buf); } else { ucl_utstring_append_len ("false", 5, buf); } break; case UCL_STRING: ucl_utstring_append_len (obj->value.sv, obj->len, buf); break; case UCL_USERDATA: ucl_utstring_append_len ("userdata", 8, buf); break; } res = utstring_body (buf); free (buf); } return res; } #define LONG_STRING_LIMIT 80 bool ucl_maybe_long_string (const ucl_object_t *obj) { if (obj->len > LONG_STRING_LIMIT || (obj->flags & UCL_OBJECT_MULTILINE)) { /* String is long enough, so search for newline characters in it */ if (memchr (obj->value.sv, '\n', obj->len) != NULL) { return true; } } return false; } diff --git a/contrib/libucl/src/ucl_hash.c b/contrib/libucl/src/ucl_hash.c index bdc7fb486fc4..a74dfcdee68e 100644 --- a/contrib/libucl/src/ucl_hash.c +++ b/contrib/libucl/src/ucl_hash.c @@ -1,447 +1,637 @@ /* Copyright (c) 2013, Vsevolod Stakhov * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED ''AS IS'' AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL AUTHOR BE LIABLE FOR ANY * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "ucl_internal.h" #include "ucl_hash.h" #include "khash.h" #include "kvec.h" #include "mum.h" #include #include struct ucl_hash_elt { const ucl_object_t *obj; size_t ar_idx; }; struct ucl_hash_struct { void *hash; kvec_t(const ucl_object_t *) ar; bool caseless; }; static uint64_t ucl_hash_seed (void) { static uint64_t seed; if (seed == 0) { #ifdef UCL_RANDOM_FUNCTION seed = UCL_RANDOM_FUNCTION; #else /* Not very random but can be useful for our purposes */ seed = time (NULL); #endif } return seed; } static const unsigned char lc_map[256] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x40, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff }; #if (defined(WORD_BIT) && WORD_BIT == 64) || \ (defined(__WORDSIZE) && __WORDSIZE == 64) || \ defined(__x86_64__) || \ defined(__amd64__) #define UCL64_BIT_HASH 1 #endif static inline uint32_t ucl_hash_func (const ucl_object_t *o) { return mum_hash (o->key, o->keylen, ucl_hash_seed ()); } static inline int ucl_hash_equal (const ucl_object_t *k1, const ucl_object_t *k2) { if (k1->keylen == k2->keylen) { return memcmp (k1->key, k2->key, k1->keylen) == 0; } return 0; } KHASH_INIT (ucl_hash_node, const ucl_object_t *, struct ucl_hash_elt, 1, ucl_hash_func, ucl_hash_equal) static inline uint32_t ucl_hash_caseless_func (const ucl_object_t *o) { unsigned len = o->keylen; unsigned leftover = o->keylen % 8; unsigned fp, i; const uint8_t* s = (const uint8_t*)o->key; union { struct { unsigned char c1, c2, c3, c4, c5, c6, c7, c8; } c; uint64_t pp; } u; uint64_t r; fp = len - leftover; r = ucl_hash_seed (); for (i = 0; i != fp; i += 8) { u.c.c1 = s[i], u.c.c2 = s[i + 1], u.c.c3 = s[i + 2], u.c.c4 = s[i + 3]; u.c.c5 = s[i + 4], u.c.c6 = s[i + 5], u.c.c7 = s[i + 6], u.c.c8 = s[i + 7]; u.c.c1 = lc_map[u.c.c1]; u.c.c2 = lc_map[u.c.c2]; u.c.c3 = lc_map[u.c.c3]; u.c.c4 = lc_map[u.c.c4]; - u.c.c1 = lc_map[u.c.c5]; - u.c.c2 = lc_map[u.c.c6]; - u.c.c3 = lc_map[u.c.c7]; - u.c.c4 = lc_map[u.c.c8]; + u.c.c5 = lc_map[u.c.c5]; + u.c.c6 = lc_map[u.c.c6]; + u.c.c7 = lc_map[u.c.c7]; + u.c.c8 = lc_map[u.c.c8]; r = mum_hash_step (r, u.pp); } u.pp = 0; switch (leftover) { case 7: u.c.c7 = lc_map[(unsigned char)s[i++]]; + /* FALLTHRU */ case 6: u.c.c6 = lc_map[(unsigned char)s[i++]]; + /* FALLTHRU */ case 5: u.c.c5 = lc_map[(unsigned char)s[i++]]; + /* FALLTHRU */ case 4: u.c.c4 = lc_map[(unsigned char)s[i++]]; + /* FALLTHRU */ case 3: u.c.c3 = lc_map[(unsigned char)s[i++]]; + /* FALLTHRU */ case 2: u.c.c2 = lc_map[(unsigned char)s[i++]]; + /* FALLTHRU */ case 1: u.c.c1 = lc_map[(unsigned char)s[i]]; r = mum_hash_step (r, u.pp); break; } return mum_hash_finish (r); } static inline int ucl_hash_caseless_equal (const ucl_object_t *k1, const ucl_object_t *k2) { if (k1->keylen == k2->keylen) { - return memcmp (k1->key, k2->key, k1->keylen) == 0; + unsigned fp, i; + const char *s = k1->key, *d = k2->key; + unsigned char c1, c2, c3, c4; + union { + unsigned char c[4]; + uint32_t n; + } cmp1, cmp2; + size_t leftover = k1->keylen % 4; + + fp = k1->keylen - leftover; + + for (i = 0; i != fp; i += 4) { + c1 = s[i], c2 = s[i + 1], c3 = s[i + 2], c4 = s[i + 3]; + cmp1.c[0] = lc_map[c1]; + cmp1.c[1] = lc_map[c2]; + cmp1.c[2] = lc_map[c3]; + cmp1.c[3] = lc_map[c4]; + + c1 = d[i], c2 = d[i + 1], c3 = d[i + 2], c4 = d[i + 3]; + cmp2.c[0] = lc_map[c1]; + cmp2.c[1] = lc_map[c2]; + cmp2.c[2] = lc_map[c3]; + cmp2.c[3] = lc_map[c4]; + + if (cmp1.n != cmp2.n) { + return 0; + } + } + + while (leftover > 0) { + if (lc_map[(unsigned char)s[i]] != lc_map[(unsigned char)d[i]]) { + return 0; + } + + leftover--; + i++; + } + + return 1; } return 0; } KHASH_INIT (ucl_hash_caseless_node, const ucl_object_t *, struct ucl_hash_elt, 1, ucl_hash_caseless_func, ucl_hash_caseless_equal) ucl_hash_t* ucl_hash_create (bool ignore_case) { ucl_hash_t *new; new = UCL_ALLOC (sizeof (ucl_hash_t)); if (new != NULL) { + void *h; kv_init (new->ar); new->caseless = ignore_case; if (ignore_case) { - khash_t(ucl_hash_caseless_node) *h = kh_init (ucl_hash_caseless_node); - new->hash = (void *)h; + h = (void *)kh_init (ucl_hash_caseless_node); } else { - khash_t(ucl_hash_node) *h = kh_init (ucl_hash_node); - new->hash = (void *)h; + h = (void *)kh_init (ucl_hash_node); } + if (h == NULL) { + UCL_FREE (sizeof (ucl_hash_t), new); + return NULL; + } + new->hash = h; } return new; } void ucl_hash_destroy (ucl_hash_t* hashlin, ucl_hash_free_func func) { const ucl_object_t *cur, *tmp; if (hashlin == NULL) { return; } if (func != NULL) { /* Iterate over the hash first */ khash_t(ucl_hash_node) *h = (khash_t(ucl_hash_node) *) hashlin->hash; khiter_t k; for (k = kh_begin (h); k != kh_end (h); ++k) { if (kh_exist (h, k)) { cur = (kh_value (h, k)).obj; while (cur != NULL) { tmp = cur->next; func (__DECONST (ucl_object_t *, cur)); cur = tmp; } } } } if (hashlin->caseless) { khash_t(ucl_hash_caseless_node) *h = (khash_t(ucl_hash_caseless_node) *) hashlin->hash; kh_destroy (ucl_hash_caseless_node, h); } else { khash_t(ucl_hash_node) *h = (khash_t(ucl_hash_node) *) hashlin->hash; kh_destroy (ucl_hash_node, h); } kv_destroy (hashlin->ar); UCL_FREE (sizeof (*hashlin), hashlin); } -void +bool ucl_hash_insert (ucl_hash_t* hashlin, const ucl_object_t *obj, const char *key, unsigned keylen) { khiter_t k; int ret; struct ucl_hash_elt *elt; if (hashlin == NULL) { - return; + return false; } if (hashlin->caseless) { khash_t(ucl_hash_caseless_node) *h = (khash_t(ucl_hash_caseless_node) *) hashlin->hash; k = kh_put (ucl_hash_caseless_node, h, obj, &ret); if (ret > 0) { elt = &kh_value (h, k); - kv_push (const ucl_object_t *, hashlin->ar, obj); + kv_push_safe (const ucl_object_t *, hashlin->ar, obj, e0); elt->obj = obj; elt->ar_idx = kv_size (hashlin->ar) - 1; } } else { khash_t(ucl_hash_node) *h = (khash_t(ucl_hash_node) *) hashlin->hash; k = kh_put (ucl_hash_node, h, obj, &ret); if (ret > 0) { elt = &kh_value (h, k); - kv_push (const ucl_object_t *, hashlin->ar, obj); + kv_push_safe (const ucl_object_t *, hashlin->ar, obj, e0); elt->obj = obj; elt->ar_idx = kv_size (hashlin->ar) - 1; + } else if (ret < 0) { + goto e0; } } + return true; +e0: + return false; } void ucl_hash_replace (ucl_hash_t* hashlin, const ucl_object_t *old, const ucl_object_t *new) { khiter_t k; int ret; struct ucl_hash_elt elt, *pelt; if (hashlin == NULL) { return; } if (hashlin->caseless) { khash_t(ucl_hash_caseless_node) *h = (khash_t(ucl_hash_caseless_node) *) hashlin->hash; k = kh_put (ucl_hash_caseless_node, h, old, &ret); if (ret == 0) { elt = kh_value (h, k); kh_del (ucl_hash_caseless_node, h, k); k = kh_put (ucl_hash_caseless_node, h, new, &ret); pelt = &kh_value (h, k); pelt->obj = new; pelt->ar_idx = elt.ar_idx; kv_A (hashlin->ar, elt.ar_idx) = new; } } else { khash_t(ucl_hash_node) *h = (khash_t(ucl_hash_node) *) hashlin->hash; k = kh_put (ucl_hash_node, h, old, &ret); if (ret == 0) { elt = kh_value (h, k); kh_del (ucl_hash_node, h, k); k = kh_put (ucl_hash_node, h, new, &ret); pelt = &kh_value (h, k); pelt->obj = new; pelt->ar_idx = elt.ar_idx; kv_A (hashlin->ar, elt.ar_idx) = new; } } } struct ucl_hash_real_iter { const ucl_object_t **cur; const ucl_object_t **end; }; +#define UHI_SETERR(ep, ern) {if (ep != NULL) *ep = (ern);} + const void* -ucl_hash_iterate (ucl_hash_t *hashlin, ucl_hash_iter_t *iter) +ucl_hash_iterate2 (ucl_hash_t *hashlin, ucl_hash_iter_t *iter, int *ep) { struct ucl_hash_real_iter *it = (struct ucl_hash_real_iter *)(*iter); const ucl_object_t *ret = NULL; if (hashlin == NULL) { + UHI_SETERR(ep, EINVAL); return NULL; } if (it == NULL) { it = UCL_ALLOC (sizeof (*it)); if (it == NULL) { + UHI_SETERR(ep, ENOMEM); return NULL; } it->cur = &hashlin->ar.a[0]; it->end = it->cur + hashlin->ar.n; } + UHI_SETERR(ep, 0); if (it->cur < it->end) { ret = *it->cur++; } else { UCL_FREE (sizeof (*it), it); *iter = NULL; return NULL; } *iter = it; return ret; } bool ucl_hash_iter_has_next (ucl_hash_t *hashlin, ucl_hash_iter_t iter) { struct ucl_hash_real_iter *it = (struct ucl_hash_real_iter *)(iter); return it->cur < it->end - 1; } const ucl_object_t* ucl_hash_search (ucl_hash_t* hashlin, const char *key, unsigned keylen) { khiter_t k; const ucl_object_t *ret = NULL; ucl_object_t search; struct ucl_hash_elt *elt; search.key = key; search.keylen = keylen; if (hashlin == NULL) { return NULL; } if (hashlin->caseless) { khash_t(ucl_hash_caseless_node) *h = (khash_t(ucl_hash_caseless_node) *) hashlin->hash; k = kh_get (ucl_hash_caseless_node, h, &search); if (k != kh_end (h)) { elt = &kh_value (h, k); ret = elt->obj; } } else { khash_t(ucl_hash_node) *h = (khash_t(ucl_hash_node) *) hashlin->hash; k = kh_get (ucl_hash_node, h, &search); if (k != kh_end (h)) { elt = &kh_value (h, k); ret = elt->obj; } } return ret; } void ucl_hash_delete (ucl_hash_t* hashlin, const ucl_object_t *obj) { khiter_t k; struct ucl_hash_elt *elt; + size_t i; if (hashlin == NULL) { return; } if (hashlin->caseless) { khash_t(ucl_hash_caseless_node) *h = (khash_t(ucl_hash_caseless_node) *) hashlin->hash; k = kh_get (ucl_hash_caseless_node, h, obj); if (k != kh_end (h)) { elt = &kh_value (h, k); + i = elt->ar_idx; kv_del (const ucl_object_t *, hashlin->ar, elt->ar_idx); kh_del (ucl_hash_caseless_node, h, k); + + /* Update subsequent elts */ + for (; i < hashlin->ar.n; i ++) { + elt = &kh_value (h, i); + elt->ar_idx --; + } } } else { khash_t(ucl_hash_node) *h = (khash_t(ucl_hash_node) *) hashlin->hash; k = kh_get (ucl_hash_node, h, obj); if (k != kh_end (h)) { elt = &kh_value (h, k); + i = elt->ar_idx; kv_del (const ucl_object_t *, hashlin->ar, elt->ar_idx); kh_del (ucl_hash_node, h, k); + + /* Update subsequent elts */ + for (; i < hashlin->ar.n; i ++) { + elt = &kh_value (h, i); + elt->ar_idx --; + } + } + } +} + +bool ucl_hash_reserve (ucl_hash_t *hashlin, size_t sz) +{ + if (hashlin == NULL) { + return false; + } + + if (sz > hashlin->ar.m) { + kv_resize_safe (const ucl_object_t *, hashlin->ar, sz, e0); + + if (hashlin->caseless) { + khash_t(ucl_hash_caseless_node) *h = (khash_t( + ucl_hash_caseless_node) *) + hashlin->hash; + kh_resize (ucl_hash_caseless_node, h, sz * 2); + } else { + khash_t(ucl_hash_node) *h = (khash_t(ucl_hash_node) *) + hashlin->hash; + kh_resize (ucl_hash_node, h, sz * 2); + } + } + return true; +e0: + return false; +} + +static int +ucl_lc_cmp (const char *s, const char *d, size_t l) +{ + unsigned int fp, i; + unsigned char c1, c2, c3, c4; + union { + unsigned char c[4]; + uint32_t n; + } cmp1, cmp2; + size_t leftover = l % 4; + int ret = 0; + + fp = l - leftover; + + for (i = 0; i != fp; i += 4) { + c1 = s[i], c2 = s[i + 1], c3 = s[i + 2], c4 = s[i + 3]; + cmp1.c[0] = lc_map[c1]; + cmp1.c[1] = lc_map[c2]; + cmp1.c[2] = lc_map[c3]; + cmp1.c[3] = lc_map[c4]; + + c1 = d[i], c2 = d[i + 1], c3 = d[i + 2], c4 = d[i + 3]; + cmp2.c[0] = lc_map[c1]; + cmp2.c[1] = lc_map[c2]; + cmp2.c[2] = lc_map[c3]; + cmp2.c[3] = lc_map[c4]; + + if (cmp1.n != cmp2.n) { + return cmp1.n - cmp2.n; + } + } + + while (leftover > 0) { + if (lc_map[(unsigned char)s[i]] != lc_map[(unsigned char)d[i]]) { + return s[i] - d[i]; + } + + leftover--; + i++; + } + + return ret; +} + +static int +ucl_hash_cmp_icase (const void *a, const void *b) +{ + const ucl_object_t *oa = *(const ucl_object_t **)a, + *ob = *(const ucl_object_t **)b; + + if (oa->keylen == ob->keylen) { + return ucl_lc_cmp (oa->key, ob->key, oa->keylen); + } + + return ((int)(oa->keylen)) - ob->keylen; +} + +static int +ucl_hash_cmp_case_sens (const void *a, const void *b) +{ + const ucl_object_t *oa = *(const ucl_object_t **)a, + *ob = *(const ucl_object_t **)b; + + if (oa->keylen == ob->keylen) { + return memcmp (oa->key, ob->key, oa->keylen); + } + + return ((int)(oa->keylen)) - ob->keylen; +} + +void +ucl_hash_sort (ucl_hash_t *hashlin, enum ucl_object_keys_sort_flags fl) +{ + + if (fl & UCL_SORT_KEYS_ICASE) { + qsort (hashlin->ar.a, hashlin->ar.n, sizeof (ucl_object_t *), + ucl_hash_cmp_icase); + } + else { + qsort (hashlin->ar.a, hashlin->ar.n, sizeof (ucl_object_t *), + ucl_hash_cmp_case_sens); + } + + if (fl & UCL_SORT_KEYS_RECURSIVE) { + for (size_t i = 0; i < hashlin->ar.n; i ++) { + if (ucl_object_type (hashlin->ar.a[i]) == UCL_OBJECT) { + ucl_hash_sort (hashlin->ar.a[i]->value.ov, fl); + } } } } diff --git a/contrib/libucl/src/ucl_hash.h b/contrib/libucl/src/ucl_hash.h index 92021e34075e..8f6d69e21a25 100644 --- a/contrib/libucl/src/ucl_hash.h +++ b/contrib/libucl/src/ucl_hash.h @@ -1,93 +1,109 @@ /* Copyright (c) 2013, Vsevolod Stakhov * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED ''AS IS'' AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL AUTHOR BE LIABLE FOR ANY * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifndef __UCL_HASH_H #define __UCL_HASH_H #include "ucl.h" /******************************************************************************/ struct ucl_hash_node_s; typedef struct ucl_hash_node_s ucl_hash_node_t; typedef int (*ucl_hash_cmp_func) (const void* void_a, const void* void_b); typedef void (*ucl_hash_free_func) (void *ptr); typedef void* ucl_hash_iter_t; /** * Linear chained hashtable. */ struct ucl_hash_struct; typedef struct ucl_hash_struct ucl_hash_t; /** * Initializes the hashtable. */ ucl_hash_t* ucl_hash_create (bool ignore_case); /** * Deinitializes the hashtable. */ void ucl_hash_destroy (ucl_hash_t* hashlin, ucl_hash_free_func func); /** * Inserts an element in the the hashtable. + * @return true on success, false on failure (i.e. ENOMEM) */ -void ucl_hash_insert (ucl_hash_t* hashlin, const ucl_object_t *obj, const char *key, +bool ucl_hash_insert (ucl_hash_t* hashlin, const ucl_object_t *obj, const char *key, unsigned keylen); /** * Replace element in the hash */ void ucl_hash_replace (ucl_hash_t* hashlin, const ucl_object_t *old, const ucl_object_t *new); /** * Delete an element from the the hashtable. */ void ucl_hash_delete (ucl_hash_t* hashlin, const ucl_object_t *obj); /** * Searches an element in the hashtable. */ const ucl_object_t* ucl_hash_search (ucl_hash_t* hashlin, const char *key, unsigned keylen); /** * Iterate over hash table * @param hashlin hash * @param iter iterator (must be NULL on first iteration) + * @param ep pointer record exception (such as ENOMEM), could be NULL * @return the next object */ -const void* ucl_hash_iterate (ucl_hash_t *hashlin, ucl_hash_iter_t *iter); +const void* ucl_hash_iterate2 (ucl_hash_t *hashlin, ucl_hash_iter_t *iter, int *ep); + +/** + * Helper macro to support older code + */ +#define ucl_hash_iterate(hl, ip) ucl_hash_iterate2((hl), (ip), NULL) /** * Check whether an iterator has next element */ bool ucl_hash_iter_has_next (ucl_hash_t *hashlin, ucl_hash_iter_t iter); +/** + * Reserves space in hash + * @return true on sucess, false on failure (e.g. ENOMEM) + * @param hashlin + */ +bool ucl_hash_reserve (ucl_hash_t *hashlin, size_t sz); + +void ucl_hash_sort (ucl_hash_t *hashlin, enum ucl_object_keys_sort_flags fl); + #endif diff --git a/contrib/libucl/src/ucl_internal.h b/contrib/libucl/src/ucl_internal.h index 9ae5250cc92e..2c5fdf84fee7 100644 --- a/contrib/libucl/src/ucl_internal.h +++ b/contrib/libucl/src/ucl_internal.h @@ -1,576 +1,667 @@ /* Copyright (c) 2013, Vsevolod Stakhov * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED ''AS IS'' AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL AUTHOR BE LIABLE FOR ANY * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifndef UCL_INTERNAL_H_ #define UCL_INTERNAL_H_ #ifdef HAVE_CONFIG_H #include "config.h" #else /* Help embedded builds */ #define HAVE_SYS_TYPES_H #define HAVE_SYS_MMAN_H #define HAVE_SYS_STAT_H #define HAVE_SYS_PARAM_H #define HAVE_LIMITS_H #define HAVE_FCNTL_H #define HAVE_ERRNO_H #define HAVE_UNISTD_H #define HAVE_CTYPE_H #define HAVE_STDIO_H #define HAVE_STRING_H #define HAVE_FLOAT_H #define HAVE_LIBGEN_H #define HAVE_MATH_H #define HAVE_STDBOOL_H #define HAVE_STDINT_H #define HAVE_STDARG_H #ifndef _WIN32 # define HAVE_REGEX_H #endif #endif #ifdef HAVE_SYS_TYPES_H #include #endif #ifdef HAVE_SYS_MMAN_H # ifndef _WIN32 # include # endif #endif #ifdef HAVE_SYS_STAT_H #include #endif #ifdef HAVE_SYS_PARAM_H -#include +# ifndef _WIN32 +# include +# endif #endif #ifdef HAVE_LIMITS_H #include #endif #ifdef HAVE_FCNTL_H #include #endif #ifdef HAVE_ERRNO_H #include #endif #ifdef HAVE_UNISTD_H -#include +# ifndef _WIN32 +# include +# endif #endif #ifdef HAVE_CTYPE_H #include #endif #ifdef HAVE_STDIO_H #include #endif #ifdef HAVE_STRING_H #include #endif #ifdef HAVE_STRINGS_H #include #endif +#if defined(_MSC_VER) +/* Windows hacks */ +#include +#include +typedef SSIZE_T ssize_t; +#define strdup _strdup +#define snprintf _snprintf +#define vsnprintf _vsnprintf +#define strcasecmp _stricmp +#define strncasecmp _strnicmp +#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) +#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) +#if _MSC_VER >= 1900 +#include <../ucrt/stdlib.h> +#else +#include <../include/stdlib.h> +#endif +#ifndef PATH_MAX +#define PATH_MAX _MAX_PATH +#endif + +/* Dirname, basename implementations */ + + +#endif + #include "utlist.h" #include "utstring.h" #include "uthash.h" #include "ucl.h" #include "ucl_hash.h" #ifdef HAVE_OPENSSL #include #endif #ifndef __DECONST #define __DECONST(type, var) ((type)(uintptr_t)(const void *)(var)) #endif /** * @file rcl_internal.h * Internal structures and functions of UCL library */ #define UCL_MAX_RECURSION 16 #define UCL_TRASH_KEY 0 #define UCL_TRASH_VALUE 1 enum ucl_parser_state { UCL_STATE_INIT = 0, UCL_STATE_OBJECT, UCL_STATE_ARRAY, UCL_STATE_KEY, + UCL_STATE_KEY_OBRACE, UCL_STATE_VALUE, UCL_STATE_AFTER_VALUE, UCL_STATE_ARRAY_VALUE, UCL_STATE_SCOMMENT, UCL_STATE_MCOMMENT, UCL_STATE_MACRO_NAME, UCL_STATE_MACRO, UCL_STATE_ERROR }; enum ucl_character_type { UCL_CHARACTER_DENIED = (1 << 0), UCL_CHARACTER_KEY = (1 << 1), UCL_CHARACTER_KEY_START = (1 << 2), UCL_CHARACTER_WHITESPACE = (1 << 3), UCL_CHARACTER_WHITESPACE_UNSAFE = (1 << 4), UCL_CHARACTER_VALUE_END = (1 << 5), UCL_CHARACTER_VALUE_STR = (1 << 6), UCL_CHARACTER_VALUE_DIGIT = (1 << 7), UCL_CHARACTER_VALUE_DIGIT_START = (1 << 8), UCL_CHARACTER_ESCAPE = (1 << 9), UCL_CHARACTER_KEY_SEP = (1 << 10), UCL_CHARACTER_JSON_UNSAFE = (1 << 11), UCL_CHARACTER_UCL_UNSAFE = (1 << 12) }; struct ucl_macro { char *name; - union { + union _ucl_macro { ucl_macro_handler handler; ucl_context_macro_handler context_handler; } h; void* ud; bool is_context; UT_hash_handle hh; }; +enum ucl_stack_flags { + UCL_STACK_HAS_OBRACE = (1u << 0), + UCL_STACK_MAX = (1u << 1), +}; + struct ucl_stack { ucl_object_t *obj; struct ucl_stack *next; - uint64_t level; + union { + struct { + uint16_t level; + uint16_t flags; + uint32_t line; + } params; + uint64_t len; + } e; + struct ucl_chunk *chunk; +}; + +struct ucl_parser_special_handler_chain { + unsigned char *begin; + size_t len; + struct ucl_parser_special_handler *special_handler; + struct ucl_parser_special_handler_chain *next; }; struct ucl_chunk { const unsigned char *begin; const unsigned char *end; const unsigned char *pos; + char *fname; size_t remain; unsigned int line; unsigned int column; unsigned priority; enum ucl_duplicate_strategy strategy; enum ucl_parse_type parse_type; + struct ucl_parser_special_handler_chain *special_handlers; struct ucl_chunk *next; }; #ifdef HAVE_OPENSSL struct ucl_pubkey { EVP_PKEY *key; struct ucl_pubkey *next; }; #else struct ucl_pubkey { struct ucl_pubkey *next; }; #endif struct ucl_variable { char *var; char *value; size_t var_len; size_t value_len; struct ucl_variable *prev, *next; }; struct ucl_parser { enum ucl_parser_state state; enum ucl_parser_state prev_state; unsigned int recursion; int flags; unsigned default_priority; int err_code; ucl_object_t *top_obj; ucl_object_t *cur_obj; ucl_object_t *trash_objs; ucl_object_t *includepaths; char *cur_file; struct ucl_macro *macroes; struct ucl_stack *stack; struct ucl_chunk *chunks; struct ucl_pubkey *keys; + struct ucl_parser_special_handler *special_handlers; + ucl_include_trace_func_t *include_trace_func; + void *include_trace_ud; struct ucl_variable *variables; ucl_variable_handler var_handler; void *var_data; ucl_object_t *comments; ucl_object_t *last_comment; UT_string *err; }; struct ucl_object_userdata { ucl_object_t obj; ucl_userdata_dtor dtor; ucl_userdata_emitter emitter; }; /** * Unescape json string inplace * @param str */ size_t ucl_unescape_json_string (char *str, size_t len); + +/** + * Unescape single quoted string inplace + * @param str + */ +size_t ucl_unescape_squoted_string (char *str, size_t len); + /** * Handle include macro * @param data include data * @param len length of data * @param args UCL object representing arguments to the macro * @param ud user data * @return */ bool ucl_include_handler (const unsigned char *data, size_t len, const ucl_object_t *args, void* ud); /** * Handle tryinclude macro * @param data include data * @param len length of data * @param args UCL object representing arguments to the macro * @param ud user data * @return */ bool ucl_try_include_handler (const unsigned char *data, size_t len, const ucl_object_t *args, void* ud); /** * Handle includes macro * @param data include data * @param len length of data * @param args UCL object representing arguments to the macro * @param ud user data * @return */ bool ucl_includes_handler (const unsigned char *data, size_t len, const ucl_object_t *args, void* ud); /** * Handle priority macro * @param data include data * @param len length of data * @param args UCL object representing arguments to the macro * @param ud user data * @return */ bool ucl_priority_handler (const unsigned char *data, size_t len, const ucl_object_t *args, void* ud); /** * Handle load macro * @param data include data * @param len length of data * @param args UCL object representing arguments to the macro * @param ud user data * @return */ bool ucl_load_handler (const unsigned char *data, size_t len, const ucl_object_t *args, void* ud); /** * Handle inherit macro * @param data include data * @param len length of data * @param args UCL object representing arguments to the macro * @param ctx the current context object * @param ud user data * @return */ bool ucl_inherit_handler (const unsigned char *data, size_t len, const ucl_object_t *args, const ucl_object_t *ctx, void* ud); size_t ucl_strlcpy (char *dst, const char *src, size_t siz); size_t ucl_strlcpy_unsafe (char *dst, const char *src, size_t siz); size_t ucl_strlcpy_tolower (char *dst, const char *src, size_t siz); char *ucl_strnstr (const char *s, const char *find, int len); char *ucl_strncasestr (const char *s, const char *find, int len); #ifdef __GNUC__ static inline void ucl_create_err (UT_string **err, const char *fmt, ...) __attribute__ (( format( printf, 2, 3) )); #endif #undef UCL_FATAL_ERRORS static inline void ucl_create_err (UT_string **err, const char *fmt, ...) { if (*err == NULL) { utstring_new (*err); va_list ap; va_start (ap, fmt); utstring_printf_va (*err, fmt, ap); va_end (ap); } #ifdef UCL_FATAL_ERRORS assert (0); #endif } /** * Check whether a given string contains a boolean value * @param obj object to set * @param start start of a string * @param len length of a string * @return true if a string is a boolean value */ static inline bool ucl_maybe_parse_boolean (ucl_object_t *obj, const unsigned char *start, size_t len) { const char *p = (const char *)start; bool ret = false, val = false; if (len == 5) { if ((p[0] == 'f' || p[0] == 'F') && strncasecmp (p, "false", 5) == 0) { ret = true; val = false; } } else if (len == 4) { if ((p[0] == 't' || p[0] == 'T') && strncasecmp (p, "true", 4) == 0) { ret = true; val = true; } } else if (len == 3) { if ((p[0] == 'y' || p[0] == 'Y') && strncasecmp (p, "yes", 3) == 0) { ret = true; val = true; } else if ((p[0] == 'o' || p[0] == 'O') && strncasecmp (p, "off", 3) == 0) { ret = true; val = false; } } else if (len == 2) { if ((p[0] == 'n' || p[0] == 'N') && strncasecmp (p, "no", 2) == 0) { ret = true; val = false; } else if ((p[0] == 'o' || p[0] == 'O') && strncasecmp (p, "on", 2) == 0) { ret = true; val = true; } } if (ret && obj != NULL) { obj->type = UCL_BOOLEAN; obj->value.iv = val; } return ret; } /** * Check numeric string * @param obj object to set if a string is numeric * @param start start of string * @param end end of string * @param pos position where parsing has stopped * @param allow_double allow parsing of floating point values * @return 0 if string is numeric and error code (EINVAL or ERANGE) in case of conversion error */ int ucl_maybe_parse_number (ucl_object_t *obj, const char *start, const char *end, const char **pos, bool allow_double, bool number_bytes, bool allow_time); static inline const ucl_object_t * ucl_hash_search_obj (ucl_hash_t* hashlin, ucl_object_t *obj) { return (const ucl_object_t *)ucl_hash_search (hashlin, obj->key, obj->keylen); } static inline ucl_hash_t * ucl_hash_insert_object (ucl_hash_t *hashlin, const ucl_object_t *obj, bool ignore_case) UCL_WARN_UNUSED_RESULT; static inline ucl_hash_t * ucl_hash_insert_object (ucl_hash_t *hashlin, const ucl_object_t *obj, bool ignore_case) { + ucl_hash_t *nhp; + if (hashlin == NULL) { - hashlin = ucl_hash_create (ignore_case); + nhp = ucl_hash_create (ignore_case); + if (nhp == NULL) { + return NULL; + } + } else { + nhp = hashlin; + } + if (!ucl_hash_insert (nhp, obj, obj->key, obj->keylen)) { + if (nhp != hashlin) { + ucl_hash_destroy(nhp, NULL); + } + return NULL; } - ucl_hash_insert (hashlin, obj, obj->key, obj->keylen); - return hashlin; + return nhp; } /** * Get standard emitter context for a specified emit_type * @param emit_type type of emitter * @return context or NULL if input is invalid */ const struct ucl_emitter_context * ucl_emit_get_standard_context (enum ucl_emitter emit_type); /** * Serialize string as JSON string * @param str string to emit * @param buf target buffer */ void ucl_elt_string_write_json (const char *str, size_t size, struct ucl_emitter_context *ctx); + +/** + * Serialize string as single quoted string + * @param str string to emit + * @param buf target buffer + */ +void +ucl_elt_string_write_squoted (const char *str, size_t size, + struct ucl_emitter_context *ctx); + /** * Write multiline string using `EOD` as string terminator * @param str * @param size * @param ctx */ void ucl_elt_string_write_multiline (const char *str, size_t size, struct ucl_emitter_context *ctx); /** * Emit a single object to string * @param obj * @return */ unsigned char * ucl_object_emit_single_json (const ucl_object_t *obj); /** * Check whether a specified string is long and should be likely printed in * multiline mode * @param obj * @return */ bool ucl_maybe_long_string (const ucl_object_t *obj); /** * Print integer to the msgpack output * @param ctx * @param val */ void ucl_emitter_print_int_msgpack (struct ucl_emitter_context *ctx, int64_t val); /** * Print integer to the msgpack output * @param ctx * @param val */ void ucl_emitter_print_double_msgpack (struct ucl_emitter_context *ctx, double val); /** * Print double to the msgpack output * @param ctx * @param val */ void ucl_emitter_print_bool_msgpack (struct ucl_emitter_context *ctx, bool val); /** * Print string to the msgpack output * @param ctx * @param s * @param len */ void ucl_emitter_print_string_msgpack (struct ucl_emitter_context *ctx, const char *s, size_t len); /** * Print binary string to the msgpack output * @param ctx * @param s * @param len */ void ucl_emitter_print_binary_string_msgpack (struct ucl_emitter_context *ctx, const char *s, size_t len); /** * Print array preamble for msgpack * @param ctx * @param len */ void ucl_emitter_print_array_msgpack (struct ucl_emitter_context *ctx, size_t len); /** * Print object preamble for msgpack * @param ctx * @param len */ void ucl_emitter_print_object_msgpack (struct ucl_emitter_context *ctx, size_t len); /** * Print NULL to the msgpack output * @param ctx */ void ucl_emitter_print_null_msgpack (struct ucl_emitter_context *ctx); /** * Print object's key if needed to the msgpack output * @param print_key * @param ctx * @param obj */ void ucl_emitter_print_key_msgpack (bool print_key, struct ucl_emitter_context *ctx, const ucl_object_t *obj); /** * Fetch URL into a buffer * @param url url to fetch * @param buf pointer to buffer (must be freed by callee) * @param buflen pointer to buffer length * @param err pointer to error argument * @param must_exist fail if cannot find a url */ bool ucl_fetch_url (const unsigned char *url, unsigned char **buf, size_t *buflen, UT_string **err, bool must_exist); /** * Fetch a file and save results to the memory buffer * @param filename filename to fetch * @param len length of filename * @param buf target buffer * @param buflen target length * @return */ bool ucl_fetch_file (const unsigned char *filename, unsigned char **buf, size_t *buflen, UT_string **err, bool must_exist); /** * Add new element to an object using the current merge strategy and priority * @param parser * @param nobj * @return */ bool ucl_parser_process_object_element (struct ucl_parser *parser, ucl_object_t *nobj); /** * Parse msgpack chunk * @param parser * @return */ bool ucl_parse_msgpack (struct ucl_parser *parser); bool ucl_parse_csexp (struct ucl_parser *parser); +/** + * Free ucl chunk + * @param chunk + */ +void ucl_chunk_free (struct ucl_chunk *chunk); + #endif /* UCL_INTERNAL_H_ */ diff --git a/contrib/libucl/src/ucl_msgpack.c b/contrib/libucl/src/ucl_msgpack.c index bd7c3a1ce785..3335e39cd9e7 100644 --- a/contrib/libucl/src/ucl_msgpack.c +++ b/contrib/libucl/src/ucl_msgpack.c @@ -1,1626 +1,1638 @@ /* * Copyright (c) 2015, Vsevolod Stakhov * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY AUTHOR ''AS IS'' AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL AUTHOR BE LIABLE FOR ANY * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifdef HAVE_CONFIG_H #include "config.h" #endif #include "ucl.h" #include "ucl_internal.h" #ifdef HAVE_ENDIAN_H #include #elif defined(HAVE_SYS_ENDIAN_H) #include #elif defined(HAVE_MACHINE_ENDIAN_H) #include #endif #if !defined(__LITTLE_ENDIAN__) && !defined(__BIG_ENDIAN__) #if __BYTE_ORDER == __LITTLE_ENDIAN #define __LITTLE_ENDIAN__ #elif __BYTE_ORDER == __BIG_ENDIAN #define __BIG_ENDIAN__ #elif _WIN32 #define __LITTLE_ENDIAN__ #endif #endif #define SWAP_LE_BE16(val) ((uint16_t) ( \ (uint16_t) ((uint16_t) (val) >> 8) | \ (uint16_t) ((uint16_t) (val) << 8))) #if defined(__clang__) || (defined(__GNUC__) && __GNUC__ >= 4 && defined (__GNUC_MINOR__) && __GNUC_MINOR__ >= 3) # define SWAP_LE_BE32(val) ((uint32_t)__builtin_bswap32 ((uint32_t)(val))) # define SWAP_LE_BE64(val) ((uint64_t)__builtin_bswap64 ((uint64_t)(val))) #else #define SWAP_LE_BE32(val) ((uint32_t)( \ (((uint32_t)(val) & (uint32_t)0x000000ffU) << 24) | \ (((uint32_t)(val) & (uint32_t)0x0000ff00U) << 8) | \ (((uint32_t)(val) & (uint32_t)0x00ff0000U) >> 8) | \ (((uint32_t)(val) & (uint32_t)0xff000000U) >> 24))) #define SWAP_LE_BE64(val) ((uint64_t)( \ (((uint64_t)(val) & \ (uint64_t)(0x00000000000000ffULL)) << 56) | \ (((uint64_t)(val) & \ (uint64_t)(0x000000000000ff00ULL)) << 40) | \ (((uint64_t)(val) & \ (uint64_t)(0x0000000000ff0000ULL)) << 24) | \ (((uint64_t)(val) & \ (uint64_t) (0x00000000ff000000ULL)) << 8) | \ (((uint64_t)(val) & \ (uint64_t)(0x000000ff00000000ULL)) >> 8) | \ (((uint64_t)(val) & \ (uint64_t)(0x0000ff0000000000ULL)) >> 24) | \ (((uint64_t)(val) & \ (uint64_t)(0x00ff000000000000ULL)) >> 40) | \ (((uint64_t)(val) & \ (uint64_t)(0xff00000000000000ULL)) >> 56))) #endif #ifdef __LITTLE_ENDIAN__ #define TO_BE16 SWAP_LE_BE16 #define TO_BE32 SWAP_LE_BE32 #define TO_BE64 SWAP_LE_BE64 #define FROM_BE16 SWAP_LE_BE16 #define FROM_BE32 SWAP_LE_BE32 #define FROM_BE64 SWAP_LE_BE64 #else #define TO_BE16(val) (uint16_t)(val) #define TO_BE32(val) (uint32_t)(val) #define TO_BE64(val) (uint64_t)(val) #define FROM_BE16(val) (uint16_t)(val) #define FROM_BE32(val) (uint32_t)(val) #define FROM_BE64(val) (uint64_t)(val) #endif void ucl_emitter_print_int_msgpack (struct ucl_emitter_context *ctx, int64_t val) { const struct ucl_emitter_functions *func = ctx->func; unsigned char buf[sizeof(uint64_t) + 1]; const unsigned char mask_positive = 0x7f, mask_negative = 0xe0, uint8_ch = 0xcc, uint16_ch = 0xcd, uint32_ch = 0xce, uint64_ch = 0xcf, int8_ch = 0xd0, int16_ch = 0xd1, int32_ch = 0xd2, int64_ch = 0xd3; unsigned len; if (val >= 0) { if (val <= 0x7f) { /* Fixed num 7 bits */ len = 1; buf[0] = mask_positive & val; } else if (val <= UINT8_MAX) { len = 2; buf[0] = uint8_ch; buf[1] = val & 0xff; } else if (val <= UINT16_MAX) { uint16_t v = TO_BE16 (val); len = 3; buf[0] = uint16_ch; memcpy (&buf[1], &v, sizeof (v)); } else if (val <= UINT32_MAX) { uint32_t v = TO_BE32 (val); len = 5; buf[0] = uint32_ch; memcpy (&buf[1], &v, sizeof (v)); } else { uint64_t v = TO_BE64 (val); len = 9; buf[0] = uint64_ch; memcpy (&buf[1], &v, sizeof (v)); } } else { uint64_t uval; /* Bithack abs */ uval = ((val ^ (val >> 63)) - (val >> 63)); if (val > -(1 << 5)) { len = 1; buf[0] = (mask_negative | uval) & 0xff; } else if (uval <= INT8_MAX) { uint8_t v = (uint8_t)val; len = 2; buf[0] = int8_ch; buf[1] = v; } else if (uval <= INT16_MAX) { uint16_t v = TO_BE16 (val); len = 3; buf[0] = int16_ch; memcpy (&buf[1], &v, sizeof (v)); } else if (uval <= INT32_MAX) { uint32_t v = TO_BE32 (val); len = 5; buf[0] = int32_ch; memcpy (&buf[1], &v, sizeof (v)); } else { uint64_t v = TO_BE64 (val); len = 9; buf[0] = int64_ch; memcpy (&buf[1], &v, sizeof (v)); } } func->ucl_emitter_append_len (buf, len, func->ud); } void ucl_emitter_print_double_msgpack (struct ucl_emitter_context *ctx, double val) { const struct ucl_emitter_functions *func = ctx->func; union { double d; uint64_t i; } u; const unsigned char dbl_ch = 0xcb; unsigned char buf[sizeof(double) + 1]; /* Convert to big endian */ u.d = val; u.i = TO_BE64 (u.i); buf[0] = dbl_ch; memcpy (&buf[1], &u.d, sizeof (double)); func->ucl_emitter_append_len (buf, sizeof (buf), func->ud); } void ucl_emitter_print_bool_msgpack (struct ucl_emitter_context *ctx, bool val) { const struct ucl_emitter_functions *func = ctx->func; const unsigned char true_ch = 0xc3, false_ch = 0xc2; func->ucl_emitter_append_character (val ? true_ch : false_ch, 1, func->ud); } void ucl_emitter_print_string_msgpack (struct ucl_emitter_context *ctx, const char *s, size_t len) { const struct ucl_emitter_functions *func = ctx->func; const unsigned char fix_mask = 0xA0, l8_ch = 0xd9, l16_ch = 0xda, l32_ch = 0xdb; unsigned char buf[5]; unsigned blen; if (len <= 0x1F) { blen = 1; buf[0] = (len | fix_mask) & 0xff; } else if (len <= 0xff) { blen = 2; buf[0] = l8_ch; buf[1] = len & 0xff; } else if (len <= 0xffff) { uint16_t bl = TO_BE16 (len); blen = 3; buf[0] = l16_ch; memcpy (&buf[1], &bl, sizeof (bl)); } else { uint32_t bl = TO_BE32 (len); blen = 5; buf[0] = l32_ch; memcpy (&buf[1], &bl, sizeof (bl)); } func->ucl_emitter_append_len (buf, blen, func->ud); func->ucl_emitter_append_len (s, len, func->ud); } void ucl_emitter_print_binary_string_msgpack (struct ucl_emitter_context *ctx, const char *s, size_t len) { const struct ucl_emitter_functions *func = ctx->func; const unsigned char l8_ch = 0xc4, l16_ch = 0xc5, l32_ch = 0xc6; unsigned char buf[5]; unsigned blen; if (len <= 0xff) { blen = 2; buf[0] = l8_ch; buf[1] = len & 0xff; } else if (len <= 0xffff) { uint16_t bl = TO_BE16 (len); blen = 3; buf[0] = l16_ch; memcpy (&buf[1], &bl, sizeof (bl)); } else { uint32_t bl = TO_BE32 (len); blen = 5; buf[0] = l32_ch; memcpy (&buf[1], &bl, sizeof (bl)); } func->ucl_emitter_append_len (buf, blen, func->ud); func->ucl_emitter_append_len (s, len, func->ud); } void ucl_emitter_print_null_msgpack (struct ucl_emitter_context *ctx) { const struct ucl_emitter_functions *func = ctx->func; const unsigned char nil = 0xc0; func->ucl_emitter_append_character (nil, 1, func->ud); } void ucl_emitter_print_key_msgpack (bool print_key, struct ucl_emitter_context *ctx, const ucl_object_t *obj) { if (print_key) { ucl_emitter_print_string_msgpack (ctx, obj->key, obj->keylen); } } void ucl_emitter_print_array_msgpack (struct ucl_emitter_context *ctx, size_t len) { const struct ucl_emitter_functions *func = ctx->func; const unsigned char fix_mask = 0x90, l16_ch = 0xdc, l32_ch = 0xdd; unsigned char buf[5]; unsigned blen; if (len <= 0xF) { blen = 1; buf[0] = (len | fix_mask) & 0xff; } else if (len <= 0xffff) { uint16_t bl = TO_BE16 (len); blen = 3; buf[0] = l16_ch; memcpy (&buf[1], &bl, sizeof (bl)); } else { uint32_t bl = TO_BE32 (len); blen = 5; buf[0] = l32_ch; memcpy (&buf[1], &bl, sizeof (bl)); } func->ucl_emitter_append_len (buf, blen, func->ud); } void ucl_emitter_print_object_msgpack (struct ucl_emitter_context *ctx, size_t len) { const struct ucl_emitter_functions *func = ctx->func; const unsigned char fix_mask = 0x80, l16_ch = 0xde, l32_ch = 0xdf; unsigned char buf[5]; unsigned blen; if (len <= 0xF) { blen = 1; buf[0] = (len | fix_mask) & 0xff; } else if (len <= 0xffff) { uint16_t bl = TO_BE16 (len); blen = 3; buf[0] = l16_ch; memcpy (&buf[1], &bl, sizeof (bl)); } else { uint32_t bl = TO_BE32 (len); blen = 5; buf[0] = l32_ch; memcpy (&buf[1], &bl, sizeof (bl)); } func->ucl_emitter_append_len (buf, blen, func->ud); } enum ucl_msgpack_format { msgpack_positive_fixint = 0, msgpack_fixmap, msgpack_fixarray, msgpack_fixstr, msgpack_nil, msgpack_false, msgpack_true, msgpack_bin8, msgpack_bin16, msgpack_bin32, msgpack_ext8, msgpack_ext16, msgpack_ext32, msgpack_float32, msgpack_float64, msgpack_uint8, msgpack_uint16, msgpack_uint32, msgpack_uint64, msgpack_int8, msgpack_int16, msgpack_int32, msgpack_int64, msgpack_fixext1, msgpack_fixext2, msgpack_fixext4, msgpack_fixext8, msgpack_fixext16, msgpack_str8, msgpack_str16, msgpack_str32, msgpack_array16, msgpack_array32, msgpack_map16, msgpack_map32, msgpack_negative_fixint, msgpack_invalid }; typedef ssize_t (*ucl_msgpack_parse_function)(struct ucl_parser *parser, struct ucl_stack *container, size_t len, enum ucl_msgpack_format fmt, const unsigned char *pos, size_t remain); static ssize_t ucl_msgpack_parse_map (struct ucl_parser *parser, struct ucl_stack *container, size_t len, enum ucl_msgpack_format fmt, const unsigned char *pos, size_t remain); static ssize_t ucl_msgpack_parse_array (struct ucl_parser *parser, struct ucl_stack *container, size_t len, enum ucl_msgpack_format fmt, const unsigned char *pos, size_t remain); static ssize_t ucl_msgpack_parse_string (struct ucl_parser *parser, struct ucl_stack *container, size_t len, enum ucl_msgpack_format fmt, const unsigned char *pos, size_t remain); static ssize_t ucl_msgpack_parse_int (struct ucl_parser *parser, struct ucl_stack *container, size_t len, enum ucl_msgpack_format fmt, const unsigned char *pos, size_t remain); static ssize_t ucl_msgpack_parse_float (struct ucl_parser *parser, struct ucl_stack *container, size_t len, enum ucl_msgpack_format fmt, const unsigned char *pos, size_t remain); static ssize_t ucl_msgpack_parse_bool (struct ucl_parser *parser, struct ucl_stack *container, size_t len, enum ucl_msgpack_format fmt, const unsigned char *pos, size_t remain); static ssize_t ucl_msgpack_parse_null (struct ucl_parser *parser, struct ucl_stack *container, size_t len, enum ucl_msgpack_format fmt, const unsigned char *pos, size_t remain); static ssize_t ucl_msgpack_parse_ignore (struct ucl_parser *parser, struct ucl_stack *container, size_t len, enum ucl_msgpack_format fmt, const unsigned char *pos, size_t remain); #define MSGPACK_FLAG_FIXED (1 << 0) #define MSGPACK_FLAG_CONTAINER (1 << 1) #define MSGPACK_FLAG_TYPEVALUE (1 << 2) #define MSGPACK_FLAG_EXT (1 << 3) #define MSGPACK_FLAG_ASSOC (1 << 4) #define MSGPACK_FLAG_KEY (1 << 5) -#define MSGPACK_CONTAINER_BIT (1ULL << 62) /* * Search tree packed in array */ struct ucl_msgpack_parser { uint8_t prefix; /* Prefix byte */ uint8_t prefixlen; /* Length of prefix in bits */ uint8_t fmt; /* The desired format */ uint8_t len; /* Length of the object (either length bytes or length of value in case of fixed objects */ uint8_t flags; /* Flags of the specified type */ ucl_msgpack_parse_function func; /* Parser function */ } parsers[] = { { 0xa0, 3, msgpack_fixstr, 0, MSGPACK_FLAG_FIXED|MSGPACK_FLAG_KEY, ucl_msgpack_parse_string }, { 0x0, 1, msgpack_positive_fixint, 0, MSGPACK_FLAG_FIXED|MSGPACK_FLAG_TYPEVALUE, ucl_msgpack_parse_int }, { 0xe0, 3, msgpack_negative_fixint, 0, MSGPACK_FLAG_FIXED|MSGPACK_FLAG_TYPEVALUE, ucl_msgpack_parse_int }, { 0x80, 4, msgpack_fixmap, 0, MSGPACK_FLAG_FIXED|MSGPACK_FLAG_CONTAINER|MSGPACK_FLAG_ASSOC, ucl_msgpack_parse_map }, { 0x90, 4, msgpack_fixarray, 0, MSGPACK_FLAG_FIXED|MSGPACK_FLAG_CONTAINER, ucl_msgpack_parse_array }, { 0xd9, 8, msgpack_str8, 1, MSGPACK_FLAG_KEY, ucl_msgpack_parse_string }, { 0xc4, 8, msgpack_bin8, 1, MSGPACK_FLAG_KEY, ucl_msgpack_parse_string }, { 0xcf, 8, msgpack_uint64, 8, MSGPACK_FLAG_FIXED, ucl_msgpack_parse_int }, { 0xd3, 8, msgpack_int64, 8, MSGPACK_FLAG_FIXED, ucl_msgpack_parse_int }, { 0xce, 8, msgpack_uint32, 4, MSGPACK_FLAG_FIXED, ucl_msgpack_parse_int }, { 0xd2, 8, msgpack_int32, 4, MSGPACK_FLAG_FIXED, ucl_msgpack_parse_int }, { 0xcb, 8, msgpack_float64, 8, MSGPACK_FLAG_FIXED, ucl_msgpack_parse_float }, { 0xca, 8, msgpack_float32, 4, MSGPACK_FLAG_FIXED, ucl_msgpack_parse_float }, { 0xc2, 8, msgpack_false, 1, MSGPACK_FLAG_FIXED | MSGPACK_FLAG_TYPEVALUE, ucl_msgpack_parse_bool }, { 0xc3, 8, msgpack_true, 1, MSGPACK_FLAG_FIXED | MSGPACK_FLAG_TYPEVALUE, ucl_msgpack_parse_bool }, { 0xcc, 8, msgpack_uint8, 1, MSGPACK_FLAG_FIXED, ucl_msgpack_parse_int }, { 0xcd, 8, msgpack_uint16, 2, MSGPACK_FLAG_FIXED, ucl_msgpack_parse_int }, { 0xd0, 8, msgpack_int8, 1, MSGPACK_FLAG_FIXED, ucl_msgpack_parse_int }, { 0xd1, 8, msgpack_int16, 2, MSGPACK_FLAG_FIXED, ucl_msgpack_parse_int }, { 0xc0, 8, msgpack_nil, 0, MSGPACK_FLAG_FIXED | MSGPACK_FLAG_TYPEVALUE, ucl_msgpack_parse_null }, { 0xda, 8, msgpack_str16, 2, MSGPACK_FLAG_KEY, ucl_msgpack_parse_string }, { 0xdb, 8, msgpack_str32, 4, MSGPACK_FLAG_KEY, ucl_msgpack_parse_string }, { 0xc5, 8, msgpack_bin16, 2, MSGPACK_FLAG_KEY, ucl_msgpack_parse_string }, { 0xc6, 8, msgpack_bin32, 4, MSGPACK_FLAG_KEY, ucl_msgpack_parse_string }, { 0xdc, 8, msgpack_array16, 2, MSGPACK_FLAG_CONTAINER, ucl_msgpack_parse_array }, { 0xdd, 8, msgpack_array32, 4, MSGPACK_FLAG_CONTAINER, ucl_msgpack_parse_array }, { 0xde, 8, msgpack_map16, 2, MSGPACK_FLAG_CONTAINER|MSGPACK_FLAG_ASSOC, ucl_msgpack_parse_map }, { 0xdf, 8, msgpack_map32, 4, MSGPACK_FLAG_CONTAINER|MSGPACK_FLAG_ASSOC, ucl_msgpack_parse_map }, { 0xc7, 8, msgpack_ext8, 1, MSGPACK_FLAG_EXT, ucl_msgpack_parse_ignore }, { 0xc8, 8, msgpack_ext16, 2, MSGPACK_FLAG_EXT, ucl_msgpack_parse_ignore }, { 0xc9, 8, msgpack_ext32, 4, MSGPACK_FLAG_EXT, ucl_msgpack_parse_ignore }, { 0xd4, 8, msgpack_fixext1, 1, MSGPACK_FLAG_FIXED | MSGPACK_FLAG_EXT, ucl_msgpack_parse_ignore }, { 0xd5, 8, msgpack_fixext2, 2, MSGPACK_FLAG_FIXED | MSGPACK_FLAG_EXT, ucl_msgpack_parse_ignore }, { 0xd6, 8, msgpack_fixext4, 4, MSGPACK_FLAG_FIXED | MSGPACK_FLAG_EXT, ucl_msgpack_parse_ignore }, { 0xd7, 8, msgpack_fixext8, 8, MSGPACK_FLAG_FIXED | MSGPACK_FLAG_EXT, ucl_msgpack_parse_ignore }, { 0xd8, 8, msgpack_fixext16, 16, MSGPACK_FLAG_FIXED | MSGPACK_FLAG_EXT, ucl_msgpack_parse_ignore } }; #undef MSGPACK_DEBUG_PARSER static inline struct ucl_msgpack_parser * ucl_msgpack_get_parser_from_type (unsigned char t) { unsigned int i, shift, mask; for (i = 0; i < sizeof (parsers) / sizeof (parsers[0]); i ++) { shift = CHAR_BIT - parsers[i].prefixlen; mask = parsers[i].prefix >> shift; if (mask == (((unsigned int)t) >> shift)) { return &parsers[i]; } } return NULL; } static inline struct ucl_stack * ucl_msgpack_get_container (struct ucl_parser *parser, struct ucl_msgpack_parser *obj_parser, uint64_t len) { struct ucl_stack *stack; assert (obj_parser != NULL); if (obj_parser->flags & MSGPACK_FLAG_CONTAINER) { - assert ((len & MSGPACK_CONTAINER_BIT) == 0); /* * Insert new container to the stack */ if (parser->stack == NULL) { parser->stack = calloc (1, sizeof (struct ucl_stack)); if (parser->stack == NULL) { ucl_create_err (&parser->err, "no memory"); return NULL; } + + parser->stack->chunk = parser->chunks; } else { stack = calloc (1, sizeof (struct ucl_stack)); if (stack == NULL) { ucl_create_err (&parser->err, "no memory"); return NULL; } + stack->chunk = parser->chunks; stack->next = parser->stack; parser->stack = stack; } - parser->stack->level = len | MSGPACK_CONTAINER_BIT; + parser->stack->e.len = len; #ifdef MSGPACK_DEBUG_PARSER stack = parser->stack; while (stack) { fprintf(stderr, "+"); stack = stack->next; } fprintf(stderr, "%s -> %d\n", obj_parser->flags & MSGPACK_FLAG_ASSOC ? "object" : "array", (int)len); #endif } else { /* * Get the current stack top */ if (parser->stack) { return parser->stack; } else { ucl_create_err (&parser->err, "bad top level object for msgpack"); return NULL; } } return parser->stack; } static bool ucl_msgpack_is_container_finished (struct ucl_stack *container) { - uint64_t level; - assert (container != NULL); - if (container->level & MSGPACK_CONTAINER_BIT) { - level = container->level & ~MSGPACK_CONTAINER_BIT; - if (level == 0) { - return true; - } + if (container->e.len == 0) { + return true; } return false; } static bool ucl_msgpack_insert_object (struct ucl_parser *parser, const unsigned char *key, size_t keylen, ucl_object_t *obj) { - uint64_t level; struct ucl_stack *container; container = parser->stack; assert (container != NULL); - assert (container->level > 0); + assert (container->e.len > 0); assert (obj != NULL); assert (container->obj != NULL); if (container->obj->type == UCL_ARRAY) { ucl_array_append (container->obj, obj); } else if (container->obj->type == UCL_OBJECT) { if (key == NULL || keylen == 0) { ucl_create_err (&parser->err, "cannot insert object with no key"); return false; } obj->key = key; obj->keylen = keylen; if (!(parser->flags & UCL_PARSER_ZEROCOPY)) { ucl_copy_key_trash (obj); } ucl_parser_process_object_element (parser, obj); } else { ucl_create_err (&parser->err, "bad container type"); return false; } - if (container->level & MSGPACK_CONTAINER_BIT) { - level = container->level & ~MSGPACK_CONTAINER_BIT; - container->level = (level - 1) | MSGPACK_CONTAINER_BIT; - } + container->e.len--; return true; } static struct ucl_stack * ucl_msgpack_get_next_container (struct ucl_parser *parser) { struct ucl_stack *cur = NULL; - uint64_t level; + uint64_t len; cur = parser->stack; if (cur == NULL) { return NULL; } - if (cur->level & MSGPACK_CONTAINER_BIT) { - level = cur->level & ~MSGPACK_CONTAINER_BIT; + len = cur->e.len; - if (level == 0) { - /* We need to switch to the previous container */ - parser->stack = cur->next; - parser->cur_obj = cur->obj; - free (cur); + if (len == 0) { + /* We need to switch to the previous container */ + parser->stack = cur->next; + parser->cur_obj = cur->obj; + free (cur); #ifdef MSGPACK_DEBUG_PARSER - cur = parser->stack; + cur = parser->stack; while (cur) { fprintf(stderr, "-"); cur = cur->next; } fprintf(stderr, "-%s -> %d\n", parser->cur_obj->type == UCL_OBJECT ? "object" : "array", (int)parser->cur_obj->len); #endif - return ucl_msgpack_get_next_container (parser); - } + return ucl_msgpack_get_next_container (parser); } /* * For UCL containers we don't know length, so we just insert the whole * message pack blob into the top level container */ assert (cur->obj != NULL); return cur; } #define CONSUME_RET do { \ if (ret != -1) { \ p += ret; \ remain -= ret; \ obj_parser = NULL; \ assert (remain >= 0); \ } \ else { \ ucl_create_err (&parser->err, \ "cannot parse type %d of len %u", \ (int)obj_parser->fmt, \ (unsigned)len); \ return false; \ } \ } while(0) #define GET_NEXT_STATE do { \ container = ucl_msgpack_get_next_container (parser); \ if (container == NULL) { \ ucl_create_err (&parser->err, \ "empty container"); \ return false; \ } \ next_state = container->obj->type == UCL_OBJECT ? \ read_assoc_key : read_array_value; \ } while(0) static bool ucl_msgpack_consume (struct ucl_parser *parser) { const unsigned char *p, *end, *key = NULL; struct ucl_stack *container; enum e_msgpack_parser_state { read_type, start_assoc, start_array, read_assoc_key, read_assoc_value, finish_assoc_value, read_array_value, finish_array_value, error_state } state = read_type, next_state = error_state; struct ucl_msgpack_parser *obj_parser = NULL; uint64_t len = 0; ssize_t ret, remain, keylen = 0; #ifdef MSGPACK_DEBUG_PARSER uint64_t i; enum e_msgpack_parser_state hist[256]; #endif p = parser->chunks->begin; remain = parser->chunks->remain; end = p + remain; while (p < end) { #ifdef MSGPACK_DEBUG_PARSER hist[i++ % 256] = state; #endif switch (state) { case read_type: obj_parser = ucl_msgpack_get_parser_from_type (*p); if (obj_parser == NULL) { ucl_create_err (&parser->err, "unknown msgpack format: %x", (unsigned int)*p); return false; } /* Now check length sanity */ if (obj_parser->flags & MSGPACK_FLAG_FIXED) { if (obj_parser->len == 0) { /* We have an embedded size */ len = *p & ~obj_parser->prefix; } else { if (remain < obj_parser->len) { ucl_create_err (&parser->err, "not enough data remain to " "read object's length: %u remain, %u needed", (unsigned)remain, obj_parser->len); return false; } len = obj_parser->len; } if (!(obj_parser->flags & MSGPACK_FLAG_TYPEVALUE)) { /* We must pass value as the second byte */ if (remain > 0) { p ++; remain --; } } else { /* Len is irrelevant now */ len = 0; } } else { /* Length is not embedded */ + remain --; + if (remain < obj_parser->len) { ucl_create_err (&parser->err, "not enough data remain to " "read object's length: %u remain, %u needed", (unsigned)remain, obj_parser->len); return false; } p ++; - remain --; switch (obj_parser->len) { case 1: len = *p; break; case 2: len = FROM_BE16 (*(uint16_t *)p); break; case 4: len = FROM_BE32 (*(uint32_t *)p); break; case 8: len = FROM_BE64 (*(uint64_t *)p); break; default: - assert (0); - break; + ucl_create_err (&parser->err, "invalid length of the length field: %u", + (unsigned)obj_parser->len); + + return false; } p += obj_parser->len; remain -= obj_parser->len; } if (obj_parser->flags & MSGPACK_FLAG_ASSOC) { /* We have just read the new associative map */ state = start_assoc; } else if (obj_parser->flags & MSGPACK_FLAG_CONTAINER){ state = start_array; } else { state = next_state; } break; case start_assoc: parser->cur_obj = ucl_object_new_full (UCL_OBJECT, parser->chunks->priority); /* Insert to the previous level container */ if (parser->stack && !ucl_msgpack_insert_object (parser, key, keylen, parser->cur_obj)) { return false; } /* Get new container */ container = ucl_msgpack_get_container (parser, obj_parser, len); if (container == NULL) { return false; } ret = obj_parser->func (parser, container, len, obj_parser->fmt, p, remain); CONSUME_RET; key = NULL; keylen = 0; if (len > 0) { state = read_type; next_state = read_assoc_key; } else { /* Empty object */ state = finish_assoc_value; } break; case start_array: parser->cur_obj = ucl_object_new_full (UCL_ARRAY, parser->chunks->priority); /* Insert to the previous level container */ if (parser->stack && !ucl_msgpack_insert_object (parser, key, keylen, parser->cur_obj)) { return false; } /* Get new container */ container = ucl_msgpack_get_container (parser, obj_parser, len); if (container == NULL) { return false; } ret = obj_parser->func (parser, container, len, obj_parser->fmt, p, remain); CONSUME_RET; if (len > 0) { state = read_type; next_state = read_array_value; } else { /* Empty array */ state = finish_array_value; } break; case read_array_value: /* * p is now at the value start, len now contains length read and * obj_parser contains the corresponding specific parser */ container = parser->stack; - if (container == NULL) { + if (parser->stack == NULL) { + ucl_create_err (&parser->err, + "read assoc value when no container represented"); return false; } ret = obj_parser->func (parser, container, len, obj_parser->fmt, p, remain); CONSUME_RET; /* Insert value to the container and check if we have finished array */ if (!ucl_msgpack_insert_object (parser, NULL, 0, parser->cur_obj)) { return false; } if (ucl_msgpack_is_container_finished (container)) { state = finish_array_value; } else { /* Read more elements */ state = read_type; next_state = read_array_value; } break; case read_assoc_key: /* * Keys must have string type for ucl msgpack */ if (!(obj_parser->flags & MSGPACK_FLAG_KEY)) { ucl_create_err (&parser->err, "bad type for key: %u, expected " "string", (unsigned)obj_parser->fmt); return false; } key = p; keylen = len; if (keylen > remain || keylen == 0) { ucl_create_err (&parser->err, "too long or empty key"); return false; } p += len; remain -= len; state = read_type; next_state = read_assoc_value; break; case read_assoc_value: /* * p is now at the value start, len now contains length read and * obj_parser contains the corresponding specific parser */ container = parser->stack; if (container == NULL) { + ucl_create_err (&parser->err, + "read assoc value when no container represented"); return false; } ret = obj_parser->func (parser, container, len, obj_parser->fmt, p, remain); CONSUME_RET; assert (key != NULL && keylen > 0); if (!ucl_msgpack_insert_object (parser, key, keylen, parser->cur_obj)) { + return false; } key = NULL; keylen = 0; if (ucl_msgpack_is_container_finished (container)) { state = finish_assoc_value; } else { /* Read more elements */ state = read_type; next_state = read_assoc_key; } break; case finish_array_value: case finish_assoc_value: GET_NEXT_STATE; state = read_type; break; case error_state: ucl_create_err (&parser->err, "invalid state machine state"); return false; } } /* Check the finishing state */ switch (state) { case start_array: case start_assoc: /* Empty container at the end */ if (len != 0) { - ucl_create_err (&parser->err, "invalid non-empty container at the end"); + ucl_create_err (&parser->err, + "invalid non-empty container at the end; len=%zu", + (uintmax_t)len); return false; } parser->cur_obj = ucl_object_new_full ( state == start_array ? UCL_ARRAY : UCL_OBJECT, parser->chunks->priority); + + if (parser->stack == NULL) { + ucl_create_err (&parser->err, + "read assoc value when no container represented"); + return false; + } /* Insert to the previous level container */ if (!ucl_msgpack_insert_object (parser, key, keylen, parser->cur_obj)) { return false; } /* Get new container */ container = ucl_msgpack_get_container (parser, obj_parser, len); if (container == NULL) { return false; } ret = obj_parser->func (parser, container, len, obj_parser->fmt, p, remain); break; case read_array_value: case read_assoc_value: if (len != 0) { ucl_create_err (&parser->err, "unfinished value at the end"); return false; } container = parser->stack; - if (container == NULL) { + if (parser->stack == NULL) { + ucl_create_err (&parser->err, + "read assoc value when no container represented"); return false; } ret = obj_parser->func (parser, container, len, obj_parser->fmt, p, remain); CONSUME_RET; /* Insert value to the container and check if we have finished array */ if (!ucl_msgpack_insert_object (parser, NULL, 0, parser->cur_obj)) { return false; } break; case finish_array_value: case finish_assoc_value: case read_type: /* Valid finishing state */ break; default: /* Invalid finishing state */ ucl_create_err (&parser->err, "invalid state machine finishing state: %d", state); return false; } /* Rewind to the top level container */ ucl_msgpack_get_next_container (parser); - assert (parser->stack == NULL || - (parser->stack->level & MSGPACK_CONTAINER_BIT) == 0); + + if (parser->stack != NULL) { + ucl_create_err (&parser->err, "incomplete container"); + + return false; + } return true; } bool ucl_parse_msgpack (struct ucl_parser *parser) { ucl_object_t *container = NULL; const unsigned char *p; bool ret; assert (parser != NULL); assert (parser->chunks != NULL); assert (parser->chunks->begin != NULL); assert (parser->chunks->remain != 0); p = parser->chunks->begin; if (parser->stack) { container = parser->stack->obj; } /* * When we start parsing message pack chunk, we must ensure that we * have either a valid container or the top object inside message pack is * of container type */ if (container == NULL) { if ((*p & 0x80) != 0x80 && !(*p >= 0xdc && *p <= 0xdf)) { ucl_create_err (&parser->err, "bad top level object for msgpack"); return false; } } ret = ucl_msgpack_consume (parser); if (ret && parser->top_obj == NULL) { parser->top_obj = parser->cur_obj; } return ret; } static ssize_t ucl_msgpack_parse_map (struct ucl_parser *parser, struct ucl_stack *container, size_t len, enum ucl_msgpack_format fmt, const unsigned char *pos, size_t remain) { container->obj = parser->cur_obj; return 0; } static ssize_t ucl_msgpack_parse_array (struct ucl_parser *parser, struct ucl_stack *container, size_t len, enum ucl_msgpack_format fmt, const unsigned char *pos, size_t remain) { container->obj = parser->cur_obj; return 0; } static ssize_t ucl_msgpack_parse_string (struct ucl_parser *parser, struct ucl_stack *container, size_t len, enum ucl_msgpack_format fmt, const unsigned char *pos, size_t remain) { ucl_object_t *obj; if (len > remain) { return -1; } obj = ucl_object_new_full (UCL_STRING, parser->chunks->priority); obj->value.sv = pos; obj->len = len; if (fmt >= msgpack_bin8 && fmt <= msgpack_bin32) { obj->flags |= UCL_OBJECT_BINARY; } if (!(parser->flags & UCL_PARSER_ZEROCOPY)) { if (obj->flags & UCL_OBJECT_BINARY) { obj->trash_stack[UCL_TRASH_VALUE] = malloc (len); if (obj->trash_stack[UCL_TRASH_VALUE] != NULL) { memcpy (obj->trash_stack[UCL_TRASH_VALUE], pos, len); } } else { ucl_copy_value_trash (obj); } } parser->cur_obj = obj; return len; } static ssize_t ucl_msgpack_parse_int (struct ucl_parser *parser, struct ucl_stack *container, size_t len, enum ucl_msgpack_format fmt, const unsigned char *pos, size_t remain) { ucl_object_t *obj; int8_t iv8; int16_t iv16; int32_t iv32; int64_t iv64; uint16_t uiv16; uint32_t uiv32; uint64_t uiv64; if (len > remain) { return -1; } obj = ucl_object_new_full (UCL_INT, parser->chunks->priority); switch (fmt) { case msgpack_positive_fixint: obj->value.iv = (*pos & 0x7f); len = 1; break; case msgpack_negative_fixint: obj->value.iv = - (*pos & 0x1f); len = 1; break; case msgpack_uint8: obj->value.iv = (unsigned char)*pos; len = 1; break; case msgpack_int8: memcpy (&iv8, pos, sizeof (iv8)); obj->value.iv = iv8; len = 1; break; case msgpack_int16: memcpy (&iv16, pos, sizeof (iv16)); iv16 = FROM_BE16 (iv16); obj->value.iv = iv16; len = 2; break; case msgpack_uint16: memcpy (&uiv16, pos, sizeof (uiv16)); uiv16 = FROM_BE16 (uiv16); obj->value.iv = uiv16; len = 2; break; case msgpack_int32: memcpy (&iv32, pos, sizeof (iv32)); iv32 = FROM_BE32 (iv32); obj->value.iv = iv32; len = 4; break; case msgpack_uint32: memcpy(&uiv32, pos, sizeof(uiv32)); uiv32 = FROM_BE32(uiv32); obj->value.iv = uiv32; len = 4; break; case msgpack_int64: memcpy (&iv64, pos, sizeof (iv64)); iv64 = FROM_BE64 (iv64); obj->value.iv = iv64; len = 8; break; case msgpack_uint64: memcpy(&uiv64, pos, sizeof(uiv64)); uiv64 = FROM_BE64(uiv64); obj->value.iv = uiv64; len = 8; break; default: assert (0); break; } parser->cur_obj = obj; return len; } static ssize_t ucl_msgpack_parse_float (struct ucl_parser *parser, struct ucl_stack *container, size_t len, enum ucl_msgpack_format fmt, const unsigned char *pos, size_t remain) { ucl_object_t *obj; union { uint32_t i; float f; } d; uint64_t uiv64; if (len > remain) { return -1; } obj = ucl_object_new_full (UCL_FLOAT, parser->chunks->priority); switch (fmt) { case msgpack_float32: memcpy(&d.i, pos, sizeof(d.i)); d.i = FROM_BE32(d.i); /* XXX: can be slow */ obj->value.dv = d.f; len = 4; break; case msgpack_float64: memcpy(&uiv64, pos, sizeof(uiv64)); uiv64 = FROM_BE64(uiv64); obj->value.iv = uiv64; len = 8; break; default: assert (0); break; } parser->cur_obj = obj; return len; } static ssize_t ucl_msgpack_parse_bool (struct ucl_parser *parser, struct ucl_stack *container, size_t len, enum ucl_msgpack_format fmt, const unsigned char *pos, size_t remain) { ucl_object_t *obj; if (len > remain) { return -1; } obj = ucl_object_new_full (UCL_BOOLEAN, parser->chunks->priority); switch (fmt) { case msgpack_true: obj->value.iv = true; break; case msgpack_false: obj->value.iv = false; break; default: assert (0); break; } parser->cur_obj = obj; return 1; } static ssize_t ucl_msgpack_parse_null (struct ucl_parser *parser, struct ucl_stack *container, size_t len, enum ucl_msgpack_format fmt, const unsigned char *pos, size_t remain) { ucl_object_t *obj; if (len > remain) { return -1; } obj = ucl_object_new_full (UCL_NULL, parser->chunks->priority); parser->cur_obj = obj; return 1; } static ssize_t ucl_msgpack_parse_ignore (struct ucl_parser *parser, struct ucl_stack *container, size_t len, enum ucl_msgpack_format fmt, const unsigned char *pos, size_t remain) { if (len > remain) { return -1; } switch (fmt) { case msgpack_fixext1: len = 2; break; case msgpack_fixext2: len = 3; break; case msgpack_fixext4: len = 5; break; case msgpack_fixext8: len = 9; break; case msgpack_fixext16: len = 17; break; case msgpack_ext8: case msgpack_ext16: case msgpack_ext32: len = len + 1; break; default: ucl_create_err (&parser->err, "bad type: %x", (unsigned)fmt); return -1; } return len; } diff --git a/contrib/libucl/src/ucl_parser.c b/contrib/libucl/src/ucl_parser.c index 9f44de10a6fc..23f5bce3056f 100644 --- a/contrib/libucl/src/ucl_parser.c +++ b/contrib/libucl/src/ucl_parser.c @@ -1,2757 +1,3137 @@ /* Copyright (c) 2013, Vsevolod Stakhov * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED ''AS IS'' AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL AUTHOR BE LIABLE FOR ANY * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include #include "ucl.h" #include "ucl_internal.h" #include "ucl_chartable.h" /** * @file ucl_parser.c * The implementation of ucl parser */ struct ucl_parser_saved_state { unsigned int line; unsigned int column; size_t remain; const unsigned char *pos; }; /** * Move up to len characters * @param parser * @param begin * @param len * @return new position in chunk */ -#define ucl_chunk_skipc(chunk, p) do{ \ - if (*(p) == '\n') { \ - (chunk)->line ++; \ - (chunk)->column = 0; \ - } \ - else (chunk)->column ++; \ - (p++); \ - (chunk)->pos ++; \ - (chunk)->remain --; \ - } while (0) +#define ucl_chunk_skipc(chunk, p) \ +do { \ + if (*(p) == '\n') { \ + (chunk)->line ++; \ + (chunk)->column = 0; \ + } \ + else (chunk)->column ++; \ + (p++); \ + (chunk)->pos ++; \ + (chunk)->remain --; \ +} while (0) static inline void ucl_set_err (struct ucl_parser *parser, int code, const char *str, UT_string **err) { const char *fmt_string, *filename; struct ucl_chunk *chunk = parser->chunks; if (parser->cur_file) { filename = parser->cur_file; } else { filename = ""; } if (chunk->pos < chunk->end) { if (isgraph (*chunk->pos)) { fmt_string = "error while parsing %s: " "line: %d, column: %d - '%s', character: '%c'"; } else { fmt_string = "error while parsing %s: " "line: %d, column: %d - '%s', character: '0x%02x'"; } ucl_create_err (err, fmt_string, filename, chunk->line, chunk->column, str, *chunk->pos); } else { ucl_create_err (err, "error while parsing %s: at the end of chunk: %s", filename, str); } parser->err_code = code; + parser->state = UCL_STATE_ERROR; } static void ucl_save_comment (struct ucl_parser *parser, const char *begin, size_t len) { ucl_object_t *nobj; if (len > 0 && begin != NULL) { nobj = ucl_object_fromstring_common (begin, len, 0); if (parser->last_comment) { /* We need to append data to an existing object */ DL_APPEND (parser->last_comment, nobj); } else { parser->last_comment = nobj; } } } static void ucl_attach_comment (struct ucl_parser *parser, ucl_object_t *obj, bool before) { if (parser->last_comment) { ucl_object_insert_key (parser->comments, parser->last_comment, (const char *)&obj, sizeof (void *), true); if (before) { parser->last_comment->flags |= UCL_OBJECT_INHERITED; } parser->last_comment = NULL; } } /** * Skip all comments from the current pos resolving nested and multiline comments * @param parser * @return */ static bool ucl_skip_comments (struct ucl_parser *parser) { struct ucl_chunk *chunk = parser->chunks; const unsigned char *p, *beg = NULL; int comments_nested = 0; bool quoted = false; p = chunk->pos; start: if (chunk->remain > 0 && *p == '#') { if (parser->state != UCL_STATE_SCOMMENT && parser->state != UCL_STATE_MCOMMENT) { beg = p; while (p < chunk->end) { if (*p == '\n') { if (parser->flags & UCL_PARSER_SAVE_COMMENTS) { ucl_save_comment (parser, beg, p - beg); beg = NULL; } ucl_chunk_skipc (chunk, p); goto start; } ucl_chunk_skipc (chunk, p); } } } else if (chunk->remain >= 2 && *p == '/') { if (p[1] == '*') { beg = p; ucl_chunk_skipc (chunk, p); comments_nested ++; ucl_chunk_skipc (chunk, p); while (p < chunk->end) { if (*p == '"' && *(p - 1) != '\\') { quoted = !quoted; } if (!quoted) { if (*p == '*') { ucl_chunk_skipc (chunk, p); if (*p == '/') { comments_nested --; if (comments_nested == 0) { if (parser->flags & UCL_PARSER_SAVE_COMMENTS) { ucl_save_comment (parser, beg, p - beg + 1); beg = NULL; } ucl_chunk_skipc (chunk, p); goto start; } } ucl_chunk_skipc (chunk, p); } else if (p[0] == '/' && chunk->remain >= 2 && p[1] == '*') { comments_nested ++; ucl_chunk_skipc (chunk, p); ucl_chunk_skipc (chunk, p); continue; } } ucl_chunk_skipc (chunk, p); } if (comments_nested != 0) { ucl_set_err (parser, UCL_ENESTED, "unfinished multiline comment", &parser->err); return false; } } } if (beg && p > beg && (parser->flags & UCL_PARSER_SAVE_COMMENTS)) { ucl_save_comment (parser, beg, p - beg); } return true; } /** * Return multiplier for a character * @param c multiplier character * @param is_bytes if true use 1024 multiplier * @return multiplier */ static inline unsigned long ucl_lex_num_multiplier (const unsigned char c, bool is_bytes) { const struct { char c; long mult_normal; long mult_bytes; } multipliers[] = { {'m', 1000 * 1000, 1024 * 1024}, {'k', 1000, 1024}, {'g', 1000 * 1000 * 1000, 1024 * 1024 * 1024} }; int i; for (i = 0; i < 3; i ++) { if (tolower (c) == multipliers[i].c) { if (is_bytes) { return multipliers[i].mult_bytes; } return multipliers[i].mult_normal; } } return 1; } /** * Return multiplier for time scaling * @param c * @return */ static inline double ucl_lex_time_multiplier (const unsigned char c) { const struct { char c; double mult; } multipliers[] = { {'m', 60}, {'h', 60 * 60}, {'d', 60 * 60 * 24}, {'w', 60 * 60 * 24 * 7}, {'y', 60 * 60 * 24 * 365} }; int i; for (i = 0; i < 5; i ++) { if (tolower (c) == multipliers[i].c) { return multipliers[i].mult; } } return 1; } /** * Return true if a character is a end of an atom * @param c * @return */ static inline bool ucl_lex_is_atom_end (const unsigned char c) { return ucl_test_character (c, UCL_CHARACTER_VALUE_END); } static inline bool ucl_lex_is_comment (const unsigned char c1, const unsigned char c2) { if (c1 == '/') { if (c2 == '*') { return true; } } else if (c1 == '#') { return true; } return false; } /** * Check variable found * @param parser * @param ptr * @param remain * @param out_len * @param strict * @param found * @return */ static inline const char * ucl_check_variable_safe (struct ucl_parser *parser, const char *ptr, size_t remain, size_t *out_len, bool strict, bool *found) { struct ucl_variable *var; unsigned char *dst; size_t dstlen; bool need_free = false; LL_FOREACH (parser->variables, var) { if (strict) { if (remain == var->var_len) { if (memcmp (ptr, var->var, var->var_len) == 0) { *out_len += var->value_len; *found = true; return (ptr + var->var_len); } } } else { if (remain >= var->var_len) { if (memcmp (ptr, var->var, var->var_len) == 0) { *out_len += var->value_len; *found = true; return (ptr + var->var_len); } } } } /* XXX: can only handle ${VAR} */ if (!(*found) && parser->var_handler != NULL && strict) { /* Call generic handler */ if (parser->var_handler (ptr, remain, &dst, &dstlen, &need_free, parser->var_data)) { - *out_len += dstlen; + *out_len = dstlen; *found = true; if (need_free) { free (dst); } return (ptr + remain); } } return ptr; } /** * Check for a variable in a given string * @param parser * @param ptr * @param remain * @param out_len * @param vars_found * @return */ static const char * ucl_check_variable (struct ucl_parser *parser, const char *ptr, size_t remain, size_t *out_len, bool *vars_found) { const char *p, *end, *ret = ptr; bool found = false; if (*ptr == '{') { /* We need to match the variable enclosed in braces */ p = ptr + 1; end = ptr + remain; while (p < end) { if (*p == '}') { ret = ucl_check_variable_safe (parser, ptr + 1, p - ptr - 1, out_len, true, &found); if (found) { /* {} must be excluded actually */ ret ++; if (!*vars_found) { *vars_found = true; } } else { *out_len += 2; } break; } p ++; } } else if (*ptr != '$') { /* Not count escaped dollar sign */ ret = ucl_check_variable_safe (parser, ptr, remain, out_len, false, &found); if (found && !*vars_found) { *vars_found = true; } if (!found) { (*out_len) ++; } } else { ret ++; (*out_len) ++; } return ret; } /** * Expand a single variable * @param parser * @param ptr * @param remain * @param dest * @return */ static const char * ucl_expand_single_variable (struct ucl_parser *parser, const char *ptr, size_t remain, unsigned char **dest) { unsigned char *d = *dest, *dst; const char *p = ptr + 1, *ret; struct ucl_variable *var; size_t dstlen; bool need_free = false; bool found = false; bool strict = false; ret = ptr + 1; remain --; if (*p == '$') { *d++ = *p++; *dest = d; return p; } else if (*p == '{') { p ++; strict = true; ret += 2; remain -= 2; } LL_FOREACH (parser->variables, var) { if (remain >= var->var_len) { if (memcmp (p, var->var, var->var_len) == 0) { memcpy (d, var->value, var->value_len); ret += var->var_len; d += var->value_len; found = true; break; } } } if (!found) { if (strict && parser->var_handler != NULL) { - size_t var_len = 0; - while (var_len < remain && p[var_len] != '}') - var_len ++; - - if (parser->var_handler (p, var_len, &dst, &dstlen, &need_free, + if (parser->var_handler (p, remain, &dst, &dstlen, &need_free, parser->var_data)) { memcpy (d, dst, dstlen); - ret += var_len; + ret += remain; d += dstlen; + found = true; if (need_free) { free (dst); } - found = true; } } /* Leave variable as is */ if (!found) { if (strict) { /* Copy '${' */ memcpy (d, ptr, 2); d += 2; ret --; } else { memcpy (d, ptr, 1); d ++; } } } *dest = d; return ret; } /** * Expand variables in string * @param parser * @param dst * @param src * @param in_len * @return */ static ssize_t ucl_expand_variable (struct ucl_parser *parser, unsigned char **dst, const char *src, size_t in_len) { const char *p, *end = src + in_len; unsigned char *d; size_t out_len = 0; bool vars_found = false; if (parser->flags & UCL_PARSER_DISABLE_MACRO) { *dst = NULL; return in_len; } p = src; while (p != end) { if (*p == '$') { p = ucl_check_variable (parser, p + 1, end - p - 1, &out_len, &vars_found); } else { p ++; out_len ++; } } if (!vars_found) { /* Trivial case */ *dst = NULL; return in_len; } *dst = UCL_ALLOC (out_len + 1); if (*dst == NULL) { return in_len; } d = *dst; p = src; while (p != end) { if (*p == '$') { p = ucl_expand_single_variable (parser, p, end - p, &d); } else { *d++ = *p++; } } *d = '\0'; return out_len; } /** * Store or copy pointer to the trash stack * @param parser parser object * @param src src string * @param dst destination buffer (trash stack pointer) * @param dst_const const destination pointer (e.g. value of object) * @param in_len input length * @param need_unescape need to unescape source (and copy it) * @param need_lowercase need to lowercase value (and copy) * @param need_expand need to expand variables (and copy as well) + * @param unescape_squote unescape single quoted string * @return output length (excluding \0 symbol) */ static inline ssize_t ucl_copy_or_store_ptr (struct ucl_parser *parser, const unsigned char *src, unsigned char **dst, const char **dst_const, size_t in_len, - bool need_unescape, bool need_lowercase, bool need_expand) + bool need_unescape, bool need_lowercase, bool need_expand, + bool unescape_squote) { ssize_t ret = -1, tret; unsigned char *tmp; if (need_unescape || need_lowercase || (need_expand && parser->variables != NULL) || !(parser->flags & UCL_PARSER_ZEROCOPY)) { /* Copy string */ *dst = UCL_ALLOC (in_len + 1); if (*dst == NULL) { ucl_set_err (parser, UCL_EINTERNAL, "cannot allocate memory for a string", &parser->err); return false; } if (need_lowercase) { ret = ucl_strlcpy_tolower (*dst, src, in_len + 1); } else { ret = ucl_strlcpy_unsafe (*dst, src, in_len + 1); } if (need_unescape) { - ret = ucl_unescape_json_string (*dst, ret); + if (!unescape_squote) { + ret = ucl_unescape_json_string (*dst, ret); + } + else { + ret = ucl_unescape_squoted_string (*dst, ret); + } } + if (need_expand) { tmp = *dst; tret = ret; ret = ucl_expand_variable (parser, dst, tmp, ret); if (*dst == NULL) { /* Nothing to expand */ *dst = tmp; ret = tret; } else { /* Free unexpanded value */ UCL_FREE (in_len + 1, tmp); } } *dst_const = *dst; } else { *dst_const = src; ret = in_len; } return ret; } /** * Create and append an object at the specified level * @param parser * @param is_array * @param level * @return */ static inline ucl_object_t * ucl_parser_add_container (ucl_object_t *obj, struct ucl_parser *parser, - bool is_array, int level) + bool is_array, uint32_t level, bool has_obrace) { struct ucl_stack *st; + ucl_object_t *nobj; - if (!is_array) { - if (obj == NULL) { - obj = ucl_object_new_full (UCL_OBJECT, parser->chunks->priority); + if (obj == NULL) { + nobj = ucl_object_new_full (is_array ? UCL_ARRAY : UCL_OBJECT, parser->chunks->priority); + if (nobj == NULL) { + goto enomem0; } - else { - obj->type = UCL_OBJECT; - } - if (obj->value.ov == NULL) { - obj->value.ov = ucl_hash_create (parser->flags & UCL_PARSER_KEY_LOWERCASE); + } else { + if (obj->type == (is_array ? UCL_OBJECT : UCL_ARRAY)) { + /* Bad combination for merge: array and object */ + ucl_set_err (parser, UCL_EMERGE, + "cannot merge an object with an array", + &parser->err); + + return NULL; } - parser->state = UCL_STATE_KEY; + nobj = obj; + nobj->type = is_array ? UCL_ARRAY : UCL_OBJECT; } - else { - if (obj == NULL) { - obj = ucl_object_new_full (UCL_ARRAY, parser->chunks->priority); - } - else { - obj->type = UCL_ARRAY; + + if (!is_array) { + if (nobj->value.ov == NULL) { + nobj->value.ov = ucl_hash_create (parser->flags & UCL_PARSER_KEY_LOWERCASE); + if (nobj->value.ov == NULL) { + goto enomem1; + } } + parser->state = UCL_STATE_KEY; + } else { parser->state = UCL_STATE_VALUE; } st = UCL_ALLOC (sizeof (struct ucl_stack)); if (st == NULL) { - ucl_set_err (parser, UCL_EINTERNAL, "cannot allocate memory for an object", + goto enomem1; + } + + st->obj = nobj; + + if (level >= UINT16_MAX) { + ucl_set_err (parser, UCL_ENESTED, + "objects are nesting too deep (over 65535 limit)", &parser->err); - ucl_object_unref (obj); + if (nobj != obj) { + ucl_object_unref (obj); + } + return NULL; } - st->obj = obj; - st->level = level; + + st->e.params.level = level; + st->e.params.line = parser->chunks->line; + st->chunk = parser->chunks; + + if (has_obrace) { + st->e.params.flags = UCL_STACK_HAS_OBRACE; + } + else { + st->e.params.flags = 0; + } + LL_PREPEND (parser->stack, st); - parser->cur_obj = obj; + parser->cur_obj = nobj; - return obj; + return nobj; +enomem1: + if (nobj != obj) + ucl_object_unref (nobj); +enomem0: + ucl_set_err (parser, UCL_EINTERNAL, "cannot allocate memory for an object", + &parser->err); + return NULL; } int ucl_maybe_parse_number (ucl_object_t *obj, const char *start, const char *end, const char **pos, bool allow_double, bool number_bytes, bool allow_time) { const char *p = start, *c = start; char *endptr; bool got_dot = false, got_exp = false, need_double = false, is_time = false, valid_start = false, is_hex = false, is_neg = false; double dv = 0; int64_t lv = 0; if (*p == '-') { is_neg = true; c ++; p ++; } while (p < end) { if (is_hex && isxdigit (*p)) { p ++; } else if (isdigit (*p)) { valid_start = true; p ++; } else if (!is_hex && (*p == 'x' || *p == 'X')) { is_hex = true; allow_double = false; c = p + 1; } else if (allow_double) { if (p == c) { /* Empty digits sequence, not a number */ *pos = start; return EINVAL; } else if (*p == '.') { if (got_dot) { /* Double dots, not a number */ *pos = start; return EINVAL; } else { got_dot = true; need_double = true; p ++; } } else if (*p == 'e' || *p == 'E') { if (got_exp) { /* Double exp, not a number */ *pos = start; return EINVAL; } else { got_exp = true; need_double = true; p ++; if (p >= end) { *pos = start; return EINVAL; } if (!isdigit (*p) && *p != '+' && *p != '-') { /* Wrong exponent sign */ *pos = start; return EINVAL; } else { p ++; } } } else { /* Got the end of the number, need to check */ break; } } else { break; } } if (!valid_start) { *pos = start; return EINVAL; } errno = 0; if (need_double) { dv = strtod (c, &endptr); } else { if (is_hex) { lv = strtoimax (c, &endptr, 16); } else { lv = strtoimax (c, &endptr, 10); } } if (errno == ERANGE) { *pos = start; return ERANGE; } /* Now check endptr */ if (endptr == NULL || ucl_lex_is_atom_end (*endptr) || *endptr == '\0') { p = endptr; goto set_obj; } if (endptr < end && endptr != start) { p = endptr; switch (*p) { case 'm': case 'M': case 'g': case 'G': case 'k': case 'K': if (end - p >= 2) { if (p[1] == 's' || p[1] == 'S') { /* Milliseconds */ if (!need_double) { need_double = true; dv = lv; } is_time = true; if (p[0] == 'm' || p[0] == 'M') { dv /= 1000.; } else { dv *= ucl_lex_num_multiplier (*p, false); } p += 2; goto set_obj; } else if (number_bytes || (p[1] == 'b' || p[1] == 'B')) { /* Bytes */ if (need_double) { need_double = false; lv = dv; } lv *= ucl_lex_num_multiplier (*p, true); p += 2; goto set_obj; } else if (ucl_lex_is_atom_end (p[1])) { if (need_double) { dv *= ucl_lex_num_multiplier (*p, false); } else { lv *= ucl_lex_num_multiplier (*p, number_bytes); } p ++; goto set_obj; } else if (allow_time && end - p >= 3) { if (tolower (p[0]) == 'm' && tolower (p[1]) == 'i' && tolower (p[2]) == 'n') { /* Minutes */ if (!need_double) { need_double = true; dv = lv; } is_time = true; dv *= 60.; p += 3; goto set_obj; } } } else { if (need_double) { dv *= ucl_lex_num_multiplier (*p, false); } else { lv *= ucl_lex_num_multiplier (*p, number_bytes); } p ++; goto set_obj; } break; case 'S': case 's': if (allow_time && (p == end - 1 || ucl_lex_is_atom_end (p[1]))) { if (!need_double) { need_double = true; dv = lv; } p ++; is_time = true; goto set_obj; } break; case 'h': case 'H': case 'd': case 'D': case 'w': case 'W': case 'Y': case 'y': if (allow_time && (p == end - 1 || ucl_lex_is_atom_end (p[1]))) { if (!need_double) { need_double = true; dv = lv; } is_time = true; dv *= ucl_lex_time_multiplier (*p); p ++; goto set_obj; } break; case '\t': case ' ': while (p < end && ucl_test_character(*p, UCL_CHARACTER_WHITESPACE)) { p++; } if (ucl_lex_is_atom_end(*p)) goto set_obj; break; } } else if (endptr == end) { /* Just a number at the end of chunk */ p = endptr; goto set_obj; } *pos = c; return EINVAL; set_obj: if (obj != NULL) { if (allow_double && (need_double || is_time)) { if (!is_time) { obj->type = UCL_FLOAT; } else { obj->type = UCL_TIME; } obj->value.dv = is_neg ? (-dv) : dv; } else { obj->type = UCL_INT; obj->value.iv = is_neg ? (-lv) : lv; } } *pos = p; return 0; } /** * Parse possible number * @param parser * @param chunk * @param obj * @return true if a number has been parsed */ static bool ucl_lex_number (struct ucl_parser *parser, struct ucl_chunk *chunk, ucl_object_t *obj) { const unsigned char *pos; int ret; ret = ucl_maybe_parse_number (obj, chunk->pos, chunk->end, (const char **)&pos, true, false, ((parser->flags & UCL_PARSER_NO_TIME) == 0)); if (ret == 0) { chunk->remain -= pos - chunk->pos; chunk->column += pos - chunk->pos; chunk->pos = pos; return true; } else if (ret == ERANGE) { ucl_set_err (parser, UCL_ESYNTAX, "numeric value out of range", &parser->err); } return false; } /** * Parse quoted string with possible escapes * @param parser * @param chunk * @param need_unescape * @param ucl_escape * @param var_expand * @return true if a string has been parsed */ static bool ucl_lex_json_string (struct ucl_parser *parser, - struct ucl_chunk *chunk, bool *need_unescape, bool *ucl_escape, bool *var_expand) + struct ucl_chunk *chunk, + bool *need_unescape, + bool *ucl_escape, + bool *var_expand) { const unsigned char *p = chunk->pos; unsigned char c; int i; while (p < chunk->end) { c = *p; if (c < 0x1F) { /* Unmasked control character */ if (c == '\n') { ucl_set_err (parser, UCL_ESYNTAX, "unexpected newline", &parser->err); } else { ucl_set_err (parser, UCL_ESYNTAX, "unexpected control character", &parser->err); } return false; } else if (c == '\\') { ucl_chunk_skipc (chunk, p); c = *p; if (p >= chunk->end) { ucl_set_err (parser, UCL_ESYNTAX, "unfinished escape character", &parser->err); return false; } else if (ucl_test_character (c, UCL_CHARACTER_ESCAPE)) { if (c == 'u') { ucl_chunk_skipc (chunk, p); for (i = 0; i < 4 && p < chunk->end; i ++) { if (!isxdigit (*p)) { ucl_set_err (parser, UCL_ESYNTAX, "invalid utf escape", &parser->err); return false; } ucl_chunk_skipc (chunk, p); } if (p >= chunk->end) { - ucl_set_err (parser, UCL_ESYNTAX, "unfinished escape character", + ucl_set_err (parser, UCL_ESYNTAX, + "unfinished escape character", &parser->err); return false; } } else { ucl_chunk_skipc (chunk, p); } } *need_unescape = true; *ucl_escape = true; continue; } else if (c == '"') { ucl_chunk_skipc (chunk, p); return true; } else if (ucl_test_character (c, UCL_CHARACTER_UCL_UNSAFE)) { *ucl_escape = true; } else if (c == '$') { *var_expand = true; } ucl_chunk_skipc (chunk, p); } - ucl_set_err (parser, UCL_ESYNTAX, "no quote at the end of json string", + ucl_set_err (parser, UCL_ESYNTAX, + "no quote at the end of json string", + &parser->err); + return false; +} + +/** + * Process single quoted string + * @param parser + * @param chunk + * @param need_unescape + * @return + */ +static bool +ucl_lex_squoted_string (struct ucl_parser *parser, + struct ucl_chunk *chunk, bool *need_unescape) +{ + const unsigned char *p = chunk->pos; + unsigned char c; + + while (p < chunk->end) { + c = *p; + if (c == '\\') { + ucl_chunk_skipc (chunk, p); + + if (p >= chunk->end) { + ucl_set_err (parser, UCL_ESYNTAX, + "unfinished escape character", + &parser->err); + return false; + } + else { + ucl_chunk_skipc (chunk, p); + } + + *need_unescape = true; + continue; + } + else if (c == '\'') { + ucl_chunk_skipc (chunk, p); + return true; + } + + ucl_chunk_skipc (chunk, p); + } + + ucl_set_err (parser, UCL_ESYNTAX, + "no quote at the end of single quoted string", &parser->err); return false; } static void ucl_parser_append_elt (struct ucl_parser *parser, ucl_hash_t *cont, ucl_object_t *top, ucl_object_t *elt) { ucl_object_t *nobj; if ((parser->flags & UCL_PARSER_NO_IMPLICIT_ARRAYS) == 0) { /* Implicit array */ top->flags |= UCL_OBJECT_MULTIVALUE; DL_APPEND (top, elt); parser->stack->obj->len ++; } else { if ((top->flags & UCL_OBJECT_MULTIVALUE) != 0) { /* Just add to the explicit array */ ucl_array_append (top, elt); } else { /* Convert to an array */ nobj = ucl_object_typed_new (UCL_ARRAY); nobj->key = top->key; nobj->keylen = top->keylen; nobj->flags |= UCL_OBJECT_MULTIVALUE; ucl_array_append (nobj, top); ucl_array_append (nobj, elt); ucl_hash_replace (cont, top, nobj); } } } bool ucl_parser_process_object_element (struct ucl_parser *parser, ucl_object_t *nobj) { ucl_hash_t *container; - ucl_object_t *tobj; + ucl_object_t *tobj = NULL, *cur; char errmsg[256]; container = parser->stack->obj->value.ov; - tobj = __DECONST (ucl_object_t *, ucl_hash_search_obj (container, nobj)); + DL_FOREACH (parser->stack->obj, cur) { + tobj = __DECONST (ucl_object_t *, ucl_hash_search_obj (cur->value.ov, nobj)); + + if (tobj != NULL) { + break; + } + } + + if (tobj == NULL) { container = ucl_hash_insert_object (container, nobj, parser->flags & UCL_PARSER_KEY_LOWERCASE); + if (container == NULL) { + return false; + } nobj->prev = nobj; nobj->next = NULL; parser->stack->obj->len ++; } else { unsigned priold = ucl_object_get_priority (tobj), prinew = ucl_object_get_priority (nobj); switch (parser->chunks->strategy) { case UCL_DUPLICATE_APPEND: /* * The logic here is the following: * * - if we have two objects with the same priority, then we form an * implicit or explicit array * - if a new object has bigger priority, then we overwrite an old one * - if a new object has lower priority, then we ignore it */ - - /* Special case for inherited objects */ if (tobj->flags & UCL_OBJECT_INHERITED) { prinew = priold + 1; } if (priold == prinew) { ucl_parser_append_elt (parser, container, tobj, nobj); } else if (priold > prinew) { /* * We add this new object to a list of trash objects just to ensure * that it won't come to any real object * XXX: rather inefficient approach */ DL_APPEND (parser->trash_objs, nobj); } else { ucl_hash_replace (container, tobj, nobj); ucl_object_unref (tobj); } break; case UCL_DUPLICATE_REWRITE: /* We just rewrite old values regardless of priority */ ucl_hash_replace (container, tobj, nobj); ucl_object_unref (tobj); break; case UCL_DUPLICATE_ERROR: snprintf(errmsg, sizeof(errmsg), "duplicate element for key '%s' found", nobj->key); ucl_set_err (parser, UCL_EMERGE, errmsg, &parser->err); return false; case UCL_DUPLICATE_MERGE: /* * Here we do have some old object so we just push it on top of objects stack * Check priority and then perform the merge on the remaining objects */ if (tobj->type == UCL_OBJECT || tobj->type == UCL_ARRAY) { ucl_object_unref (nobj); nobj = tobj; } else if (priold == prinew) { ucl_parser_append_elt (parser, container, tobj, nobj); } else if (priold > prinew) { /* * We add this new object to a list of trash objects just to ensure * that it won't come to any real object * XXX: rather inefficient approach */ DL_APPEND (parser->trash_objs, nobj); } else { ucl_hash_replace (container, tobj, nobj); ucl_object_unref (tobj); } break; } } parser->stack->obj->value.ov = container; parser->cur_obj = nobj; ucl_attach_comment (parser, nobj, false); return true; } /** * Parse a key in an object * @param parser * @param chunk * @param next_key * @param end_of_object * @return true if a key has been parsed */ static bool ucl_parse_key (struct ucl_parser *parser, struct ucl_chunk *chunk, bool *next_key, bool *end_of_object) { const unsigned char *p, *c = NULL, *end, *t; const char *key = NULL; bool got_quote = false, got_eq = false, got_semicolon = false, need_unescape = false, ucl_escape = false, var_expand = false, got_content = false, got_sep = false; ucl_object_t *nobj; ssize_t keylen; p = chunk->pos; if (*p == '.') { /* It is macro actually */ if (!(parser->flags & UCL_PARSER_DISABLE_MACRO)) { ucl_chunk_skipc (chunk, p); } parser->prev_state = parser->state; parser->state = UCL_STATE_MACRO_NAME; *end_of_object = false; return true; } while (p < chunk->end) { /* * A key must start with alpha, number, '/' or '_' and end with space character */ if (c == NULL) { if (chunk->remain >= 2 && ucl_lex_is_comment (p[0], p[1])) { if (!ucl_skip_comments (parser)) { return false; } p = chunk->pos; } else if (ucl_test_character (*p, UCL_CHARACTER_WHITESPACE_UNSAFE)) { ucl_chunk_skipc (chunk, p); } else if (ucl_test_character (*p, UCL_CHARACTER_KEY_START)) { /* The first symbol */ c = p; ucl_chunk_skipc (chunk, p); got_content = true; } else if (*p == '"') { /* JSON style key */ c = p + 1; got_quote = true; got_content = true; ucl_chunk_skipc (chunk, p); } else if (*p == '}') { /* We have actually end of an object */ *end_of_object = true; return true; } else if (*p == '.') { ucl_chunk_skipc (chunk, p); parser->prev_state = parser->state; parser->state = UCL_STATE_MACRO_NAME; return true; } else { /* Invalid identifier */ ucl_set_err (parser, UCL_ESYNTAX, "key must begin with a letter", &parser->err); return false; } } else { /* Parse the body of a key */ if (!got_quote) { if (ucl_test_character (*p, UCL_CHARACTER_KEY)) { got_content = true; ucl_chunk_skipc (chunk, p); } else if (ucl_test_character (*p, UCL_CHARACTER_KEY_SEP)) { end = p; break; } else { ucl_set_err (parser, UCL_ESYNTAX, "invalid character in a key", &parser->err); return false; } } else { /* We need to parse json like quoted string */ if (!ucl_lex_json_string (parser, chunk, &need_unescape, &ucl_escape, &var_expand)) { return false; } /* Always escape keys obtained via json */ end = chunk->pos - 1; p = chunk->pos; break; } } } if (p >= chunk->end && got_content) { ucl_set_err (parser, UCL_ESYNTAX, "unfinished key", &parser->err); return false; } else if (!got_content) { return true; } *end_of_object = false; /* We are now at the end of the key, need to parse the rest */ while (p < chunk->end) { if (ucl_test_character (*p, UCL_CHARACTER_WHITESPACE)) { ucl_chunk_skipc (chunk, p); } else if (*p == '=') { if (!got_eq && !got_semicolon) { ucl_chunk_skipc (chunk, p); got_eq = true; } else { ucl_set_err (parser, UCL_ESYNTAX, "unexpected '=' character", &parser->err); return false; } } else if (*p == ':') { if (!got_eq && !got_semicolon) { ucl_chunk_skipc (chunk, p); got_semicolon = true; } else { ucl_set_err (parser, UCL_ESYNTAX, "unexpected ':' character", &parser->err); return false; } } else if (chunk->remain >= 2 && ucl_lex_is_comment (p[0], p[1])) { /* Check for comment */ if (!ucl_skip_comments (parser)) { return false; } p = chunk->pos; } else { /* Start value */ break; } } if (p >= chunk->end && got_content) { ucl_set_err (parser, UCL_ESYNTAX, "unfinished key", &parser->err); return false; } got_sep = got_semicolon || got_eq; if (!got_sep) { /* * Maybe we have more keys nested, so search for termination character. * Possible choices: * 1) key1 key2 ... keyN [:=] value <- we treat that as error * 2) key1 ... keyN {} or [] <- we treat that as nested objects * 3) key1 value[;,\n] <- we treat that as linear object */ t = p; *next_key = false; while (ucl_test_character (*t, UCL_CHARACTER_WHITESPACE)) { t ++; } /* Check first non-space character after a key */ if (*t != '{' && *t != '[') { while (t < chunk->end) { if (*t == ',' || *t == ';' || *t == '\n' || *t == '\r') { break; } else if (*t == '{' || *t == '[') { *next_key = true; break; } t ++; } } } /* Create a new object */ nobj = ucl_object_new_full (UCL_NULL, parser->chunks->priority); + if (nobj == NULL) { + return false; + } keylen = ucl_copy_or_store_ptr (parser, c, &nobj->trash_stack[UCL_TRASH_KEY], - &key, end - c, need_unescape, parser->flags & UCL_PARSER_KEY_LOWERCASE, false); + &key, end - c, need_unescape, parser->flags & UCL_PARSER_KEY_LOWERCASE, + false, false); if (keylen == -1) { ucl_object_unref (nobj); return false; } else if (keylen == 0) { ucl_set_err (parser, UCL_ESYNTAX, "empty keys are not allowed", &parser->err); ucl_object_unref (nobj); return false; } nobj->key = key; nobj->keylen = keylen; if (!ucl_parser_process_object_element (parser, nobj)) { return false; } if (ucl_escape) { nobj->flags |= UCL_OBJECT_NEED_KEY_ESCAPE; } return true; } /** * Parse a cl string * @param parser * @param chunk * @param var_expand * @param need_unescape * @return true if a key has been parsed */ static bool ucl_parse_string_value (struct ucl_parser *parser, struct ucl_chunk *chunk, bool *var_expand, bool *need_unescape) { const unsigned char *p; enum { UCL_BRACE_ROUND = 0, UCL_BRACE_SQUARE, UCL_BRACE_FIGURE }; int braces[3][2] = {{0, 0}, {0, 0}, {0, 0}}; p = chunk->pos; while (p < chunk->end) { /* Skip pairs of figure braces */ if (*p == '{') { braces[UCL_BRACE_FIGURE][0] ++; } else if (*p == '}') { braces[UCL_BRACE_FIGURE][1] ++; if (braces[UCL_BRACE_FIGURE][1] <= braces[UCL_BRACE_FIGURE][0]) { /* This is not a termination symbol, continue */ ucl_chunk_skipc (chunk, p); continue; } } /* Skip pairs of square braces */ else if (*p == '[') { braces[UCL_BRACE_SQUARE][0] ++; } else if (*p == ']') { braces[UCL_BRACE_SQUARE][1] ++; if (braces[UCL_BRACE_SQUARE][1] <= braces[UCL_BRACE_SQUARE][0]) { /* This is not a termination symbol, continue */ ucl_chunk_skipc (chunk, p); continue; } } else if (*p == '$') { *var_expand = true; } else if (*p == '\\') { *need_unescape = true; ucl_chunk_skipc (chunk, p); if (p < chunk->end) { ucl_chunk_skipc (chunk, p); } continue; } if (ucl_lex_is_atom_end (*p) || (chunk->remain >= 2 && ucl_lex_is_comment (p[0], p[1]))) { break; } ucl_chunk_skipc (chunk, p); } return true; } /** * Parse multiline string ending with \n{term}\n * @param parser * @param chunk * @param term * @param term_len * @param beg * @param var_expand * @return size of multiline string or 0 in case of error */ static int ucl_parse_multiline_string (struct ucl_parser *parser, struct ucl_chunk *chunk, const unsigned char *term, int term_len, unsigned char const **beg, bool *var_expand) { const unsigned char *p, *c, *tend; bool newline = false; int len = 0; p = chunk->pos; c = p; while (p < chunk->end) { if (newline) { if (chunk->end - p < term_len) { return 0; } else if (memcmp (p, term, term_len) == 0) { tend = p + term_len; if (*tend != '\n' && *tend != ';' && *tend != ',') { /* Incomplete terminator */ ucl_chunk_skipc (chunk, p); continue; } len = p - c; chunk->remain -= term_len; chunk->pos = p + term_len; chunk->column = term_len; *beg = c; break; } } if (*p == '\n') { newline = true; } else { if (*p == '$') { *var_expand = true; } newline = false; } ucl_chunk_skipc (chunk, p); } return len; } static inline ucl_object_t* ucl_parser_get_container (struct ucl_parser *parser) { ucl_object_t *t, *obj = NULL; if (parser == NULL || parser->stack == NULL || parser->stack->obj == NULL) { return NULL; } if (parser->stack->obj->type == UCL_ARRAY) { /* Object must be allocated */ obj = ucl_object_new_full (UCL_NULL, parser->chunks->priority); t = parser->stack->obj; if (!ucl_array_append (t, obj)) { ucl_object_unref (obj); return NULL; } parser->cur_obj = obj; ucl_attach_comment (parser, obj, false); } else { /* Object has been already allocated */ obj = parser->cur_obj; } return obj; } /** * Handle value data * @param parser * @param chunk * @return */ static bool ucl_parse_value (struct ucl_parser *parser, struct ucl_chunk *chunk) { const unsigned char *p, *c; ucl_object_t *obj = NULL; unsigned int stripped_spaces; - int str_len; + ssize_t str_len; bool need_unescape = false, ucl_escape = false, var_expand = false; p = chunk->pos; /* Skip any spaces and comments */ if (ucl_test_character (*p, UCL_CHARACTER_WHITESPACE_UNSAFE) || (chunk->remain >= 2 && ucl_lex_is_comment (p[0], p[1]))) { while (p < chunk->end && ucl_test_character (*p, UCL_CHARACTER_WHITESPACE_UNSAFE)) { ucl_chunk_skipc (chunk, p); } if (!ucl_skip_comments (parser)) { return false; } p = chunk->pos; } while (p < chunk->end) { c = p; switch (*p) { case '"': ucl_chunk_skipc (chunk, p); if (!ucl_lex_json_string (parser, chunk, &need_unescape, &ucl_escape, &var_expand)) { return false; } obj = ucl_parser_get_container (parser); if (!obj) { return false; } str_len = chunk->pos - c - 2; obj->type = UCL_STRING; if ((str_len = ucl_copy_or_store_ptr (parser, c + 1, &obj->trash_stack[UCL_TRASH_VALUE], &obj->value.sv, str_len, need_unescape, false, - var_expand)) == -1) { + var_expand, false)) == -1) { + return false; + } + + obj->len = str_len; + parser->state = UCL_STATE_AFTER_VALUE; + + return true; + break; + case '\'': + ucl_chunk_skipc (chunk, p); + + if (!ucl_lex_squoted_string (parser, chunk, &need_unescape)) { + return false; + } + + obj = ucl_parser_get_container (parser); + if (!obj) { + return false; + } + + str_len = chunk->pos - c - 2; + obj->type = UCL_STRING; + obj->flags |= UCL_OBJECT_SQUOTED; + + if ((str_len = ucl_copy_or_store_ptr (parser, c + 1, + &obj->trash_stack[UCL_TRASH_VALUE], + &obj->value.sv, str_len, need_unescape, false, + var_expand, true)) == -1) { return false; } + obj->len = str_len; parser->state = UCL_STATE_AFTER_VALUE; - p = chunk->pos; return true; break; case '{': obj = ucl_parser_get_container (parser); + if (obj == NULL) { + return false; + } /* We have a new object */ - obj = ucl_parser_add_container (obj, parser, false, parser->stack->level); + if (parser->stack) { + obj = ucl_parser_add_container (obj, parser, false, + parser->stack->e.params.level, true); + } + else { + return false; + } if (obj == NULL) { return false; } ucl_chunk_skipc (chunk, p); return true; break; case '[': obj = ucl_parser_get_container (parser); + if (obj == NULL) { + return false; + } /* We have a new array */ - obj = ucl_parser_add_container (obj, parser, true, parser->stack->level); + if (parser->stack) { + obj = ucl_parser_add_container (obj, parser, true, + parser->stack->e.params.level, true); + } + else { + return false; + } + if (obj == NULL) { return false; } ucl_chunk_skipc (chunk, p); return true; break; case ']': /* We have the array ending */ if (parser->stack && parser->stack->obj->type == UCL_ARRAY) { parser->state = UCL_STATE_AFTER_VALUE; return true; } else { goto parse_string; } break; case '<': obj = ucl_parser_get_container (parser); /* We have something like multiline value, which must be <<[A-Z]+\n */ if (chunk->end - p > 3) { if (memcmp (p, "<<", 2) == 0) { p += 2; /* We allow only uppercase characters in multiline definitions */ while (p < chunk->end && *p >= 'A' && *p <= 'Z') { p ++; } if (*p =='\n') { /* Set chunk positions and start multiline parsing */ + chunk->remain -= p - c + 1; c += 2; - chunk->remain -= p - c; chunk->pos = p + 1; chunk->column = 0; chunk->line ++; if ((str_len = ucl_parse_multiline_string (parser, chunk, c, p - c, &c, &var_expand)) == 0) { ucl_set_err (parser, UCL_ESYNTAX, "unterminated multiline value", &parser->err); return false; } obj->type = UCL_STRING; obj->flags |= UCL_OBJECT_MULTILINE; if ((str_len = ucl_copy_or_store_ptr (parser, c, &obj->trash_stack[UCL_TRASH_VALUE], &obj->value.sv, str_len - 1, false, - false, var_expand)) == -1) { + false, var_expand, false)) == -1) { return false; } obj->len = str_len; parser->state = UCL_STATE_AFTER_VALUE; return true; } } } /* Fallback to ordinary strings */ + /* FALLTHRU */ default: parse_string: if (obj == NULL) { obj = ucl_parser_get_container (parser); } /* Parse atom */ if (ucl_test_character (*p, UCL_CHARACTER_VALUE_DIGIT_START)) { if (!ucl_lex_number (parser, chunk, obj)) { if (parser->state == UCL_STATE_ERROR) { return false; } } else { parser->state = UCL_STATE_AFTER_VALUE; return true; } /* Fallback to normal string */ } if (!ucl_parse_string_value (parser, chunk, &var_expand, &need_unescape)) { return false; } /* Cut trailing spaces */ stripped_spaces = 0; while (ucl_test_character (*(chunk->pos - 1 - stripped_spaces), UCL_CHARACTER_WHITESPACE)) { stripped_spaces ++; } str_len = chunk->pos - c - stripped_spaces; if (str_len <= 0) { ucl_set_err (parser, UCL_ESYNTAX, "string value must not be empty", &parser->err); return false; } else if (str_len == 4 && memcmp (c, "null", 4) == 0) { obj->len = 0; obj->type = UCL_NULL; } + else if (str_len == 3 && memcmp (c, "nan", 3) == 0) { + obj->len = 0; + obj->type = UCL_FLOAT; + obj->value.dv = NAN; + } + else if (str_len == 3 && memcmp (c, "inf", 3) == 0) { + obj->len = 0; + obj->type = UCL_FLOAT; + obj->value.dv = INFINITY; + } else if (!ucl_maybe_parse_boolean (obj, c, str_len)) { obj->type = UCL_STRING; if ((str_len = ucl_copy_or_store_ptr (parser, c, &obj->trash_stack[UCL_TRASH_VALUE], &obj->value.sv, str_len, need_unescape, - false, var_expand)) == -1) { + false, var_expand, false)) == -1) { return false; } obj->len = str_len; } + parser->state = UCL_STATE_AFTER_VALUE; - p = chunk->pos; return true; break; } } return true; } /** * Handle after value data * @param parser * @param chunk * @return */ static bool ucl_parse_after_value (struct ucl_parser *parser, struct ucl_chunk *chunk) { const unsigned char *p; bool got_sep = false; struct ucl_stack *st; p = chunk->pos; while (p < chunk->end) { if (ucl_test_character (*p, UCL_CHARACTER_WHITESPACE)) { /* Skip whitespaces */ ucl_chunk_skipc (chunk, p); } else if (chunk->remain >= 2 && ucl_lex_is_comment (p[0], p[1])) { /* Skip comment */ if (!ucl_skip_comments (parser)) { return false; } /* Treat comment as a separator */ got_sep = true; p = chunk->pos; } else if (ucl_test_character (*p, UCL_CHARACTER_VALUE_END)) { if (*p == '}' || *p == ']') { if (parser->stack == NULL) { ucl_set_err (parser, UCL_ESYNTAX, "end of array or object detected without corresponding start", &parser->err); return false; } if ((*p == '}' && parser->stack->obj->type == UCL_OBJECT) || (*p == ']' && parser->stack->obj->type == UCL_ARRAY)) { /* Pop all nested objects from a stack */ st = parser->stack; + + if (!(st->e.params.flags & UCL_STACK_HAS_OBRACE)) { + parser->err_code = UCL_EUNPAIRED; + ucl_create_err (&parser->err, + "%s:%d object closed with } is not opened with { at line %d", + chunk->fname ? chunk->fname : "memory", + parser->chunks->line, st->e.params.line); + + return false; + } + parser->stack = st->next; UCL_FREE (sizeof (struct ucl_stack), st); if (parser->cur_obj) { ucl_attach_comment (parser, parser->cur_obj, true); } while (parser->stack != NULL) { st = parser->stack; - if (st->next == NULL || st->next->level == st->level) { + if (st->next == NULL) { + break; + } + else if (st->next->e.params.level == st->e.params.level) { break; } + parser->stack = st->next; parser->cur_obj = st->obj; UCL_FREE (sizeof (struct ucl_stack), st); } } else { ucl_set_err (parser, UCL_ESYNTAX, "unexpected terminating symbol detected", &parser->err); return false; } if (parser->stack == NULL) { /* Ignore everything after a top object */ return true; } else { ucl_chunk_skipc (chunk, p); } got_sep = true; } else { /* Got a separator */ got_sep = true; ucl_chunk_skipc (chunk, p); } } else { /* Anything else */ if (!got_sep) { ucl_set_err (parser, UCL_ESYNTAX, "delimiter is missing", &parser->err); return false; } return true; } } return true; } static bool ucl_skip_macro_as_comment (struct ucl_parser *parser, struct ucl_chunk *chunk) { const unsigned char *p, *c; enum { macro_skip_start = 0, macro_has_symbols, macro_has_obrace, macro_has_quote, macro_has_backslash, macro_has_sqbrace, macro_save } state = macro_skip_start, prev_state = macro_skip_start; p = chunk->pos; c = chunk->pos; while (p < chunk->end) { switch (state) { case macro_skip_start: if (!ucl_test_character (*p, UCL_CHARACTER_WHITESPACE)) { state = macro_has_symbols; } else if (ucl_test_character (*p, UCL_CHARACTER_WHITESPACE_UNSAFE)) { state = macro_save; continue; } ucl_chunk_skipc (chunk, p); break; case macro_has_symbols: if (*p == '{') { state = macro_has_sqbrace; } else if (*p == '(') { state = macro_has_obrace; } else if (*p == '"') { state = macro_has_quote; } else if (*p == '\n') { state = macro_save; continue; } ucl_chunk_skipc (chunk, p); break; case macro_has_obrace: if (*p == '\\') { prev_state = state; state = macro_has_backslash; } else if (*p == ')') { state = macro_has_symbols; } ucl_chunk_skipc (chunk, p); break; case macro_has_sqbrace: if (*p == '\\') { prev_state = state; state = macro_has_backslash; } else if (*p == '}') { state = macro_save; } ucl_chunk_skipc (chunk, p); break; case macro_has_quote: if (*p == '\\') { prev_state = state; state = macro_has_backslash; } else if (*p == '"') { state = macro_save; } ucl_chunk_skipc (chunk, p); break; case macro_has_backslash: state = prev_state; ucl_chunk_skipc (chunk, p); break; case macro_save: if (parser->flags & UCL_PARSER_SAVE_COMMENTS) { ucl_save_comment (parser, c, p - c); } return true; } } return false; } /** * Handle macro data * @param parser * @param chunk * @param marco * @param macro_start * @param macro_len * @return */ static bool ucl_parse_macro_value (struct ucl_parser *parser, struct ucl_chunk *chunk, struct ucl_macro *macro, unsigned char const **macro_start, size_t *macro_len) { const unsigned char *p, *c; bool need_unescape = false, ucl_escape = false, var_expand = false; p = chunk->pos; switch (*p) { case '"': /* We have macro value encoded in quotes */ c = p; ucl_chunk_skipc (chunk, p); if (!ucl_lex_json_string (parser, chunk, &need_unescape, &ucl_escape, &var_expand)) { return false; } *macro_start = c + 1; *macro_len = chunk->pos - c - 2; p = chunk->pos; break; case '{': /* We got a multiline macro body */ ucl_chunk_skipc (chunk, p); /* Skip spaces at the beginning */ while (p < chunk->end) { if (ucl_test_character (*p, UCL_CHARACTER_WHITESPACE_UNSAFE)) { ucl_chunk_skipc (chunk, p); } else { break; } } c = p; while (p < chunk->end) { if (*p == '}') { break; } ucl_chunk_skipc (chunk, p); } *macro_start = c; *macro_len = p - c; ucl_chunk_skipc (chunk, p); break; default: /* Macro is not enclosed in quotes or braces */ c = p; while (p < chunk->end) { if (ucl_lex_is_atom_end (*p)) { break; } ucl_chunk_skipc (chunk, p); } *macro_start = c; *macro_len = p - c; break; } /* We are at the end of a macro */ /* Skip ';' and space characters and return to previous state */ while (p < chunk->end) { if (!ucl_test_character (*p, UCL_CHARACTER_WHITESPACE_UNSAFE) && *p != ';') { break; } ucl_chunk_skipc (chunk, p); } return true; } /** * Parse macro arguments as UCL object * @param parser parser structure * @param chunk the current data chunk * @return */ static ucl_object_t * ucl_parse_macro_arguments (struct ucl_parser *parser, struct ucl_chunk *chunk) { ucl_object_t *res = NULL; struct ucl_parser *params_parser; int obraces = 1, ebraces = 0, state = 0; const unsigned char *p, *c; size_t args_len = 0; struct ucl_parser_saved_state saved; saved.column = chunk->column; saved.line = chunk->line; saved.pos = chunk->pos; saved.remain = chunk->remain; p = chunk->pos; if (*p != '(' || chunk->remain < 2) { return NULL; } /* Set begin and start */ ucl_chunk_skipc (chunk, p); c = p; while ((p) < (chunk)->end) { switch (state) { case 0: /* Parse symbols and check for '(', ')' and '"' */ if (*p == '(') { obraces ++; } else if (*p == ')') { ebraces ++; } else if (*p == '"') { state = 1; } /* Check pairing */ if (obraces == ebraces) { state = 99; } else { args_len ++; } /* Check overflow */ if (chunk->remain == 0) { goto restore_chunk; } ucl_chunk_skipc (chunk, p); break; case 1: /* We have quote character, so skip all but quotes */ if (*p == '"' && *(p - 1) != '\\') { state = 0; } if (chunk->remain == 0) { goto restore_chunk; } args_len ++; ucl_chunk_skipc (chunk, p); break; case 99: /* * We have read the full body of arguments, so we need to parse and set * object from that */ params_parser = ucl_parser_new (parser->flags); if (!ucl_parser_add_chunk (params_parser, c, args_len)) { ucl_set_err (parser, UCL_ESYNTAX, "macro arguments parsing error", &parser->err); } else { res = ucl_parser_get_object (params_parser); } ucl_parser_free (params_parser); return res; break; } } return res; restore_chunk: chunk->column = saved.column; chunk->line = saved.line; chunk->pos = saved.pos; chunk->remain = saved.remain; return NULL; } #define SKIP_SPACES_COMMENTS(parser, chunk, p) do { \ while ((p) < (chunk)->end) { \ if (!ucl_test_character (*(p), UCL_CHARACTER_WHITESPACE_UNSAFE)) { \ if ((chunk)->remain >= 2 && ucl_lex_is_comment ((p)[0], (p)[1])) { \ if (!ucl_skip_comments (parser)) { \ return false; \ } \ p = (chunk)->pos; \ } \ break; \ } \ ucl_chunk_skipc (chunk, p); \ } \ } while(0) /** * Handle the main states of rcl parser * @param parser parser structure * @return true if chunk has been parsed and false in case of error */ static bool ucl_state_machine (struct ucl_parser *parser) { ucl_object_t *obj, *macro_args; struct ucl_chunk *chunk = parser->chunks; const unsigned char *p, *c = NULL, *macro_start = NULL; unsigned char *macro_escaped; size_t macro_len = 0; struct ucl_macro *macro = NULL; bool next_key = false, end_of_object = false, ret; if (parser->top_obj == NULL) { parser->state = UCL_STATE_INIT; } p = chunk->pos; while (chunk->pos < chunk->end) { switch (parser->state) { case UCL_STATE_INIT: /* * At the init state we can either go to the parse array or object * if we got [ or { correspondingly or can just treat new data as * a key of newly created object */ if (!ucl_skip_comments (parser)) { parser->prev_state = parser->state; parser->state = UCL_STATE_ERROR; return false; } else { + bool seen_obrace = false; + /* 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; - ucl_chunk_skipc (chunk, p); - } - else { - parser->state = UCL_STATE_KEY; - if (*p == '{') { + if (p < chunk->end) { + if (*p == '[') { + parser->state = UCL_STATE_VALUE; ucl_chunk_skipc (chunk, p); + seen_obrace = true; + } + else { + + if (*p == '{') { + ucl_chunk_skipc (chunk, p); + parser->state = UCL_STATE_KEY_OBRACE; + seen_obrace = true; + } + else { + parser->state = UCL_STATE_KEY; + } } } if (parser->top_obj == NULL) { if (parser->state == UCL_STATE_VALUE) { - obj = ucl_parser_add_container (NULL, parser, true, 0); + obj = ucl_parser_add_container (NULL, parser, true, 0, + seen_obrace); } else { - obj = ucl_parser_add_container (NULL, parser, false, 0); + obj = ucl_parser_add_container (NULL, parser, false, 0, + seen_obrace); } if (obj == NULL) { return false; } parser->top_obj = obj; parser->cur_obj = obj; } } break; case UCL_STATE_KEY: + case UCL_STATE_KEY_OBRACE: /* Skip any spaces */ while (p < chunk->end && ucl_test_character (*p, UCL_CHARACTER_WHITESPACE_UNSAFE)) { ucl_chunk_skipc (chunk, p); } if (p == chunk->end || *p == '}') { /* We have the end of an object */ parser->state = UCL_STATE_AFTER_VALUE; continue; } if (parser->stack == NULL) { /* No objects are on stack, but we want to parse a key */ ucl_set_err (parser, UCL_ESYNTAX, "top object is finished but the parser " "expects a key", &parser->err); parser->prev_state = parser->state; parser->state = UCL_STATE_ERROR; return false; } if (!ucl_parse_key (parser, chunk, &next_key, &end_of_object)) { parser->prev_state = parser->state; parser->state = UCL_STATE_ERROR; return false; } + if (end_of_object) { p = chunk->pos; parser->state = UCL_STATE_AFTER_VALUE; continue; } else if (parser->state != UCL_STATE_MACRO_NAME) { if (next_key && parser->stack->obj->type == UCL_OBJECT) { /* Parse more keys and nest objects accordingly */ - obj = ucl_parser_add_container (parser->cur_obj, parser, false, - parser->stack->level + 1); + obj = ucl_parser_add_container (parser->cur_obj, + parser, + false, + parser->stack->e.params.level + 1, + parser->state == UCL_STATE_KEY_OBRACE); if (obj == NULL) { return false; } } else { parser->state = UCL_STATE_VALUE; } } else { c = chunk->pos; } p = chunk->pos; break; case UCL_STATE_VALUE: /* We need to check what we do have */ if (!parser->cur_obj || !ucl_parse_value (parser, chunk)) { parser->prev_state = parser->state; parser->state = UCL_STATE_ERROR; return false; } /* State is set in ucl_parse_value call */ p = chunk->pos; break; case UCL_STATE_AFTER_VALUE: if (!ucl_parse_after_value (parser, chunk)) { parser->prev_state = parser->state; parser->state = UCL_STATE_ERROR; return false; } if (parser->stack != NULL) { if (parser->stack->obj->type == UCL_OBJECT) { parser->state = UCL_STATE_KEY; } else { /* Array */ parser->state = UCL_STATE_VALUE; } } else { /* Skip everything at the end */ return true; } p = chunk->pos; break; case UCL_STATE_MACRO_NAME: if (parser->flags & UCL_PARSER_DISABLE_MACRO) { if (!ucl_skip_macro_as_comment (parser, chunk)) { /* We have invalid macro */ ucl_create_err (&parser->err, - "error on line %d at column %d: invalid macro", + "error at %s:%d at column %d: invalid macro", + chunk->fname ? chunk->fname : "memory", chunk->line, chunk->column); parser->state = UCL_STATE_ERROR; return false; } else { p = chunk->pos; parser->state = parser->prev_state; } } else { if (!ucl_test_character (*p, UCL_CHARACTER_WHITESPACE_UNSAFE) && *p != '(') { ucl_chunk_skipc (chunk, p); } else { if (c != NULL && p - c > 0) { /* We got macro name */ macro_len = (size_t) (p - c); HASH_FIND (hh, parser->macroes, c, macro_len, macro); if (macro == NULL) { ucl_create_err (&parser->err, - "error on line %d at column %d: " + "error at %s:%d at column %d: " "unknown macro: '%.*s', character: '%c'", + chunk->fname ? chunk->fname : "memory", chunk->line, chunk->column, (int) (p - c), c, *chunk->pos); parser->state = UCL_STATE_ERROR; return false; } /* Now we need to skip all spaces */ SKIP_SPACES_COMMENTS(parser, chunk, p); parser->state = UCL_STATE_MACRO; } else { /* We have invalid macro name */ ucl_create_err (&parser->err, - "error on line %d at column %d: invalid macro name", + "error at %s:%d at column %d: invalid macro name", + chunk->fname ? chunk->fname : "memory", chunk->line, chunk->column); parser->state = UCL_STATE_ERROR; return false; } } } break; case UCL_STATE_MACRO: if (*chunk->pos == '(') { macro_args = ucl_parse_macro_arguments (parser, chunk); p = chunk->pos; if (macro_args) { SKIP_SPACES_COMMENTS(parser, chunk, p); } } else { macro_args = NULL; } if (!ucl_parse_macro_value (parser, chunk, macro, ¯o_start, ¯o_len)) { parser->prev_state = parser->state; parser->state = UCL_STATE_ERROR; return false; } macro_len = ucl_expand_variable (parser, ¯o_escaped, macro_start, macro_len); parser->state = parser->prev_state; if (macro_escaped == NULL && macro != NULL) { if (macro->is_context) { ret = macro->h.context_handler (macro_start, macro_len, macro_args, parser->top_obj, macro->ud); } else { ret = macro->h.handler (macro_start, macro_len, macro_args, macro->ud); } } else if (macro != NULL) { if (macro->is_context) { ret = macro->h.context_handler (macro_escaped, macro_len, macro_args, parser->top_obj, macro->ud); } else { ret = macro->h.handler (macro_escaped, macro_len, macro_args, macro->ud); } UCL_FREE (macro_len + 1, macro_escaped); } else { ret = false; ucl_set_err (parser, UCL_EINTERNAL, "internal error: parser has macro undefined", &parser->err); } /* * Chunk can be modified within macro handler */ chunk = parser->chunks; p = chunk->pos; if (macro_args) { ucl_object_unref (macro_args); } if (!ret) { return false; } break; default: ucl_set_err (parser, UCL_EINTERNAL, "internal error: parser is in an unknown state", &parser->err); parser->state = UCL_STATE_ERROR; return false; } } if (parser->last_comment) { if (parser->cur_obj) { ucl_attach_comment (parser, parser->cur_obj, true); } else if (parser->stack && parser->stack->obj) { ucl_attach_comment (parser, parser->stack->obj, true); } else if (parser->top_obj) { ucl_attach_comment (parser, parser->top_obj, true); } else { ucl_object_unref (parser->last_comment); } } + if (parser->stack != NULL && parser->state != UCL_STATE_ERROR) { + struct ucl_stack *st; + bool has_error = false; + + LL_FOREACH (parser->stack, st) { + if (st->chunk != parser->chunks) { + break; /* Not our chunk, give up */ + } + if (st->e.params.flags & UCL_STACK_HAS_OBRACE) { + if (parser->err == NULL) { + utstring_new (parser->err); + } + + utstring_printf (parser->err, "%s:%d unmatched open brace at %d; ", + chunk->fname ? chunk->fname : "memory", + parser->chunks->line, + st->e.params.line); + + has_error = true; + } + } + + if (has_error) { + parser->err_code = UCL_EUNPAIRED; + + return false; + } + } + return true; } +#define UPRM_SAFE(fn, a, b, c, el) do { \ + if (!fn(a, b, c, a)) \ + goto el; \ + } while (0) + struct ucl_parser* ucl_parser_new (int flags) { struct ucl_parser *parser; parser = UCL_ALLOC (sizeof (struct ucl_parser)); if (parser == NULL) { return NULL; } memset (parser, 0, sizeof (struct ucl_parser)); - ucl_parser_register_macro (parser, "include", ucl_include_handler, parser); - ucl_parser_register_macro (parser, "try_include", ucl_try_include_handler, parser); - ucl_parser_register_macro (parser, "includes", ucl_includes_handler, parser); - ucl_parser_register_macro (parser, "priority", ucl_priority_handler, parser); - ucl_parser_register_macro (parser, "load", ucl_load_handler, parser); - ucl_parser_register_context_macro (parser, "inherit", ucl_inherit_handler, parser); + UPRM_SAFE(ucl_parser_register_macro, parser, "include", ucl_include_handler, e0); + UPRM_SAFE(ucl_parser_register_macro, parser, "try_include", ucl_try_include_handler, e0); + UPRM_SAFE(ucl_parser_register_macro, parser, "includes", ucl_includes_handler, e0); + UPRM_SAFE(ucl_parser_register_macro, parser, "priority", ucl_priority_handler, e0); + UPRM_SAFE(ucl_parser_register_macro, parser, "load", ucl_load_handler, e0); + UPRM_SAFE(ucl_parser_register_context_macro, parser, "inherit", ucl_inherit_handler, e0); parser->flags = flags; parser->includepaths = NULL; if (flags & UCL_PARSER_SAVE_COMMENTS) { parser->comments = ucl_object_typed_new (UCL_OBJECT); } if (!(flags & UCL_PARSER_NO_FILEVARS)) { /* Initial assumption about filevars */ ucl_parser_set_filevars (parser, NULL, false); } return parser; +e0: + ucl_parser_free(parser); + return NULL; } bool ucl_parser_set_default_priority (struct ucl_parser *parser, unsigned prio) { if (parser == NULL) { return false; } parser->default_priority = prio; return true; } -void +int +ucl_parser_get_default_priority (struct ucl_parser *parser) +{ + if (parser == NULL) { + return -1; + } + + return parser->default_priority; +} + +bool ucl_parser_register_macro (struct ucl_parser *parser, const char *macro, ucl_macro_handler handler, void* ud) { struct ucl_macro *new; if (macro == NULL || handler == NULL) { - return; + return false; } new = UCL_ALLOC (sizeof (struct ucl_macro)); if (new == NULL) { - return; + return false; } memset (new, 0, sizeof (struct ucl_macro)); new->h.handler = handler; new->name = strdup (macro); + if (new->name == NULL) { + UCL_FREE (sizeof (struct ucl_macro), new); + return false; + } new->ud = ud; HASH_ADD_KEYPTR (hh, parser->macroes, new->name, strlen (new->name), new); + return true; } -void +bool ucl_parser_register_context_macro (struct ucl_parser *parser, const char *macro, ucl_context_macro_handler handler, void* ud) { struct ucl_macro *new; if (macro == NULL || handler == NULL) { - return; + return false; } new = UCL_ALLOC (sizeof (struct ucl_macro)); if (new == NULL) { - return; + return false; } memset (new, 0, sizeof (struct ucl_macro)); new->h.context_handler = handler; new->name = strdup (macro); + if (new->name == NULL) { + UCL_FREE (sizeof (struct ucl_macro), new); + return false; + } new->ud = ud; new->is_context = true; HASH_ADD_KEYPTR (hh, parser->macroes, new->name, strlen (new->name), new); + return true; } void ucl_parser_register_variable (struct ucl_parser *parser, const char *var, const char *value) { struct ucl_variable *new = NULL, *cur; if (var == NULL) { return; } /* Find whether a variable already exists */ LL_FOREACH (parser->variables, cur) { if (strcmp (cur->var, var) == 0) { new = cur; break; } } if (value == NULL) { if (new != NULL) { /* Remove variable */ DL_DELETE (parser->variables, new); free (new->var); free (new->value); UCL_FREE (sizeof (struct ucl_variable), new); } else { /* Do nothing */ return; } } else { if (new == NULL) { new = UCL_ALLOC (sizeof (struct ucl_variable)); if (new == NULL) { return; } memset (new, 0, sizeof (struct ucl_variable)); new->var = strdup (var); new->var_len = strlen (var); new->value = strdup (value); new->value_len = strlen (value); DL_APPEND (parser->variables, new); } else { free (new->value); new->value = strdup (value); new->value_len = strlen (value); } } } void ucl_parser_set_variables_handler (struct ucl_parser *parser, ucl_variable_handler handler, void *ud) { parser->var_handler = handler; parser->var_data = ud; } bool ucl_parser_add_chunk_full (struct ucl_parser *parser, const unsigned char *data, size_t len, unsigned priority, enum ucl_duplicate_strategy strat, enum ucl_parse_type parse_type) { struct ucl_chunk *chunk; + struct ucl_parser_special_handler *special_handler; if (parser == NULL) { return false; } if (data == NULL && len != 0) { ucl_create_err (&parser->err, "invalid chunk added"); return false; } if (parser->state != UCL_STATE_ERROR) { chunk = UCL_ALLOC (sizeof (struct ucl_chunk)); if (chunk == NULL) { ucl_create_err (&parser->err, "cannot allocate chunk structure"); return false; } + memset (chunk, 0, sizeof (*chunk)); + + /* Apply all matching handlers from the first to the last */ + LL_FOREACH (parser->special_handlers, special_handler) { + if ((special_handler->flags & UCL_SPECIAL_HANDLER_PREPROCESS_ALL) || + (len >= special_handler->magic_len && + memcmp (data, special_handler->magic, special_handler->magic_len) == 0)) { + unsigned char *ndata = NULL; + size_t nlen = 0; + + if (!special_handler->handler (parser, data, len, &ndata, &nlen, + special_handler->user_data)) { + ucl_create_err (&parser->err, "call for external handler failed"); + return false; + } + + struct ucl_parser_special_handler_chain *nchain; + nchain = UCL_ALLOC (sizeof (*nchain)); + nchain->begin = ndata; + nchain->len = nlen; + nchain->special_handler = special_handler; + + /* Free order is reversed */ + LL_PREPEND (chunk->special_handlers, nchain); + + data = ndata; + len = nlen; + } + } + if (parse_type == UCL_PARSE_AUTO && len > 0) { /* We need to detect parse type by the first symbol */ if ((*data & 0x80) == 0x80 && (*data >= 0xdc && *data <= 0xdf)) { parse_type = UCL_PARSE_MSGPACK; } else if (*data == '(') { parse_type = UCL_PARSE_CSEXP; } else { parse_type = UCL_PARSE_UCL; } } chunk->begin = data; chunk->remain = len; chunk->pos = chunk->begin; chunk->end = chunk->begin + len; chunk->line = 1; chunk->column = 0; chunk->priority = priority; chunk->strategy = strat; chunk->parse_type = parse_type; + + if (parser->cur_file) { + chunk->fname = strdup (parser->cur_file); + } + LL_PREPEND (parser->chunks, chunk); parser->recursion ++; if (parser->recursion > UCL_MAX_RECURSION) { ucl_create_err (&parser->err, "maximum include nesting limit is reached: %d", parser->recursion); return false; } if (len > 0) { /* Need to parse something */ switch (parse_type) { default: case UCL_PARSE_UCL: return ucl_state_machine (parser); case UCL_PARSE_MSGPACK: return ucl_parse_msgpack (parser); case UCL_PARSE_CSEXP: return ucl_parse_csexp (parser); } } else { /* Just add empty chunk and go forward */ if (parser->top_obj == NULL) { /* * In case of empty object, create one to indicate that we've * read something */ parser->top_obj = ucl_object_new_full (UCL_OBJECT, priority); } return true; } } ucl_create_err (&parser->err, "a parser is in an invalid state"); return false; } bool ucl_parser_add_chunk_priority (struct ucl_parser *parser, const unsigned char *data, size_t len, unsigned priority) { /* We dereference parser, so this check is essential */ if (parser == NULL) { return false; } return ucl_parser_add_chunk_full (parser, data, len, priority, UCL_DUPLICATE_APPEND, UCL_PARSE_UCL); } bool ucl_parser_add_chunk (struct ucl_parser *parser, const unsigned char *data, size_t len) { if (parser == NULL) { return false; } return ucl_parser_add_chunk_full (parser, data, len, parser->default_priority, UCL_DUPLICATE_APPEND, UCL_PARSE_UCL); } +bool +ucl_parser_insert_chunk (struct ucl_parser *parser, const unsigned char *data, + size_t len) +{ + if (parser == NULL || parser->top_obj == NULL) { + return false; + } + + bool res; + struct ucl_chunk *chunk; + + int state = parser->state; + parser->state = UCL_STATE_INIT; + + /* Prevent inserted chunks from unintentionally closing the current object */ + if (parser->stack != NULL && parser->stack->next != NULL) { + parser->stack->e.params.level = parser->stack->next->e.params.level; + } + + res = ucl_parser_add_chunk_full (parser, data, len, parser->chunks->priority, + parser->chunks->strategy, parser->chunks->parse_type); + + /* Remove chunk from the stack */ + chunk = parser->chunks; + if (chunk != NULL) { + parser->chunks = chunk->next; + ucl_chunk_free (chunk); + parser->recursion --; + } + + parser->state = state; + + return res; +} + bool ucl_parser_add_string_priority (struct ucl_parser *parser, const char *data, size_t len, unsigned priority) { if (data == NULL) { ucl_create_err (&parser->err, "invalid string added"); return false; } if (len == 0) { len = strlen (data); } return ucl_parser_add_chunk_priority (parser, (const unsigned char *)data, len, priority); } bool ucl_parser_add_string (struct ucl_parser *parser, const char *data, size_t len) { if (parser == NULL) { return false; } return ucl_parser_add_string_priority (parser, (const unsigned char *)data, len, parser->default_priority); } bool ucl_set_include_path (struct ucl_parser *parser, ucl_object_t *paths) { if (parser == NULL || paths == NULL) { return false; } if (parser->includepaths == NULL) { parser->includepaths = ucl_object_copy (paths); } else { ucl_object_unref (parser->includepaths); parser->includepaths = ucl_object_copy (paths); } if (parser->includepaths == NULL) { return false; } return true; } + +unsigned char ucl_parser_chunk_peek (struct ucl_parser *parser) +{ + if (parser == NULL || parser->chunks == NULL || parser->chunks->pos == NULL || parser->chunks->end == NULL || + parser->chunks->pos == parser->chunks->end) { + return 0; + } + + return( *parser->chunks->pos ); +} + +bool ucl_parser_chunk_skip (struct ucl_parser *parser) +{ + if (parser == NULL || parser->chunks == NULL || parser->chunks->pos == NULL || parser->chunks->end == NULL || + parser->chunks->pos == parser->chunks->end) { + return false; + } + + const unsigned char *p = parser->chunks->pos; + ucl_chunk_skipc( parser->chunks, p ); + if( parser->chunks->pos != NULL ) return true; + return false; +} + +ucl_object_t* +ucl_parser_get_current_stack_object (struct ucl_parser *parser, unsigned int depth) +{ + ucl_object_t *obj; + + if (parser == NULL || parser->stack == NULL) { + return NULL; + } + + struct ucl_stack *stack = parser->stack; + if(stack == NULL || stack->obj == NULL || ucl_object_type (stack->obj) != UCL_OBJECT) + { + return NULL; + } + + for( unsigned int i = 0; i < depth; ++i ) + { + stack = stack->next; + if(stack == NULL || stack->obj == NULL || ucl_object_type (stack->obj) != UCL_OBJECT) + { + return NULL; + } + } + + obj = ucl_object_ref (stack->obj); + return obj; +} + diff --git a/contrib/libucl/src/ucl_schema.c b/contrib/libucl/src/ucl_schema.c index c3aa8a780402..68f01187e375 100644 --- a/contrib/libucl/src/ucl_schema.c +++ b/contrib/libucl/src/ucl_schema.c @@ -1,1091 +1,1104 @@ /* * Copyright (c) 2014, Vsevolod Stakhov * * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY AUTHOR ''AS IS'' AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL AUTHOR BE LIABLE FOR ANY * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "ucl.h" #include "ucl_internal.h" #include "tree.h" #include "utlist.h" #ifdef HAVE_STDARG_H #include #endif #ifdef HAVE_STDIO_H #include #endif #ifdef HAVE_REGEX_H #include #endif #ifdef HAVE_MATH_H #include #endif static bool ucl_schema_validate (const ucl_object_t *schema, const ucl_object_t *obj, bool try_array, struct ucl_schema_error *err, const ucl_object_t *root, ucl_object_t *ext_ref); /* * Create validation error */ -static void + +#ifdef __GNUC__ +static inline void +ucl_schema_create_error (struct ucl_schema_error *err, + enum ucl_schema_error_code code, const ucl_object_t *obj, + const char *fmt, ...) +__attribute__ (( format( printf, 4, 5) )); +#endif + +static inline void ucl_schema_create_error (struct ucl_schema_error *err, enum ucl_schema_error_code code, const ucl_object_t *obj, const char *fmt, ...) { va_list va; if (err != NULL) { err->code = code; err->obj = obj; va_start (va, fmt); vsnprintf (err->msg, sizeof (err->msg), fmt, va); va_end (va); } } /* * Check whether we have a pattern specified */ static const ucl_object_t * ucl_schema_test_pattern (const ucl_object_t *obj, const char *pattern, bool recursive) { const ucl_object_t *res = NULL; #ifdef HAVE_REGEX_H regex_t reg; const ucl_object_t *elt; ucl_object_iter_t iter = NULL; if (regcomp (®, pattern, REG_EXTENDED | REG_NOSUB) == 0) { if (recursive) { while ((elt = ucl_object_iterate (obj, &iter, true)) != NULL) { if (regexec (®, ucl_object_key (elt), 0, NULL, 0) == 0) { res = elt; break; } } } else { if (regexec (®, ucl_object_key (obj), 0, NULL, 0) == 0) res = obj; } regfree (®); } #endif return res; } /* * Check dependencies for an object */ static bool ucl_schema_validate_dependencies (const ucl_object_t *deps, const ucl_object_t *obj, struct ucl_schema_error *err, const ucl_object_t *root, ucl_object_t *ext_ref) { const ucl_object_t *elt, *cur, *cur_dep; ucl_object_iter_t iter = NULL, piter; bool ret = true; while (ret && (cur = ucl_object_iterate (deps, &iter, true)) != NULL) { elt = ucl_object_lookup (obj, ucl_object_key (cur)); if (elt != NULL) { /* Need to check dependencies */ if (cur->type == UCL_ARRAY) { piter = NULL; while (ret && (cur_dep = ucl_object_iterate (cur, &piter, true)) != NULL) { if (ucl_object_lookup (obj, ucl_object_tostring (cur_dep)) == NULL) { ucl_schema_create_error (err, UCL_SCHEMA_MISSING_DEPENDENCY, elt, "dependency %s is missing for key %s", ucl_object_tostring (cur_dep), ucl_object_key (cur)); ret = false; break; } } } else if (cur->type == UCL_OBJECT) { ret = ucl_schema_validate (cur, obj, true, err, root, ext_ref); } } } return ret; } /* * Validate object */ static bool ucl_schema_validate_object (const ucl_object_t *schema, const ucl_object_t *obj, struct ucl_schema_error *err, const ucl_object_t *root, ucl_object_t *ext_ref) { const ucl_object_t *elt, *prop, *found, *additional_schema = NULL, *required = NULL, *pat, *pelt; ucl_object_iter_t iter = NULL, piter = NULL; bool ret = true, allow_additional = true; int64_t minmax; while (ret && (elt = ucl_object_iterate (schema, &iter, true)) != NULL) { if (elt->type == UCL_OBJECT && strcmp (ucl_object_key (elt), "properties") == 0) { piter = NULL; while (ret && (prop = ucl_object_iterate (elt, &piter, true)) != NULL) { found = ucl_object_lookup (obj, ucl_object_key (prop)); if (found) { ret = ucl_schema_validate (prop, found, true, err, root, ext_ref); } } } else if (strcmp (ucl_object_key (elt), "additionalProperties") == 0) { if (elt->type == UCL_BOOLEAN) { if (!ucl_object_toboolean (elt)) { /* Deny additional fields completely */ allow_additional = false; } } else if (elt->type == UCL_OBJECT) { /* Define validator for additional fields */ additional_schema = elt; } else { ucl_schema_create_error (err, UCL_SCHEMA_INVALID_SCHEMA, elt, "additionalProperties attribute is invalid in schema"); ret = false; break; } } else if (strcmp (ucl_object_key (elt), "required") == 0) { if (elt->type == UCL_ARRAY) { required = elt; } else { ucl_schema_create_error (err, UCL_SCHEMA_INVALID_SCHEMA, elt, "required attribute is invalid in schema"); ret = false; break; } } else if (strcmp (ucl_object_key (elt), "minProperties") == 0 && ucl_object_toint_safe (elt, &minmax)) { if (obj->len < minmax) { ucl_schema_create_error (err, UCL_SCHEMA_CONSTRAINT, obj, "object has not enough properties: %u, minimum is: %u", obj->len, (unsigned)minmax); ret = false; break; } } else if (strcmp (ucl_object_key (elt), "maxProperties") == 0 && ucl_object_toint_safe (elt, &minmax)) { if (obj->len > minmax) { ucl_schema_create_error (err, UCL_SCHEMA_CONSTRAINT, obj, "object has too many properties: %u, maximum is: %u", obj->len, (unsigned)minmax); ret = false; break; } } else if (strcmp (ucl_object_key (elt), "patternProperties") == 0) { const ucl_object_t *vobj; ucl_object_iter_t viter; piter = NULL; while (ret && (prop = ucl_object_iterate (elt, &piter, true)) != NULL) { viter = NULL; while (ret && (vobj = ucl_object_iterate (obj, &viter, true)) != NULL) { found = ucl_schema_test_pattern (vobj, ucl_object_key (prop), false); if (found) { ret = ucl_schema_validate (prop, found, true, err, root, ext_ref); } } } } else if (elt->type == UCL_OBJECT && strcmp (ucl_object_key (elt), "dependencies") == 0) { ret = ucl_schema_validate_dependencies (elt, obj, err, root, ext_ref); } } if (ret) { /* Additional properties */ if (!allow_additional || additional_schema != NULL) { /* Check if we have exactly the same properties in schema and object */ - iter = NULL; + iter = ucl_object_iterate_new (obj); prop = ucl_object_lookup (schema, "properties"); - while ((elt = ucl_object_iterate (obj, &iter, true)) != NULL) { + while ((elt = ucl_object_iterate_safe (iter, true)) != NULL) { found = ucl_object_lookup (prop, ucl_object_key (elt)); if (found == NULL) { /* Try patternProperties */ - piter = NULL; pat = ucl_object_lookup (schema, "patternProperties"); - while ((pelt = ucl_object_iterate (pat, &piter, true)) != NULL) { + piter = ucl_object_iterate_new (pat); + while ((pelt = ucl_object_iterate_safe (piter, true)) != NULL) { found = ucl_schema_test_pattern (obj, ucl_object_key (pelt), true); if (found != NULL) { break; } } + ucl_object_iterate_free (piter); + piter = NULL; } if (found == NULL) { if (!allow_additional) { ucl_schema_create_error (err, UCL_SCHEMA_CONSTRAINT, obj, "object has non-allowed property %s", ucl_object_key (elt)); ret = false; break; } else if (additional_schema != NULL) { if (!ucl_schema_validate (additional_schema, elt, true, err, root, ext_ref)) { ret = false; break; } } } } + ucl_object_iterate_free (iter); + iter = NULL; } /* Required properties */ if (required != NULL) { iter = NULL; while ((elt = ucl_object_iterate (required, &iter, true)) != NULL) { if (ucl_object_lookup (obj, ucl_object_tostring (elt)) == NULL) { ucl_schema_create_error (err, UCL_SCHEMA_MISSING_PROPERTY, obj, "object has missing property %s", ucl_object_tostring (elt)); ret = false; break; } } } } return ret; } static bool ucl_schema_validate_number (const ucl_object_t *schema, const ucl_object_t *obj, struct ucl_schema_error *err) { const ucl_object_t *elt, *test; ucl_object_iter_t iter = NULL; bool ret = true, exclusive = false; double constraint, val; const double alpha = 1e-16; while (ret && (elt = ucl_object_iterate (schema, &iter, true)) != NULL) { if ((elt->type == UCL_FLOAT || elt->type == UCL_INT) && strcmp (ucl_object_key (elt), "multipleOf") == 0) { constraint = ucl_object_todouble (elt); if (constraint <= 0) { ucl_schema_create_error (err, UCL_SCHEMA_INVALID_SCHEMA, elt, "multipleOf must be greater than zero"); ret = false; break; } val = ucl_object_todouble (obj); if (fabs (remainder (val, constraint)) > alpha) { ucl_schema_create_error (err, UCL_SCHEMA_CONSTRAINT, obj, "number %.4f is not multiple of %.4f, remainder is %.7f", - val, constraint); + val, constraint, remainder (val, constraint)); ret = false; break; } } else if ((elt->type == UCL_FLOAT || elt->type == UCL_INT) && strcmp (ucl_object_key (elt), "maximum") == 0) { constraint = ucl_object_todouble (elt); test = ucl_object_lookup (schema, "exclusiveMaximum"); if (test && test->type == UCL_BOOLEAN) { exclusive = ucl_object_toboolean (test); } val = ucl_object_todouble (obj); if (val > constraint || (exclusive && val >= constraint)) { ucl_schema_create_error (err, UCL_SCHEMA_CONSTRAINT, obj, "number is too big: %.3f, maximum is: %.3f", val, constraint); ret = false; break; } } else if ((elt->type == UCL_FLOAT || elt->type == UCL_INT) && strcmp (ucl_object_key (elt), "minimum") == 0) { constraint = ucl_object_todouble (elt); test = ucl_object_lookup (schema, "exclusiveMinimum"); if (test && test->type == UCL_BOOLEAN) { exclusive = ucl_object_toboolean (test); } val = ucl_object_todouble (obj); if (val < constraint || (exclusive && val <= constraint)) { ucl_schema_create_error (err, UCL_SCHEMA_CONSTRAINT, obj, "number is too small: %.3f, minimum is: %.3f", val, constraint); ret = false; break; } } } return ret; } static bool ucl_schema_validate_string (const ucl_object_t *schema, const ucl_object_t *obj, struct ucl_schema_error *err) { const ucl_object_t *elt; ucl_object_iter_t iter = NULL; bool ret = true; int64_t constraint; #ifdef HAVE_REGEX_H regex_t re; #endif while (ret && (elt = ucl_object_iterate (schema, &iter, true)) != NULL) { if (elt->type == UCL_INT && strcmp (ucl_object_key (elt), "maxLength") == 0) { constraint = ucl_object_toint (elt); if (obj->len > constraint) { ucl_schema_create_error (err, UCL_SCHEMA_CONSTRAINT, obj, - "string is too big: %.3f, maximum is: %.3f", + "string is too big: %u, maximum is: %" PRId64, obj->len, constraint); ret = false; break; } } else if (elt->type == UCL_INT && strcmp (ucl_object_key (elt), "minLength") == 0) { constraint = ucl_object_toint (elt); if (obj->len < constraint) { ucl_schema_create_error (err, UCL_SCHEMA_CONSTRAINT, obj, - "string is too short: %.3f, minimum is: %.3f", + "string is too short: %u, minimum is: %" PRId64, obj->len, constraint); ret = false; break; } } #ifdef HAVE_REGEX_H else if (elt->type == UCL_STRING && strcmp (ucl_object_key (elt), "pattern") == 0) { if (regcomp (&re, ucl_object_tostring (elt), REG_EXTENDED | REG_NOSUB) != 0) { ucl_schema_create_error (err, UCL_SCHEMA_INVALID_SCHEMA, elt, "cannot compile pattern %s", ucl_object_tostring (elt)); ret = false; break; } if (regexec (&re, ucl_object_tostring (obj), 0, NULL, 0) != 0) { ucl_schema_create_error (err, UCL_SCHEMA_CONSTRAINT, obj, "string doesn't match regexp %s", ucl_object_tostring (elt)); ret = false; } regfree (&re); } #endif } return ret; } struct ucl_compare_node { const ucl_object_t *obj; TREE_ENTRY(ucl_compare_node) link; struct ucl_compare_node *next; }; typedef TREE_HEAD(_tree, ucl_compare_node) ucl_compare_tree_t; TREE_DEFINE(ucl_compare_node, link) static int ucl_schema_elt_compare (struct ucl_compare_node *n1, struct ucl_compare_node *n2) { const ucl_object_t *o1 = n1->obj, *o2 = n2->obj; return ucl_object_compare (o1, o2); } static bool ucl_schema_array_is_unique (const ucl_object_t *obj, struct ucl_schema_error *err) { ucl_compare_tree_t tree = TREE_INITIALIZER (ucl_schema_elt_compare); ucl_object_iter_t iter = NULL; const ucl_object_t *elt; struct ucl_compare_node *node, test, *nodes = NULL, *tmp; bool ret = true; while ((elt = ucl_object_iterate (obj, &iter, true)) != NULL) { test.obj = elt; node = TREE_FIND (&tree, ucl_compare_node, link, &test); if (node != NULL) { ucl_schema_create_error (err, UCL_SCHEMA_CONSTRAINT, elt, "duplicate values detected while uniqueItems is true"); ret = false; break; } node = calloc (1, sizeof (*node)); if (node == NULL) { ucl_schema_create_error (err, UCL_SCHEMA_UNKNOWN, elt, "cannot allocate tree node"); ret = false; break; } node->obj = elt; TREE_INSERT (&tree, ucl_compare_node, link, node); LL_PREPEND (nodes, node); } LL_FOREACH_SAFE (nodes, node, tmp) { free (node); } return ret; } static bool ucl_schema_validate_array (const ucl_object_t *schema, const ucl_object_t *obj, struct ucl_schema_error *err, const ucl_object_t *root, ucl_object_t *ext_ref) { const ucl_object_t *elt, *it, *found, *additional_schema = NULL, *first_unvalidated = NULL; ucl_object_iter_t iter = NULL, piter = NULL; bool ret = true, allow_additional = true, need_unique = false; int64_t minmax; unsigned int idx = 0; while (ret && (elt = ucl_object_iterate (schema, &iter, true)) != NULL) { if (strcmp (ucl_object_key (elt), "items") == 0) { if (elt->type == UCL_ARRAY) { found = ucl_array_head (obj); while (ret && (it = ucl_object_iterate (elt, &piter, true)) != NULL) { if (found) { ret = ucl_schema_validate (it, found, false, err, root, ext_ref); found = ucl_array_find_index (obj, ++idx); } } if (found != NULL) { /* The first element that is not validated */ first_unvalidated = found; } } else if (elt->type == UCL_OBJECT) { /* Validate all items using the specified schema */ while (ret && (it = ucl_object_iterate (obj, &piter, true)) != NULL) { ret = ucl_schema_validate (elt, it, false, err, root, ext_ref); } } else { ucl_schema_create_error (err, UCL_SCHEMA_INVALID_SCHEMA, elt, "items attribute is invalid in schema"); ret = false; break; } } else if (strcmp (ucl_object_key (elt), "additionalItems") == 0) { if (elt->type == UCL_BOOLEAN) { if (!ucl_object_toboolean (elt)) { /* Deny additional fields completely */ allow_additional = false; } } else if (elt->type == UCL_OBJECT) { /* Define validator for additional fields */ additional_schema = elt; } else { ucl_schema_create_error (err, UCL_SCHEMA_INVALID_SCHEMA, elt, "additionalItems attribute is invalid in schema"); ret = false; break; } } else if (elt->type == UCL_BOOLEAN && strcmp (ucl_object_key (elt), "uniqueItems") == 0) { need_unique = ucl_object_toboolean (elt); } else if (strcmp (ucl_object_key (elt), "minItems") == 0 && ucl_object_toint_safe (elt, &minmax)) { if (obj->len < minmax) { ucl_schema_create_error (err, UCL_SCHEMA_CONSTRAINT, obj, "array has not enough items: %u, minimum is: %u", obj->len, (unsigned)minmax); ret = false; break; } } else if (strcmp (ucl_object_key (elt), "maxItems") == 0 && ucl_object_toint_safe (elt, &minmax)) { if (obj->len > minmax) { ucl_schema_create_error (err, UCL_SCHEMA_CONSTRAINT, obj, "array has too many items: %u, maximum is: %u", obj->len, (unsigned)minmax); ret = false; break; } } } if (ret) { /* Additional properties */ if (!allow_additional || additional_schema != NULL) { if (first_unvalidated != NULL) { if (!allow_additional) { ucl_schema_create_error (err, UCL_SCHEMA_CONSTRAINT, obj, "array has undefined item"); ret = false; } else if (additional_schema != NULL) { elt = ucl_array_find_index (obj, idx); while (elt) { if (!ucl_schema_validate (additional_schema, elt, false, err, root, ext_ref)) { ret = false; break; } elt = ucl_array_find_index (obj, idx ++); } } } } /* Required properties */ if (ret && need_unique) { ret = ucl_schema_array_is_unique (obj, err); } } return ret; } /* * Returns whether this object is allowed for this type */ static bool ucl_schema_type_is_allowed (const ucl_object_t *type, const ucl_object_t *obj, struct ucl_schema_error *err) { ucl_object_iter_t iter = NULL; const ucl_object_t *elt; const char *type_str; ucl_type_t t; if (type == NULL) { /* Any type is allowed */ return true; } if (type->type == UCL_ARRAY) { /* One of allowed types */ while ((elt = ucl_object_iterate (type, &iter, true)) != NULL) { if (ucl_schema_type_is_allowed (elt, obj, err)) { return true; } } } else if (type->type == UCL_STRING) { type_str = ucl_object_tostring (type); if (!ucl_object_string_to_type (type_str, &t)) { ucl_schema_create_error (err, UCL_SCHEMA_INVALID_SCHEMA, type, "Type attribute is invalid in schema"); return false; } if (obj->type != t) { /* Some types are actually compatible */ if (obj->type == UCL_TIME && t == UCL_FLOAT) { return true; } else if (obj->type == UCL_INT && t == UCL_FLOAT) { return true; } else { ucl_schema_create_error (err, UCL_SCHEMA_TYPE_MISMATCH, obj, "Invalid type of %s, expected %s", ucl_object_type_to_string (obj->type), ucl_object_type_to_string (t)); } } else { /* Types are equal */ return true; } } return false; } /* * Check if object is equal to one of elements of enum */ static bool ucl_schema_validate_enum (const ucl_object_t *en, const ucl_object_t *obj, struct ucl_schema_error *err) { ucl_object_iter_t iter = NULL; const ucl_object_t *elt; bool ret = false; while ((elt = ucl_object_iterate (en, &iter, true)) != NULL) { if (ucl_object_compare (elt, obj) == 0) { ret = true; break; } } if (!ret) { ucl_schema_create_error (err, UCL_SCHEMA_CONSTRAINT, obj, "object is not one of enumerated patterns"); } return ret; } /* * Check a single ref component */ static const ucl_object_t * ucl_schema_resolve_ref_component (const ucl_object_t *cur, const char *refc, int len, struct ucl_schema_error *err) { const ucl_object_t *res = NULL; char *err_str; int num, i; if (cur->type == UCL_OBJECT) { /* Find a key inside an object */ res = ucl_object_lookup_len (cur, refc, len); if (res == NULL) { ucl_schema_create_error (err, UCL_SCHEMA_INVALID_SCHEMA, cur, "reference %s is invalid, missing path component", refc); return NULL; } } else if (cur->type == UCL_ARRAY) { /* We must figure out a number inside array */ num = strtoul (refc, &err_str, 10); if (err_str != NULL && *err_str != '/' && *err_str != '\0') { ucl_schema_create_error (err, UCL_SCHEMA_INVALID_SCHEMA, cur, "reference %s is invalid, invalid item number", refc); return NULL; } res = ucl_array_head (cur); i = 0; while (res != NULL) { if (i == num) { break; } res = res->next; } if (res == NULL) { ucl_schema_create_error (err, UCL_SCHEMA_INVALID_SCHEMA, cur, "reference %s is invalid, item number %d does not exist", refc, num); return NULL; } } else { ucl_schema_create_error (err, UCL_SCHEMA_INVALID_SCHEMA, res, "reference %s is invalid, contains primitive object in the path", refc); return NULL; } return res; } /* * Find reference schema */ static const ucl_object_t * ucl_schema_resolve_ref (const ucl_object_t *root, const char *ref, struct ucl_schema_error *err, ucl_object_t *ext_ref, ucl_object_t const ** nroot) { UT_string *url_err = NULL; struct ucl_parser *parser; const ucl_object_t *res = NULL, *ext_obj = NULL; ucl_object_t *url_obj; const char *p, *c, *hash_ptr = NULL; char *url_copy = NULL; unsigned char *url_buf; size_t url_buflen; if (ref[0] != '#') { hash_ptr = strrchr (ref, '#'); if (hash_ptr) { url_copy = malloc (hash_ptr - ref + 1); if (url_copy == NULL) { ucl_schema_create_error (err, UCL_SCHEMA_INTERNAL_ERROR, root, "cannot allocate memory"); return NULL; } ucl_strlcpy (url_copy, ref, hash_ptr - ref + 1); p = url_copy; } else { /* Full URL */ p = ref; } ext_obj = ucl_object_lookup (ext_ref, p); if (ext_obj == NULL) { if (ucl_strnstr (p, "://", strlen (p)) != NULL) { if (!ucl_fetch_url (p, &url_buf, &url_buflen, &url_err, true)) { ucl_schema_create_error (err, UCL_SCHEMA_INVALID_SCHEMA, root, "cannot fetch reference %s: %s", p, url_err != NULL ? utstring_body (url_err) : "unknown"); free (url_copy); return NULL; } } else { if (!ucl_fetch_file (p, &url_buf, &url_buflen, &url_err, true)) { ucl_schema_create_error (err, UCL_SCHEMA_INVALID_SCHEMA, root, "cannot fetch reference %s: %s", p, url_err != NULL ? utstring_body (url_err) : "unknown"); free (url_copy); return NULL; } } parser = ucl_parser_new (0); if (!ucl_parser_add_chunk (parser, url_buf, url_buflen)) { ucl_schema_create_error (err, UCL_SCHEMA_INVALID_SCHEMA, root, "cannot fetch reference %s: %s", p, ucl_parser_get_error (parser)); ucl_parser_free (parser); free (url_copy); return NULL; } url_obj = ucl_parser_get_object (parser); ext_obj = url_obj; ucl_object_insert_key (ext_ref, url_obj, p, 0, true); free (url_buf); } free (url_copy); if (hash_ptr) { p = hash_ptr + 1; } else { p = ""; } } else { p = ref + 1; } res = ext_obj != NULL ? ext_obj : root; *nroot = res; if (*p == '/') { p++; } else if (*p == '\0') { return res; } c = p; while (*p != '\0') { if (*p == '/') { if (p - c == 0) { ucl_schema_create_error (err, UCL_SCHEMA_INVALID_SCHEMA, res, "reference %s is invalid, empty path component", ref); return NULL; } /* Now we have some url part, so we need to figure out where we are */ res = ucl_schema_resolve_ref_component (res, c, p - c, err); if (res == NULL) { return NULL; } c = p + 1; } p ++; } if (p - c != 0) { res = ucl_schema_resolve_ref_component (res, c, p - c, err); } if (res == NULL || res->type != UCL_OBJECT) { ucl_schema_create_error (err, UCL_SCHEMA_INVALID_SCHEMA, res, "reference %s is invalid, cannot find specified object", ref); return NULL; } return res; } static bool ucl_schema_validate_values (const ucl_object_t *schema, const ucl_object_t *obj, struct ucl_schema_error *err) { const ucl_object_t *elt, *cur; int64_t constraint, i; elt = ucl_object_lookup (schema, "maxValues"); if (elt != NULL && elt->type == UCL_INT) { constraint = ucl_object_toint (elt); cur = obj; i = 0; while (cur) { if (i > constraint) { ucl_schema_create_error (err, UCL_SCHEMA_CONSTRAINT, obj, "object has more values than defined: %ld", (long int)constraint); return false; } i ++; cur = cur->next; } } elt = ucl_object_lookup (schema, "minValues"); if (elt != NULL && elt->type == UCL_INT) { constraint = ucl_object_toint (elt); cur = obj; i = 0; while (cur) { if (i >= constraint) { break; } i ++; cur = cur->next; } if (i < constraint) { ucl_schema_create_error (err, UCL_SCHEMA_CONSTRAINT, obj, "object has less values than defined: %ld", (long int)constraint); return false; } } return true; } static bool ucl_schema_validate (const ucl_object_t *schema, const ucl_object_t *obj, bool try_array, struct ucl_schema_error *err, const ucl_object_t *root, ucl_object_t *external_refs) { const ucl_object_t *elt, *cur, *ref_root; ucl_object_iter_t iter = NULL; bool ret; if (schema->type != UCL_OBJECT) { ucl_schema_create_error (err, UCL_SCHEMA_INVALID_SCHEMA, schema, "schema is %s instead of object", ucl_object_type_to_string (schema->type)); return false; } if (try_array) { /* * Special case for multiple values */ if (!ucl_schema_validate_values (schema, obj, err)) { return false; } LL_FOREACH (obj, cur) { if (!ucl_schema_validate (schema, cur, false, err, root, external_refs)) { return false; } } return true; } elt = ucl_object_lookup (schema, "enum"); if (elt != NULL && elt->type == UCL_ARRAY) { if (!ucl_schema_validate_enum (elt, obj, err)) { return false; } } elt = ucl_object_lookup (schema, "allOf"); if (elt != NULL && elt->type == UCL_ARRAY) { iter = NULL; while ((cur = ucl_object_iterate (elt, &iter, true)) != NULL) { ret = ucl_schema_validate (cur, obj, true, err, root, external_refs); if (!ret) { return false; } } } elt = ucl_object_lookup (schema, "anyOf"); if (elt != NULL && elt->type == UCL_ARRAY) { iter = NULL; while ((cur = ucl_object_iterate (elt, &iter, true)) != NULL) { ret = ucl_schema_validate (cur, obj, true, err, root, external_refs); if (ret) { break; } } if (!ret) { return false; } else { /* Reset error */ err->code = UCL_SCHEMA_OK; } } elt = ucl_object_lookup (schema, "oneOf"); if (elt != NULL && elt->type == UCL_ARRAY) { iter = NULL; ret = false; while ((cur = ucl_object_iterate (elt, &iter, true)) != NULL) { if (!ret) { ret = ucl_schema_validate (cur, obj, true, err, root, external_refs); } else if (ucl_schema_validate (cur, obj, true, err, root, external_refs)) { ret = false; break; } } if (!ret) { return false; } } elt = ucl_object_lookup (schema, "not"); if (elt != NULL && elt->type == UCL_OBJECT) { if (ucl_schema_validate (elt, obj, true, err, root, external_refs)) { return false; } else { /* Reset error */ err->code = UCL_SCHEMA_OK; } } elt = ucl_object_lookup (schema, "$ref"); if (elt != NULL) { ref_root = root; cur = ucl_schema_resolve_ref (root, ucl_object_tostring (elt), err, external_refs, &ref_root); if (cur == NULL) { return false; } if (!ucl_schema_validate (cur, obj, try_array, err, ref_root, external_refs)) { return false; } } elt = ucl_object_lookup (schema, "type"); if (!ucl_schema_type_is_allowed (elt, obj, err)) { return false; } switch (obj->type) { case UCL_OBJECT: return ucl_schema_validate_object (schema, obj, err, root, external_refs); break; case UCL_ARRAY: return ucl_schema_validate_array (schema, obj, err, root, external_refs); break; case UCL_INT: case UCL_FLOAT: return ucl_schema_validate_number (schema, obj, err); break; case UCL_STRING: return ucl_schema_validate_string (schema, obj, err); break; default: break; } return true; } bool ucl_object_validate (const ucl_object_t *schema, const ucl_object_t *obj, struct ucl_schema_error *err) { return ucl_object_validate_root_ext (schema, obj, schema, NULL, err); } bool ucl_object_validate_root (const ucl_object_t *schema, const ucl_object_t *obj, const ucl_object_t *root, struct ucl_schema_error *err) { return ucl_object_validate_root_ext (schema, obj, root, NULL, err); } bool ucl_object_validate_root_ext (const ucl_object_t *schema, const ucl_object_t *obj, const ucl_object_t *root, ucl_object_t *ext_refs, struct ucl_schema_error *err) { bool ret, need_unref = false; if (ext_refs == NULL) { ext_refs = ucl_object_typed_new (UCL_OBJECT); need_unref = true; } ret = ucl_schema_validate (schema, obj, true, err, root, ext_refs); if (need_unref) { ucl_object_unref (ext_refs); } return ret; } diff --git a/contrib/libucl/src/ucl_util.c b/contrib/libucl/src/ucl_util.c index 299e0bca2357..b00a34787e5a 100644 --- a/contrib/libucl/src/ucl_util.c +++ b/contrib/libucl/src/ucl_util.c @@ -1,3543 +1,3947 @@ /* Copyright (c) 2013, Vsevolod Stakhov * Copyright (c) 2015 Allan Jude * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED ''AS IS'' AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL AUTHOR BE LIABLE FOR ANY * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "ucl.h" #include "ucl_internal.h" #include "ucl_chartable.h" #include "kvec.h" #include #include #include /* for snprintf */ #ifndef _WIN32 #include #include #else #ifndef NBBY #define NBBY 8 #endif #endif #ifdef HAVE_LIBGEN_H -#include /* For dirname */ +#ifndef _WIN32 +# include /* For dirname */ +#endif #endif typedef kvec_t(ucl_object_t *) ucl_array_t; #define UCL_ARRAY_GET(ar, obj) ucl_array_t *ar = \ (ucl_array_t *)((obj) != NULL ? (obj)->value.av : NULL) #ifdef HAVE_OPENSSL #include #include #include #include #include #endif #ifdef CURL_FOUND /* Seems to be broken */ #define CURL_DISABLE_TYPECHECK 1 #include #endif #ifdef HAVE_FETCH_H #include #endif -#ifdef _WIN32 +#if defined(_MSC_VER) #include +#include +#include #ifndef PROT_READ #define PROT_READ 1 #endif #ifndef PROT_WRITE #define PROT_WRITE 2 #endif #ifndef PROT_READWRITE #define PROT_READWRITE 3 #endif #ifndef MAP_SHARED #define MAP_SHARED 1 #endif #ifndef MAP_PRIVATE #define MAP_PRIVATE 2 #endif #ifndef MAP_FAILED #define MAP_FAILED ((void *) -1) #endif +#define getcwd _getcwd +#define open _open +#define close _close + static void *ucl_mmap(char *addr, size_t length, int prot, int access, int fd, off_t offset) { void *map = NULL; HANDLE handle = INVALID_HANDLE_VALUE; switch (prot) { default: case PROT_READ: { handle = CreateFileMapping((HANDLE) _get_osfhandle(fd), 0, PAGE_READONLY, 0, length, 0); if (!handle) break; map = (void *) MapViewOfFile(handle, FILE_MAP_READ, 0, 0, length); CloseHandle(handle); break; } case PROT_WRITE: { handle = CreateFileMapping((HANDLE) _get_osfhandle(fd), 0, PAGE_READWRITE, 0, length, 0); if (!handle) break; map = (void *) MapViewOfFile(handle, FILE_MAP_WRITE, 0, 0, length); CloseHandle(handle); break; } case PROT_READWRITE: { handle = CreateFileMapping((HANDLE) _get_osfhandle(fd), 0, PAGE_READWRITE, 0, length, 0); if (!handle) break; map = (void *) MapViewOfFile(handle, FILE_MAP_ALL_ACCESS, 0, 0, length); CloseHandle(handle); break; } } if (map == (void *) NULL) { return (void *) MAP_FAILED; } return (void *) ((char *) map + offset); } static int ucl_munmap(void *map,size_t length) { if (!UnmapViewOfFile(map)) { return(-1); } return(0); } -static char* ucl_realpath(const char *path, char *resolved_path) { - char *p; - char tmp[MAX_PATH + 1]; - strncpy(tmp, path, sizeof(tmp)-1); - p = tmp; - while(*p) { - if (*p == '/') *p = '\\'; - p++; - } - return _fullpath(resolved_path, tmp, MAX_PATH); +static char* ucl_realpath(const char *path, char *resolved_path) +{ + char *p; + char tmp[MAX_PATH + 1]; + strncpy(tmp, path, sizeof(tmp)-1); + p = tmp; + while(*p) { + if (*p == '/') *p = '\\'; + p++; + } + return _fullpath(resolved_path, tmp, MAX_PATH); +} + + +char *dirname(char *path) +{ + static char path_buffer[_MAX_PATH]; + char drive[_MAX_DRIVE]; + char dir[_MAX_DIR]; + char fname[_MAX_FNAME]; + char ext[_MAX_EXT]; + + _splitpath (path, drive, dir, fname, ext); + _makepath(path_buffer, drive, dir, NULL, NULL); + + return path_buffer; +} + +char *basename(char *path) +{ + static char path_buffer[_MAX_PATH]; + char drive[_MAX_DRIVE]; + char dir[_MAX_DIR]; + char fname[_MAX_FNAME]; + char ext[_MAX_EXT]; + + _splitpath(path, drive, dir, fname, ext); + _makepath(path_buffer, NULL, NULL, fname, ext); + + return path_buffer; } #else #define ucl_mmap mmap #define ucl_munmap munmap #define ucl_realpath realpath #endif typedef void (*ucl_object_dtor) (ucl_object_t *obj); static void ucl_object_free_internal (ucl_object_t *obj, bool allow_rec, ucl_object_dtor dtor); static void ucl_object_dtor_unref (ucl_object_t *obj); static void ucl_object_dtor_free (ucl_object_t *obj) { if (obj->trash_stack[UCL_TRASH_KEY] != NULL) { UCL_FREE (obj->hh.keylen, obj->trash_stack[UCL_TRASH_KEY]); } if (obj->trash_stack[UCL_TRASH_VALUE] != NULL) { UCL_FREE (obj->len, obj->trash_stack[UCL_TRASH_VALUE]); } /* Do not free ephemeral objects */ if ((obj->flags & UCL_OBJECT_EPHEMERAL) == 0) { if (obj->type != UCL_USERDATA) { UCL_FREE (sizeof (ucl_object_t), obj); } else { struct ucl_object_userdata *ud = (struct ucl_object_userdata *)obj; if (ud->dtor) { ud->dtor (obj->value.ud); } UCL_FREE (sizeof (*ud), obj); } } } /* * This is a helper function that performs exactly the same as * `ucl_object_unref` but it doesn't iterate over elements allowing * to use it for individual elements of arrays and multiple values */ static void ucl_object_dtor_unref_single (ucl_object_t *obj) { if (obj != NULL) { #ifdef HAVE_ATOMIC_BUILTINS unsigned int rc = __sync_sub_and_fetch (&obj->ref, 1); if (rc == 0) { #else if (--obj->ref == 0) { #endif ucl_object_free_internal (obj, false, ucl_object_dtor_unref); } } } static void ucl_object_dtor_unref (ucl_object_t *obj) { if (obj->ref == 0) { ucl_object_dtor_free (obj); } else { /* This may cause dtor unref being called one more time */ ucl_object_dtor_unref_single (obj); } } static void ucl_object_free_internal (ucl_object_t *obj, bool allow_rec, ucl_object_dtor dtor) { ucl_object_t *tmp, *sub; while (obj != NULL) { if (obj->type == UCL_ARRAY) { UCL_ARRAY_GET (vec, obj); unsigned int i; if (vec != NULL) { for (i = 0; i < vec->n; i ++) { sub = kv_A (*vec, i); if (sub != NULL) { tmp = sub; while (sub) { tmp = sub->next; dtor (sub); sub = tmp; } } } kv_destroy (*vec); UCL_FREE (sizeof (*vec), vec); } obj->value.av = NULL; } else if (obj->type == UCL_OBJECT) { if (obj->value.ov != NULL) { ucl_hash_destroy (obj->value.ov, (ucl_hash_free_func)dtor); } obj->value.ov = NULL; } tmp = obj->next; dtor (obj); obj = tmp; if (!allow_rec) { break; } } } void ucl_object_free (ucl_object_t *obj) { ucl_object_free_internal (obj, true, ucl_object_dtor_free); } size_t ucl_unescape_json_string (char *str, size_t len) { char *t = str, *h = str; int i, uval; if (len <= 1) { return len; } /* t is target (tortoise), h is source (hare) */ while (len) { if (*h == '\\') { h ++; if (len == 1) { /* * If \ is last, then do not try to go further * Issue: #74 */ len --; *t++ = '\\'; continue; } switch (*h) { case 'n': *t++ = '\n'; break; case 'r': *t++ = '\r'; break; case 'b': *t++ = '\b'; break; case 't': *t++ = '\t'; break; case 'f': *t++ = '\f'; break; case '\\': *t++ = '\\'; break; case '"': *t++ = '"'; break; case 'u': /* Unicode escape */ uval = 0; h ++; /* u character */ len --; if (len > 3) { for (i = 0; i < 4; i++) { uval <<= 4; if (isdigit (h[i])) { uval += h[i] - '0'; } else if (h[i] >= 'a' && h[i] <= 'f') { uval += h[i] - 'a' + 10; } else if (h[i] >= 'A' && h[i] <= 'F') { uval += h[i] - 'A' + 10; } else { break; } } /* Encode */ if(uval < 0x80) { t[0] = (char)uval; t ++; } else if(uval < 0x800) { t[0] = 0xC0 + ((uval & 0x7C0) >> 6); t[1] = 0x80 + ((uval & 0x03F)); t += 2; } else if(uval < 0x10000) { t[0] = 0xE0 + ((uval & 0xF000) >> 12); t[1] = 0x80 + ((uval & 0x0FC0) >> 6); t[2] = 0x80 + ((uval & 0x003F)); t += 3; } #if 0 /* It's not actually supported now */ else if(uval <= 0x10FFFF) { t[0] = 0xF0 + ((uval & 0x1C0000) >> 18); t[1] = 0x80 + ((uval & 0x03F000) >> 12); t[2] = 0x80 + ((uval & 0x000FC0) >> 6); t[3] = 0x80 + ((uval & 0x00003F)); t += 4; } #endif else { *t++ = '?'; } /* Consume 4 characters of source */ h += 4; len -= 4; if (len > 0) { len --; /* for '\' character */ } continue; } else { *t++ = 'u'; } break; default: *t++ = *h; break; } h ++; len --; } else { *t++ = *h++; } if (len > 0) { len --; } } *t = '\0'; return (t - str); } +size_t +ucl_unescape_squoted_string (char *str, size_t len) +{ + char *t = str, *h = str; + + if (len <= 1) { + return len; + } + + /* t is target (tortoise), h is source (hare) */ + + while (len) { + if (*h == '\\') { + h ++; + + if (len == 1) { + /* + * If \ is last, then do not try to go further + * Issue: #74 + */ + len --; + *t++ = '\\'; + continue; + } + + switch (*h) { + case '\'': + *t++ = '\''; + break; + case '\n': + /* Ignore \ style stuff */ + break; + case '\r': + /* Ignore \r and the following \n if needed */ + if (len > 1 && h[1] == '\n') { + h ++; + len --; + } + break; + default: + /* Ignore \ */ + *t++ = '\\'; + *t++ = *h; + break; + } + + h ++; + len --; + } + else { + *t++ = *h++; + } + + if (len > 0) { + len --; + } + } + + *t = '\0'; + + return (t - str); +} + char * ucl_copy_key_trash (const ucl_object_t *obj) { ucl_object_t *deconst; if (obj == NULL) { return NULL; } if (obj->trash_stack[UCL_TRASH_KEY] == NULL && obj->key != NULL) { deconst = __DECONST (ucl_object_t *, obj); deconst->trash_stack[UCL_TRASH_KEY] = malloc (obj->keylen + 1); if (deconst->trash_stack[UCL_TRASH_KEY] != NULL) { memcpy (deconst->trash_stack[UCL_TRASH_KEY], obj->key, obj->keylen); deconst->trash_stack[UCL_TRASH_KEY][obj->keylen] = '\0'; } deconst->key = obj->trash_stack[UCL_TRASH_KEY]; deconst->flags |= UCL_OBJECT_ALLOCATED_KEY; } return obj->trash_stack[UCL_TRASH_KEY]; } +void +ucl_chunk_free (struct ucl_chunk *chunk) +{ + if (chunk) { + struct ucl_parser_special_handler_chain *chain, *tmp; + + LL_FOREACH_SAFE (chunk->special_handlers, chain, tmp) { + if (chain->special_handler->free_function) { + chain->special_handler->free_function ( + chain->begin, + chain->len, + chain->special_handler->user_data); + } else { + UCL_FREE (chain->len, chain->begin); + } + + UCL_FREE (sizeof (*chain), chain); + } + + chunk->special_handlers = NULL; + + if (chunk->fname) { + free (chunk->fname); + } + + UCL_FREE (sizeof (*chunk), chunk); + } +} + char * ucl_copy_value_trash (const ucl_object_t *obj) { ucl_object_t *deconst; if (obj == NULL) { return NULL; } if (obj->trash_stack[UCL_TRASH_VALUE] == NULL) { deconst = __DECONST (ucl_object_t *, obj); if (obj->type == UCL_STRING) { /* Special case for strings */ if (obj->flags & UCL_OBJECT_BINARY) { deconst->trash_stack[UCL_TRASH_VALUE] = malloc (obj->len); if (deconst->trash_stack[UCL_TRASH_VALUE] != NULL) { memcpy (deconst->trash_stack[UCL_TRASH_VALUE], obj->value.sv, obj->len); deconst->value.sv = obj->trash_stack[UCL_TRASH_VALUE]; } } else { deconst->trash_stack[UCL_TRASH_VALUE] = malloc (obj->len + 1); if (deconst->trash_stack[UCL_TRASH_VALUE] != NULL) { memcpy (deconst->trash_stack[UCL_TRASH_VALUE], obj->value.sv, obj->len); deconst->trash_stack[UCL_TRASH_VALUE][obj->len] = '\0'; deconst->value.sv = obj->trash_stack[UCL_TRASH_VALUE]; } } } else { /* Just emit value in json notation */ deconst->trash_stack[UCL_TRASH_VALUE] = ucl_object_emit_single_json (obj); deconst->len = strlen (obj->trash_stack[UCL_TRASH_VALUE]); } deconst->flags |= UCL_OBJECT_ALLOCATED_VALUE; } return obj->trash_stack[UCL_TRASH_VALUE]; } ucl_object_t* ucl_parser_get_object (struct ucl_parser *parser) { if (parser->state != UCL_STATE_ERROR && parser->top_obj != NULL) { return ucl_object_ref (parser->top_obj); } return NULL; } void ucl_parser_free (struct ucl_parser *parser) { struct ucl_stack *stack, *stmp; struct ucl_macro *macro, *mtmp; struct ucl_chunk *chunk, *ctmp; struct ucl_pubkey *key, *ktmp; struct ucl_variable *var, *vtmp; ucl_object_t *tr, *trtmp; if (parser == NULL) { return; } if (parser->top_obj != NULL) { ucl_object_unref (parser->top_obj); } if (parser->includepaths != NULL) { ucl_object_unref (parser->includepaths); } LL_FOREACH_SAFE (parser->stack, stack, stmp) { free (stack); } HASH_ITER (hh, parser->macroes, macro, mtmp) { free (macro->name); HASH_DEL (parser->macroes, macro); UCL_FREE (sizeof (struct ucl_macro), macro); } LL_FOREACH_SAFE (parser->chunks, chunk, ctmp) { - UCL_FREE (sizeof (struct ucl_chunk), chunk); + ucl_chunk_free (chunk); } LL_FOREACH_SAFE (parser->keys, key, ktmp) { UCL_FREE (sizeof (struct ucl_pubkey), key); } LL_FOREACH_SAFE (parser->variables, var, vtmp) { free (var->value); free (var->var); UCL_FREE (sizeof (struct ucl_variable), var); } LL_FOREACH_SAFE (parser->trash_objs, tr, trtmp) { ucl_object_free_internal (tr, false, ucl_object_dtor_free); } if (parser->err != NULL) { utstring_free (parser->err); } if (parser->cur_file) { free (parser->cur_file); } if (parser->comments) { ucl_object_unref (parser->comments); } UCL_FREE (sizeof (struct ucl_parser), parser); } const char * ucl_parser_get_error(struct ucl_parser *parser) { if (parser == NULL) { return NULL; } if (parser->err == NULL) { return NULL; } return utstring_body (parser->err); } int ucl_parser_get_error_code(struct ucl_parser *parser) { if (parser == NULL) { return 0; } return parser->err_code; } unsigned ucl_parser_get_column(struct ucl_parser *parser) { if (parser == NULL || parser->chunks == NULL) { return 0; } return parser->chunks->column; } unsigned ucl_parser_get_linenum(struct ucl_parser *parser) { if (parser == NULL || parser->chunks == NULL) { return 0; } return parser->chunks->line; } void ucl_parser_clear_error(struct ucl_parser *parser) { if (parser != NULL && parser->err != NULL) { utstring_free(parser->err); parser->err = NULL; parser->err_code = 0; } } bool ucl_pubkey_add (struct ucl_parser *parser, const unsigned char *key, size_t len) { #ifndef HAVE_OPENSSL ucl_create_err (&parser->err, "cannot check signatures without openssl"); return false; #else # if (OPENSSL_VERSION_NUMBER < 0x10000000L) ucl_create_err (&parser->err, "cannot check signatures, openssl version is unsupported"); return EXIT_FAILURE; # else struct ucl_pubkey *nkey; BIO *mem; mem = BIO_new_mem_buf ((void *)key, len); nkey = UCL_ALLOC (sizeof (struct ucl_pubkey)); if (nkey == NULL) { ucl_create_err (&parser->err, "cannot allocate memory for key"); return false; } nkey->key = PEM_read_bio_PUBKEY (mem, &nkey->key, NULL, NULL); BIO_free (mem); if (nkey->key == NULL) { UCL_FREE (sizeof (struct ucl_pubkey), nkey); ucl_create_err (&parser->err, "%s", ERR_error_string (ERR_get_error (), NULL)); return false; } LL_PREPEND (parser->keys, nkey); # endif #endif return true; } +void ucl_parser_add_special_handler (struct ucl_parser *parser, + struct ucl_parser_special_handler *handler) +{ + LL_APPEND (parser->special_handlers, handler); +} + #ifdef CURL_FOUND struct ucl_curl_cbdata { unsigned char *buf; size_t buflen; }; static size_t ucl_curl_write_callback (void* contents, size_t size, size_t nmemb, void* ud) { struct ucl_curl_cbdata *cbdata = ud; size_t realsize = size * nmemb; cbdata->buf = realloc (cbdata->buf, cbdata->buflen + realsize + 1); if (cbdata->buf == NULL) { return 0; } memcpy (&(cbdata->buf[cbdata->buflen]), contents, realsize); cbdata->buflen += realsize; cbdata->buf[cbdata->buflen] = 0; return realsize; } #endif /** * Fetch a url and save results to the memory buffer * @param url url to fetch * @param len length of url * @param buf target buffer * @param buflen target length * @return */ bool ucl_fetch_url (const unsigned char *url, unsigned char **buf, size_t *buflen, UT_string **err, bool must_exist) { #ifdef HAVE_FETCH_H struct url *fetch_url; struct url_stat us; FILE *in; fetch_url = fetchParseURL (url); if (fetch_url == NULL) { ucl_create_err (err, "invalid URL %s: %s", url, strerror (errno)); return false; } if ((in = fetchXGet (fetch_url, &us, "")) == NULL) { if (!must_exist) { ucl_create_err (err, "cannot fetch URL %s: %s", url, strerror (errno)); } fetchFreeURL (fetch_url); return false; } *buflen = us.size; *buf = malloc (*buflen); if (*buf == NULL) { ucl_create_err (err, "cannot allocate buffer for URL %s: %s", url, strerror (errno)); fclose (in); fetchFreeURL (fetch_url); return false; } if (fread (*buf, *buflen, 1, in) != 1) { ucl_create_err (err, "cannot read URL %s: %s", url, strerror (errno)); fclose (in); fetchFreeURL (fetch_url); return false; } fetchFreeURL (fetch_url); return true; #elif defined(CURL_FOUND) CURL *curl; int r; struct ucl_curl_cbdata cbdata; curl = curl_easy_init (); if (curl == NULL) { ucl_create_err (err, "CURL interface is broken"); return false; } if ((r = curl_easy_setopt (curl, CURLOPT_URL, url)) != CURLE_OK) { ucl_create_err (err, "invalid URL %s: %s", url, curl_easy_strerror (r)); curl_easy_cleanup (curl); return false; } curl_easy_setopt (curl, CURLOPT_WRITEFUNCTION, ucl_curl_write_callback); cbdata.buf = NULL; cbdata.buflen = 0; curl_easy_setopt (curl, CURLOPT_WRITEDATA, &cbdata); if ((r = curl_easy_perform (curl)) != CURLE_OK) { if (!must_exist) { ucl_create_err (err, "error fetching URL %s: %s", url, curl_easy_strerror (r)); } curl_easy_cleanup (curl); if (cbdata.buf) { free (cbdata.buf); } return false; } *buf = cbdata.buf; *buflen = cbdata.buflen; + curl_easy_cleanup (curl); + return true; #else ucl_create_err (err, "URL support is disabled"); return false; #endif } /** * Fetch a file and save results to the memory buffer * @param filename filename to fetch * @param len length of filename * @param buf target buffer * @param buflen target length * @return */ bool ucl_fetch_file (const unsigned char *filename, unsigned char **buf, size_t *buflen, UT_string **err, bool must_exist) { int fd; struct stat st; - if (stat (filename, &st) == -1 || !S_ISREG (st.st_mode)) { - if (must_exist) { + if (stat (filename, &st) == -1) { + if (must_exist || errno == EPERM) { ucl_create_err (err, "cannot stat file %s: %s", filename, strerror (errno)); } return false; } + if (!S_ISREG (st.st_mode)) { + if (must_exist) { + ucl_create_err (err, "file %s is not a regular file", filename); + } + + return false; + } if (st.st_size == 0) { /* Do not map empty files */ *buf = NULL; *buflen = 0; } else { if ((fd = open (filename, O_RDONLY)) == -1) { ucl_create_err (err, "cannot open file %s: %s", filename, strerror (errno)); return false; } if ((*buf = ucl_mmap (NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0)) == MAP_FAILED) { close (fd); ucl_create_err (err, "cannot mmap file %s: %s", filename, strerror (errno)); *buf = NULL; return false; } *buflen = st.st_size; close (fd); } return true; } #if (defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER >= 0x10000000L) static inline bool ucl_sig_check (const unsigned char *data, size_t datalen, const unsigned char *sig, size_t siglen, struct ucl_parser *parser) { struct ucl_pubkey *key; char dig[EVP_MAX_MD_SIZE]; unsigned int diglen; EVP_PKEY_CTX *key_ctx; EVP_MD_CTX *sign_ctx = NULL; sign_ctx = EVP_MD_CTX_create (); LL_FOREACH (parser->keys, key) { key_ctx = EVP_PKEY_CTX_new (key->key, NULL); if (key_ctx != NULL) { if (EVP_PKEY_verify_init (key_ctx) <= 0) { EVP_PKEY_CTX_free (key_ctx); continue; } if (EVP_PKEY_CTX_set_rsa_padding (key_ctx, RSA_PKCS1_PADDING) <= 0) { EVP_PKEY_CTX_free (key_ctx); continue; } if (EVP_PKEY_CTX_set_signature_md (key_ctx, EVP_sha256 ()) <= 0) { EVP_PKEY_CTX_free (key_ctx); continue; } EVP_DigestInit (sign_ctx, EVP_sha256 ()); EVP_DigestUpdate (sign_ctx, data, datalen); EVP_DigestFinal (sign_ctx, dig, &diglen); if (EVP_PKEY_verify (key_ctx, sig, siglen, dig, diglen) == 1) { EVP_MD_CTX_destroy (sign_ctx); EVP_PKEY_CTX_free (key_ctx); return true; } EVP_PKEY_CTX_free (key_ctx); } } EVP_MD_CTX_destroy (sign_ctx); return false; } #endif struct ucl_include_params { bool check_signature; bool must_exist; bool use_glob; bool use_prefix; bool soft_fail; bool allow_glob; unsigned priority; enum ucl_duplicate_strategy strat; enum ucl_parse_type parse_type; const char *prefix; const char *target; }; /** * Include an url to configuration * @param data * @param len * @param parser * @param err * @return */ static bool ucl_include_url (const unsigned char *data, size_t len, struct ucl_parser *parser, struct ucl_include_params *params) { bool res; unsigned char *buf = NULL; size_t buflen = 0; struct ucl_chunk *chunk; char urlbuf[PATH_MAX]; int prev_state; snprintf (urlbuf, sizeof (urlbuf), "%.*s", (int)len, data); if (!ucl_fetch_url (urlbuf, &buf, &buflen, &parser->err, params->must_exist)) { return !params->must_exist; } if (params->check_signature) { #if (defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER >= 0x10000000L) unsigned char *sigbuf = NULL; size_t siglen = 0; /* We need to check signature first */ snprintf (urlbuf, sizeof (urlbuf), "%.*s.sig", (int)len, data); if (!ucl_fetch_url (urlbuf, &sigbuf, &siglen, &parser->err, true)) { return false; } if (!ucl_sig_check (buf, buflen, sigbuf, siglen, parser)) { ucl_create_err (&parser->err, "cannot verify url %s: %s", urlbuf, ERR_error_string (ERR_get_error (), NULL)); if (siglen > 0) { ucl_munmap (sigbuf, siglen); } return false; } if (siglen > 0) { ucl_munmap (sigbuf, siglen); } #endif } prev_state = parser->state; parser->state = UCL_STATE_INIT; res = ucl_parser_add_chunk_full (parser, buf, buflen, params->priority, params->strat, params->parse_type); if (res == true) { /* Remove chunk from the stack */ chunk = parser->chunks; if (chunk != NULL) { parser->chunks = chunk->next; - UCL_FREE (sizeof (struct ucl_chunk), chunk); + ucl_chunk_free (chunk); } } parser->state = prev_state; free (buf); return res; } /** * Include a single file to the parser * @param data * @param len * @param parser * @param check_signature * @param must_exist * @param allow_glob * @param priority * @return */ static bool ucl_include_file_single (const unsigned char *data, size_t len, struct ucl_parser *parser, struct ucl_include_params *params) { bool res; struct ucl_chunk *chunk; unsigned char *buf = NULL; char *old_curfile, *ext; size_t buflen = 0; char filebuf[PATH_MAX], realbuf[PATH_MAX]; int prev_state; struct ucl_variable *cur_var, *tmp_var, *old_curdir = NULL, *old_filename = NULL; ucl_object_t *nest_obj = NULL, *old_obj = NULL, *new_obj = NULL; ucl_hash_t *container = NULL; struct ucl_stack *st = NULL; snprintf (filebuf, sizeof (filebuf), "%.*s", (int)len, data); if (ucl_realpath (filebuf, realbuf) == NULL) { if (params->soft_fail) { return false; } - if (!params->must_exist) { + if (!params->must_exist && errno != EPERM) { return true; } + ucl_create_err (&parser->err, "cannot open file %s: %s", filebuf, strerror (errno)); return false; } if (parser->cur_file && strcmp (realbuf, parser->cur_file) == 0) { /* We are likely including the file itself */ if (params->soft_fail) { return false; } ucl_create_err (&parser->err, "trying to include the file %s from itself", realbuf); return false; } if (!ucl_fetch_file (realbuf, &buf, &buflen, &parser->err, params->must_exist)) { if (params->soft_fail) { return false; } - return (!params->must_exist || false); + if (params->must_exist || parser->err != NULL) { + /* The case of fatal errors */ + return false; + } + + return true; } if (params->check_signature) { #if (defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER >= 0x10000000L) unsigned char *sigbuf = NULL; size_t siglen = 0; /* We need to check signature first */ snprintf (filebuf, sizeof (filebuf), "%s.sig", realbuf); if (!ucl_fetch_file (filebuf, &sigbuf, &siglen, &parser->err, true)) { return false; } if (!ucl_sig_check (buf, buflen, sigbuf, siglen, parser)) { ucl_create_err (&parser->err, "cannot verify file %s: %s", filebuf, ERR_error_string (ERR_get_error (), NULL)); if (sigbuf) { ucl_munmap (sigbuf, siglen); } return false; } if (sigbuf) { ucl_munmap (sigbuf, siglen); } #endif } old_curfile = parser->cur_file; - parser->cur_file = strdup (realbuf); + parser->cur_file = NULL; /* Store old file vars */ DL_FOREACH_SAFE (parser->variables, cur_var, tmp_var) { if (strcmp (cur_var->var, "CURDIR") == 0) { old_curdir = cur_var; DL_DELETE (parser->variables, cur_var); } else if (strcmp (cur_var->var, "FILENAME") == 0) { old_filename = cur_var; DL_DELETE (parser->variables, cur_var); } } ucl_parser_set_filevars (parser, realbuf, false); prev_state = parser->state; parser->state = UCL_STATE_INIT; if (params->use_prefix && params->prefix == NULL) { /* Auto generate a key name based on the included filename */ params->prefix = basename (realbuf); ext = strrchr (params->prefix, '.'); if (ext != NULL && (strcmp (ext, ".conf") == 0 || strcmp (ext, ".ucl") == 0)) { /* Strip off .conf or .ucl */ *ext = '\0'; } } if (params->prefix != NULL) { /* This is a prefixed include */ container = parser->stack->obj->value.ov; old_obj = __DECONST (ucl_object_t *, ucl_hash_search (container, params->prefix, strlen (params->prefix))); - if (strcasecmp (params->target, "array") == 0 && old_obj == NULL) { - /* Create an array with key: prefix */ - old_obj = ucl_object_new_full (UCL_ARRAY, params->priority); - old_obj->key = params->prefix; - old_obj->keylen = strlen (params->prefix); - ucl_copy_key_trash(old_obj); - old_obj->prev = old_obj; - old_obj->next = NULL; + if (strcasecmp (params->target, "array") == 0) { + if (old_obj == NULL) { + /* Create an array with key: prefix */ + old_obj = ucl_object_new_full (UCL_ARRAY, params->priority); + old_obj->key = params->prefix; + old_obj->keylen = strlen (params->prefix); + ucl_copy_key_trash (old_obj); + old_obj->prev = old_obj; + old_obj->next = NULL; - container = ucl_hash_insert_object (container, old_obj, - parser->flags & UCL_PARSER_KEY_LOWERCASE); - parser->stack->obj->len ++; + container = ucl_hash_insert_object (container, old_obj, + parser->flags & UCL_PARSER_KEY_LOWERCASE); + parser->stack->obj->len++; - nest_obj = ucl_object_new_full (UCL_OBJECT, params->priority); - nest_obj->prev = nest_obj; - nest_obj->next = NULL; + nest_obj = ucl_object_new_full (UCL_OBJECT, params->priority); + nest_obj->prev = nest_obj; + nest_obj->next = NULL; - ucl_array_append (old_obj, nest_obj); - } - else if (old_obj == NULL) { - /* Create an object with key: prefix */ - nest_obj = ucl_object_new_full (UCL_OBJECT, params->priority); + ucl_array_append (old_obj, nest_obj); + } + else { + if (ucl_object_type (old_obj) == UCL_ARRAY) { + /* Append to the existing array */ + nest_obj = ucl_object_new_full (UCL_OBJECT, + params->priority); + if (nest_obj == NULL) { + ucl_create_err (&parser->err, + "cannot allocate memory for an object"); + if (buf) { + ucl_munmap (buf, buflen); + } - if (nest_obj == NULL) { - ucl_create_err (&parser->err, "cannot allocate memory for an object"); - if (buf) { - ucl_munmap (buf, buflen); + return false; + } + nest_obj->prev = nest_obj; + nest_obj->next = NULL; + + ucl_array_append (old_obj, nest_obj); } + else { + /* Convert the object to an array */ + new_obj = ucl_object_typed_new (UCL_ARRAY); + if (new_obj == NULL) { + ucl_create_err (&parser->err, + "cannot allocate memory for an object"); + if (buf) { + ucl_munmap (buf, buflen); + } - return false; - } + return false; + } + new_obj->key = old_obj->key; + new_obj->keylen = old_obj->keylen; + new_obj->flags |= UCL_OBJECT_MULTIVALUE; + new_obj->prev = new_obj; + new_obj->next = NULL; + + nest_obj = ucl_object_new_full (UCL_OBJECT, + params->priority); + if (nest_obj == NULL) { + ucl_create_err (&parser->err, + "cannot allocate memory for an object"); + if (buf) { + ucl_munmap (buf, buflen); + } - nest_obj->key = params->prefix; - nest_obj->keylen = strlen (params->prefix); - ucl_copy_key_trash(nest_obj); - nest_obj->prev = nest_obj; - nest_obj->next = NULL; + return false; + } + nest_obj->prev = nest_obj; + nest_obj->next = NULL; - container = ucl_hash_insert_object (container, nest_obj, - parser->flags & UCL_PARSER_KEY_LOWERCASE); - parser->stack->obj->len ++; + ucl_array_append (new_obj, old_obj); + ucl_array_append (new_obj, nest_obj); + ucl_hash_replace (container, old_obj, new_obj); + } + } } - else if (strcasecmp (params->target, "array") == 0 || - ucl_object_type(old_obj) == UCL_ARRAY) { - if (ucl_object_type(old_obj) == UCL_ARRAY) { - /* Append to the existing array */ + else { + /* Case of object */ + if (old_obj == NULL) { + /* Create an object with key: prefix */ nest_obj = ucl_object_new_full (UCL_OBJECT, params->priority); + if (nest_obj == NULL) { ucl_create_err (&parser->err, "cannot allocate memory for an object"); if (buf) { ucl_munmap (buf, buflen); } return false; } + + nest_obj->key = params->prefix; + nest_obj->keylen = strlen (params->prefix); + ucl_copy_key_trash(nest_obj); nest_obj->prev = nest_obj; nest_obj->next = NULL; - ucl_array_append (old_obj, nest_obj); + container = ucl_hash_insert_object (container, nest_obj, + parser->flags & UCL_PARSER_KEY_LOWERCASE); + parser->stack->obj->len ++; } else { - /* Convert the object to an array */ - new_obj = ucl_object_typed_new (UCL_ARRAY); - if (new_obj == NULL) { - ucl_create_err (&parser->err, "cannot allocate memory for an object"); - if (buf) { - ucl_munmap (buf, buflen); - } - - return false; + if (ucl_object_type (old_obj) == UCL_OBJECT) { + /* Append to existing Object*/ + nest_obj = old_obj; } - new_obj->key = old_obj->key; - new_obj->keylen = old_obj->keylen; - new_obj->flags |= UCL_OBJECT_MULTIVALUE; - new_obj->prev = new_obj; - new_obj->next = NULL; - - nest_obj = ucl_object_new_full (UCL_OBJECT, params->priority); - if (nest_obj == NULL) { - ucl_create_err (&parser->err, "cannot allocate memory for an object"); + else { + /* The key is not an object */ + ucl_create_err (&parser->err, + "Conflicting type for key: %s, asked %s, has %s", + params->prefix, params->target, + ucl_object_type_to_string (ucl_object_type (old_obj))); if (buf) { ucl_munmap (buf, buflen); } return false; } - nest_obj->prev = nest_obj; - nest_obj->next = NULL; - - ucl_array_append (new_obj, old_obj); - ucl_array_append (new_obj, nest_obj); - ucl_hash_replace (container, old_obj, new_obj); } } - else { - if (ucl_object_type (old_obj) == UCL_OBJECT) { - /* Append to existing Object*/ - nest_obj = old_obj; - } - else { - /* The key is not an object */ - ucl_create_err (&parser->err, - "Conflicting type for key: %s", - params->prefix); - if (buf) { - ucl_munmap (buf, buflen); - } - return false; - } - } - /* Put all of the content of the include inside that object */ + /* Put all of the content of the include inside that object */ parser->stack->obj->value.ov = container; st = UCL_ALLOC (sizeof (struct ucl_stack)); if (st == NULL) { ucl_create_err (&parser->err, "cannot allocate memory for an object"); ucl_object_unref (nest_obj); if (buf) { ucl_munmap (buf, buflen); } return false; } st->obj = nest_obj; - st->level = parser->stack->level; + st->e.params.level = parser->stack->e.params.level; + st->e.params.flags = parser->stack->e.params.flags; + st->e.params.line = parser->stack->e.params.line; + st->chunk = parser->chunks; LL_PREPEND (parser->stack, st); parser->cur_obj = nest_obj; } res = ucl_parser_add_chunk_full (parser, buf, buflen, params->priority, params->strat, params->parse_type); - if (!res) { - if (!params->must_exist) { - /* Free error */ - utstring_free (parser->err); - parser->err = NULL; - res = true; + if (res) { + /* Stop nesting the include, take 1 level off the stack */ + if (params->prefix != NULL && nest_obj != NULL) { + parser->stack = st->next; + UCL_FREE (sizeof (struct ucl_stack), st); } - } - /* Stop nesting the include, take 1 level off the stack */ - if (params->prefix != NULL && nest_obj != NULL) { - parser->stack = st->next; - UCL_FREE (sizeof (struct ucl_stack), st); - } - - /* Remove chunk from the stack */ - chunk = parser->chunks; - if (chunk != NULL) { - parser->chunks = chunk->next; - UCL_FREE (sizeof (struct ucl_chunk), chunk); - parser->recursion --; - } - - /* Restore old file vars */ - if (parser->cur_file) { - free (parser->cur_file); - } - - parser->cur_file = old_curfile; - DL_FOREACH_SAFE (parser->variables, cur_var, tmp_var) { - if (strcmp (cur_var->var, "CURDIR") == 0 && old_curdir) { - DL_DELETE (parser->variables, cur_var); - free (cur_var->var); - free (cur_var->value); - UCL_FREE (sizeof (struct ucl_variable), cur_var); + /* Remove chunk from the stack */ + chunk = parser->chunks; + if (chunk != NULL) { + parser->chunks = chunk->next; + ucl_chunk_free (chunk); + parser->recursion--; + } + + /* Restore old file vars */ + if (parser->cur_file) { + free (parser->cur_file); + } + + parser->cur_file = old_curfile; + DL_FOREACH_SAFE (parser->variables, cur_var, tmp_var) { + if (strcmp (cur_var->var, "CURDIR") == 0 && old_curdir) { + DL_DELETE (parser->variables, cur_var); + free (cur_var->var); + free (cur_var->value); + UCL_FREE (sizeof (struct ucl_variable), cur_var); + } else if (strcmp (cur_var->var, "FILENAME") == 0 && old_filename) { + DL_DELETE (parser->variables, cur_var); + free (cur_var->var); + free (cur_var->value); + UCL_FREE (sizeof (struct ucl_variable), cur_var); + } } - else if (strcmp (cur_var->var, "FILENAME") == 0 && old_filename) { - DL_DELETE (parser->variables, cur_var); - free (cur_var->var); - free (cur_var->value); - UCL_FREE (sizeof (struct ucl_variable), cur_var); + if (old_filename) { + DL_APPEND (parser->variables, old_filename); + } + if (old_curdir) { + DL_APPEND (parser->variables, old_curdir); } - } - if (old_filename) { - DL_APPEND (parser->variables, old_filename); - } - if (old_curdir) { - DL_APPEND (parser->variables, old_curdir); - } - parser->state = prev_state; + parser->state = prev_state; + } if (buflen > 0) { ucl_munmap (buf, buflen); } return res; } /** * Include a file to configuration * @param data * @param len * @param parser * @param err * @return */ static bool ucl_include_file (const unsigned char *data, size_t len, - struct ucl_parser *parser, struct ucl_include_params *params) + struct ucl_parser *parser, + struct ucl_include_params *params, + const ucl_object_t *args) { const unsigned char *p = data, *end = data + len; bool need_glob = false; int cnt = 0; char glob_pattern[PATH_MAX]; size_t i; #ifndef _WIN32 if (!params->allow_glob) { return ucl_include_file_single (data, len, parser, params); } else { /* Check for special symbols in a filename */ while (p != end) { if (*p == '*' || *p == '?') { need_glob = true; break; } p ++; } if (need_glob) { glob_t globbuf; memset (&globbuf, 0, sizeof (globbuf)); ucl_strlcpy (glob_pattern, (const char *)data, (len + 1 < sizeof (glob_pattern) ? len + 1 : sizeof (glob_pattern))); if (glob (glob_pattern, 0, NULL, &globbuf) != 0) { return (!params->must_exist || false); } for (i = 0; i < globbuf.gl_pathc; i ++) { + + if (parser->include_trace_func) { + const ucl_object_t *parent = NULL; + + if (parser->stack) { + parent = parser->stack->obj; + } + + parser->include_trace_func (parser, parent, NULL, + globbuf.gl_pathv[i], + strlen (globbuf.gl_pathv[i]), + parser->include_trace_ud); + } + if (!ucl_include_file_single ((unsigned char *)globbuf.gl_pathv[i], strlen (globbuf.gl_pathv[i]), parser, params)) { if (params->soft_fail) { continue; } globfree (&globbuf); return false; } cnt ++; } globfree (&globbuf); if (cnt == 0 && params->must_exist) { ucl_create_err (&parser->err, "cannot match any files for pattern %s", glob_pattern); return false; } } else { return ucl_include_file_single (data, len, parser, params); } } #else /* Win32 compilers do not support globbing. Therefore, for Win32, treat allow_glob/need_glob as a NOOP and just return */ return ucl_include_file_single (data, len, parser, params); #endif return true; } /** * Common function to handle .*include* macros * @param data * @param len * @param args * @param parser * @param default_try * @param default_sign * @return */ static bool ucl_include_common (const unsigned char *data, size_t len, const ucl_object_t *args, struct ucl_parser *parser, bool default_try, bool default_sign) { bool allow_url = false, search = false; const char *duplicate; const ucl_object_t *param; ucl_object_iter_t it = NULL, ip = NULL; char ipath[PATH_MAX]; struct ucl_include_params params; /* Default values */ params.soft_fail = default_try; params.allow_glob = false; params.check_signature = default_sign; params.use_prefix = false; params.target = "object"; params.prefix = NULL; params.priority = 0; params.parse_type = UCL_PARSE_UCL; params.strat = UCL_DUPLICATE_APPEND; params.must_exist = !default_try; + if (parser->include_trace_func) { + const ucl_object_t *parent = NULL; + + if (parser->stack) { + parent = parser->stack->obj; + } + + parser->include_trace_func (parser, parent, args, + data, len, parser->include_trace_ud); + } + /* Process arguments */ if (args != NULL && args->type == UCL_OBJECT) { while ((param = ucl_object_iterate (args, &it, true)) != NULL) { if (param->type == UCL_BOOLEAN) { if (strncmp (param->key, "try", param->keylen) == 0) { params.must_exist = !ucl_object_toboolean (param); } else if (strncmp (param->key, "sign", param->keylen) == 0) { params.check_signature = ucl_object_toboolean (param); } else if (strncmp (param->key, "glob", param->keylen) == 0) { params.allow_glob = ucl_object_toboolean (param); } else if (strncmp (param->key, "url", param->keylen) == 0) { allow_url = ucl_object_toboolean (param); } else if (strncmp (param->key, "prefix", param->keylen) == 0) { params.use_prefix = ucl_object_toboolean (param); } } else if (param->type == UCL_STRING) { if (strncmp (param->key, "key", param->keylen) == 0) { params.prefix = ucl_object_tostring (param); } else if (strncmp (param->key, "target", param->keylen) == 0) { params.target = ucl_object_tostring (param); } else if (strncmp (param->key, "duplicate", param->keylen) == 0) { duplicate = ucl_object_tostring (param); if (strcmp (duplicate, "append") == 0) { params.strat = UCL_DUPLICATE_APPEND; } else if (strcmp (duplicate, "merge") == 0) { params.strat = UCL_DUPLICATE_MERGE; } else if (strcmp (duplicate, "rewrite") == 0) { params.strat = UCL_DUPLICATE_REWRITE; } else if (strcmp (duplicate, "error") == 0) { params.strat = UCL_DUPLICATE_ERROR; } } } else if (param->type == UCL_ARRAY) { if (strncmp (param->key, "path", param->keylen) == 0) { ucl_set_include_path (parser, __DECONST(ucl_object_t *, param)); } } else if (param->type == UCL_INT) { if (strncmp (param->key, "priority", param->keylen) == 0) { params.priority = ucl_object_toint (param); + if (params.priority > UCL_PRIORITY_MAX) { + ucl_create_err (&parser->err, "Invalid priority value in macro: %d", + params.priority); + return false; + } } } } } if (parser->includepaths == NULL) { if (allow_url && ucl_strnstr (data, "://", len) != NULL) { /* Globbing is not used for URL's */ return ucl_include_url (data, len, parser, ¶ms); } else if (data != NULL) { /* Try to load a file */ - return ucl_include_file (data, len, parser, ¶ms); + return ucl_include_file (data, len, parser, ¶ms, args); } } else { if (allow_url && ucl_strnstr (data, "://", len) != NULL) { /* Globbing is not used for URL's */ return ucl_include_url (data, len, parser, ¶ms); } ip = ucl_object_iterate_new (parser->includepaths); while ((param = ucl_object_iterate_safe (ip, true)) != NULL) { if (ucl_object_type(param) == UCL_STRING) { snprintf (ipath, sizeof (ipath), "%s/%.*s", ucl_object_tostring(param), (int)len, data); if ((search = ucl_include_file (ipath, strlen (ipath), - parser, ¶ms))) { + parser, ¶ms, args))) { if (!params.allow_glob) { break; } } } } ucl_object_iterate_free (ip); if (search == true) { return true; } else { ucl_create_err (&parser->err, "cannot find file: %.*s in search path", (int)len, data); return false; } } return false; } /** * Handle include macro * @param data include data * @param len length of data * @param args UCL object representing arguments to the macro * @param ud user data * @return */ bool ucl_include_handler (const unsigned char *data, size_t len, const ucl_object_t *args, void* ud) { struct ucl_parser *parser = ud; return ucl_include_common (data, len, args, parser, false, false); } /** * Handle includes macro * @param data include data * @param len length of data * @param args UCL object representing arguments to the macro * @param ud user data * @return */ bool ucl_includes_handler (const unsigned char *data, size_t len, const ucl_object_t *args, void* ud) { struct ucl_parser *parser = ud; return ucl_include_common (data, len, args, parser, false, true); } /** * Handle tryinclude macro * @param data include data * @param len length of data * @param args UCL object representing arguments to the macro * @param ud user data * @return */ bool ucl_try_include_handler (const unsigned char *data, size_t len, const ucl_object_t *args, void* ud) { struct ucl_parser *parser = ud; return ucl_include_common (data, len, args, parser, true, false); } /** * Handle priority macro * @param data include data * @param len length of data * @param args UCL object representing arguments to the macro * @param ud user data * @return */ bool ucl_priority_handler (const unsigned char *data, size_t len, const ucl_object_t *args, void* ud) { struct ucl_parser *parser = ud; unsigned priority = 255; const ucl_object_t *param; bool found = false; char *value = NULL, *leftover = NULL; ucl_object_iter_t it = NULL; if (parser == NULL) { return false; } /* Process arguments */ if (args != NULL && args->type == UCL_OBJECT) { while ((param = ucl_object_iterate (args, &it, true)) != NULL) { if (param->type == UCL_INT) { if (strncmp (param->key, "priority", param->keylen) == 0) { priority = ucl_object_toint (param); found = true; } } } } if (len > 0) { value = malloc(len + 1); ucl_strlcpy(value, (const char *)data, len + 1); - priority = strtol(value, &leftover, 10); - if (*leftover != '\0') { + errno = 0; + priority = strtoul(value, &leftover, 10); + if (errno != 0 || *leftover != '\0' || priority > UCL_PRIORITY_MAX) { ucl_create_err (&parser->err, "Invalid priority value in macro: %s", value); free(value); return false; } free(value); found = true; } if (found == true) { parser->chunks->priority = priority; return true; } ucl_create_err (&parser->err, "Unable to parse priority macro"); return false; } /** * Handle load macro * @param data include data * @param len length of data * @param args UCL object representing arguments to the macro * @param ud user data * @return */ bool ucl_load_handler (const unsigned char *data, size_t len, const ucl_object_t *args, void* ud) { struct ucl_parser *parser = ud; const ucl_object_t *param; ucl_object_t *obj, *old_obj; ucl_object_iter_t it = NULL; bool try_load, multiline, test; const char *target, *prefix; char *load_file, *tmp; unsigned char *buf; size_t buflen; unsigned priority; int64_t iv; ucl_object_t *container = NULL; enum ucl_string_flags flags; /* Default values */ try_load = false; multiline = false; test = false; target = "string"; prefix = NULL; load_file = NULL; buf = NULL; buflen = 0; priority = 0; obj = NULL; old_obj = NULL; flags = 0; if (parser == NULL) { return false; } /* Process arguments */ if (args != NULL && args->type == UCL_OBJECT) { while ((param = ucl_object_iterate (args, &it, true)) != NULL) { if (param->type == UCL_BOOLEAN) { if (strncmp (param->key, "try", param->keylen) == 0) { try_load = ucl_object_toboolean (param); } else if (strncmp (param->key, "multiline", param->keylen) == 0) { multiline = ucl_object_toboolean (param); } else if (strncmp (param->key, "escape", param->keylen) == 0) { test = ucl_object_toboolean (param); if (test) { flags |= UCL_STRING_ESCAPE; } } else if (strncmp (param->key, "trim", param->keylen) == 0) { test = ucl_object_toboolean (param); if (test) { flags |= UCL_STRING_TRIM; } } } else if (param->type == UCL_STRING) { if (strncmp (param->key, "key", param->keylen) == 0) { prefix = ucl_object_tostring (param); } else if (strncmp (param->key, "target", param->keylen) == 0) { target = ucl_object_tostring (param); } } else if (param->type == UCL_INT) { if (strncmp (param->key, "priority", param->keylen) == 0) { priority = ucl_object_toint (param); } } } } if (prefix == NULL || strlen (prefix) == 0) { ucl_create_err (&parser->err, "No Key specified in load macro"); return false; } if (len > 0) { load_file = malloc (len + 1); if (!load_file) { ucl_create_err (&parser->err, "cannot allocate memory for suffix"); return false; } snprintf (load_file, len + 1, "%.*s", (int)len, data); if (!ucl_fetch_file (load_file, &buf, &buflen, &parser->err, !try_load)) { free (load_file); return (try_load || false); } free (load_file); container = parser->stack->obj; old_obj = __DECONST (ucl_object_t *, ucl_object_lookup (container, prefix)); if (old_obj != NULL) { ucl_create_err (&parser->err, "Key %s already exists", prefix); if (buf) { ucl_munmap (buf, buflen); } return false; } if (strcasecmp (target, "string") == 0) { obj = ucl_object_fromstring_common (buf, buflen, flags); ucl_copy_value_trash (obj); if (multiline) { obj->flags |= UCL_OBJECT_MULTILINE; } } else if (strcasecmp (target, "int") == 0) { tmp = malloc (buflen + 1); if (tmp == NULL) { ucl_create_err (&parser->err, "Memory allocation failed"); if (buf) { ucl_munmap (buf, buflen); } return false; } snprintf (tmp, buflen + 1, "%.*s", (int)buflen, buf); iv = strtoll (tmp, NULL, 10); obj = ucl_object_fromint (iv); free (tmp); } if (buf) { ucl_munmap (buf, buflen); } if (obj != NULL) { obj->key = prefix; obj->keylen = strlen (prefix); ucl_copy_key_trash (obj); obj->prev = obj; obj->next = NULL; ucl_object_set_priority (obj, priority); ucl_object_insert_key (container, obj, obj->key, obj->keylen, false); } return true; } ucl_create_err (&parser->err, "Unable to parse load macro"); return false; } bool ucl_inherit_handler (const unsigned char *data, size_t len, const ucl_object_t *args, const ucl_object_t *ctx, void* ud) { const ucl_object_t *parent, *cur; ucl_object_t *target, *copy; ucl_object_iter_t it = NULL; bool replace = false; struct ucl_parser *parser = ud; parent = ucl_object_lookup_len (ctx, data, len); /* Some sanity checks */ if (parent == NULL || ucl_object_type (parent) != UCL_OBJECT) { ucl_create_err (&parser->err, "Unable to find inherited object %*.s", (int)len, data); return false; } if (parser->stack == NULL || parser->stack->obj == NULL || ucl_object_type (parser->stack->obj) != UCL_OBJECT) { ucl_create_err (&parser->err, "Invalid inherit context"); return false; } target = parser->stack->obj; if (args && (cur = ucl_object_lookup (args, "replace")) != NULL) { replace = ucl_object_toboolean (cur); } while ((cur = ucl_object_iterate (parent, &it, true))) { /* We do not replace existing keys */ if (!replace && ucl_object_lookup_len (target, cur->key, cur->keylen)) { continue; } copy = ucl_object_copy (cur); if (!replace) { copy->flags |= UCL_OBJECT_INHERITED; } ucl_object_insert_key (target, copy, copy->key, copy->keylen, false); } return true; } bool ucl_parser_set_filevars (struct ucl_parser *parser, const char *filename, bool need_expand) { char realbuf[PATH_MAX], *curdir; if (filename != NULL) { if (need_expand) { if (ucl_realpath (filename, realbuf) == NULL) { return false; } } else { ucl_strlcpy (realbuf, filename, sizeof (realbuf)); } + if (parser->cur_file) { + free (parser->cur_file); + } + + parser->cur_file = strdup (realbuf); + /* Define variables */ ucl_parser_register_variable (parser, "FILENAME", realbuf); curdir = dirname (realbuf); ucl_parser_register_variable (parser, "CURDIR", curdir); } else { /* Set everything from the current dir */ curdir = getcwd (realbuf, sizeof (realbuf)); ucl_parser_register_variable (parser, "FILENAME", "undef"); ucl_parser_register_variable (parser, "CURDIR", curdir); } return true; } bool ucl_parser_add_file_full (struct ucl_parser *parser, const char *filename, unsigned priority, enum ucl_duplicate_strategy strat, enum ucl_parse_type parse_type) { unsigned char *buf; size_t len; bool ret; char realbuf[PATH_MAX]; if (ucl_realpath (filename, realbuf) == NULL) { ucl_create_err (&parser->err, "cannot open file %s: %s", filename, strerror (errno)); return false; } if (!ucl_fetch_file (realbuf, &buf, &len, &parser->err, true)) { return false; } - if (parser->cur_file) { - free (parser->cur_file); - } - parser->cur_file = strdup (realbuf); ucl_parser_set_filevars (parser, realbuf, false); ret = ucl_parser_add_chunk_full (parser, buf, len, priority, strat, parse_type); if (len > 0) { ucl_munmap (buf, len); } return ret; } bool ucl_parser_add_file_priority (struct ucl_parser *parser, const char *filename, unsigned priority) { if (parser == NULL) { return false; } return ucl_parser_add_file_full(parser, filename, priority, UCL_DUPLICATE_APPEND, UCL_PARSE_UCL); } bool ucl_parser_add_file (struct ucl_parser *parser, const char *filename) { if (parser == NULL) { return false; } return ucl_parser_add_file_full(parser, filename, parser->default_priority, UCL_DUPLICATE_APPEND, UCL_PARSE_UCL); } bool ucl_parser_add_fd_full (struct ucl_parser *parser, int fd, unsigned priority, enum ucl_duplicate_strategy strat, enum ucl_parse_type parse_type) { unsigned char *buf; size_t len; bool ret; struct stat st; if (fstat (fd, &st) == -1) { ucl_create_err (&parser->err, "cannot stat fd %d: %s", fd, strerror (errno)); return false; } if (st.st_size == 0) { return true; } if ((buf = ucl_mmap (NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0)) == MAP_FAILED) { ucl_create_err (&parser->err, "cannot mmap fd %d: %s", fd, strerror (errno)); return false; } if (parser->cur_file) { free (parser->cur_file); } parser->cur_file = NULL; len = st.st_size; ret = ucl_parser_add_chunk_full (parser, buf, len, priority, strat, parse_type); if (len > 0) { ucl_munmap (buf, len); } return ret; } bool ucl_parser_add_fd_priority (struct ucl_parser *parser, int fd, unsigned priority) { if (parser == NULL) { return false; } return ucl_parser_add_fd_full(parser, fd, parser->default_priority, UCL_DUPLICATE_APPEND, UCL_PARSE_UCL); } bool ucl_parser_add_fd (struct ucl_parser *parser, int fd) { if (parser == NULL) { return false; } return ucl_parser_add_fd_priority(parser, fd, parser->default_priority); } size_t ucl_strlcpy (char *dst, const char *src, size_t siz) { char *d = dst; const char *s = src; size_t n = siz; /* Copy as many bytes as will fit */ if (n != 0) { while (--n != 0) { if ((*d++ = *s++) == '\0') { break; } } } if (n == 0 && siz != 0) { *d = '\0'; } return (s - src - 1); /* count does not include NUL */ } size_t ucl_strlcpy_unsafe (char *dst, const char *src, size_t siz) { memcpy (dst, src, siz - 1); dst[siz - 1] = '\0'; return siz - 1; } size_t ucl_strlcpy_tolower (char *dst, const char *src, size_t siz) { char *d = dst; const char *s = src; size_t n = siz; /* Copy as many bytes as will fit */ if (n != 0) { while (--n != 0) { if ((*d++ = tolower (*s++)) == '\0') { break; } } } if (n == 0 && siz != 0) { *d = '\0'; } return (s - src); /* count does not include NUL */ } /* * Find the first occurrence of find in s */ char * ucl_strnstr (const char *s, const char *find, int len) { char c, sc; int mlen; if ((c = *find++) != 0) { mlen = strlen (find); do { do { if ((sc = *s++) == 0 || len-- == 0) return (NULL); } while (sc != c); } while (strncmp (s, find, mlen) != 0); s--; } return ((char *)s); } /* * Find the first occurrence of find in s, ignore case. */ char * ucl_strncasestr (const char *s, const char *find, int len) { char c, sc; int mlen; if ((c = *find++) != 0) { c = tolower (c); mlen = strlen (find); do { do { if ((sc = *s++) == 0 || len-- == 0) return (NULL); } while (tolower (sc) != c); } while (strncasecmp (s, find, mlen) != 0); s--; } return ((char *)s); } ucl_object_t * ucl_object_fromstring_common (const char *str, size_t len, enum ucl_string_flags flags) { ucl_object_t *obj; const char *start, *end, *p, *pos; char *dst, *d; size_t escaped_len; if (str == NULL) { return NULL; } obj = ucl_object_new (); if (obj) { if (len == 0) { len = strlen (str); } if (flags & UCL_STRING_TRIM) { /* Skip leading spaces */ for (start = str; (size_t)(start - str) < len; start ++) { if (!ucl_test_character (*start, UCL_CHARACTER_WHITESPACE_UNSAFE)) { break; } } /* Skip trailing spaces */ for (end = str + len - 1; end > start; end --) { if (!ucl_test_character (*end, UCL_CHARACTER_WHITESPACE_UNSAFE)) { break; } } end ++; } else { start = str; end = str + len; } obj->type = UCL_STRING; if (flags & UCL_STRING_ESCAPE) { for (p = start, escaped_len = 0; p < end; p ++, escaped_len ++) { - if (ucl_test_character (*p, UCL_CHARACTER_JSON_UNSAFE)) { - escaped_len ++; + if (ucl_test_character (*p, UCL_CHARACTER_JSON_UNSAFE | UCL_CHARACTER_WHITESPACE_UNSAFE)) { + switch (*p) { + case '\v': + case '\0': + escaped_len += 5; + break; + case ' ': + break; + default: + escaped_len ++; + break; + } } } dst = malloc (escaped_len + 1); if (dst != NULL) { for (p = start, d = dst; p < end; p ++, d ++) { - if (ucl_test_character (*p, UCL_CHARACTER_JSON_UNSAFE)) { + if (ucl_test_character (*p, UCL_CHARACTER_JSON_UNSAFE | UCL_CHARACTER_WHITESPACE_UNSAFE)) { switch (*p) { case '\n': *d++ = '\\'; *d = 'n'; break; case '\r': *d++ = '\\'; *d = 'r'; break; case '\b': *d++ = '\\'; *d = 'b'; break; case '\t': *d++ = '\\'; *d = 't'; break; case '\f': *d++ = '\\'; *d = 'f'; break; + case '\0': + *d++ = '\\'; + *d++ = 'u'; + *d++ = '0'; + *d++ = '0'; + *d++ = '0'; + *d = '0'; + break; + case '\v': + *d++ = '\\'; + *d++ = 'u'; + *d++ = '0'; + *d++ = '0'; + *d++ = '0'; + *d = 'B'; + break; case '\\': *d++ = '\\'; *d = '\\'; break; + case ' ': + *d = ' '; + break; case '"': *d++ = '\\'; *d = '"'; break; } } else { *d = *p; } } *d = '\0'; obj->value.sv = dst; obj->trash_stack[UCL_TRASH_VALUE] = dst; obj->len = escaped_len; } } else { dst = malloc (end - start + 1); if (dst != NULL) { ucl_strlcpy_unsafe (dst, start, end - start + 1); obj->value.sv = dst; obj->trash_stack[UCL_TRASH_VALUE] = dst; obj->len = end - start; } } if ((flags & UCL_STRING_PARSE) && dst != NULL) { /* Parse what we have */ if (flags & UCL_STRING_PARSE_BOOLEAN) { if (!ucl_maybe_parse_boolean (obj, dst, obj->len) && (flags & UCL_STRING_PARSE_NUMBER)) { ucl_maybe_parse_number (obj, dst, dst + obj->len, &pos, flags & UCL_STRING_PARSE_DOUBLE, flags & UCL_STRING_PARSE_BYTES, flags & UCL_STRING_PARSE_TIME); } } else { ucl_maybe_parse_number (obj, dst, dst + obj->len, &pos, flags & UCL_STRING_PARSE_DOUBLE, flags & UCL_STRING_PARSE_BYTES, flags & UCL_STRING_PARSE_TIME); } } } return obj; } static bool ucl_object_insert_key_common (ucl_object_t *top, ucl_object_t *elt, const char *key, size_t keylen, bool copy_key, bool merge, bool replace) { ucl_object_t *found, *tmp; const ucl_object_t *cur; ucl_object_iter_t it = NULL; const char *p; int ret = true; if (elt == NULL || key == NULL) { return false; } if (top == NULL) { return false; } if (top->type != UCL_OBJECT) { /* It is possible to convert NULL type to an object */ if (top->type == UCL_NULL) { top->type = UCL_OBJECT; } else { /* Refuse converting of other object types */ return false; } } if (top->value.ov == NULL) { top->value.ov = ucl_hash_create (false); } if (keylen == 0) { keylen = strlen (key); } for (p = key; p < key + keylen; p ++) { if (ucl_test_character (*p, UCL_CHARACTER_UCL_UNSAFE)) { elt->flags |= UCL_OBJECT_NEED_KEY_ESCAPE; break; } } /* workaround for some use cases */ if (elt->trash_stack[UCL_TRASH_KEY] != NULL && key != (const char *)elt->trash_stack[UCL_TRASH_KEY]) { /* Remove copied key */ free (elt->trash_stack[UCL_TRASH_KEY]); elt->trash_stack[UCL_TRASH_KEY] = NULL; elt->flags &= ~UCL_OBJECT_ALLOCATED_KEY; } elt->key = key; elt->keylen = keylen; if (copy_key) { ucl_copy_key_trash (elt); } found = __DECONST (ucl_object_t *, ucl_hash_search_obj (top->value.ov, elt)); if (found == NULL) { top->value.ov = ucl_hash_insert_object (top->value.ov, elt, false); top->len ++; if (replace) { ret = false; } } else { if (replace) { ucl_hash_replace (top->value.ov, found, elt); ucl_object_unref (found); } else if (merge) { if (found->type != UCL_OBJECT && elt->type == UCL_OBJECT) { /* Insert old elt to new one */ ucl_object_insert_key_common (elt, found, found->key, found->keylen, copy_key, false, false); ucl_hash_delete (top->value.ov, found); top->value.ov = ucl_hash_insert_object (top->value.ov, elt, false); } else if (found->type == UCL_OBJECT && elt->type != UCL_OBJECT) { /* Insert new to old */ ucl_object_insert_key_common (found, elt, elt->key, elt->keylen, copy_key, false, false); } else if (found->type == UCL_OBJECT && elt->type == UCL_OBJECT) { /* Mix two hashes */ while ((cur = ucl_object_iterate (elt, &it, true)) != NULL) { tmp = ucl_object_ref (cur); ucl_object_insert_key_common (found, tmp, cur->key, - cur->keylen, copy_key, false, false); + cur->keylen, copy_key, true, false); } ucl_object_unref (elt); } else { /* Just make a list of scalars */ - DL_APPEND (found, elt); + DL_CONCAT (found, elt); } } else { - DL_APPEND (found, elt); + DL_CONCAT (found, elt); } } return ret; } bool ucl_object_delete_keyl (ucl_object_t *top, const char *key, size_t keylen) { ucl_object_t *found; if (top == NULL || key == NULL) { return false; } found = __DECONST (ucl_object_t *, ucl_object_lookup_len (top, key, keylen)); if (found == NULL) { return false; } ucl_hash_delete (top->value.ov, found); ucl_object_unref (found); top->len --; return true; } bool ucl_object_delete_key (ucl_object_t *top, const char *key) { return ucl_object_delete_keyl (top, key, strlen (key)); } ucl_object_t* ucl_object_pop_keyl (ucl_object_t *top, const char *key, size_t keylen) { const ucl_object_t *found; if (top == NULL || key == NULL) { return false; } found = ucl_object_lookup_len (top, key, keylen); if (found == NULL) { return NULL; } ucl_hash_delete (top->value.ov, found); top->len --; return __DECONST (ucl_object_t *, found); } ucl_object_t* ucl_object_pop_key (ucl_object_t *top, const char *key) { return ucl_object_pop_keyl (top, key, strlen (key)); } bool ucl_object_insert_key (ucl_object_t *top, ucl_object_t *elt, const char *key, size_t keylen, bool copy_key) { return ucl_object_insert_key_common (top, elt, key, keylen, copy_key, false, false); } bool ucl_object_insert_key_merged (ucl_object_t *top, ucl_object_t *elt, const char *key, size_t keylen, bool copy_key) { return ucl_object_insert_key_common (top, elt, key, keylen, copy_key, true, false); } bool ucl_object_replace_key (ucl_object_t *top, ucl_object_t *elt, const char *key, size_t keylen, bool copy_key) { return ucl_object_insert_key_common (top, elt, key, keylen, copy_key, false, true); } bool ucl_object_merge (ucl_object_t *top, ucl_object_t *elt, bool copy) { ucl_object_t *cur = NULL, *cp = NULL, *found = NULL; ucl_object_iter_t iter = NULL; - if (top == NULL || top->type != UCL_OBJECT || elt == NULL || elt->type != UCL_OBJECT) { + if (top == NULL || elt == NULL) { return false; } - /* Mix two hashes */ - while ((cur = (ucl_object_t*)ucl_hash_iterate (elt->value.ov, &iter))) { - if (copy) { - cp = ucl_object_copy (cur); + if (top->type == UCL_ARRAY) { + if (elt->type == UCL_ARRAY) { + /* Merge two arrays */ + return ucl_array_merge (top, elt, copy); } else { - cp = ucl_object_ref (cur); + if (copy) { + ucl_array_append (top, ucl_object_copy (elt)); + + return true; + } + else { + ucl_array_append (top, ucl_object_ref (elt)); + + return true; + } } - found = __DECONST(ucl_object_t *, ucl_hash_search (top->value.ov, cp->key, cp->keylen)); - if (found == NULL) { - /* The key does not exist */ - top->value.ov = ucl_hash_insert_object (top->value.ov, cp, false); - top->len ++; + } + else if (top->type == UCL_OBJECT) { + if (elt->type == UCL_OBJECT) { + /* Mix two hashes */ + while ((cur = (ucl_object_t *) ucl_hash_iterate (elt->value.ov, + &iter))) { + + if (copy) { + cp = ucl_object_copy (cur); + } else { + cp = ucl_object_ref (cur); + } + + found = __DECONST(ucl_object_t *, + ucl_hash_search (top->value.ov, cp->key, cp->keylen)); + + if (found == NULL) { + /* The key does not exist */ + top->value.ov = ucl_hash_insert_object (top->value.ov, cp, + false); + top->len++; + } + else { + /* The key already exists, merge it recursively */ + if (found->type == UCL_OBJECT || found->type == UCL_ARRAY) { + if (!ucl_object_merge (found, cp, copy)) { + return false; + } + } + else { + ucl_hash_replace (top->value.ov, found, cp); + ucl_object_unref (found); + } + } + } } else { - /* The key already exists, replace it */ - ucl_hash_replace (top->value.ov, found, cp); - ucl_object_unref (found); + if (copy) { + cp = ucl_object_copy (elt); + } + else { + cp = ucl_object_ref (elt); + } + + found = __DECONST(ucl_object_t *, + ucl_hash_search (top->value.ov, cp->key, cp->keylen)); + + if (found == NULL) { + /* The key does not exist */ + top->value.ov = ucl_hash_insert_object (top->value.ov, cp, + false); + top->len++; + } + else { + /* The key already exists, merge it recursively */ + if (found->type == UCL_OBJECT || found->type == UCL_ARRAY) { + if (!ucl_object_merge (found, cp, copy)) { + return false; + } + } + else { + ucl_hash_replace (top->value.ov, found, cp); + ucl_object_unref (found); + } + } } } + else { + /* Cannot merge trivial objects */ + return false; + } return true; } const ucl_object_t * ucl_object_lookup_len (const ucl_object_t *obj, const char *key, size_t klen) { const ucl_object_t *ret; ucl_object_t srch; if (obj == NULL || obj->type != UCL_OBJECT || key == NULL) { return NULL; } srch.key = key; srch.keylen = klen; ret = ucl_hash_search_obj (obj->value.ov, &srch); return ret; } const ucl_object_t * ucl_object_lookup (const ucl_object_t *obj, const char *key) { if (key == NULL) { return NULL; } return ucl_object_lookup_len (obj, key, strlen (key)); } const ucl_object_t* ucl_object_lookup_any (const ucl_object_t *obj, const char *key, ...) { va_list ap; const ucl_object_t *ret = NULL; const char *nk = NULL; if (obj == NULL || key == NULL) { return NULL; } ret = ucl_object_lookup_len (obj, key, strlen (key)); if (ret == NULL) { va_start (ap, key); while (ret == NULL) { nk = va_arg (ap, const char *); if (nk == NULL) { break; } else { ret = ucl_object_lookup_len (obj, nk, strlen (nk)); } } va_end (ap); } return ret; } const ucl_object_t* -ucl_object_iterate (const ucl_object_t *obj, ucl_object_iter_t *iter, bool expand_values) +ucl_object_iterate_with_error (const ucl_object_t *obj, ucl_object_iter_t *iter, bool expand_values, + int *ep) { const ucl_object_t *elt = NULL; if (obj == NULL || iter == NULL) { return NULL; } if (expand_values) { switch (obj->type) { case UCL_OBJECT: - return (const ucl_object_t*)ucl_hash_iterate (obj->value.ov, iter); + return (const ucl_object_t*)ucl_hash_iterate2 (obj->value.ov, iter, ep); break; case UCL_ARRAY: { unsigned int idx; UCL_ARRAY_GET (vec, obj); idx = (unsigned int)(uintptr_t)(*iter); if (vec != NULL) { while (idx < kv_size (*vec)) { if ((elt = kv_A (*vec, idx)) != NULL) { idx ++; break; } idx ++; } *iter = (void *)(uintptr_t)idx; } return elt; break; } default: /* Go to linear iteration */ break; } } /* Treat everything as a linear list */ elt = *iter; if (elt == NULL) { elt = obj; } else if (elt == obj) { return NULL; } *iter = __DECONST (void *, elt->next ? elt->next : obj); return elt; /* Not reached */ return NULL; } -const char safe_iter_magic[4] = {'u', 'i', 't', 'e'}; +enum ucl_safe_iter_flags { + UCL_ITERATE_FLAG_UNDEFINED = 0, + UCL_ITERATE_FLAG_INSIDE_ARRAY, + UCL_ITERATE_FLAG_INSIDE_OBJECT, + UCL_ITERATE_FLAG_IMPLICIT, + UCL_ITERATE_FLAG_EXCEPTION +}; + +static const char safe_iter_magic[4] = {'u', 'i', 't', 'e'}; struct ucl_object_safe_iter { char magic[4]; /* safety check */ + uint32_t flags; const ucl_object_t *impl_it; /* implicit object iteration */ ucl_object_iter_t expl_it; /* explicit iteration */ }; #define UCL_SAFE_ITER(ptr) (struct ucl_object_safe_iter *)(ptr) #define UCL_SAFE_ITER_CHECK(it) do { \ assert (it != NULL); \ assert (memcmp (it->magic, safe_iter_magic, sizeof (it->magic)) == 0); \ } while (0) ucl_object_iter_t ucl_object_iterate_new (const ucl_object_t *obj) { struct ucl_object_safe_iter *it; it = UCL_ALLOC (sizeof (*it)); if (it != NULL) { memcpy (it->magic, safe_iter_magic, sizeof (it->magic)); + it->flags = UCL_ITERATE_FLAG_UNDEFINED; it->expl_it = NULL; it->impl_it = obj; } return (ucl_object_iter_t)it; } +bool +ucl_object_iter_chk_excpn(ucl_object_iter_t *it) +{ + struct ucl_object_safe_iter *rit = UCL_SAFE_ITER (it); + + UCL_SAFE_ITER_CHECK (rit); + + return (rit->flags == UCL_ITERATE_FLAG_EXCEPTION); +} ucl_object_iter_t ucl_object_iterate_reset (ucl_object_iter_t it, const ucl_object_t *obj) { struct ucl_object_safe_iter *rit = UCL_SAFE_ITER (it); UCL_SAFE_ITER_CHECK (rit); if (rit->expl_it != NULL) { - UCL_FREE (sizeof (*rit->expl_it), rit->expl_it); + if (rit->flags == UCL_ITERATE_FLAG_INSIDE_OBJECT) { + UCL_FREE (sizeof (*rit->expl_it), rit->expl_it); + } } rit->impl_it = obj; rit->expl_it = NULL; + rit->flags = UCL_ITERATE_FLAG_UNDEFINED; return it; } const ucl_object_t* ucl_object_iterate_safe (ucl_object_iter_t it, bool expand_values) { return ucl_object_iterate_full (it, expand_values ? UCL_ITERATE_BOTH : UCL_ITERATE_IMPLICIT); } const ucl_object_t* ucl_object_iterate_full (ucl_object_iter_t it, enum ucl_iterate_type type) { struct ucl_object_safe_iter *rit = UCL_SAFE_ITER (it); const ucl_object_t *ret = NULL; + int ern; UCL_SAFE_ITER_CHECK (rit); if (rit->impl_it == NULL) { return NULL; } - if (rit->impl_it->type == UCL_OBJECT || rit->impl_it->type == UCL_ARRAY) { + if (rit->impl_it->type == UCL_OBJECT) { + rit->flags = UCL_ITERATE_FLAG_INSIDE_OBJECT; + ret = ucl_object_iterate_with_error (rit->impl_it, &rit->expl_it, true, &ern); + + if (ret == NULL && ern != 0) { + rit->flags = UCL_ITERATE_FLAG_EXCEPTION; + return NULL; + } + + if (ret == NULL && (type & UCL_ITERATE_IMPLICIT)) { + /* Need to switch to another implicit object in chain */ + rit->impl_it = rit->impl_it->next; + rit->expl_it = NULL; + + return ucl_object_iterate_safe (it, type); + } + } + else if (rit->impl_it->type == UCL_ARRAY) { + rit->flags = UCL_ITERATE_FLAG_INSIDE_ARRAY; ret = ucl_object_iterate (rit->impl_it, &rit->expl_it, true); if (ret == NULL && (type & UCL_ITERATE_IMPLICIT)) { /* Need to switch to another implicit object in chain */ rit->impl_it = rit->impl_it->next; rit->expl_it = NULL; return ucl_object_iterate_safe (it, type); } } else { /* Just iterate over the implicit array */ + rit->flags = UCL_ITERATE_FLAG_IMPLICIT; ret = rit->impl_it; rit->impl_it = rit->impl_it->next; if (type & UCL_ITERATE_EXPLICIT) { /* We flatten objects if need to expand values */ if (ret->type == UCL_OBJECT || ret->type == UCL_ARRAY) { return ucl_object_iterate_safe (it, type); } } } return ret; } void ucl_object_iterate_free (ucl_object_iter_t it) { struct ucl_object_safe_iter *rit = UCL_SAFE_ITER (it); UCL_SAFE_ITER_CHECK (rit); if (rit->expl_it != NULL) { - UCL_FREE (sizeof (*rit->expl_it), rit->expl_it); + if (rit->flags == UCL_ITERATE_FLAG_INSIDE_OBJECT) { + UCL_FREE (sizeof (*rit->expl_it), rit->expl_it); + } } UCL_FREE (sizeof (*rit), it); } const ucl_object_t * ucl_object_lookup_path (const ucl_object_t *top, const char *path_in) { return ucl_object_lookup_path_char (top, path_in, '.'); } const ucl_object_t * ucl_object_lookup_path_char (const ucl_object_t *top, const char *path_in, const char sep) { const ucl_object_t *o = NULL, *found; const char *p, *c; char *err_str; unsigned index; if (path_in == NULL || top == NULL) { return NULL; } found = NULL; p = path_in; /* Skip leading dots */ while (*p == sep) { p ++; } c = p; while (*p != '\0') { p ++; if (*p == sep || *p == '\0') { if (p > c) { switch (top->type) { case UCL_ARRAY: /* Key should be an int */ index = strtoul (c, &err_str, 10); if (err_str != NULL && (*err_str != sep && *err_str != '\0')) { return NULL; } o = ucl_array_find_index (top, index); break; default: o = ucl_object_lookup_len (top, c, p - c); break; } if (o == NULL) { return NULL; } top = o; } if (*p != '\0') { c = p + 1; } } } found = o; return found; } ucl_object_t * ucl_object_new (void) { return ucl_object_typed_new (UCL_NULL); } ucl_object_t * ucl_object_typed_new (ucl_type_t type) { return ucl_object_new_full (type, 0); } ucl_object_t * ucl_object_new_full (ucl_type_t type, unsigned priority) { ucl_object_t *new; if (type != UCL_USERDATA) { new = UCL_ALLOC (sizeof (ucl_object_t)); if (new != NULL) { memset (new, 0, sizeof (ucl_object_t)); new->ref = 1; new->type = (type <= UCL_NULL ? type : UCL_NULL); new->next = NULL; new->prev = new; ucl_object_set_priority (new, priority); if (type == UCL_ARRAY) { new->value.av = UCL_ALLOC (sizeof (ucl_array_t)); if (new->value.av) { memset (new->value.av, 0, sizeof (ucl_array_t)); UCL_ARRAY_GET (vec, new); /* Preallocate some space for arrays */ - kv_resize (ucl_object_t *, *vec, 8); + kv_resize_safe (ucl_object_t *, *vec, 8, enomem); } } } } else { new = ucl_object_new_userdata (NULL, NULL, NULL); ucl_object_set_priority (new, priority); } - +enomem: return new; } +bool ucl_object_reserve (ucl_object_t *obj, size_t reserved) +{ + if (obj->type == UCL_ARRAY) { + UCL_ARRAY_GET (vec, obj); + + if (vec->m < reserved) { + /* Preallocate some space for arrays */ + kv_resize_safe (ucl_object_t *, *vec, reserved, e0); + } + } + else if (obj->type == UCL_OBJECT) { + ucl_hash_reserve (obj->value.ov, reserved); + } + return true; +e0: + return false; +} + ucl_object_t* ucl_object_new_userdata (ucl_userdata_dtor dtor, ucl_userdata_emitter emitter, void *ptr) { struct ucl_object_userdata *new; size_t nsize = sizeof (*new); new = UCL_ALLOC (nsize); if (new != NULL) { memset (new, 0, nsize); new->obj.ref = 1; new->obj.type = UCL_USERDATA; new->obj.next = NULL; new->obj.prev = (ucl_object_t *)new; new->dtor = dtor; new->emitter = emitter; new->obj.value.ud = ptr; } return (ucl_object_t *)new; } ucl_type_t ucl_object_type (const ucl_object_t *obj) { if (obj == NULL) { return UCL_NULL; } return obj->type; } ucl_object_t* ucl_object_fromstring (const char *str) { return ucl_object_fromstring_common (str, 0, UCL_STRING_ESCAPE); } ucl_object_t * ucl_object_fromlstring (const char *str, size_t len) { return ucl_object_fromstring_common (str, len, UCL_STRING_ESCAPE); } ucl_object_t * ucl_object_fromint (int64_t iv) { ucl_object_t *obj; obj = ucl_object_new (); if (obj != NULL) { obj->type = UCL_INT; obj->value.iv = iv; } return obj; } ucl_object_t * ucl_object_fromdouble (double dv) { ucl_object_t *obj; obj = ucl_object_new (); if (obj != NULL) { obj->type = UCL_FLOAT; obj->value.dv = dv; } return obj; } ucl_object_t* ucl_object_frombool (bool bv) { ucl_object_t *obj; obj = ucl_object_new (); if (obj != NULL) { obj->type = UCL_BOOLEAN; obj->value.iv = bv; } return obj; } bool ucl_array_append (ucl_object_t *top, ucl_object_t *elt) { UCL_ARRAY_GET (vec, top); if (elt == NULL || top == NULL) { return false; } if (vec == NULL) { vec = UCL_ALLOC (sizeof (*vec)); if (vec == NULL) { return false; } kv_init (*vec); top->value.av = (void *)vec; } - kv_push (ucl_object_t *, *vec, elt); + kv_push_safe (ucl_object_t *, *vec, elt, e0); top->len ++; return true; +e0: + return false; } bool ucl_array_prepend (ucl_object_t *top, ucl_object_t *elt) { UCL_ARRAY_GET (vec, top); if (elt == NULL || top == NULL) { return false; } if (vec == NULL) { vec = UCL_ALLOC (sizeof (*vec)); kv_init (*vec); top->value.av = (void *)vec; - kv_push (ucl_object_t *, *vec, elt); + kv_push_safe (ucl_object_t *, *vec, elt, e0); } else { /* Slow O(n) algorithm */ - kv_prepend (ucl_object_t *, *vec, elt); + kv_prepend_safe (ucl_object_t *, *vec, elt, e0); } top->len ++; return true; +e0: + return false; } bool ucl_array_merge (ucl_object_t *top, ucl_object_t *elt, bool copy) { unsigned i; ucl_object_t *cp = NULL; ucl_object_t **obj; if (elt == NULL || top == NULL || top->type != UCL_ARRAY || elt->type != UCL_ARRAY) { return false; } if (copy) { cp = ucl_object_copy (elt); } else { cp = ucl_object_ref (elt); } UCL_ARRAY_GET (v1, top); UCL_ARRAY_GET (v2, cp); if (v1 && v2) { - kv_concat (ucl_object_t *, *v1, *v2); + kv_concat_safe (ucl_object_t *, *v1, *v2, e0); for (i = v2->n; i < v1->n; i ++) { obj = &kv_A (*v1, i); if (*obj == NULL) { continue; } top->len ++; } } return true; +e0: + return false; } ucl_object_t * ucl_array_delete (ucl_object_t *top, ucl_object_t *elt) { UCL_ARRAY_GET (vec, top); ucl_object_t *ret = NULL; unsigned i; if (vec == NULL) { return NULL; } for (i = 0; i < vec->n; i ++) { if (kv_A (*vec, i) == elt) { kv_del (ucl_object_t *, *vec, i); ret = elt; top->len --; break; } } return ret; } const ucl_object_t * ucl_array_head (const ucl_object_t *top) { UCL_ARRAY_GET (vec, top); if (vec == NULL || top == NULL || top->type != UCL_ARRAY || top->value.av == NULL) { return NULL; } return (vec->n > 0 ? vec->a[0] : NULL); } const ucl_object_t * ucl_array_tail (const ucl_object_t *top) { UCL_ARRAY_GET (vec, top); if (top == NULL || top->type != UCL_ARRAY || top->value.av == NULL) { return NULL; } return (vec->n > 0 ? vec->a[vec->n - 1] : NULL); } ucl_object_t * ucl_array_pop_last (ucl_object_t *top) { UCL_ARRAY_GET (vec, top); ucl_object_t **obj, *ret = NULL; if (vec != NULL && vec->n > 0) { obj = &kv_A (*vec, vec->n - 1); ret = *obj; kv_del (ucl_object_t *, *vec, vec->n - 1); top->len --; } return ret; } ucl_object_t * ucl_array_pop_first (ucl_object_t *top) { UCL_ARRAY_GET (vec, top); ucl_object_t **obj, *ret = NULL; if (vec != NULL && vec->n > 0) { obj = &kv_A (*vec, 0); ret = *obj; kv_del (ucl_object_t *, *vec, 0); top->len --; } return ret; } +unsigned int +ucl_array_size (const ucl_object_t *top) +{ + if (top == NULL || top->type != UCL_ARRAY) { + return 0; + } + + UCL_ARRAY_GET (vec, top); + + if (vec != NULL) { + return kv_size(*vec); + } + + return 0; +} + const ucl_object_t * ucl_array_find_index (const ucl_object_t *top, unsigned int index) { UCL_ARRAY_GET (vec, top); if (vec != NULL && vec->n > 0 && index < vec->n) { return kv_A (*vec, index); } return NULL; } unsigned int ucl_array_index_of (ucl_object_t *top, ucl_object_t *elt) { UCL_ARRAY_GET (vec, top); unsigned i; if (vec == NULL) { return (unsigned int)(-1); } for (i = 0; i < vec->n; i ++) { if (kv_A (*vec, i) == elt) { return i; } } return (unsigned int)(-1); } ucl_object_t * ucl_array_replace_index (ucl_object_t *top, ucl_object_t *elt, unsigned int index) { UCL_ARRAY_GET (vec, top); ucl_object_t *ret = NULL; if (vec != NULL && vec->n > 0 && index < vec->n) { ret = kv_A (*vec, index); kv_A (*vec, index) = elt; } return ret; } ucl_object_t * ucl_elt_append (ucl_object_t *head, ucl_object_t *elt) { if (head == NULL) { elt->next = NULL; elt->prev = elt; head = elt; } else { elt->prev = head->prev; head->prev->next = elt; head->prev = elt; elt->next = NULL; } return head; } bool ucl_object_todouble_safe (const ucl_object_t *obj, double *target) { if (obj == NULL || target == NULL) { return false; } switch (obj->type) { case UCL_INT: - *target = obj->value.iv; /* Probaly could cause overflow */ + *target = obj->value.iv; /* Probably could cause overflow */ break; case UCL_FLOAT: case UCL_TIME: *target = obj->value.dv; break; default: return false; } return true; } double ucl_object_todouble (const ucl_object_t *obj) { double result = 0.; ucl_object_todouble_safe (obj, &result); return result; } bool ucl_object_toint_safe (const ucl_object_t *obj, int64_t *target) { if (obj == NULL || target == NULL) { return false; } switch (obj->type) { case UCL_INT: *target = obj->value.iv; break; case UCL_FLOAT: case UCL_TIME: - *target = obj->value.dv; /* Loosing of decimal points */ + *target = obj->value.dv; /* Losing of decimal points */ break; default: return false; } return true; } int64_t ucl_object_toint (const ucl_object_t *obj) { int64_t result = 0; ucl_object_toint_safe (obj, &result); return result; } bool ucl_object_toboolean_safe (const ucl_object_t *obj, bool *target) { if (obj == NULL || target == NULL) { return false; } switch (obj->type) { case UCL_BOOLEAN: *target = (obj->value.iv == true); break; default: return false; } return true; } bool ucl_object_toboolean (const ucl_object_t *obj) { bool result = false; ucl_object_toboolean_safe (obj, &result); return result; } bool ucl_object_tostring_safe (const ucl_object_t *obj, const char **target) { if (obj == NULL || target == NULL) { return false; } switch (obj->type) { case UCL_STRING: if (!(obj->flags & UCL_OBJECT_BINARY)) { *target = ucl_copy_value_trash (obj); } break; default: return false; } return true; } const char * ucl_object_tostring (const ucl_object_t *obj) { const char *result = NULL; ucl_object_tostring_safe (obj, &result); return result; } const char * ucl_object_tostring_forced (const ucl_object_t *obj) { /* TODO: For binary strings we might encode string here */ if (!(obj->flags & UCL_OBJECT_BINARY)) { return ucl_copy_value_trash (obj); } return NULL; } bool ucl_object_tolstring_safe (const ucl_object_t *obj, const char **target, size_t *tlen) { if (obj == NULL || target == NULL) { return false; } switch (obj->type) { case UCL_STRING: *target = obj->value.sv; if (tlen != NULL) { *tlen = obj->len; } break; default: return false; } return true; } const char * ucl_object_tolstring (const ucl_object_t *obj, size_t *tlen) { const char *result = NULL; ucl_object_tolstring_safe (obj, &result, tlen); return result; } const char * ucl_object_key (const ucl_object_t *obj) { return ucl_copy_key_trash (obj); } const char * ucl_object_keyl (const ucl_object_t *obj, size_t *len) { if (len == NULL || obj == NULL) { return NULL; } *len = obj->keylen; return obj->key; } ucl_object_t * ucl_object_ref (const ucl_object_t *obj) { ucl_object_t *res = NULL; if (obj != NULL) { if (obj->flags & UCL_OBJECT_EPHEMERAL) { /* * Use deep copy for ephemeral objects, note that its refcount * is NOT increased, since ephemeral objects does not need refcount * at all */ res = ucl_object_copy (obj); } else { res = __DECONST (ucl_object_t *, obj); #ifdef HAVE_ATOMIC_BUILTINS (void)__sync_add_and_fetch (&res->ref, 1); #else res->ref ++; #endif } } return res; } static ucl_object_t * ucl_object_copy_internal (const ucl_object_t *other, bool allow_array) { ucl_object_t *new; ucl_object_iter_t it = NULL; const ucl_object_t *cur; new = malloc (sizeof (*new)); if (new != NULL) { memcpy (new, other, sizeof (*new)); if (other->flags & UCL_OBJECT_EPHEMERAL) { /* Copied object is always non ephemeral */ new->flags &= ~UCL_OBJECT_EPHEMERAL; } new->ref = 1; /* Unlink from others */ new->next = NULL; new->prev = new; /* deep copy of values stored */ if (other->trash_stack[UCL_TRASH_KEY] != NULL) { new->trash_stack[UCL_TRASH_KEY] = strdup (other->trash_stack[UCL_TRASH_KEY]); if (other->key == (const char *)other->trash_stack[UCL_TRASH_KEY]) { new->key = new->trash_stack[UCL_TRASH_KEY]; } } if (other->trash_stack[UCL_TRASH_VALUE] != NULL) { new->trash_stack[UCL_TRASH_VALUE] = strdup (other->trash_stack[UCL_TRASH_VALUE]); if (new->type == UCL_STRING) { new->value.sv = new->trash_stack[UCL_TRASH_VALUE]; } } if (other->type == UCL_ARRAY || other->type == UCL_OBJECT) { /* reset old value */ memset (&new->value, 0, sizeof (new->value)); while ((cur = ucl_object_iterate (other, &it, true)) != NULL) { if (other->type == UCL_ARRAY) { ucl_array_append (new, ucl_object_copy_internal (cur, false)); } else { ucl_object_t *cp = ucl_object_copy_internal (cur, true); if (cp != NULL) { ucl_object_insert_key (new, cp, cp->key, cp->keylen, false); } } } } else if (allow_array && other->next != NULL) { LL_FOREACH (other->next, cur) { ucl_object_t *cp = ucl_object_copy_internal (cur, false); if (cp != NULL) { DL_APPEND (new, cp); } } } } return new; } ucl_object_t * ucl_object_copy (const ucl_object_t *other) { return ucl_object_copy_internal (other, true); } void ucl_object_unref (ucl_object_t *obj) { if (obj != NULL) { #ifdef HAVE_ATOMIC_BUILTINS unsigned int rc = __sync_sub_and_fetch (&obj->ref, 1); if (rc == 0) { #else if (--obj->ref == 0) { #endif ucl_object_free_internal (obj, true, ucl_object_dtor_unref); } } } int ucl_object_compare (const ucl_object_t *o1, const ucl_object_t *o2) { const ucl_object_t *it1, *it2; ucl_object_iter_t iter = NULL; int ret = 0; + // Must check for NULL or code will segfault + if ((o1 == NULL) || (o2 == NULL)) + { + // The only way this could be true is of both are NULL + return (o1 == NULL) && (o2 == NULL); + } + if (o1->type != o2->type) { return (o1->type) - (o2->type); } switch (o1->type) { case UCL_STRING: if (o1->len == o2->len && o1->len > 0) { ret = strcmp (ucl_object_tostring(o1), ucl_object_tostring(o2)); } else { ret = o1->len - o2->len; } break; case UCL_FLOAT: case UCL_INT: case UCL_TIME: ret = ucl_object_todouble (o1) - ucl_object_todouble (o2); break; case UCL_BOOLEAN: ret = ucl_object_toboolean (o1) - ucl_object_toboolean (o2); break; case UCL_ARRAY: if (o1->len == o2->len && o1->len > 0) { UCL_ARRAY_GET (vec1, o1); UCL_ARRAY_GET (vec2, o2); unsigned i; /* Compare all elements in both arrays */ for (i = 0; i < vec1->n; i ++) { it1 = kv_A (*vec1, i); it2 = kv_A (*vec2, i); if (it1 == NULL && it2 != NULL) { return -1; } else if (it2 == NULL && it1 != NULL) { return 1; } else if (it1 != NULL && it2 != NULL) { ret = ucl_object_compare (it1, it2); if (ret != 0) { break; } } } } else { ret = o1->len - o2->len; } break; case UCL_OBJECT: if (o1->len == o2->len && o1->len > 0) { while ((it1 = ucl_object_iterate (o1, &iter, true)) != NULL) { it2 = ucl_object_lookup (o2, ucl_object_key (it1)); if (it2 == NULL) { ret = 1; break; } ret = ucl_object_compare (it1, it2); if (ret != 0) { break; } } } else { ret = o1->len - o2->len; } break; default: ret = 0; break; } return ret; } int ucl_object_compare_qsort (const ucl_object_t **o1, const ucl_object_t **o2) { return ucl_object_compare (*o1, *o2); } void ucl_object_array_sort (ucl_object_t *ar, int (*cmp)(const ucl_object_t **o1, const ucl_object_t **o2)) { UCL_ARRAY_GET (vec, ar); if (cmp == NULL || ar == NULL || ar->type != UCL_ARRAY) { return; } qsort (vec->a, vec->n, sizeof (ucl_object_t *), (int (*)(const void *, const void *))cmp); } +void ucl_object_sort_keys (ucl_object_t *obj, + enum ucl_object_keys_sort_flags how) +{ + if (obj != NULL && obj->type == UCL_OBJECT) { + ucl_hash_sort (obj->value.ov, how); + } +} + #define PRIOBITS 4 unsigned int ucl_object_get_priority (const ucl_object_t *obj) { if (obj == NULL) { return 0; } return (obj->flags >> ((sizeof (obj->flags) * NBBY) - PRIOBITS)); } void ucl_object_set_priority (ucl_object_t *obj, unsigned int priority) { if (obj != NULL) { priority &= (0x1 << PRIOBITS) - 1; priority <<= ((sizeof (obj->flags) * NBBY) - PRIOBITS); priority |= obj->flags & ((1 << ((sizeof (obj->flags) * NBBY) - PRIOBITS)) - 1); obj->flags = priority; } } bool ucl_object_string_to_type (const char *input, ucl_type_t *res) { if (strcasecmp (input, "object") == 0) { *res = UCL_OBJECT; } else if (strcasecmp (input, "array") == 0) { *res = UCL_ARRAY; } else if (strcasecmp (input, "integer") == 0) { *res = UCL_INT; } else if (strcasecmp (input, "number") == 0) { *res = UCL_FLOAT; } else if (strcasecmp (input, "string") == 0) { *res = UCL_STRING; } else if (strcasecmp (input, "boolean") == 0) { *res = UCL_BOOLEAN; } else if (strcasecmp (input, "null") == 0) { *res = UCL_NULL; } else if (strcasecmp (input, "userdata") == 0) { *res = UCL_USERDATA; } else { return false; } return true; } const char * ucl_object_type_to_string (ucl_type_t type) { const char *res = "unknown"; switch (type) { case UCL_OBJECT: res = "object"; break; case UCL_ARRAY: res = "array"; break; case UCL_INT: res = "integer"; break; case UCL_FLOAT: case UCL_TIME: res = "number"; break; case UCL_STRING: res = "string"; break; case UCL_BOOLEAN: res = "boolean"; break; case UCL_USERDATA: res = "userdata"; break; case UCL_NULL: res = "null"; break; } return res; } const ucl_object_t * ucl_parser_get_comments (struct ucl_parser *parser) { if (parser && parser->comments) { return parser->comments; } return NULL; } const ucl_object_t * ucl_comments_find (const ucl_object_t *comments, const ucl_object_t *srch) { if (comments && srch) { return ucl_object_lookup_len (comments, (const char *)&srch, sizeof (void *)); } return NULL; } bool ucl_comments_move (ucl_object_t *comments, const ucl_object_t *from, const ucl_object_t *to) { const ucl_object_t *found; ucl_object_t *obj; if (comments && from && to) { found = ucl_object_lookup_len (comments, (const char *)&from, sizeof (void *)); if (found) { /* Replace key */ obj = ucl_object_ref (found); ucl_object_delete_keyl (comments, (const char *)&from, sizeof (void *)); ucl_object_insert_key (comments, obj, (const char *)&to, sizeof (void *), true); return true; } } return false; } void ucl_comments_add (ucl_object_t *comments, const ucl_object_t *obj, const char *comment) { if (comments && obj && comment) { ucl_object_insert_key (comments, ucl_object_fromstring (comment), (const char *)&obj, sizeof (void *), true); } } + +void +ucl_parser_set_include_tracer (struct ucl_parser *parser, + ucl_include_trace_func_t func, + void *user_data) +{ + parser->include_trace_func = func; + parser->include_trace_ud = user_data; +} + +const char * +ucl_parser_get_cur_file (struct ucl_parser *parser) +{ + return parser->cur_file; +} diff --git a/contrib/libucl/tests/basic.test b/contrib/libucl/tests/basic.test index 174cc8c3f0f1..4ef1a504b2ba 100755 --- a/contrib/libucl/tests/basic.test +++ b/contrib/libucl/tests/basic.test @@ -1,38 +1,38 @@ #!/bin/sh PROG=${TEST_BINARY_DIR}/test_basic for _tin in ${TEST_DIR}/basic/*.in ; do _t=`echo $_tin | sed -e 's/.in$//'` _out=${TEST_OUT_DIR}/basic.out $PROG $_t.in $_out if [ $? -ne 0 ] ; then echo "Test: $_t failed, output:" cat $_out rm $_out exit 1 fi if [ -f $_t.res ] ; then diff -s $_out $_t.res -u 2>/dev/null if [ $? -ne 0 ] ; then rm $_out - echo "Test: $_t output missmatch" + echo "Test: $_t output mismatch" exit 1 fi fi rm $_out # Use FD interface $PROG -f $_t.in > /dev/null # JSON output $PROG -j $_t.in > /dev/null $PROG -c -j $_t.in > /dev/null # YAML output $PROG -y $_t.in > /dev/null # Save comments mode $PROG -C $_t.in > /dev/null # Save macro mode $PROG -M $_t.in > /dev/null $PROG -M -C $_t.in > /dev/null done diff --git a/contrib/libucl/tests/basic/13.in b/contrib/libucl/tests/basic/13.in index 6e31e9c4b17f..7c464996d404 100644 --- a/contrib/libucl/tests/basic/13.in +++ b/contrib/libucl/tests/basic/13.in @@ -1,9 +1,9 @@ key = value_orig; # test glob .include(glob=true,something="test") "${CURDIR}/include_dir/test*.conf" .include(priority=1) "${CURDIR}/include_dir/pri1.conf" .include(priority=2) "${CURDIR}/include_dir/pri2.conf" -.include(try=true) "${CURDIR}/include_dir/invalid.conf" +# No longer valid! .include(try=true) "${CURDIR}/include_dir/invalid.conf" diff --git a/contrib/libucl/tests/basic/20.in b/contrib/libucl/tests/basic/20.in deleted file mode 100644 index f9d4088fc20c..000000000000 --- a/contrib/libucl/tests/basic/20.in +++ /dev/null @@ -1,2 +0,0 @@ -# issue 112 -[[0 \ No newline at end of file diff --git a/contrib/libucl/tests/basic/20.res b/contrib/libucl/tests/basic/20.res deleted file mode 100644 index abfbbf02cfe6..000000000000 --- a/contrib/libucl/tests/basic/20.res +++ /dev/null @@ -1,5 +0,0 @@ -[ - [ - 0, - ] -] diff --git a/contrib/libucl/tests/basic/21.in b/contrib/libucl/tests/basic/21.in deleted file mode 100644 index 8f4b328548bb..000000000000 --- a/contrib/libucl/tests/basic/21.in +++ /dev/null @@ -1,2 +0,0 @@ - [9 -{0 [[0 \ No newline at end of file diff --git a/contrib/libucl/tests/basic/21.res b/contrib/libucl/tests/basic/21.res deleted file mode 100644 index db091ce39354..000000000000 --- a/contrib/libucl/tests/basic/21.res +++ /dev/null @@ -1,10 +0,0 @@ -[ - 9, - { - 0 [ - [ - 0, - ] - ] - } -] diff --git a/contrib/libucl/tests/basic/9.in b/contrib/libucl/tests/basic/9.in index 2341445edbf0..630ee9a15d75 100644 --- a/contrib/libucl/tests/basic/9.in +++ b/contrib/libucl/tests/basic/9.in @@ -1,23 +1,23 @@ .include "$CURDIR/9.inc" .include "$CURDIR/9-comment.inc" #.include "$CURDIR/9.inc" .include "$CURDIR/9.inc" key = value; .include "$CURDIR/9.inc" #.try_include "$CURDIR/9.incorrect.inc" # 9.incorrect.inc contains '{}}' #key = value; prefix1 = { key = value } array = [10] array1 = [10] .include(prefix=true; key="prefix") "$CURDIR/9.inc" .include(prefix=true; key="prefix2"; target="array"; glob=true) "$CURDIR/9.inc" +.include(prefix=true; key="prefix3"; target="array"; glob=true) "$CURDIR/9.inc" .include(prefix=true; key="prefix1"; target="array"; glob=true) "$CURDIR/9.inc" .include(prefix=true; key="array"; target="array"; glob=true) "$CURDIR/9.inc" -.include(prefix=true; key="array1"; glob=true) "$CURDIR/9.inc" .include(prefix=true; key="prefix"; glob=true) "$CURDIR/9.inc" .try_include "/non/existent" diff --git a/contrib/libucl/tests/basic/9.res b/contrib/libucl/tests/basic/9.res index 0ed36e84422a..a4eccc8692b4 100644 --- a/contrib/libucl/tests/basic/9.res +++ b/contrib/libucl/tests/basic/9.res @@ -1,34 +1,36 @@ key1 = "value"; key1 = "value"; key1 = "value"; key = "value"; prefix1 [ { key = "value"; } { key1 = "value"; } ] array [ 10, { key1 = "value"; } ] array1 [ 10, - { - key1 = "value"; - } ] prefix { key1 = "value"; key1 = "value"; } prefix2 [ { key1 = "value"; } ] +prefix3 [ + { + key1 = "value"; + } +] diff --git a/contrib/libucl/tests/basic/squote.in b/contrib/libucl/tests/basic/squote.in new file mode 100644 index 000000000000..2ee9d25d8122 --- /dev/null +++ b/contrib/libucl/tests/basic/squote.in @@ -0,0 +1,8 @@ +a = 'b'; +b = 'b\n\'a' +c = '' +d = '\ +aaa'; +e = '"'; +f = '\0\e\\\\\\\\\ +\''; diff --git a/contrib/libucl/tests/basic/squote.res b/contrib/libucl/tests/basic/squote.res new file mode 100644 index 000000000000..a595269567bd --- /dev/null +++ b/contrib/libucl/tests/basic/squote.res @@ -0,0 +1,7 @@ +a = 'b'; +b = 'b\n\'a'; +c = ''; +d = 'aaa'; +e = '"'; +f = '\0\e\\\\\\\\\''; + diff --git a/contrib/libucl/tests/fuzzers/ucl_add_string_fuzzer.c b/contrib/libucl/tests/fuzzers/ucl_add_string_fuzzer.c new file mode 100644 index 000000000000..388ce5dffebb --- /dev/null +++ b/contrib/libucl/tests/fuzzers/ucl_add_string_fuzzer.c @@ -0,0 +1,25 @@ +#include +#include +#include +#include "ucl.h" + +int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { + // If size is 0 we need a null-terminated string. + // We dont null-terminate the string and by the design + // of the API passing 0 as size with non null-terminated string + // gives undefined behavior. + if(size==0){ + return 0; + } + struct ucl_parser *parser; + parser = ucl_parser_new(0); + + ucl_parser_add_string(parser, (char *)data, size); + + if (ucl_parser_get_error(parser) != NULL) { + return 0; + } + + ucl_parser_free (parser); + return 0; +} diff --git a/contrib/libucl/tests/fuzzers/ucl_msgpack_fuzzer.c b/contrib/libucl/tests/fuzzers/ucl_msgpack_fuzzer.c new file mode 100644 index 000000000000..6989ec0e4375 --- /dev/null +++ b/contrib/libucl/tests/fuzzers/ucl_msgpack_fuzzer.c @@ -0,0 +1,29 @@ +#include +#include +#include +#include "ucl.h" +#include "ucl_internal.h" +#include + +typedef ucl_object_t* (*ucl_msgpack_test)(void); + + +int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { + + if(size<3){ + return 0; + } + + struct ucl_parser *parser; + + ucl_object_t *obj = ucl_object_new_full (UCL_OBJECT, 2); + obj->type = UCL_OBJECT; + + parser = ucl_parser_new(UCL_PARSER_KEY_LOWERCASE); + parser->stack = NULL; + + bool res = ucl_parser_add_chunk_full(parser, (const unsigned char*)data, size, 0, UCL_DUPLICATE_APPEND, UCL_PARSE_MSGPACK); + + ucl_parser_free (parser); + return 0; +} diff --git a/contrib/libucl/tests/generate.test b/contrib/libucl/tests/generate.test index ed237a35b017..ee4b6e427bf2 100755 --- a/contrib/libucl/tests/generate.test +++ b/contrib/libucl/tests/generate.test @@ -1,13 +1,13 @@ #!/bin/sh PROG=${TEST_BINARY_DIR}/test_generate $PROG ${TEST_OUT_DIR}/generate.out diff -s ${TEST_OUT_DIR}/generate.out ${TEST_DIR}/generate.res -u 2>/dev/null if [ $? -ne 0 ] ; then rm ${TEST_OUT_DIR}/generate.out - echo "Test: generate.res output missmatch" + echo "Test: generate.res output mismatch" exit 1 fi rm ${TEST_OUT_DIR}/generate.out diff --git a/contrib/libucl/tests/run_tests.sh b/contrib/libucl/tests/run_tests.sh index bc26160d8059..f04f459e015b 100755 --- a/contrib/libucl/tests/run_tests.sh +++ b/contrib/libucl/tests/run_tests.sh @@ -1,67 +1,67 @@ #!/bin/sh if [ $# -lt 1 ] ; then echo 'Specify binary to run as the first argument' exit 1 fi for _tin in ${TEST_DIR}/*.in ; do _t=`echo $_tin | sed -e 's/.in$//'` $1 $_t.in $_t.out if [ $? -ne 0 ] ; then echo "Test: $_t failed, output:" cat $_t.out rm $_t.out exit 1 fi if [ -f $_t.res ] ; then diff -s $_t.out $_t.res -u 2>/dev/null if [ $? -ne 0 ] ; then rm $_t.out - echo "Test: $_t output missmatch" + echo "Test: $_t output mismatch" exit 1 fi fi rm $_t.out done if [ $# -gt 2 ] ; then $3 ${TEST_DIR}/generate.out diff -s ${TEST_DIR}/generate.out ${TEST_DIR}/generate.res -u 2>/dev/null if [ $? -ne 0 ] ; then rm ${TEST_DIR}/generate.out - echo "Test: generate.res output missmatch" + echo "Test: generate.res output mismatch" exit 1 fi rm ${TEST_DIR}/generate.out fi if [ $# -gt 3 ] ; then rm /tmp/_ucl_test_schema.out ||true for i in ${TEST_DIR}/schema/*.json ; do _name=`basename $i` printf "running schema test suite $_name... " cat $i | $4 >> /tmp/_ucl_test_schema.out && ( echo "OK" ) || ( echo "Fail" ) done fi sh -c "xz -c < /dev/null > /dev/null" if [ $? -eq 0 -a $# -gt 1 ] ; then echo 'Running speed tests' for _tin in ${TEST_DIR}/*.xz ; do echo "Unpacking $_tin..." xz -cd < $_tin > ${TEST_DIR}/test_file # Preread file to cheat benchmark! cat ${TEST_DIR}/test_file > /dev/null echo "Starting benchmarking for $_tin..." $2 ${TEST_DIR}/test_file if [ $? -ne 0 ] ; then echo "Test: $_tin failed" rm ${TEST_DIR}/test_file exit 1 fi rm ${TEST_DIR}/test_file done fi diff --git a/contrib/libucl/tests/streamline.test b/contrib/libucl/tests/streamline.test index dbe583622fca..11324da316b7 100755 --- a/contrib/libucl/tests/streamline.test +++ b/contrib/libucl/tests/streamline.test @@ -1,12 +1,12 @@ #!/bin/sh PROG=${TEST_BINARY_DIR}/test_streamline $PROG ${TEST_OUT_DIR}/streamline.out diff -s ${TEST_OUT_DIR}/streamline.out ${TEST_DIR}/streamline.res -u 2>/dev/null if [ $? -ne 0 ] ; then rm ${TEST_OUT_DIR}/streamline.out - echo "Test: streamline.res output missmatch" + echo "Test: streamline.res output mismatch" exit 1 fi rm ${TEST_OUT_DIR}/streamline.out \ No newline at end of file diff --git a/contrib/libucl/tests/test_basic.c b/contrib/libucl/tests/test_basic.c index b7acc73b4a69..d199b031471c 100644 --- a/contrib/libucl/tests/test_basic.c +++ b/contrib/libucl/tests/test_basic.c @@ -1,298 +1,303 @@ /* Copyright (c) 2013, Vsevolod Stakhov * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED ''AS IS'' AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL AUTHOR BE LIABLE FOR ANY * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "ucl.h" #include "ucl_internal.h" #include #include #include int main (int argc, char **argv) { char *inbuf = NULL; struct ucl_parser *parser = NULL, *parser2 = NULL; ucl_object_t *obj, *comments = NULL; ssize_t bufsize, r; FILE *in, *out; unsigned char *emitted = NULL; const char *fname_in = NULL, *fname_out = NULL; int ret = 0, opt, json = 0, compact = 0, yaml = 0, save_comments = 0, skip_macro = 0, - flags, fd_out, fd_in, use_fd = 0; + flags, fd_out, fd_in, use_fd = 0, msgpack_input = 0; struct ucl_emitter_functions *func; - while ((opt = getopt(argc, argv, "fjcyCM")) != -1) { + while ((opt = getopt(argc, argv, "fjcyCMm")) != -1) { switch (opt) { case 'j': json = 1; break; case 'c': compact = 1; break; case 'C': save_comments = 1; break; case 'y': yaml = 1; break; case 'M': skip_macro = true; break; + case 'm': + msgpack_input = 1; + break; case 'f': use_fd = true; break; default: /* '?' */ fprintf (stderr, "Usage: %s [-jcy] [-CM] [-f] [in] [out]\n", argv[0]); exit (EXIT_FAILURE); } } argc -= optind; argv += optind; switch (argc) { case 1: fname_in = argv[0]; break; case 2: fname_in = argv[0]; fname_out = argv[1]; break; } if (!use_fd) { if (fname_in != NULL) { in = fopen (fname_in, "r"); if (in == NULL) { exit (-errno); } } else { in = stdin; } } else { if (fname_in != NULL) { fd_in = open (fname_in, O_RDONLY); if (fd_in == -1) { exit (-errno); } } else { fd_in = STDIN_FILENO; } } flags = UCL_PARSER_KEY_LOWERCASE; if (save_comments) { flags |= UCL_PARSER_SAVE_COMMENTS; } if (skip_macro) { flags |= UCL_PARSER_DISABLE_MACRO; } parser = ucl_parser_new (flags); ucl_parser_register_variable (parser, "ABI", "unknown"); if (fname_in != NULL) { ucl_parser_set_filevars (parser, fname_in, true); } if (!use_fd) { inbuf = malloc (BUFSIZ); bufsize = BUFSIZ; r = 0; while (!feof (in) && !ferror (in)) { if (r == bufsize) { inbuf = realloc (inbuf, bufsize * 2); bufsize *= 2; if (inbuf == NULL) { perror ("realloc"); exit (EXIT_FAILURE); } } r += fread (inbuf + r, 1, bufsize - r, in); } if (ferror (in)) { fprintf (stderr, "Failed to read the input file.\n"); exit (EXIT_FAILURE); } - ucl_parser_add_chunk (parser, (const unsigned char *)inbuf, r); + ucl_parser_add_chunk_full (parser, (const unsigned char *)inbuf, r, + 0, UCL_DUPLICATE_APPEND, + msgpack_input ? UCL_PARSE_MSGPACK : UCL_PARSE_UCL); fclose (in); } else { ucl_parser_add_fd (parser, fd_in); close (fd_in); } if (!use_fd) { if (fname_out != NULL) { out = fopen (fname_out, "w"); if (out == NULL) { exit (-errno); } } else { out = stdout; } } else { if (fname_out != NULL) { fd_out = open (fname_out, O_WRONLY | O_CREAT, 00644); if (fd_out == -1) { exit (-errno); } } else { fd_out = STDOUT_FILENO; } } if (ucl_parser_get_error (parser) != NULL) { fprintf (out, "Error occurred (phase 1): %s\n", ucl_parser_get_error(parser)); ret = 1; goto end; } obj = ucl_parser_get_object (parser); if (save_comments) { comments = ucl_object_ref (ucl_parser_get_comments (parser)); } if (json) { if (compact) { emitted = ucl_object_emit (obj, UCL_EMIT_JSON_COMPACT); } else { emitted = ucl_object_emit (obj, UCL_EMIT_JSON); } } else if (yaml) { emitted = ucl_object_emit (obj, UCL_EMIT_YAML); } else { emitted = NULL; func = ucl_object_emit_memory_funcs ((void **)&emitted); if (func != NULL) { ucl_object_emit_full (obj, UCL_EMIT_CONFIG, func, comments); ucl_object_emit_funcs_free (func); } } #if 0 fprintf (out, "%s\n****\n", emitted); #endif ucl_parser_free (parser); ucl_object_unref (obj); parser2 = ucl_parser_new (flags); ucl_parser_add_string (parser2, (const char *)emitted, 0); if (ucl_parser_get_error(parser2) != NULL) { fprintf (out, "Error occurred (phase 2): %s\n", ucl_parser_get_error(parser2)); fprintf (out, "%s\n", emitted); ret = 1; goto end; } if (emitted != NULL) { free (emitted); } if (comments) { ucl_object_unref (comments); comments = NULL; } if (save_comments) { comments = ucl_object_ref (ucl_parser_get_comments (parser2)); } obj = ucl_parser_get_object (parser2); if (!use_fd) { func = ucl_object_emit_file_funcs (out); } else { func = ucl_object_emit_fd_funcs (fd_out); } if (func != NULL) { if (json) { if (compact) { ucl_object_emit_full (obj, UCL_EMIT_JSON_COMPACT, func, comments); } else { ucl_object_emit_full (obj, UCL_EMIT_JSON, func, comments); } } else if (yaml) { ucl_object_emit_full (obj, UCL_EMIT_YAML, func, comments); } else { ucl_object_emit_full (obj, UCL_EMIT_CONFIG, func, comments); } ucl_object_emit_funcs_free (func); } if (!use_fd) { fprintf (out, "\n"); fclose (out); } else { write (fd_out, "\n", 1); close (fd_out); } ucl_object_unref (obj); end: if (parser2 != NULL) { ucl_parser_free (parser2); } if (comments) { ucl_object_unref (comments); } if (inbuf != NULL) { free (inbuf); } return ret; } diff --git a/contrib/libucl/tests/test_generate.c b/contrib/libucl/tests/test_generate.c index a8dc2fafc2bb..302a733441cd 100644 --- a/contrib/libucl/tests/test_generate.c +++ b/contrib/libucl/tests/test_generate.c @@ -1,308 +1,317 @@ /* Copyright (c) 2013, Vsevolod Stakhov * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED ''AS IS'' AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL AUTHOR BE LIABLE FOR ANY * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include #include #include #include "ucl.h" static void ud_dtor (void *ptr) { assert (ptr == NULL); } static const char * ud_emit (void *ptr) { return "test userdata emit"; } int main (int argc, char **argv) { ucl_object_t *obj, *cur, *ar, *ar1, *ref, *test_obj, *comments; ucl_object_iter_t it; const ucl_object_t *found, *it_obj, *test; struct ucl_emitter_functions *fn; FILE *out; unsigned char *emitted; const char *fname_out = NULL; struct ucl_parser *parser; int ret = 0; switch (argc) { case 2: fname_out = argv[1]; break; } if (fname_out != NULL) { out = fopen (fname_out, "w"); if (out == NULL) { exit (-errno); } } else { out = stdout; } obj = ucl_object_typed_new (UCL_OBJECT); /* Keys replacing */ cur = ucl_object_fromstring_common ("value1", 0, UCL_STRING_TRIM); ucl_object_insert_key (obj, cur, "key0", 0, false); cur = ucl_object_fromdouble (0.1); assert (ucl_object_replace_key (obj, cur, "key0", 0, false)); /* Create some strings */ cur = ucl_object_fromstring_common (" test string ", 0, UCL_STRING_TRIM); ucl_object_insert_key (obj, cur, "key1", 0, false); cur = ucl_object_fromstring_common (" test \nstring\n\r\n\b\t\f\\\" ", 0, UCL_STRING_TRIM | UCL_STRING_ESCAPE); ucl_object_insert_key (obj, cur, "key2", 0, false); cur = ucl_object_fromstring_common (" test string \n", 0, 0); ucl_object_insert_key (obj, cur, "key3", 0, false); /* Array of numbers */ ar = ucl_object_typed_new (UCL_ARRAY); cur = ucl_object_fromint (10); ucl_array_append (ar, cur); assert (ucl_array_index_of (ar, cur) == 0); cur = ucl_object_fromdouble (10.1); ucl_array_append (ar, cur); assert (ucl_array_index_of (ar, cur) == 1); cur = ucl_object_fromdouble (9.999); ucl_array_prepend (ar, cur); assert (ucl_array_index_of (ar, cur) == 0); ar1 = ucl_object_copy (ar); cur = ucl_object_fromstring ("abc"); ucl_array_prepend (ar1, cur); cur = ucl_object_fromstring ("cde"); ucl_array_prepend (ar1, cur); cur = ucl_object_fromstring ("абв"); /* UTF8 */ ucl_array_prepend (ar1, cur); cur = ucl_object_fromstring ("Ебв"); /* UTF8 */ ucl_array_prepend (ar1, cur); /* - * This is ususally broken or fragile as utf collate is far from perfect + * This is usually broken or fragile as utf collate is far from perfect cur = ucl_object_fromstring ("ёбв"); ucl_array_prepend (ar1, cur); cur = ucl_object_fromstring ("Ёбв"); // hello to @bapt ucl_array_prepend (ar1, cur); */ cur = ucl_object_fromstring ("😎"); /* everybody likes emoji in the code */ ucl_array_prepend (ar1, cur); ucl_object_array_sort (ar1, ucl_object_compare_qsort); /* Removing from an array */ cur = ucl_object_fromdouble (1.0); ucl_array_append (ar, cur); cur = ucl_array_delete (ar, cur); assert (ucl_object_todouble (cur) == 1.0); ucl_object_unref (cur); cur = ucl_object_fromdouble (2.0); ucl_array_append (ar, cur); cur = ucl_array_pop_last (ar); assert (ucl_object_todouble (cur) == 2.0); ucl_object_unref (cur); cur = ucl_object_fromdouble (3.0); ucl_array_prepend (ar, cur); cur = ucl_array_pop_first (ar); assert (ucl_object_todouble (cur) == 3.0); ucl_object_unref (cur); ucl_object_insert_key (obj, ar, "key4", 0, false); cur = ucl_object_frombool (true); /* Ref object to test refcounts */ ref = ucl_object_ref (cur); ucl_object_insert_key (obj, cur, "key4", 0, false); /* Empty strings */ cur = ucl_object_fromstring_common (" ", 0, UCL_STRING_TRIM); ucl_object_insert_key (obj, cur, "key5", 0, false); cur = ucl_object_fromstring_common ("", 0, UCL_STRING_ESCAPE); ucl_object_insert_key (obj, cur, "key6", 0, false); cur = ucl_object_fromstring_common (" \n", 0, UCL_STRING_ESCAPE); ucl_object_insert_key (obj, cur, "key7", 0, false); /* Numbers and booleans */ cur = ucl_object_fromstring_common ("1mb", 0, UCL_STRING_ESCAPE | UCL_STRING_PARSE); ucl_object_insert_key (obj, cur, "key8", 0, false); cur = ucl_object_fromstring_common ("3.14", 0, UCL_STRING_PARSE); ucl_object_insert_key (obj, cur, "key9", 0, false); cur = ucl_object_fromstring_common ("true", 0, UCL_STRING_PARSE); ucl_object_insert_key (obj, cur, "key10", 0, false); cur = ucl_object_fromstring_common (" off ", 0, UCL_STRING_PARSE | UCL_STRING_TRIM); ucl_object_insert_key (obj, cur, "key11", 0, false); cur = ucl_object_fromstring_common ("gslin@gslin.org", 0, UCL_STRING_PARSE_INT); ucl_object_insert_key (obj, cur, "key12", 0, false); cur = ucl_object_fromstring_common ("#test", 0, UCL_STRING_PARSE_INT); ucl_object_insert_key (obj, cur, "key13", 0, false); cur = ucl_object_frombool (true); ucl_object_insert_key (obj, cur, "k=3", 0, false); ucl_object_insert_key (obj, ar1, "key14", 0, false); cur = ucl_object_new_userdata (ud_dtor, ud_emit, NULL); ucl_object_insert_key (obj, cur, "key15", 0, false); /* More tests for keys */ cur = ucl_object_fromlstring ("test", 3); ucl_object_insert_key (obj, cur, "key16", 0, false); test = ucl_object_lookup_any (obj, "key100", "key200", "key300", "key16", NULL); assert (test == cur); test = ucl_object_lookup_len (obj, "key160", 5); assert (test == cur); cur = ucl_object_pop_key (obj, "key16"); assert (test == cur); test = ucl_object_pop_key (obj, "key16"); assert (test == NULL); test = ucl_object_lookup_len (obj, "key160", 5); assert (test == NULL); /* Objects merging tests */ test_obj = ucl_object_new_full (UCL_OBJECT, 2); ucl_object_insert_key (test_obj, cur, "key16", 0, true); ucl_object_merge (obj, test_obj, true); ucl_object_unref (test_obj); /* Array merging test */ test_obj = ucl_object_new_full (UCL_ARRAY, 3); ucl_array_append (test_obj, ucl_object_fromstring ("test")); ucl_array_merge (test_obj, ar1, false); ucl_object_insert_key (obj, test_obj, "key17", 0, true); /* Object deletion */ cur = ucl_object_fromstring ("test"); ucl_object_insert_key (obj, cur, "key18", 0, true); assert (ucl_object_delete_key (obj, "key18")); assert (!ucl_object_delete_key (obj, "key18")); cur = ucl_object_fromlstring ("test", 4); ucl_object_insert_key (obj, cur, "key18\0\0", 7, true); assert (ucl_object_lookup_len (obj, "key18\0\0", 7) == cur); assert (ucl_object_lookup (obj, "key18") == NULL); assert (ucl_object_lookup_len (obj, "key18\0\1", 7) == NULL); assert (ucl_object_delete_keyl (obj, "key18\0\0", 7)); /* Comments */ comments = ucl_object_typed_new (UCL_OBJECT); found = ucl_object_lookup (obj, "key17"); test = ucl_object_lookup (obj, "key16"); ucl_comments_add (comments, found, "# test comment"); assert (ucl_comments_find (comments, found) != NULL); assert (ucl_comments_find (comments, test) == NULL); ucl_comments_move (comments, found, test); assert (ucl_comments_find (comments, found) == NULL); assert (ucl_comments_find (comments, test) != NULL); /* Array replace */ ar1 = ucl_object_typed_new (UCL_ARRAY); cur = ucl_object_fromstring ("test"); cur = ucl_elt_append (cur, ucl_object_fromstring ("test1")); ucl_array_append (ar1, cur); test = ucl_array_replace_index (ar1, ucl_object_fromstring ("test2"), 0); assert (test == cur); /* Try to find using path */ /* Should exist */ found = ucl_object_lookup_path (obj, "key4.1"); assert (found != NULL && ucl_object_toint (found) == 10); /* . should be ignored */ found = ucl_object_lookup_path (obj, ".key4.1"); assert (found != NULL && ucl_object_toint (found) == 10); /* moar dots... */ found = ucl_object_lookup_path (obj, ".key4........1..."); assert (found != NULL && ucl_object_toint (found) == 10); /* No such index */ found = ucl_object_lookup_path (obj, ".key4.3"); assert (found == NULL); /* No such key */ found = ucl_object_lookup_path (obj, "key9..key1"); assert (found == NULL); /* Test iteration */ it = ucl_object_iterate_new (obj); it_obj = ucl_object_iterate_safe (it, true); + assert (!ucl_object_iter_chk_excpn (it)); /* key0 = 0.1 */ assert (ucl_object_type (it_obj) == UCL_FLOAT); it_obj = ucl_object_iterate_safe (it, true); + assert (!ucl_object_iter_chk_excpn (it)); /* key1 = "" */ assert (ucl_object_type (it_obj) == UCL_STRING); it_obj = ucl_object_iterate_safe (it, true); + assert (!ucl_object_iter_chk_excpn (it)); /* key2 = "" */ assert (ucl_object_type (it_obj) == UCL_STRING); it_obj = ucl_object_iterate_safe (it, true); + assert (!ucl_object_iter_chk_excpn (it)); /* key3 = "" */ assert (ucl_object_type (it_obj) == UCL_STRING); it_obj = ucl_object_iterate_safe (it, true); + assert (!ucl_object_iter_chk_excpn (it)); /* key4 = ([float, int, float], boolean) */ ucl_object_iterate_reset (it, it_obj); it_obj = ucl_object_iterate_safe (it, true); + assert (!ucl_object_iter_chk_excpn (it)); assert (ucl_object_type (it_obj) == UCL_FLOAT); it_obj = ucl_object_iterate_safe (it, true); + assert (!ucl_object_iter_chk_excpn (it)); assert (ucl_object_type (it_obj) == UCL_INT); it_obj = ucl_object_iterate_safe (it, true); + assert (!ucl_object_iter_chk_excpn (it)); assert (ucl_object_type (it_obj) == UCL_FLOAT); it_obj = ucl_object_iterate_safe (it, true); + assert (!ucl_object_iter_chk_excpn (it)); assert (ucl_object_type (it_obj) == UCL_BOOLEAN); ucl_object_iterate_free (it); - fn = ucl_object_emit_memory_funcs (&emitted); + fn = ucl_object_emit_memory_funcs ((void **)&emitted); assert (ucl_object_emit_full (obj, UCL_EMIT_CONFIG, fn, comments)); fprintf (out, "%s\n", emitted); ucl_object_emit_funcs_free (fn); ucl_object_unref (obj); ucl_object_unref (comments); parser = ucl_parser_new (UCL_PARSER_NO_IMPLICIT_ARRAYS); if (ucl_parser_add_chunk_full (parser, emitted, strlen (emitted), 3, UCL_DUPLICATE_ERROR, UCL_PARSE_UCL)) { /* Should fail due to duplicate */ assert (0); } else { assert (ucl_parser_get_error (parser) != NULL); ucl_parser_clear_error (parser); ucl_parser_free (parser); parser = ucl_parser_new (0); ucl_parser_add_chunk_full (parser, emitted, strlen (emitted), 3, UCL_DUPLICATE_MERGE, UCL_PARSE_UCL); } assert (ucl_parser_get_column (parser) == 0); assert (ucl_parser_get_linenum (parser) != 0); ucl_parser_clear_error (parser); assert (ucl_parser_get_error_code (parser) == 0); obj = ucl_parser_get_object (parser); ucl_parser_free (parser); - ucl_object_free (obj); + ucl_object_unref (obj); if (emitted != NULL) { free (emitted); } fclose (out); /* Ref should still be accessible */ ref->value.iv = 100500; ucl_object_unref (ref); return ret; } diff --git a/contrib/libucl/tests/test_msgpack.c b/contrib/libucl/tests/test_msgpack.c index 00f804a0a07e..5415c912d33d 100644 --- a/contrib/libucl/tests/test_msgpack.c +++ b/contrib/libucl/tests/test_msgpack.c @@ -1,467 +1,468 @@ /* * Copyright (c) 2015, Vsevolod Stakhov * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY AUTHOR ''AS IS'' AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL AUTHOR BE LIABLE FOR ANY * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "ucl.h" #include "ucl_internal.h" #include static const int niter = 20; static const int ntests = 10; static const int nelt = 20; static int recursion = 0; typedef ucl_object_t* (*ucl_msgpack_test)(void); static ucl_object_t* ucl_test_integer (void); static ucl_object_t* ucl_test_string (void); static ucl_object_t* ucl_test_boolean (void); static ucl_object_t* ucl_test_map (void); static ucl_object_t* ucl_test_array (void); static ucl_object_t* ucl_test_large_map (void); static ucl_object_t* ucl_test_large_array (void); static ucl_object_t* ucl_test_large_string (void); static ucl_object_t* ucl_test_null (void); ucl_msgpack_test tests[] = { ucl_test_integer, ucl_test_string, ucl_test_boolean, ucl_test_map, ucl_test_array, ucl_test_null }; #define NTESTS (sizeof(tests) / sizeof(tests[0])) typedef struct { uint64_t state; uint64_t inc; } pcg32_random_t; pcg32_random_t rng; /* * From http://www.pcg-random.org/ */ static uint32_t pcg32_random (void) { uint64_t oldstate = rng.state; rng.state = oldstate * 6364136223846793005ULL + (rng.inc | 1); uint32_t xorshifted = ((oldstate >> 18u) ^ oldstate) >> 27u; uint32_t rot = oldstate >> 59u; return (xorshifted >> rot) | (xorshifted << ((-rot) & 31)); } static const char * random_key (size_t *lenptr) { static char keybuf[512]; int keylen, i; char c; keylen = pcg32_random () % (sizeof (keybuf) - 1) + 1; for (i = 0; i < keylen; i ++) { do { c = pcg32_random () & 0xFF; } while (!isgraph (c)); keybuf[i] = c; } *lenptr = keylen; return keybuf; } int main (int argc, char **argv) { int fd, i, j; uint32_t sel; ucl_object_t *obj, *elt; struct ucl_parser *parser; size_t klen, elen, elen2; const char *key; unsigned char *emitted, *emitted2; FILE *out; const char *fname_out = NULL; switch (argc) { case 2: fname_out = argv[1]; break; } /* Seed prng */ fd = open ("/dev/urandom", O_RDONLY); assert (fd != -1); assert (read (fd, &rng, sizeof (rng)) == sizeof (rng)); close (fd); for (i = 0; i < niter; i ++) { if (fname_out != NULL) { out = fopen (fname_out, "w"); if (out == NULL) { exit (-errno); } } else { out = NULL; } /* Generate phase */ obj = ucl_object_typed_new (UCL_OBJECT); for (j = 0; j < ntests; j ++) { sel = pcg32_random () % NTESTS; key = random_key (&klen); recursion = 0; elt = tests[sel](); assert (elt != NULL); assert (klen != 0); ucl_object_insert_key (obj, elt, key, klen, true); } key = random_key (&klen); elt = ucl_test_large_array (); ucl_object_insert_key (obj, elt, key, klen, true); key = random_key (&klen); elt = ucl_test_large_map (); ucl_object_insert_key (obj, elt, key, klen, true); key = random_key (&klen); elt = ucl_test_large_string (); ucl_object_insert_key (obj, elt, key, klen, true); emitted = ucl_object_emit_len (obj, UCL_EMIT_MSGPACK, &elen); assert (emitted != NULL); if (out) { fprintf (out, "%*.s\n", (int)elen, emitted); fclose (out); } ucl_object_unref (obj); parser = ucl_parser_new (0); if (!ucl_parser_add_chunk_full (parser, emitted, elen, 0, UCL_DUPLICATE_APPEND, UCL_PARSE_MSGPACK)) { fprintf (stderr, "error parsing input: %s", ucl_parser_get_error (parser)); assert (0); } obj = ucl_parser_get_object (parser); assert (obj != NULL); emitted2 = ucl_object_emit_len (obj, UCL_EMIT_MSGPACK, &elen2); assert (emitted2 != NULL); assert (elen2 == elen); assert (memcmp (emitted, emitted2, elen) == 0); ucl_parser_free (parser); ucl_object_unref (obj); free (emitted); free (emitted2); } return 0; } static ucl_object_t* ucl_test_integer (void) { ucl_object_t *res; int count, i; uint64_t cur; double curf; res = ucl_object_typed_new (UCL_ARRAY); count = pcg32_random () % nelt; for (i = 0; i < count; i ++) { cur = ((uint64_t)pcg32_random ()) << 32 | pcg32_random (); ucl_array_append (res, ucl_object_fromint (cur % 128)); ucl_array_append (res, ucl_object_fromint (-(cur % 128))); cur = ((uint64_t)pcg32_random ()) << 32 | pcg32_random (); ucl_array_append (res, ucl_object_fromint (cur % UINT16_MAX)); ucl_array_append (res, ucl_object_fromint (-(cur % INT16_MAX))); cur = ((uint64_t)pcg32_random ()) << 32 | pcg32_random (); ucl_array_append (res, ucl_object_fromint (cur % UINT32_MAX)); ucl_array_append (res, ucl_object_fromint (-(cur % INT32_MAX))); cur = ((uint64_t)pcg32_random ()) << 32 | pcg32_random (); ucl_array_append (res, ucl_object_fromint (cur)); ucl_array_append (res, ucl_object_fromint (-cur)); /* Double version */ cur = ((uint64_t)pcg32_random ()) << 32 | pcg32_random (); curf = (cur % 128) / 19 * 16; ucl_array_append (res, ucl_object_fromdouble (curf)); cur = ((uint64_t)pcg32_random ()) << 32 | pcg32_random (); curf = -(cur % 128) / 19 * 16; ucl_array_append (res, ucl_object_fromdouble (curf)); cur = ((uint64_t)pcg32_random ()) << 32 | pcg32_random (); curf = (cur % 65536) / 19 * 16; ucl_array_append (res, ucl_object_fromdouble (curf)); ucl_array_append (res, ucl_object_fromdouble (-curf)); cur = ((uint64_t)pcg32_random ()) << 32 | pcg32_random (); curf = (cur % INT32_MAX) / 19 * 16; ucl_array_append (res, ucl_object_fromdouble (curf)); cur = ((uint64_t)pcg32_random ()) << 32 | pcg32_random (); memcpy (&curf, &cur, sizeof (curf)); ucl_array_append (res, ucl_object_fromint (cur)); } return res; } static ucl_object_t* ucl_test_string (void) { ucl_object_t *res, *elt; int count, i; uint32_t cur_len; char *str; res = ucl_object_typed_new (UCL_ARRAY); count = pcg32_random () % nelt; for (i = 0; i < count; i ++) { while ((cur_len = pcg32_random ()) % 128 == 0); str = malloc (cur_len % 128); ucl_array_append (res, ucl_object_fromstring_common (str, cur_len % 128, UCL_STRING_RAW)); free (str); while ((cur_len = pcg32_random ()) % 512 == 0); str = malloc (cur_len % 512); ucl_array_append (res, ucl_object_fromstring_common (str, cur_len % 512, UCL_STRING_RAW)); free (str); while ((cur_len = pcg32_random ()) % 128 == 0); str = malloc (cur_len % 128); elt = ucl_object_fromstring_common (str, cur_len % 128, UCL_STRING_RAW); elt->flags |= UCL_OBJECT_BINARY; ucl_array_append (res, elt); free (str); while ((cur_len = pcg32_random ()) % 512 == 0); str = malloc (cur_len % 512); elt = ucl_object_fromstring_common (str, cur_len % 512, UCL_STRING_RAW); elt->flags |= UCL_OBJECT_BINARY; ucl_array_append (res, elt); free (str); } /* One large string */ str = malloc (65537); elt = ucl_object_fromstring_common (str, 65537, UCL_STRING_RAW); elt->flags |= UCL_OBJECT_BINARY; ucl_array_append (res, elt); free (str); return res; } static ucl_object_t* ucl_test_boolean (void) { ucl_object_t *res; int count, i; res = ucl_object_typed_new (UCL_ARRAY); count = pcg32_random () % nelt; for (i = 0; i < count; i ++) { ucl_array_append (res, ucl_object_frombool (pcg32_random () % 2)); } return res; } static ucl_object_t* ucl_test_map (void) { ucl_object_t *res, *cur; int count, i; uint32_t cur_len, sel; size_t klen; const char *key; res = ucl_object_typed_new (UCL_OBJECT); count = pcg32_random () % nelt; recursion ++; for (i = 0; i < count; i ++) { if (recursion > 10) { for (;;) { sel = pcg32_random () % NTESTS; if (tests[sel] != ucl_test_map && tests[sel] != ucl_test_array) { break; } } } else { sel = pcg32_random () % NTESTS; } key = random_key (&klen); cur = tests[sel](); assert (cur != NULL); assert (klen != 0); ucl_object_insert_key (res, cur, key, klen, true); /* Multi value key */ cur = tests[sel](); assert (cur != NULL); ucl_object_insert_key (res, cur, key, klen, true); } return res; } static ucl_object_t* ucl_test_large_map (void) { ucl_object_t *res, *cur; int count, i; uint32_t cur_len; size_t klen; const char *key; res = ucl_object_typed_new (UCL_OBJECT); count = 65537; recursion ++; for (i = 0; i < count; i ++) { key = random_key (&klen); cur = ucl_test_boolean (); assert (cur != NULL); assert (klen != 0); ucl_object_insert_key (res, cur, key, klen, true); } return res; } static ucl_object_t* ucl_test_array (void) { ucl_object_t *res, *cur; int count, i; uint32_t cur_len, sel; res = ucl_object_typed_new (UCL_ARRAY); count = pcg32_random () % nelt; recursion ++; for (i = 0; i < count; i ++) { if (recursion > 10) { for (;;) { sel = pcg32_random () % NTESTS; if (tests[sel] != ucl_test_map && tests[sel] != ucl_test_array) { break; } } } else { sel = pcg32_random () % NTESTS; } cur = tests[sel](); assert (cur != NULL); ucl_array_append (res, cur); } return res; } static ucl_object_t* ucl_test_large_array (void) { ucl_object_t *res, *cur; int count, i; uint32_t cur_len; res = ucl_object_typed_new (UCL_ARRAY); count = 65537; recursion ++; for (i = 0; i < count; i ++) { cur = ucl_test_boolean (); assert (cur != NULL); ucl_array_append (res, cur); } return res; } static ucl_object_t* ucl_test_large_string (void) { ucl_object_t *res; char *str; uint32_t cur_len; while ((cur_len = pcg32_random ()) % 100000 == 0); str = malloc (cur_len % 100000); res = ucl_object_fromstring_common (str, cur_len % 100000, UCL_STRING_RAW); res->flags |= UCL_OBJECT_BINARY; + free (str); return res; } static ucl_object_t* ucl_test_null (void) { return ucl_object_typed_new (UCL_NULL); } diff --git a/contrib/libucl/utils/CMakeLists.txt b/contrib/libucl/utils/CMakeLists.txt new file mode 100644 index 000000000000..4de95fd7b4b0 --- /dev/null +++ b/contrib/libucl/utils/CMakeLists.txt @@ -0,0 +1,12 @@ + +PROJECT(libucl-utils C) + +FUNCTION(MAKE_UTIL UTIL_NAME UTIL_SRCS) + ADD_EXECUTABLE(${UTIL_NAME} ${UTIL_SRCS}) + TARGET_LINK_LIBRARIES(${UTIL_NAME} ucl) + INSTALL(TARGETS ${UTIL_NAME} DESTINATION bin) +ENDFUNCTION() + +MAKE_UTIL(ucl_chargen chargen.c) +MAKE_UTIL(ucl_objdump objdump.c) +MAKE_UTIL(ucl_tool ucl-tool.c) diff --git a/contrib/libucl/utils/objdump.c b/contrib/libucl/utils/objdump.c index 3c60c5569231..416eca7c87e0 100644 --- a/contrib/libucl/utils/objdump.c +++ b/contrib/libucl/utils/objdump.c @@ -1,182 +1,185 @@ /* Copyright (c) 2013, Dmitriy V. Reshetnikov * Copyright (c) 2013, Vsevolod Stakhov * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED ''AS IS'' AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL AUTHOR BE LIABLE FOR ANY * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include +#if defined(_MSC_VER) + #include + + typedef SSIZE_T ssize_t; +#endif #include "ucl.h" void ucl_obj_dump (const ucl_object_t *obj, unsigned int shift) { int num = shift * 4 + 5; char *pre = (char *) malloc (num * sizeof(char)); const ucl_object_t *cur, *tmp; ucl_object_iter_t it = NULL, it_obj = NULL; pre[--num] = 0x00; while (num--) pre[num] = 0x20; tmp = obj; while ((obj = ucl_object_iterate (tmp, &it, false))) { printf ("%sucl object address: %p\n", pre + 4, obj); if (obj->key != NULL) { printf ("%skey: \"%s\"\n", pre, ucl_object_key (obj)); } printf ("%sref: %u\n", pre, obj->ref); printf ("%slen: %u\n", pre, obj->len); printf ("%sprev: %p\n", pre, obj->prev); printf ("%snext: %p\n", pre, obj->next); if (obj->type == UCL_OBJECT) { printf ("%stype: UCL_OBJECT\n", pre); printf ("%svalue: %p\n", pre, obj->value.ov); it_obj = NULL; while ((cur = ucl_object_iterate (obj, &it_obj, true))) { ucl_obj_dump (cur, shift + 2); } } else if (obj->type == UCL_ARRAY) { printf ("%stype: UCL_ARRAY\n", pre); printf ("%svalue: %p\n", pre, obj->value.av); it_obj = NULL; while ((cur = ucl_object_iterate (obj, &it_obj, true))) { ucl_obj_dump (cur, shift + 2); } } else if (obj->type == UCL_INT) { printf ("%stype: UCL_INT\n", pre); printf ("%svalue: %jd\n", pre, (intmax_t)ucl_object_toint (obj)); } else if (obj->type == UCL_FLOAT) { printf ("%stype: UCL_FLOAT\n", pre); printf ("%svalue: %f\n", pre, ucl_object_todouble (obj)); } else if (obj->type == UCL_STRING) { printf ("%stype: UCL_STRING\n", pre); printf ("%svalue: \"%s\"\n", pre, ucl_object_tostring (obj)); } else if (obj->type == UCL_BOOLEAN) { printf ("%stype: UCL_BOOLEAN\n", pre); printf ("%svalue: %s\n", pre, ucl_object_tostring_forced (obj)); } else if (obj->type == UCL_TIME) { printf ("%stype: UCL_TIME\n", pre); printf ("%svalue: %f\n", pre, ucl_object_todouble (obj)); } else if (obj->type == UCL_USERDATA) { printf ("%stype: UCL_USERDATA\n", pre); printf ("%svalue: %p\n", pre, obj->value.ud); } } free (pre); } int main(int argc, char **argv) { const char *fn = NULL; unsigned char *inbuf; struct ucl_parser *parser; - int k, ret = 0, r = 0; - ssize_t bufsize; + int k, ret = 0; + ssize_t bufsize, r = 0; ucl_object_t *obj = NULL; const ucl_object_t *par; FILE *in; if (argc > 1) { fn = argv[1]; } if (fn != NULL) { in = fopen (fn, "r"); if (in == NULL) { - exit (-errno); + exit (EXIT_FAILURE); } } else { in = stdin; } parser = ucl_parser_new (0); inbuf = malloc (BUFSIZ); bufsize = BUFSIZ; r = 0; while (!feof (in) && !ferror (in)) { if (r == bufsize) { inbuf = realloc (inbuf, bufsize * 2); bufsize *= 2; if (inbuf == NULL) { perror ("realloc"); exit (EXIT_FAILURE); } } r += fread (inbuf + r, 1, bufsize - r, in); } if (ferror (in)) { fprintf (stderr, "Failed to read the input file.\n"); exit (EXIT_FAILURE); } ucl_parser_add_chunk (parser, inbuf, r); fclose (in); if (ucl_parser_get_error(parser)) { - printf ("Error occured: %s\n", ucl_parser_get_error(parser)); + printf ("Error occurred: %s\n", ucl_parser_get_error(parser)); ret = 1; goto end; } obj = ucl_parser_get_object (parser); if (ucl_parser_get_error (parser)) { - printf ("Error occured: %s\n", ucl_parser_get_error(parser)); + printf ("Error occurred: %s\n", ucl_parser_get_error(parser)); ret = 1; goto end; } if (argc > 2) { for (k = 2; k < argc; k++) { printf ("search for \"%s\"... ", argv[k]); par = ucl_object_lookup (obj, argv[k]); printf ("%sfound\n", (par == NULL )?"not ":""); ucl_obj_dump (par, 0); } } else { ucl_obj_dump (obj, 0); } end: if (parser != NULL) { ucl_parser_free (parser); } if (obj != NULL) { ucl_object_unref (obj); } return ret; } diff --git a/contrib/libucl/utils/ucl-tool.c b/contrib/libucl/utils/ucl-tool.c index feea9c2070d5..9b807d35c092 100644 --- a/contrib/libucl/utils/ucl-tool.c +++ b/contrib/libucl/utils/ucl-tool.c @@ -1,168 +1,170 @@ /* Copyright (c) 2015, Cesanta Software * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED ''AS IS'' AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL AUTHOR BE LIABLE FOR ANY * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include - #include "ucl.h" -static struct option opts[] = { - {"help", no_argument, NULL, 'h'}, - {"in", required_argument, NULL, 'i' }, - {"out", required_argument, NULL, 'o' }, - {"schema", required_argument, NULL, 's'}, - {"format", required_argument, NULL, 'f'}, - {0, 0, 0, 0} -}; - void usage(const char *name, FILE *out) { fprintf(out, "Usage: %s [--help] [-i|--in file] [-o|--out file]\n", name); fprintf(out, " [-s|--schema file] [-f|--format format]\n\n"); fprintf(out, " --help - print this message and exit\n"); fprintf(out, " --in - specify input filename " "(default: standard input)\n"); fprintf(out, " --out - specify output filename " "(default: standard output)\n"); fprintf(out, " --schema - specify schema file for validation\n"); fprintf(out, " --format - output format. Options: ucl (default), " "json, compact_json, yaml, msgpack\n"); } int main(int argc, char **argv) { + int i; char ch; FILE *in = stdin, *out = stdout; - const char *schema = NULL; + const char *schema = NULL, *parm, *val; unsigned char *buf = NULL; size_t size = 0, r = 0; struct ucl_parser *parser = NULL; ucl_object_t *obj = NULL; ucl_emitter_t emitter = UCL_EMIT_CONFIG; - while((ch = getopt_long(argc, argv, "hi:o:s:f:", opts, NULL)) != -1) { - switch (ch) { - case 'i': - in = fopen(optarg, "r"); + for (i = 1; i < argc; ++i) { + parm = argv[i]; + val = ((i + 1) < argc) ? argv[++i] : NULL; + + if ((strcmp(parm, "--help") == 0) || (strcmp(parm, "-h") == 0)) { + usage(argv[0], stdout); + exit(0); + + } else if ((strcmp(parm, "--in") == 0) || (strcmp(parm, "-i") == 0)) { + if (!val) + goto err_val; + + in = fopen(val, "r"); if (in == NULL) { perror("fopen on input file"); exit(EXIT_FAILURE); } - break; - case 'o': - out = fopen(optarg, "w"); + } else if ((strcmp(parm, "--out") == 0) || (strcmp(parm, "-o") == 0)) { + if (!val) + goto err_val; + + out = fopen(val, "w"); if (out == NULL) { perror("fopen on output file"); exit(EXIT_FAILURE); } - break; - case 's': - schema = optarg; - break; - case 'f': - if (strcmp(optarg, "ucl") == 0) { - emitter = UCL_EMIT_CONFIG; - } else if (strcmp(optarg, "json") == 0) { - emitter = UCL_EMIT_JSON; - } else if (strcmp(optarg, "yaml") == 0) { - emitter = UCL_EMIT_YAML; - } else if (strcmp(optarg, "compact_json") == 0) { - emitter = UCL_EMIT_JSON_COMPACT; - } else if (strcmp(optarg, "msgpack") == 0) { - emitter = UCL_EMIT_MSGPACK; - } else { - fprintf(stderr, "Unknown output format: %s\n", optarg); - exit(EXIT_FAILURE); - } - break; - case 'h': - usage(argv[0], stdout); - exit(0); - default: + } else if ((strcmp(parm, "--schema") == 0) || (strcmp(parm, "-s") == 0)) { + if (!val) + goto err_val; + schema = val; + + } else if ((strcmp(parm, "--format") == 0) || (strcmp(parm, "-f") == 0)) { + if (!val) + goto err_val; + + if (strcmp(val, "ucl") == 0) { + emitter = UCL_EMIT_CONFIG; + } else if (strcmp(val, "json") == 0) { + emitter = UCL_EMIT_JSON; + } else if (strcmp(val, "yaml") == 0) { + emitter = UCL_EMIT_YAML; + } else if (strcmp(val, "compact_json") == 0) { + emitter = UCL_EMIT_JSON_COMPACT; + } else if (strcmp(val, "msgpack") == 0) { + emitter = UCL_EMIT_MSGPACK; + } else { + fprintf(stderr, "Unknown output format: %s\n", val); + exit(EXIT_FAILURE); + } + } else { usage(argv[0], stderr); exit(EXIT_FAILURE); - break; } } parser = ucl_parser_new(0); buf = malloc(BUFSIZ); size = BUFSIZ; - while(!feof(in) && !ferror(in)) { + while (!feof(in) && !ferror(in)) { if (r == size) { buf = realloc(buf, size*2); size *= 2; if (buf == NULL) { perror("realloc"); exit(EXIT_FAILURE); } } r += fread(buf + r, 1, size - r, in); } if (ferror(in)) { fprintf(stderr, "Failed to read the input file.\n"); exit(EXIT_FAILURE); } fclose(in); if (!ucl_parser_add_chunk(parser, buf, r)) { fprintf(stderr, "Failed to parse input file: %s\n", ucl_parser_get_error(parser)); exit(EXIT_FAILURE); } if ((obj = ucl_parser_get_object(parser)) == NULL) { fprintf(stderr, "Failed to get root object: %s\n", ucl_parser_get_error(parser)); exit(EXIT_FAILURE); } if (schema != NULL) { struct ucl_parser *schema_parser = ucl_parser_new(0); ucl_object_t *schema_obj = NULL; struct ucl_schema_error error; if (!ucl_parser_add_file(schema_parser, schema)) { fprintf(stderr, "Failed to parse schema file: %s\n", ucl_parser_get_error(schema_parser)); exit(EXIT_FAILURE); } if ((schema_obj = ucl_parser_get_object(schema_parser)) == NULL) { fprintf(stderr, "Failed to get root object: %s\n", ucl_parser_get_error(schema_parser)); exit(EXIT_FAILURE); } if (!ucl_object_validate(schema_obj, obj, &error)) { fprintf(stderr, "Validation failed: %s\n", error.msg); exit(EXIT_FAILURE); } } if (emitter != UCL_EMIT_MSGPACK) { fprintf(out, "%s\n", ucl_object_emit(obj, emitter)); - } - else { + } else { size_t len; unsigned char *res; res = ucl_object_emit_len(obj, emitter, &len); fwrite(res, 1, len, out); } return 0; + +err_val: + fprintf(stderr, "Parameter %s is missing mandatory value\n", parm); + usage(argv[0], stderr); + exit(EXIT_FAILURE); }