csonpath 0.16.0__tar.gz → 0.17.0__tar.gz

{csonpath-0.16.0 → csonpath-0.17.0}/Makefile

@@ -5,7 +5,7 @@ YYJSON_LDFLAGS=$(shell pkg-config --libs yyjson)
 
 include config.mk
 
-all: test-json-c-get-a test-json-update test-json-filter test-json-subpath test-json-c-array-root test-json-filter-and-missing-key test-json-get-array-big-index test-json-union test-json-audit-bugs test-json-crash-vectors
+all: test-json-c-get-a test-json-update test-json-filter test-json-subpath test-json-c-array-root test-json-filter-and-missing-key test-json-get-array-big-index test-json-union test-json-audit-bugs test-json-crash-vectors test-json-my-fuzz
 
 YYJSON_TESTS=test-yyjson
 
@@ -15,7 +15,7 @@ bench:
 bench-clean:
 	make -C bench clean
 
-.PHONY: all clean tests pip-dev pip-dev bench bench-clean
+.PHONY: all clean tests pip-dev pip-dev bench bench-clean tests-cli
 
 CFLAGS+= -Wall -Wextra -Wno-unused-function -Wno-unused-parameter -O0 -g
 
@@ -49,10 +49,13 @@ test-json-audit-bugs: tests/json-c/audit-bugs.c csonpath_json-c.h csonpath.h cso
 test-json-crash-vectors: tests/json-c/crash-vectors.c csonpath_json-c.h csonpath.h csonpath_do.h
 	$(CC) tests/json-c/crash-vectors.c $(EXTRA_FILES) $(JSON_C_CFLAGS) $(CFLAGS) -Wno-format -I./ -o test-json-crash-vectors  $(JSON_C_LDFLAGS) $(LDFLAGS)
 
+test-json-my-fuzz: tests/json-c/my_fuzz.c csonpath_json-c.h csonpath_my_fuzzing.h csonpath.h csonpath_do.h
+	$(CC) tests/json-c/my_fuzz.c $(EXTRA_FILES) $(JSON_C_CFLAGS) $(CFLAGS) -Wno-format -I./ -o test-json-my-fuzz $(JSON_C_LDFLAGS) $(LDFLAGS)
+
 test-yyjson: tests/yyjson/test-yyjson.c csonpath_yyjson.h csonpath.h csonpath_do.h
 	$(CC) tests/yyjson/test-yyjson.c $(EXTRA_FILES) $(YYJSON_CFLAGS) $(CFLAGS) -Wno-format -I./ -o test-yyjson $(YYJSON_LDFLAGS) $(LDFLAGS)
 
- tests-c: test-json-c-get-a test-json-update test-json-filter test-json-subpath test-json-c-array-root test-json-filter-and-missing-key test-json-get-array-big-index test-json-union test-json-audit-bugs test-json-crash-vectors test-yyjson
+tests-c: test-json-c-get-a test-json-update test-json-filter test-json-subpath test-json-c-array-root test-json-filter-and-missing-key test-json-get-array-big-index test-json-union test-json-audit-bugs test-json-crash-vectors test-yyjson test-json-my-fuzz
 	./test-json-c-get-a
 	./test-json-update
 	./test-json-filter
@@ -64,6 +67,13 @@ test-yyjson: tests/yyjson/test-yyjson.c csonpath_yyjson.h csonpath.h csonpath_do
 	./test-json-audit-bugs
 	./test-json-crash-vectors
 	./test-yyjson
+	./test-json-my-fuzz
+
+csonpath: cli/csonpath_cli.c csonpath_json-c.h csonpath.h csonpath_do.h
+	$(CC) cli/csonpath_cli.c $(EXTRA_FILES) $(JSON_C_CFLAGS) $(CFLAGS) -I./ -o csonpath $(JSON_C_LDFLAGS) $(LDFLAGS)
+
+tests-cli: csonpath
+	bash tests/cli/run.sh
 
 pip-dev:
 	pip install -e .[dev] --force-reinstall
@@ -74,5 +84,5 @@ tests-py: pip-dev
 tests: tests-py tests-c
 
 clean:
-	rm -rvf test-json-c-get-a test-json-update test-json-filter test-json-subpath test-json-c-array-root test-json-filter-and-missing-key test-json-get-array-big-index test-json-union test-json-audit-bugs test-json-crash-vectors test-yyjson
+	rm -rvf test-json-c-get-a test-json-update test-json-filter test-json-subpath test-json-c-array-root test-json-filter-and-missing-key test-json-get-array-big-index test-json-union test-json-audit-bugs test-json-crash-vectors test-yyjson test-json-my-fuzz csonpath
 

{csonpath-0.16.0/csonpath.egg-info → csonpath-0.17.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: csonpath
-Version: 0.16.0
+Version: 0.17.0
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Provides-Extra: dev
@@ -15,7 +15,7 @@ Dynamic: license-file
 
 **csonpath** is a partial [JSONPath](https://goessner.net/articles/JsonPath/) implementation in C, with Python bindings. It allows you to query, update, and remove data from JSON objects using path expressions.
 
-Unlike many JSONPath libraries, csonpath is **backend-agnostic**: it can work with any C library or environment that manipulates array, object, and scalar types—not just JSON. Out of the box, backends for [json-c](https://github.com/json-c/json-c) and Python are provided.
+Unlike many JSONPath libraries, csonpath is **backend-agnostic**: it can work with any C library or environment that manipulates array, object, and scalar types—not just JSON. Out of the box, backends for [json-c](https://github.com/json-c/json-c), [yyjson](https://github.com/ibireme/yyjson), Python and Rust (via `serde_json`) are provided.
 
 ---
 
@@ -62,6 +62,7 @@ Unlike many JSONPath libraries, csonpath is **backend-agnostic**: it can work wi
 - [Usage](#-usage)
 - [C API Reference](#-c-api-reference)
 - [Python API Reference](#-python-api-reference)
+- [CLI](#%EF%B8%8F-cli)
 - [Custom Backends](#-custom-backends)
 - [Running Tests](#-running-tests)
 - [Directory Structure](#-directory-structure)
@@ -87,6 +88,20 @@ Make sure to link against `json-c` when compiling:
 gcc myapp.c -o myapp $(pkg-config --cflags --libs json-c)
 ```
 
+### C (Rust backend)
+The Rust backend is located in `rust/`. It builds both a safe Rust API and the C glue required by the csonpath core.
+
+```sh
+cd rust
+cargo build
+cargo test
+```
+
+To use it from C, include the backend header and link against the produced static library:
+```c
+#include "rust/csonpath_rust_backend.h"
+```
+
 ### Python
 Install from PyPI:
 ```sh
@@ -252,6 +267,76 @@ Free the csonpath object.
 
 ---
 
+## 🖥️ CLI
+
+A standalone C CLI is available in `cli/csonpath_cli.c`. It links directly against `json-c` and the csonpath C core, so it works without Python.
+
+```sh
+make csonpath          # build ./csonpath
+make tests-cli         # run shell tests
+```
+
+It reads JSON from stdin, a file (`-f`), or a string (`-s`) and exposes the library operations through action flags.
+
+```sh
+# Get the first match (default)
+echo '{"a": "value", "array": [1, 2, 3]}' | ./csonpath '$.a'
+# => "value"
+
+# Find all matches
+echo '{"items": [{"price": 5}, {"price": 15}]}' | ./csonpath -a '$.items[?price > 10]'
+# => [{"price":15}]
+
+# One match per line
+echo '{"array": [1, 2, 3]}' | ./csonpath -a -o lines '$.array[*]'
+# => 1
+# => 2
+# => 3
+
+# Set or create a value
+echo '{"a": 1}' | ./csonpath --set '42' '$.x.y.z'
+# => {"a":1,"x":{"y":{"z":42}}}
+
+# Or with a positional value
+echo '{"a": 1}' | ./csonpath '$.x.y.z' '42'
+
+# Remove matches
+echo '{"a": 1, "b": 2}' | ./csonpath -d '$.b'
+# => {"a":1}
+
+# Edit a file in place
+./csonpath -f data.json -p -i --set '"2.0"' '$.version'
+```
+
+### Options
+
+| Option | Description |
+|---|---|
+| `-a`, `--all` | Return all matches instead of the first one. |
+| `-d`, `--delete` | Remove matches and print the modified JSON. |
+| `--set VALUE` | Set `PATH` to `VALUE` (JSON). |
+| `VALUE` (positional) | Alternative to `--set`. |
+| `-r`, `--raw` | Treat the value as a raw string. |
+| `-i`, `--in-place` | Edit `FILE` in place (requires `--file`). |
+| `--strict` | Exit with an error if `--delete` removes nothing. |
+| `-f FILE`, `--file FILE` | Read JSON from `FILE` instead of stdin. |
+| `-s JSON`, `--string JSON` | Read JSON from a string. |
+| `-j`, `--jq-like` | Allow jq-style paths without a leading `$`. |
+| `-p`, `--pretty` | Pretty-print JSON output. |
+| `-o {json,pretty,raw,lines}` | Output format (default: `json`). |
+| `-e`, `--empty-array` | Return `[]` instead of nothing when `-a` matches nothing. |
+
+### Exit codes
+
+| Code | Meaning |
+|---|---|
+| `0` | Success. |
+| `1` | No match found, or `--strict` delete found nothing. |
+| `EINVAL` | Usage error, JSON parse error, JSONPath compilation error, or invalid JSON value. |
+| `errno` | I/O error (e.g. `ENOENT`, `EACCES`). |
+
+---
+
 ## 🔌 Custom Backends
 
 csonpath is designed to be backend-agnostic. It can work with any data structure that supports array, object, and scalar semantics.
@@ -260,7 +345,9 @@ To create a custom backend, define the required macros and types in a header fil
 
 For more details, see the existing backend implementations:
 - `csonpath_json-c.h` — json-c backend
+- `csonpath_yyjson.h` — yyjson backend
 - `csonpath_python.c` — Python backend
+- `rust/csonpath_rust_backend.h` — Rust / serde_json backend
 
 ---
 
@@ -271,6 +358,12 @@ For more details, see the existing backend implementations:
 make tests-c
 ```
 
+### Rust Tests
+```sh
+cd rust
+cargo test
+```
+
 ### Python Tests
 ```sh
 make tests-py
@@ -289,7 +382,10 @@ make tests
 |---|---|
 | `csonpath.h`, `csonpath_do.h` | Core implementation (header-only style) |
 | `csonpath_json-c.h` | json-c backend |
+| `csonpath_yyjson.h` | yyjson backend |
 | `csonpath_python.c` | Python C extension backend |
+| `rust/` | Rust backend (safe API, FFI, C glue) |
+| `csonpath_my_fuzzing.h` | Fuzzer helpers (C) |
 | `tests/` | C and Python test suites |
 | `bench/` | Performance benchmarks |
 

{csonpath-0.16.0 → csonpath-0.17.0}/README.md

@@ -6,7 +6,7 @@
 
 **csonpath** is a partial [JSONPath](https://goessner.net/articles/JsonPath/) implementation in C, with Python bindings. It allows you to query, update, and remove data from JSON objects using path expressions.
 
-Unlike many JSONPath libraries, csonpath is **backend-agnostic**: it can work with any C library or environment that manipulates array, object, and scalar types—not just JSON. Out of the box, backends for [json-c](https://github.com/json-c/json-c) and Python are provided.
+Unlike many JSONPath libraries, csonpath is **backend-agnostic**: it can work with any C library or environment that manipulates array, object, and scalar types—not just JSON. Out of the box, backends for [json-c](https://github.com/json-c/json-c), [yyjson](https://github.com/ibireme/yyjson), Python and Rust (via `serde_json`) are provided.
 
 ---
 
@@ -53,6 +53,7 @@ Unlike many JSONPath libraries, csonpath is **backend-agnostic**: it can work wi
 - [Usage](#-usage)
 - [C API Reference](#-c-api-reference)
 - [Python API Reference](#-python-api-reference)
+- [CLI](#%EF%B8%8F-cli)
 - [Custom Backends](#-custom-backends)
 - [Running Tests](#-running-tests)
 - [Directory Structure](#-directory-structure)
@@ -78,6 +79,20 @@ Make sure to link against `json-c` when compiling:
 gcc myapp.c -o myapp $(pkg-config --cflags --libs json-c)
 ```
 
+### C (Rust backend)
+The Rust backend is located in `rust/`. It builds both a safe Rust API and the C glue required by the csonpath core.
+
+```sh
+cd rust
+cargo build
+cargo test
+```
+
+To use it from C, include the backend header and link against the produced static library:
+```c
+#include "rust/csonpath_rust_backend.h"
+```
+
 ### Python
 Install from PyPI:
 ```sh
@@ -243,6 +258,76 @@ Free the csonpath object.
 
 ---
 
+## 🖥️ CLI
+
+A standalone C CLI is available in `cli/csonpath_cli.c`. It links directly against `json-c` and the csonpath C core, so it works without Python.
+
+```sh
+make csonpath          # build ./csonpath
+make tests-cli         # run shell tests
+```
+
+It reads JSON from stdin, a file (`-f`), or a string (`-s`) and exposes the library operations through action flags.
+
+```sh
+# Get the first match (default)
+echo '{"a": "value", "array": [1, 2, 3]}' | ./csonpath '$.a'
+# => "value"
+
+# Find all matches
+echo '{"items": [{"price": 5}, {"price": 15}]}' | ./csonpath -a '$.items[?price > 10]'
+# => [{"price":15}]
+
+# One match per line
+echo '{"array": [1, 2, 3]}' | ./csonpath -a -o lines '$.array[*]'
+# => 1
+# => 2
+# => 3
+
+# Set or create a value
+echo '{"a": 1}' | ./csonpath --set '42' '$.x.y.z'
+# => {"a":1,"x":{"y":{"z":42}}}
+
+# Or with a positional value
+echo '{"a": 1}' | ./csonpath '$.x.y.z' '42'
+
+# Remove matches
+echo '{"a": 1, "b": 2}' | ./csonpath -d '$.b'
+# => {"a":1}
+
+# Edit a file in place
+./csonpath -f data.json -p -i --set '"2.0"' '$.version'
+```
+
+### Options
+
+| Option | Description |
+|---|---|
+| `-a`, `--all` | Return all matches instead of the first one. |
+| `-d`, `--delete` | Remove matches and print the modified JSON. |
+| `--set VALUE` | Set `PATH` to `VALUE` (JSON). |
+| `VALUE` (positional) | Alternative to `--set`. |
+| `-r`, `--raw` | Treat the value as a raw string. |
+| `-i`, `--in-place` | Edit `FILE` in place (requires `--file`). |
+| `--strict` | Exit with an error if `--delete` removes nothing. |
+| `-f FILE`, `--file FILE` | Read JSON from `FILE` instead of stdin. |
+| `-s JSON`, `--string JSON` | Read JSON from a string. |
+| `-j`, `--jq-like` | Allow jq-style paths without a leading `$`. |
+| `-p`, `--pretty` | Pretty-print JSON output. |
+| `-o {json,pretty,raw,lines}` | Output format (default: `json`). |
+| `-e`, `--empty-array` | Return `[]` instead of nothing when `-a` matches nothing. |
+
+### Exit codes
+
+| Code | Meaning |
+|---|---|
+| `0` | Success. |
+| `1` | No match found, or `--strict` delete found nothing. |
+| `EINVAL` | Usage error, JSON parse error, JSONPath compilation error, or invalid JSON value. |
+| `errno` | I/O error (e.g. `ENOENT`, `EACCES`). |
+
+---
+
 ## 🔌 Custom Backends
 
 csonpath is designed to be backend-agnostic. It can work with any data structure that supports array, object, and scalar semantics.
@@ -251,7 +336,9 @@ To create a custom backend, define the required macros and types in a header fil
 
 For more details, see the existing backend implementations:
 - `csonpath_json-c.h` — json-c backend
+- `csonpath_yyjson.h` — yyjson backend
 - `csonpath_python.c` — Python backend
+- `rust/csonpath_rust_backend.h` — Rust / serde_json backend
 
 ---
 
@@ -262,6 +349,12 @@ For more details, see the existing backend implementations:
 make tests-c
 ```
 
+### Rust Tests
+```sh
+cd rust
+cargo test
+```
+
 ### Python Tests
 ```sh
 make tests-py
@@ -280,7 +373,10 @@ make tests
 |---|---|
 | `csonpath.h`, `csonpath_do.h` | Core implementation (header-only style) |
 | `csonpath_json-c.h` | json-c backend |
+| `csonpath_yyjson.h` | yyjson backend |
 | `csonpath_python.c` | Python C extension backend |
+| `rust/` | Rust backend (safe API, FFI, C glue) |
+| `csonpath_my_fuzzing.h` | Fuzzer helpers (C) |
 | `tests/` | C and Python test suites |
 | `bench/` | Performance benchmarks |
 

{csonpath-0.16.0 → csonpath-0.17.0/csonpath.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: csonpath
-Version: 0.16.0
+Version: 0.17.0
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Provides-Extra: dev
@@ -15,7 +15,7 @@ Dynamic: license-file
 
 **csonpath** is a partial [JSONPath](https://goessner.net/articles/JsonPath/) implementation in C, with Python bindings. It allows you to query, update, and remove data from JSON objects using path expressions.
 
-Unlike many JSONPath libraries, csonpath is **backend-agnostic**: it can work with any C library or environment that manipulates array, object, and scalar types—not just JSON. Out of the box, backends for [json-c](https://github.com/json-c/json-c) and Python are provided.
+Unlike many JSONPath libraries, csonpath is **backend-agnostic**: it can work with any C library or environment that manipulates array, object, and scalar types—not just JSON. Out of the box, backends for [json-c](https://github.com/json-c/json-c), [yyjson](https://github.com/ibireme/yyjson), Python and Rust (via `serde_json`) are provided.
 
 ---
 
@@ -62,6 +62,7 @@ Unlike many JSONPath libraries, csonpath is **backend-agnostic**: it can work wi
 - [Usage](#-usage)
 - [C API Reference](#-c-api-reference)
 - [Python API Reference](#-python-api-reference)
+- [CLI](#%EF%B8%8F-cli)
 - [Custom Backends](#-custom-backends)
 - [Running Tests](#-running-tests)
 - [Directory Structure](#-directory-structure)
@@ -87,6 +88,20 @@ Make sure to link against `json-c` when compiling:
 gcc myapp.c -o myapp $(pkg-config --cflags --libs json-c)
 ```
 
+### C (Rust backend)
+The Rust backend is located in `rust/`. It builds both a safe Rust API and the C glue required by the csonpath core.
+
+```sh
+cd rust
+cargo build
+cargo test
+```
+
+To use it from C, include the backend header and link against the produced static library:
+```c
+#include "rust/csonpath_rust_backend.h"
+```
+
 ### Python
 Install from PyPI:
 ```sh
@@ -252,6 +267,76 @@ Free the csonpath object.
 
 ---
 
+## 🖥️ CLI
+
+A standalone C CLI is available in `cli/csonpath_cli.c`. It links directly against `json-c` and the csonpath C core, so it works without Python.
+
+```sh
+make csonpath          # build ./csonpath
+make tests-cli         # run shell tests
+```
+
+It reads JSON from stdin, a file (`-f`), or a string (`-s`) and exposes the library operations through action flags.
+
+```sh
+# Get the first match (default)
+echo '{"a": "value", "array": [1, 2, 3]}' | ./csonpath '$.a'
+# => "value"
+
+# Find all matches
+echo '{"items": [{"price": 5}, {"price": 15}]}' | ./csonpath -a '$.items[?price > 10]'
+# => [{"price":15}]
+
+# One match per line
+echo '{"array": [1, 2, 3]}' | ./csonpath -a -o lines '$.array[*]'
+# => 1
+# => 2
+# => 3
+
+# Set or create a value
+echo '{"a": 1}' | ./csonpath --set '42' '$.x.y.z'
+# => {"a":1,"x":{"y":{"z":42}}}
+
+# Or with a positional value
+echo '{"a": 1}' | ./csonpath '$.x.y.z' '42'
+
+# Remove matches
+echo '{"a": 1, "b": 2}' | ./csonpath -d '$.b'
+# => {"a":1}
+
+# Edit a file in place
+./csonpath -f data.json -p -i --set '"2.0"' '$.version'
+```
+
+### Options
+
+| Option | Description |
+|---|---|
+| `-a`, `--all` | Return all matches instead of the first one. |
+| `-d`, `--delete` | Remove matches and print the modified JSON. |
+| `--set VALUE` | Set `PATH` to `VALUE` (JSON). |
+| `VALUE` (positional) | Alternative to `--set`. |
+| `-r`, `--raw` | Treat the value as a raw string. |
+| `-i`, `--in-place` | Edit `FILE` in place (requires `--file`). |
+| `--strict` | Exit with an error if `--delete` removes nothing. |
+| `-f FILE`, `--file FILE` | Read JSON from `FILE` instead of stdin. |
+| `-s JSON`, `--string JSON` | Read JSON from a string. |
+| `-j`, `--jq-like` | Allow jq-style paths without a leading `$`. |
+| `-p`, `--pretty` | Pretty-print JSON output. |
+| `-o {json,pretty,raw,lines}` | Output format (default: `json`). |
+| `-e`, `--empty-array` | Return `[]` instead of nothing when `-a` matches nothing. |
+
+### Exit codes
+
+| Code | Meaning |
+|---|---|
+| `0` | Success. |
+| `1` | No match found, or `--strict` delete found nothing. |
+| `EINVAL` | Usage error, JSON parse error, JSONPath compilation error, or invalid JSON value. |
+| `errno` | I/O error (e.g. `ENOENT`, `EACCES`). |
+
+---
+
 ## 🔌 Custom Backends
 
 csonpath is designed to be backend-agnostic. It can work with any data structure that supports array, object, and scalar semantics.
@@ -260,7 +345,9 @@ To create a custom backend, define the required macros and types in a header fil
 
 For more details, see the existing backend implementations:
 - `csonpath_json-c.h` — json-c backend
+- `csonpath_yyjson.h` — yyjson backend
 - `csonpath_python.c` — Python backend
+- `rust/csonpath_rust_backend.h` — Rust / serde_json backend
 
 ---
 
@@ -271,6 +358,12 @@ For more details, see the existing backend implementations:
 make tests-c
 ```
 
+### Rust Tests
+```sh
+cd rust
+cargo test
+```
+
 ### Python Tests
 ```sh
 make tests-py
@@ -289,7 +382,10 @@ make tests
 |---|---|
 | `csonpath.h`, `csonpath_do.h` | Core implementation (header-only style) |
 | `csonpath_json-c.h` | json-c backend |
+| `csonpath_yyjson.h` | yyjson backend |
 | `csonpath_python.c` | Python C extension backend |
+| `rust/` | Rust backend (safe API, FFI, C glue) |
+| `csonpath_my_fuzzing.h` | Fuzzer helpers (C) |
 | `tests/` | C and Python test suites |
 | `bench/` | Performance benchmarks |
 

{csonpath-0.16.0 → csonpath-0.17.0}/csonpath.egg-info/SOURCES.txt

@@ -6,6 +6,7 @@ configure
 csonpath.h
 csonpath_do.h
 csonpath_json-c.h
+csonpath_my_fuzzing.h
 csonpath_python.c
 csonpath_yyjson.h
 pyproject.toml

{csonpath-0.16.0 → csonpath-0.17.0}/csonpath.h

@@ -9,6 +9,12 @@
 # error "some definitions are missing"
 #endif
 
+/* Backends that never allocate in GET_STR leave this empty; backends that do
+ * (e.g. Rust) define it to the cleanup attribute, see CSONPATH_CLEANUP_STR. */
+#ifndef CSONPATH_CLEANUP_STR
+#  define CSONPATH_CLEANUP_STR
+#endif
+
 #ifndef CSONPATH_NO_REGEX
 #  if defined CSONPATH_TINY_REGEX
 #    include <tiny-regex-c/re.h>
@@ -35,6 +41,10 @@ typedef regex_t csonpath_reg_t;
 #define CSONPATH_UNUSED __attribute__((unused))
 #define MAY_ALIAS __attribute__((__may_alias__))
 
+#ifndef CSONPATH_STATINLINE
+# define CSONPATH_STATINLINE static inline
+#endif
+
 #ifndef CSONPATH_FOREACH
 # define CSONPATH_FOREACH(obj, el, code)	\
   CSONPATH_FOREACH_EXT(obj, el, code, key_idx)
@@ -280,7 +290,7 @@ static inline struct csonpath_child_info *csonpath_child_info_set(struct csonpat
     return child_info;
 }
 
-static inline void csonpath_destroy(struct csonpath *cjp)
+CSONPATH_STATINLINE void csonpath_destroy(struct csonpath *cjp)
 {
     if (!cjp)
 	return;
@@ -314,7 +324,7 @@ static int csonpath_compile_do(struct csonpath *cjp, const char orig[static 1],
 			       int *inst_idx, int flag, int end_path, const char **end_sentinel);
 
 
-static inline struct csonpath *csonpath_new_ex(const char path[static 1], int flag) {
+CSONPATH_STATINLINE struct csonpath *csonpath_new_ex(const char path[static 1], int flag) {
     /*
      * max inst is use so we know, we will never overflow.
      */
@@ -340,11 +350,11 @@ static inline struct csonpath *csonpath_new_ex(const char path[static 1], int fl
     return ret;
 }
 
-static inline struct csonpath *csonpath_new(const char path[static 1]) {
+CSONPATH_STATINLINE struct csonpath *csonpath_new(const char path[static 1]) {
     return csonpath_new_ex(path, 0);
 }
 
-static inline struct csonpath *csonpath_set_path(struct csonpath cjp[static 1],
+CSONPATH_STATINLINE struct csonpath *csonpath_set_path(struct csonpath cjp[static 1],
 						 const char path[static 1])
 {
     csonpath_destroy(cjp);
@@ -1524,7 +1534,9 @@ static _Bool csonpath_make_match(const struct csonpath cjp[const static 1],
 		return CSONPATH_GET_NUM(el2) != CSONPATH_GET_NUM(jret);
 	    }
 	    if (CSONPATH_IS_STR(el2) && CSONPATH_IS_STR(jret)) {
-		return (!!strcmp(CSONPATH_GET_STR(el2), CSONPATH_GET_STR(jret)));
+		CSONPATH_CLEANUP_STR const char *s1 = CSONPATH_GET_STR(el2);
+		CSONPATH_CLEANUP_STR const char *s2 = CSONPATH_GET_STR(jret);
+		return (!!strcmp(s1, s2));
 	    }
 	    return 0;
 	case CSONPATH_INST_FILTER_KEY_EQ:
@@ -1532,7 +1544,9 @@ static _Bool csonpath_make_match(const struct csonpath cjp[const static 1],
 		return CSONPATH_GET_NUM(el2) == CSONPATH_GET_NUM(jret);
 	    }
 	    if (CSONPATH_IS_STR(el2) && CSONPATH_IS_STR(jret)) {
-		return (!strcmp(CSONPATH_GET_STR(el2), CSONPATH_GET_STR(jret)));
+		CSONPATH_CLEANUP_STR const char *s1 = CSONPATH_GET_STR(el2);
+		CSONPATH_CLEANUP_STR const char *s2 = CSONPATH_GET_STR(jret);
+		return (!strcmp(s1, s2));
 	    }
 	    return 0;
 	case CSONPATH_INST_FILTER_KEY_SUPERIOR_EQ:
@@ -1545,9 +1559,13 @@ static _Bool csonpath_make_match(const struct csonpath cjp[const static 1],
 	    }
 	    if (CSONPATH_IS_STR(el2) && CSONPATH_IS_STR(jret)) {
 		if (operation == CSONPATH_INST_FILTER_KEY_SUPERIOR_EQ) {
-		    return strcmp(CSONPATH_GET_STR(el2), CSONPATH_GET_STR(jret)) >= 0;
+		    CSONPATH_CLEANUP_STR const char *s1 = CSONPATH_GET_STR(el2);
+		    CSONPATH_CLEANUP_STR const char *s2 = CSONPATH_GET_STR(jret);
+		    return strcmp(s1, s2) >= 0;
 		}
-		return strcmp(CSONPATH_GET_STR(el2), CSONPATH_GET_STR(jret)) > 0;
+		CSONPATH_CLEANUP_STR const char *s1 = CSONPATH_GET_STR(el2);
+		CSONPATH_CLEANUP_STR const char *s2 = CSONPATH_GET_STR(jret);
+		return strcmp(s1, s2) > 0;
 	    }
 	    return 0;
 	case CSONPATH_INST_FILTER_KEY_INFERIOR:
@@ -1560,9 +1578,13 @@ static _Bool csonpath_make_match(const struct csonpath cjp[const static 1],
 	    }
 	    if (CSONPATH_IS_STR(el2) && CSONPATH_IS_STR(jret)) {
 		if (operation == CSONPATH_INST_FILTER_KEY_INFERIOR_EQ) {
-		    return strcmp(CSONPATH_GET_STR(el2), CSONPATH_GET_STR(jret)) <= 0;
+		    CSONPATH_CLEANUP_STR const char *s1 = CSONPATH_GET_STR(el2);
+		    CSONPATH_CLEANUP_STR const char *s2 = CSONPATH_GET_STR(jret);
+		    return strcmp(s1, s2) <= 0;
 		}
-		return strcmp(CSONPATH_GET_STR(el2), CSONPATH_GET_STR(jret)) < 0;
+		CSONPATH_CLEANUP_STR const char *s1 = CSONPATH_GET_STR(el2);
+		CSONPATH_CLEANUP_STR const char *s2 = CSONPATH_GET_STR(jret);
+		return strcmp(s1, s2) < 0;
 	    }
 	    return 0;
 	default:
@@ -1586,10 +1608,11 @@ static _Bool csonpath_make_match(const struct csonpath cjp[const static 1],
 	if (operand_instruction == CSONPATH_INST_GET_OBJ) {
 	    if (!CSONPATH_IS_STR(el2))
 		break;
+	    CSONPATH_CLEANUP_STR const char *s = CSONPATH_GET_STR(el2);
 	    if (operation == CSONPATH_INST_FILTER_KEY_SUPERIOR_EQ)
-		match = strcmp(CSONPATH_GET_STR(el2), *owalker) >= 0;
+		match = strcmp(s, *owalker) >= 0;
 	    else
-		match = strcmp(CSONPATH_GET_STR(el2), *owalker) > 0;
+		match = strcmp(s, *owalker) > 0;
 	    *owalker += strlen(*owalker) + 1;
 	} else {
 	    if (!CSONPATH_IS_NUM(el2))
@@ -1609,10 +1632,11 @@ static _Bool csonpath_make_match(const struct csonpath cjp[const static 1],
 	if (operand_instruction == CSONPATH_INST_GET_OBJ) {
 	    if (!CSONPATH_IS_STR(el2))
 		break;
+	    CSONPATH_CLEANUP_STR const char *s = CSONPATH_GET_STR(el2);
 	    if (operation == CSONPATH_INST_FILTER_KEY_INFERIOR_EQ)
-		match = strcmp(CSONPATH_GET_STR(el2), *owalker) <= 0;
+		match = strcmp(s, *owalker) <= 0;
 	    else
-		match = strcmp(CSONPATH_GET_STR(el2), *owalker) < 0;
+		match = strcmp(s, *owalker) < 0;
 	    *owalker += strlen(*owalker) + 1;
 	} else {
 	    if (!CSONPATH_IS_NUM(el2))
@@ -1636,10 +1660,11 @@ static _Bool csonpath_make_match(const struct csonpath cjp[const static 1],
 	if (CSONPATH_IS_STR(el2)) {
 	    int regex_idx = **owalker;
 	    ++*owalker;
+	    CSONPATH_CLEANUP_STR const char *s = CSONPATH_GET_STR(el2);
 #	if !defined CSONPATH_PCRE2
-	    match = csonpath_reg_exec(cjp->regexs[regex_idx], CSONPATH_GET_STR(el2));
+	    match = csonpath_reg_exec(cjp->regexs[regex_idx], s);
 #	else
-	    const unsigned char *str = (const unsigned char *)CSONPATH_GET_STR(el2);
+	    const unsigned char *str = (const unsigned char *)s;
 	    int ret = pcre2_match(cjp->regexs[regex_idx], str, PCRE2_ZERO_TERMINATED, 0,
 				  0, cjp->match_datas[regex_idx], NULL);
 

{csonpath-0.16.0 → csonpath-0.17.0}/csonpath_do.h

@@ -384,7 +384,7 @@ static CSONPATH_DO_RET_TYPE csonpath_do_internal(const struct csonpath cjp[const
 		}
 		CSONPATH_DO_POST_FIND_ARRAY;
 	    } else if (CSONPATH_IS_STR(jret)) {
-		const char *this_idx = CSONPATH_GET_STR(jret);
+		CSONPATH_CLEANUP_STR const char *this_idx = CSONPATH_GET_STR(jret);
 		CSONPATH_PRE_GET_OBJ(this_idx);
 		tmp = CSONPATH_GET(tmp, this_idx);
 		if (tmp == CSONPATH_NULL) {
@@ -462,7 +462,7 @@ static CSONPATH_DO_RET_TYPE csonpath_do_internal(const struct csonpath cjp[const
 #define csonpath_do__(name) CAT(csonpath_, name)
 #define csonpath_do_ csonpath_do__(CSONPATH_DO_FUNC_NAME)
 
-static CSONPATH_DO_RET_TYPE csonpath_do_(struct csonpath cjp[static 1],
+CSONPATH_STATINLINE CSONPATH_DO_RET_TYPE csonpath_do_(struct csonpath cjp[static 1],
 					 CSONPATH_JSON value CSONPATH_DO_EXTRA_ARGS)
 {
     char *walker = cjp->data;