util: Implement adding strings with length to a JSON object

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/libpakfire/include/pakfire/util.h b/src/libpakfire/include/pakfire/util.h
index 41e8501329b34e184c6f8224eb9fd2558e67e642..e8c61557cd9a42f55463754133827f32cef57dc7 100644 (file)
--- a/src/libpakfire/include/pakfire/util.h
+++ b/src/libpakfire/include/pakfire/util.h
@@ -91,6 +91,7 @@ struct json_object* pakfire_json_parse(struct pakfire_ctx* ctx,
        const char* buffer, const size_t length);
 struct json_object* pakfire_json_parse_from_file(struct pakfire_ctx* ctx, const char* path);
 int pakfire_json_add_string(struct json_object* json, const char* name, const char* value);
+int pakfire_json_add_stringn(struct json_object* json, const char* name, const char* value, size_t length);
 int pakfire_json_add_int64(struct json_object* json, const char* name, int64_t value);
 int pakfire_json_add_uint64(struct json_object* json, const char* name, uint64_t value);
 int pakfire_json_add_double(struct json_object* json, const char* name, double value);

diff --git a/src/libpakfire/util.c b/src/libpakfire/util.c
index 852d7fdfd1bce33ceb2698624ca29c70d9e65344..73d8c7900ed24b92fefbc3e7887f98ed07dfdad8 100644 (file)
--- a/src/libpakfire/util.c
+++ b/src/libpakfire/util.c
@@ -715,12 +715,20 @@ struct json_object* pakfire_json_parse_from_file(struct pakfire_ctx* ctx, const
 
 int pakfire_json_add_string(struct json_object* json,
                const char* name, const char* value) {
+       if (!value)
+               return 0;
+
+       return pakfire_json_add_stringn(json, name, value, strlen(value));
+}
+
+int pakfire_json_add_stringn(struct json_object* json,
+               const char* name, const char* value, size_t length) {
        // No string? Nothing to do
        if (!value)
                return 0;
 
        // Convert string to JSON object
-       struct json_object* object = json_object_new_string(value);
+       struct json_object* object = json_object_new_string_len(value, length);
        if (!object)
                return 1;