SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

json: json_dispatch_const_unit_name()

Browse Source
This commit is contained in:
Ivan Kruglov
2025-05-27 01:16:56 -07:00
parent c5ff8283b0
commit 643622f850
2 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd/sd-json/json-util.c
+28
View File
@@ -22,6 +22,7 @@
#include "string-util.h"
#include "strv.h"
#include "syslog-util.h"
#include "unit-name.h"
#include "user-util.h"
int json_dispatch_unbase64_iovec(const char *name, sd_json_variant *variant, sd_json_dispatch_flags_t flags, void *userdata) {
@@ -118,6 +119,33 @@ int json_dispatch_const_user_group_name(const char *name, sd_json_variant *varia
return 0;
}
int json_dispatch_const_unit_name(const char *name, sd_json_variant *variant, sd_json_dispatch_flags_t flags, void *userdata) {
const char **s = ASSERT_PTR(userdata), *n;
UnitNameFlags unitname_flags;
if (sd_json_variant_is_null(variant)) {
*s = NULL;
return 0;
}
if (!sd_json_variant_is_string(variant))
return json_log(variant, flags, SYNTHETIC_ERRNO(EINVAL), "JSON field '%s' is not a string.", strna(name));
if (FLAGS_SET(flags, SD_JSON_STRICT))
unitname_flags = UNIT_NAME_PLAIN;
else if (FLAGS_SET(flags, SD_JSON_RELAX))
unitname_flags = UNIT_NAME_ANY;
else
unitname_flags = UNIT_NAME_PLAIN | UNIT_NAME_INSTANCE;
n = sd_json_variant_string(variant);
if (!unit_name_is_valid(n, unitname_flags))
return json_log(variant, flags, SYNTHETIC_ERRNO(EINVAL), "JSON field '%s' is not a valid unit name.", strna(name));
*s = n;
return 0;
}
int json_dispatch_in_addr(const char *name, sd_json_variant *variant, sd_json_dispatch_flags_t flags, void *userdata) {
struct in_addr *address = ASSERT_PTR(userdata);
_cleanup_(iovec_done) struct iovec iov = {};
src/libsystemd/sd-json/json-util.h
+1
View File
@@ -112,6 +112,7 @@ int json_dispatch_unbase64_iovec(const char *name, sd_json_variant *variant, sd_
int json_dispatch_byte_array_iovec(const char *name, sd_json_variant *variant, sd_json_dispatch_flags_t flags, void *userdata);
int json_dispatch_user_group_name(const char *name, sd_json_variant *variant, sd_json_dispatch_flags_t flags, void *userdata);
int json_dispatch_const_user_group_name(const char *name, sd_json_variant *variant, sd_json_dispatch_flags_t flags, void *userdata);
int json_dispatch_const_unit_name(const char *name, sd_json_variant *variant, sd_json_dispatch_flags_t flags, void *userdata);
int json_dispatch_in_addr(const char *name, sd_json_variant *variant, sd_json_dispatch_flags_t flags, void *userdata);
int json_dispatch_path(const char *name, sd_json_variant *variant, sd_json_dispatch_flags_t flags, void *userdata);
int json_dispatch_const_path(const char *name, sd_json_variant *variant, sd_json_dispatch_flags_t flags, void *userdata);