diff options
Diffstat (limited to 'src/shared/specifier.c')
| -rw-r--r-- | src/shared/specifier.c | 43 |
1 files changed, 30 insertions, 13 deletions
diff --git a/src/shared/specifier.c b/src/shared/specifier.c index d698b42e07..b8f7537f7a 100644 --- a/src/shared/specifier.c +++ b/src/shared/specifier.c @@ -21,14 +21,13 @@ /* * Generic infrastructure for replacing %x style specifiers in * strings. Will call a callback for each replacement. - * */ /* Any ASCII character or digit: our pool of potential specifiers, * and "%" used for escaping. */ #define POSSIBLE_SPECIFIERS ALPHANUMERICAL "%" -int specifier_printf(const char *text, const Specifier table[], void *userdata, char **_ret) { +int specifier_printf(const char *text, const Specifier table[], const void *userdata, char **_ret) { size_t l, allocated = 0; _cleanup_free_ char *ret = NULL; char *t; @@ -103,7 +102,7 @@ int specifier_printf(const char *text, const Specifier table[], void *userdata, /* Generic handler for simple string replacements */ -int specifier_string(char specifier, void *data, void *userdata, char **ret) { +int specifier_string(char specifier, const void *data, const void *userdata, char **ret) { char *n; n = strdup(strempty(data)); @@ -114,7 +113,7 @@ int specifier_string(char specifier, void *data, void *userdata, char **ret) { return 0; } -int specifier_machine_id(char specifier, void *data, void *userdata, char **ret) { +int specifier_machine_id(char specifier, const void *data, const void *userdata, char **ret) { sd_id128_t id; char *n; int r; @@ -131,7 +130,7 @@ int specifier_machine_id(char specifier, void *data, void *userdata, char **ret) return 0; } -int specifier_boot_id(char specifier, void *data, void *userdata, char **ret) { +int specifier_boot_id(char specifier, const void *data, const void *userdata, char **ret) { sd_id128_t id; char *n; int r; @@ -148,7 +147,7 @@ int specifier_boot_id(char specifier, void *data, void *userdata, char **ret) { return 0; } -int specifier_host_name(char specifier, void *data, void *userdata, char **ret) { +int specifier_host_name(char specifier, const void *data, const void *userdata, char **ret) { char *n; n = gethostname_malloc(); @@ -159,7 +158,7 @@ int specifier_host_name(char specifier, void *data, void *userdata, char **ret) return 0; } -int specifier_kernel_release(char specifier, void *data, void *userdata, char **ret) { +int specifier_kernel_release(char specifier, const void *data, const void *userdata, char **ret) { struct utsname uts; char *n; int r; @@ -176,7 +175,25 @@ int specifier_kernel_release(char specifier, void *data, void *userdata, char ** return 0; } -int specifier_user_name(char specifier, void *data, void *userdata, char **ret) { +int specifier_group_name(char specifier, const void *data, const void *userdata, char **ret) { + char *t; + + t = gid_to_name(getgid()); + if (!t) + return -ENOMEM; + + *ret = t; + return 0; +} + +int specifier_group_id(char specifier, const void *data, const void *userdata, char **ret) { + if (asprintf(ret, UID_FMT, getgid()) < 0) + return -ENOMEM; + + return 0; +} + +int specifier_user_name(char specifier, const void *data, const void *userdata, char **ret) { char *t; /* If we are UID 0 (root), this will not result in NSS, otherwise it might. This is good, as we want to be able @@ -194,7 +211,7 @@ int specifier_user_name(char specifier, void *data, void *userdata, char **ret) return 0; } -int specifier_user_id(char specifier, void *data, void *userdata, char **ret) { +int specifier_user_id(char specifier, const void *data, const void *userdata, char **ret) { if (asprintf(ret, UID_FMT, getuid()) < 0) return -ENOMEM; @@ -202,7 +219,7 @@ int specifier_user_id(char specifier, void *data, void *userdata, char **ret) { return 0; } -int specifier_user_home(char specifier, void *data, void *userdata, char **ret) { +int specifier_user_home(char specifier, const void *data, const void *userdata, char **ret) { /* On PID 1 (which runs as root) this will not result in NSS, * which is good. See above */ @@ -210,7 +227,7 @@ int specifier_user_home(char specifier, void *data, void *userdata, char **ret) return get_home_dir(ret); } -int specifier_user_shell(char specifier, void *data, void *userdata, char **ret) { +int specifier_user_shell(char specifier, const void *data, const void *userdata, char **ret) { /* On PID 1 (which runs as root) this will not result in NSS, * which is good. See above */ @@ -218,7 +235,7 @@ int specifier_user_shell(char specifier, void *data, void *userdata, char **ret) return get_shell(ret); } -int specifier_tmp_dir(char specifier, void *data, void *userdata, char **ret) { +int specifier_tmp_dir(char specifier, const void *data, const void *userdata, char **ret) { const char *p; char *copy; int r; @@ -235,7 +252,7 @@ int specifier_tmp_dir(char specifier, void *data, void *userdata, char **ret) { return 0; } -int specifier_var_tmp_dir(char specifier, void *data, void *userdata, char **ret) { +int specifier_var_tmp_dir(char specifier, const void *data, const void *userdata, char **ret) { const char *p; char *copy; int r; |