tree-wide: sort specifiers and move common comments to specifier.h
This commit is contained in:
Yu Watanabe
parent
55318801ba
commit
e93387f38b
|
|
@ -177,35 +177,23 @@ int unit_name_printf(const Unit *u, const char* format, char **ret) {
|
|||
* This will use the passed string as format string and replace the following specifiers (which should all be
|
||||
* safe for inclusion in unit names):
|
||||
*
|
||||
* %n: the full id of the unit (foo@bar.waldo)
|
||||
* %N: the id of the unit without the suffix (foo@bar)
|
||||
* %p: the prefix (foo)
|
||||
* %n: the full id of the unit (foo-aaa@bar.waldo)
|
||||
* %N: the id of the unit without the suffix (foo-aaa@bar)
|
||||
* %p: the prefix (foo-aaa)
|
||||
* %i: the instance (bar)
|
||||
*
|
||||
* %U: the UID of the running user
|
||||
* %u: the username of the running user
|
||||
*
|
||||
* %m: the machine ID of the running system
|
||||
* %b: the boot ID of the running system
|
||||
* %H: the hostname of the running system
|
||||
* %v: the kernel version
|
||||
* %a: the native userspace architecture
|
||||
* %o: the OS ID according to /etc/os-release
|
||||
* %w: the OS version ID, according to /etc/os-release
|
||||
* %B: the OS build ID, according to /etc/os-release
|
||||
* %W: the OS variant ID, according to /etc/os-release
|
||||
* %j: the last componet of the prefix (aaa)
|
||||
*/
|
||||
|
||||
const Specifier table[] = {
|
||||
{ 'i', specifier_string, u->instance },
|
||||
{ 'j', specifier_last_component, NULL },
|
||||
{ 'n', specifier_string, u->id },
|
||||
{ 'N', specifier_prefix_and_instance, NULL },
|
||||
{ 'p', specifier_prefix, NULL },
|
||||
{ 'i', specifier_string, u->instance },
|
||||
{ 'j', specifier_last_component, NULL },
|
||||
|
||||
COMMON_CREDS_SPECIFIERS,
|
||||
|
||||
COMMON_SYSTEM_SPECIFIERS,
|
||||
|
||||
COMMON_CREDS_SPECIFIERS,
|
||||
{}
|
||||
};
|
||||
|
||||
|
|
@ -226,19 +214,15 @@ int unit_full_printf(const Unit *u, const char *format, char **ret) {
|
|||
* %r: where units in this slice are placed in the cgroup tree (deprecated)
|
||||
* %R: the root of this systemd's instance tree (deprecated)
|
||||
*
|
||||
* %t: the runtime directory root (e.g. /run or $XDG_RUNTIME_DIR)
|
||||
* %S: the state directory root (e.g. /var/lib or $XDG_CONFIG_HOME)
|
||||
* %C: the cache directory root (e.g. /var/cache or $XDG_CACHE_HOME)
|
||||
* %L: the log directory root (e.g. /var/log or $XDG_CONFIG_HOME/log)
|
||||
* %E: the configuration directory root (e.g. /etc or $XDG_CONFIG_HOME)
|
||||
* %T: the temporary directory (e.g. /tmp, or $TMPDIR, $TEMP, $TMP)
|
||||
* %V: the temporary directory for large, persistent stuff (e.g. /var/tmp, or $TMPDIR, $TEMP, $TMP)
|
||||
* %L: the log directory root (e.g. /var/log or $XDG_CONFIG_HOME/log)
|
||||
* %S: the state directory root (e.g. /var/lib or $XDG_CONFIG_HOME)
|
||||
* %t: the runtime directory root (e.g. /run or $XDG_RUNTIME_DIR)
|
||||
*
|
||||
* %h: the homedir of the running user
|
||||
* %s: the shell of the running user
|
||||
*
|
||||
* %v: `uname -r` of the running system
|
||||
*
|
||||
* NOTICE: When you add new entries here, please be careful: specifiers which depend on settings of the unit
|
||||
* file itself are broken by design, as they would resolve differently depending on whether they are used
|
||||
* before or after the relevant configuration setting. Hence: don't add them.
|
||||
|
|
@ -249,32 +233,35 @@ int unit_full_printf(const Unit *u, const char *format, char **ret) {
|
|||
assert(ret);
|
||||
|
||||
const Specifier table[] = {
|
||||
{ 'n', specifier_string, u->id },
|
||||
{ 'N', specifier_prefix_and_instance, NULL },
|
||||
{ 'p', specifier_prefix, NULL },
|
||||
{ 'P', specifier_prefix_unescaped, NULL },
|
||||
{ 'i', specifier_string, u->instance },
|
||||
{ 'I', specifier_instance_unescaped, NULL },
|
||||
{ 'j', specifier_last_component, NULL },
|
||||
{ 'J', specifier_last_component_unescaped, NULL },
|
||||
{ 'n', specifier_string, u->id },
|
||||
{ 'N', specifier_prefix_and_instance, NULL },
|
||||
{ 'p', specifier_prefix, NULL },
|
||||
{ 'P', specifier_prefix_unescaped, NULL },
|
||||
|
||||
{ 'f', specifier_filename, NULL },
|
||||
|
||||
{ 'c', specifier_cgroup, NULL },
|
||||
{ 'r', specifier_cgroup_slice, NULL },
|
||||
{ 'R', specifier_cgroup_root, NULL },
|
||||
|
||||
{ 't', specifier_special_directory, UINT_TO_PTR(EXEC_DIRECTORY_RUNTIME) },
|
||||
{ 'S', specifier_special_directory, UINT_TO_PTR(EXEC_DIRECTORY_STATE) },
|
||||
{ 'C', specifier_special_directory, UINT_TO_PTR(EXEC_DIRECTORY_CACHE) },
|
||||
{ 'L', specifier_special_directory, UINT_TO_PTR(EXEC_DIRECTORY_LOGS) },
|
||||
{ 'E', specifier_special_directory, UINT_TO_PTR(EXEC_DIRECTORY_CONFIGURATION) },
|
||||
COMMON_TMP_SPECIFIERS,
|
||||
{ 'L', specifier_special_directory, UINT_TO_PTR(EXEC_DIRECTORY_LOGS) },
|
||||
{ 'S', specifier_special_directory, UINT_TO_PTR(EXEC_DIRECTORY_STATE) },
|
||||
{ 't', specifier_special_directory, UINT_TO_PTR(EXEC_DIRECTORY_RUNTIME) },
|
||||
|
||||
COMMON_CREDS_SPECIFIERS,
|
||||
{ 'h', specifier_user_home, NULL },
|
||||
{ 's', specifier_user_shell, NULL },
|
||||
|
||||
COMMON_SYSTEM_SPECIFIERS,
|
||||
|
||||
COMMON_CREDS_SPECIFIERS,
|
||||
|
||||
COMMON_TMP_SPECIFIERS,
|
||||
{}
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -230,14 +230,14 @@ int config_parse_dnssd_service_name(
|
|||
void *userdata) {
|
||||
|
||||
static const Specifier specifier_table[] = {
|
||||
{ 'm', specifier_machine_id, NULL },
|
||||
{ 'b', specifier_boot_id, NULL },
|
||||
{ 'H', specifier_host_name, NULL }, /* We will use specifier_dnssd_host_name(). */
|
||||
{ 'v', specifier_kernel_release, NULL },
|
||||
{ 'a', specifier_architecture, NULL },
|
||||
{ 'o', specifier_os_id, NULL },
|
||||
{ 'w', specifier_os_version_id, NULL },
|
||||
{ 'b', specifier_boot_id, NULL },
|
||||
{ 'B', specifier_os_build_id, NULL },
|
||||
{ 'H', specifier_host_name, NULL }, /* We will use specifier_dnssd_host_name(). */
|
||||
{ 'm', specifier_machine_id, NULL },
|
||||
{ 'o', specifier_os_id, NULL },
|
||||
{ 'v', specifier_kernel_release, NULL },
|
||||
{ 'w', specifier_os_version_id, NULL },
|
||||
{ 'W', specifier_os_variant_id, NULL },
|
||||
{}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -157,14 +157,14 @@ static int specifier_dnssd_host_name(char specifier, const void *data, const voi
|
|||
|
||||
int dnssd_render_instance_name(DnssdService *s, char **ret_name) {
|
||||
static const Specifier specifier_table[] = {
|
||||
{ 'm', specifier_machine_id, NULL },
|
||||
{ 'b', specifier_boot_id, NULL },
|
||||
{ 'H', specifier_dnssd_host_name, NULL },
|
||||
{ 'v', specifier_kernel_release, NULL },
|
||||
{ 'a', specifier_architecture, NULL },
|
||||
{ 'o', specifier_os_id, NULL },
|
||||
{ 'w', specifier_os_version_id, NULL },
|
||||
{ 'b', specifier_boot_id, NULL },
|
||||
{ 'B', specifier_os_build_id, NULL },
|
||||
{ 'H', specifier_dnssd_host_name, NULL },
|
||||
{ 'm', specifier_machine_id, NULL },
|
||||
{ 'o', specifier_os_id, NULL },
|
||||
{ 'v', specifier_kernel_release, NULL },
|
||||
{ 'w', specifier_os_version_id, NULL },
|
||||
{ 'W', specifier_os_variant_id, NULL },
|
||||
{}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -104,32 +104,18 @@ static int specifier_last_component(char specifier, const void *data, const void
|
|||
}
|
||||
|
||||
int install_full_printf(const UnitFileInstallInfo *i, const char *format, char **ret) {
|
||||
/* This is similar to unit_full_printf() but does not support
|
||||
* anything path-related.
|
||||
*
|
||||
* %n: the full id of the unit (foo@bar.waldo)
|
||||
* %N: the id of the unit without the suffix (foo@bar)
|
||||
* %p: the prefix (foo)
|
||||
* %i: the instance (bar)
|
||||
|
||||
* %U the UID of the running user
|
||||
* %u the username of running user
|
||||
* %m the machine ID of the running system
|
||||
* %H the hostname of the running system
|
||||
* %b the boot ID of the running system
|
||||
* %v `uname -r` of the running system
|
||||
*/
|
||||
/* This is similar to unit_name_printf() */
|
||||
|
||||
const Specifier table[] = {
|
||||
{ 'i', specifier_instance, NULL },
|
||||
{ 'j', specifier_last_component, NULL },
|
||||
{ 'n', specifier_name, NULL },
|
||||
{ 'N', specifier_prefix_and_instance, NULL },
|
||||
{ 'p', specifier_prefix, NULL },
|
||||
{ 'i', specifier_instance, NULL },
|
||||
{ 'j', specifier_last_component, NULL },
|
||||
|
||||
COMMON_CREDS_SPECIFIERS,
|
||||
|
||||
COMMON_SYSTEM_SPECIFIERS,
|
||||
|
||||
COMMON_CREDS_SPECIFIERS,
|
||||
{}
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -37,24 +37,48 @@ int specifier_tmp_dir(char specifier, const void *data, const void *userdata, ch
|
|||
int specifier_var_tmp_dir(char specifier, const void *data, const void *userdata, char **ret);
|
||||
|
||||
/* Typically, in places where one of the above specifier is to be resolved the other similar ones are to be
|
||||
* resolved, too. Hence let's define common macros for the relevant array entries. */
|
||||
* resolved, too. Hence let's define common macros for the relevant array entries.
|
||||
*
|
||||
* COMMON_SYSTEM_SPECIFIERS:
|
||||
* %a: the native userspace architecture
|
||||
* %b: the boot ID of the running system
|
||||
* %B: the OS build ID, according to /etc/os-release
|
||||
* %H: the hostname of the running system
|
||||
* %l: the short hostname of the running system
|
||||
* %m: the machine ID of the running system
|
||||
* %o: the OS ID according to /etc/os-release
|
||||
* %v: the kernel version
|
||||
* %w: the OS version ID, according to /etc/os-release
|
||||
* %W: the OS variant ID, according to /etc/os-release
|
||||
*
|
||||
* COMMON_CREDS_SPECIFIERS:
|
||||
* %g: the groupname of the running user
|
||||
* %G: the GID of the running user
|
||||
* %u: the username of the running user
|
||||
* %U: the UID of the running user
|
||||
*
|
||||
* COMMON_TMP_SPECIFIERS:
|
||||
* %T: the temporary directory (e.g. /tmp, or $TMPDIR, $TEMP, $TMP)
|
||||
* %V: the temporary directory for large, persistent stuff (e.g. /var/tmp, or $TMPDIR, $TEMP, $TMP)
|
||||
*/
|
||||
|
||||
#define COMMON_SYSTEM_SPECIFIERS \
|
||||
{ 'm', specifier_machine_id, NULL }, \
|
||||
{ 'a', specifier_architecture, NULL }, \
|
||||
{ 'b', specifier_boot_id, NULL }, \
|
||||
{ 'B', specifier_os_build_id, NULL }, \
|
||||
{ 'H', specifier_host_name, NULL }, \
|
||||
{ 'l', specifier_short_host_name, NULL }, \
|
||||
{ 'v', specifier_kernel_release, NULL }, \
|
||||
{ 'a', specifier_architecture, NULL }, \
|
||||
{ 'm', specifier_machine_id, NULL }, \
|
||||
{ 'o', specifier_os_id, NULL }, \
|
||||
{ 'v', specifier_kernel_release, NULL }, \
|
||||
{ 'w', specifier_os_version_id, NULL }, \
|
||||
{ 'B', specifier_os_build_id, NULL }, \
|
||||
{ 'W', specifier_os_variant_id, NULL }
|
||||
|
||||
#define COMMON_CREDS_SPECIFIERS \
|
||||
{ 'g', specifier_group_name, NULL }, \
|
||||
{ 'G', specifier_group_id, NULL }, \
|
||||
{ 'U', specifier_user_id, NULL }, \
|
||||
{ 'u', specifier_user_name, NULL }
|
||||
{ 'u', specifier_user_name, NULL }, \
|
||||
{ 'U', specifier_user_id, NULL }
|
||||
|
||||
#define COMMON_TMP_SPECIFIERS \
|
||||
{ 'T', specifier_tmp_dir, NULL }, \
|
||||
|
|
|
|||
|
|
@ -188,24 +188,26 @@ static int specifier_machine_id_safe(char specifier, const void *data, const voi
|
|||
static int specifier_directory(char specifier, const void *data, const void *userdata, char **ret);
|
||||
|
||||
static const Specifier specifier_table[] = {
|
||||
{ 'm', specifier_machine_id_safe, NULL },
|
||||
{ 'a', specifier_architecture, NULL },
|
||||
{ 'b', specifier_boot_id, NULL },
|
||||
{ 'B', specifier_os_build_id, NULL },
|
||||
{ 'H', specifier_host_name, NULL },
|
||||
{ 'l', specifier_short_host_name, NULL },
|
||||
{ 'v', specifier_kernel_release, NULL },
|
||||
{ 'a', specifier_architecture, NULL },
|
||||
{ 'm', specifier_machine_id_safe, NULL },
|
||||
{ 'o', specifier_os_id, NULL },
|
||||
{ 'v', specifier_kernel_release, NULL },
|
||||
{ 'w', specifier_os_version_id, NULL },
|
||||
{ 'B', specifier_os_build_id, NULL },
|
||||
{ 'W', specifier_os_variant_id, NULL },
|
||||
|
||||
COMMON_CREDS_SPECIFIERS,
|
||||
{ 'h', specifier_user_home, NULL },
|
||||
|
||||
{ 't', specifier_directory, UINT_TO_PTR(DIRECTORY_RUNTIME) },
|
||||
{ 'S', specifier_directory, UINT_TO_PTR(DIRECTORY_STATE) },
|
||||
{ 'C', specifier_directory, UINT_TO_PTR(DIRECTORY_CACHE) },
|
||||
{ 'L', specifier_directory, UINT_TO_PTR(DIRECTORY_LOGS) },
|
||||
{ 'S', specifier_directory, UINT_TO_PTR(DIRECTORY_STATE) },
|
||||
{ 't', specifier_directory, UINT_TO_PTR(DIRECTORY_RUNTIME) },
|
||||
|
||||
COMMON_CREDS_SPECIFIERS,
|
||||
|
||||
COMMON_TMP_SPECIFIERS,
|
||||
{}
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in New Issue