From 5238d9a83a52c64e24856b0d3b2ca0b0ee52479a Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 29 Jul 2019 19:18:56 +0200 Subject: [PATCH] analyze: rename "exit-codes" to "exit-status" waitid(2) and the libc function signature calls this "exit status", and uses "exit code" for something different. Let's stick to the same nomenclature hence. --- NEWS | 6 +++--- man/systemd-analyze.xml | 28 ++++++++++++++-------------- src/analyze/analyze.c | 24 ++++++++++++------------ 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/NEWS b/NEWS index b26c749a5f8..5ad412ef990 100644 --- a/NEWS +++ b/NEWS @@ -106,9 +106,9 @@ CHANGES WITH 243 in spe: unambiguously distinguished. * SuccessExitStatus=, RestartPreventExitStatus=, and - RestartForceExitStatus= now accept exit code names (e.g. "DATAERR" is - equivalent to "65"). systemd-analyze learnt a new 'exit-codes' verb - to display those exit code name mappings. + RestartForceExitStatus= now accept exit status names (e.g. "DATAERR" + is equivalent to "65"). systemd-analyze learnt a new 'exit-status' + verb to display those exit status name mappings. * /usr/sbin/halt.local is no longer supported. Implementation in distributions was inconsistent and it seems this functionality was diff --git a/man/systemd-analyze.xml b/man/systemd-analyze.xml index 8e9f24caacd..7e842ac2016 100644 --- a/man/systemd-analyze.xml +++ b/man/systemd-analyze.xml @@ -86,8 +86,8 @@ systemd-analyze OPTIONS - exit-codes - CODE + exit-status + STATUS systemd-analyze @@ -372,25 +372,25 @@ $ eog targets.svg - <command>systemd-analyze exit-codes <optional><replaceable>CODE</replaceable>...</optional></command> + <command>systemd-analyze exit-status <optional><replaceable>STATUS</replaceable>...</optional></command> - This command prints a list of exit codes along with their "class", i.e. the source of the + This command prints a list of exit statuses along with their "class", i.e. the source of the definition (one of glibc, systemd, LSB, or BSD), see the Process Exit Codes section in systemd.exec5. - If no additional arguments are specified, all known codes are are shown. Otherwise, only the + If no additional arguments are specified, all known statuses are are shown. Otherwise, only the definitions for the specified codes are shown. - <command>Show some example exit code names</command> - - $ systemd-analyze exit-codes 0 1 {63..65} -NAME CODE CLASS -SUCCESS 0 glibc -FAILURE 1 glibc -- 63 - -USAGE 64 BSD -DATAERR 65 BSD + <command>Show some example exit status names</command> + + $ systemd-analyze exit-status 0 1 {63..65} +NAME STATUS CLASS +SUCCESS 0 glibc +FAILURE 1 glibc +- 63 - +USAGE 64 BSD +DATAERR 65 BSD diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c index 199d49f5b93..1785e2ec07b 100644 --- a/src/analyze/analyze.c +++ b/src/analyze/analyze.c @@ -1638,11 +1638,11 @@ static void dump_syscall_filter(const SyscallFilterSet *set) { printf(" %s%s%s\n", syscall[0] == '@' ? ansi_underline() : "", syscall, ansi_normal()); } -static int dump_exit_codes(int argc, char *argv[], void *userdata) { +static int dump_exit_status(int argc, char *argv[], void *userdata) { _cleanup_(table_unrefp) Table *table = NULL; int r; - table = table_new("name", "code", "class"); + table = table_new("name", "status", "class"); if (!table) return log_oom(); @@ -1660,17 +1660,17 @@ static int dump_exit_codes(int argc, char *argv[], void *userdata) { } else for (int i = 1; i < argc; i++) { - int code; + int status; - code = exit_status_from_string(argv[i]); - if (code < 0) - return log_error_errno(r, "Invalid exit code \"%s\": %m", argv[i]); + status = exit_status_from_string(argv[i]); + if (status < 0) + return log_error_errno(r, "Invalid exit status \"%s\": %m", argv[i]); - assert(code >= 0 && (size_t) code < ELEMENTSOF(exit_status_mappings)); + assert(status >= 0 && (size_t) status < ELEMENTSOF(exit_status_mappings)); r = table_add_many(table, - TABLE_STRING, exit_status_mappings[code].name ?: "-", - TABLE_INT, code, - TABLE_STRING, exit_status_class(code) ?: "-"); + TABLE_STRING, exit_status_mappings[status].name ?: "-", + TABLE_INT, status, + TABLE_STRING, exit_status_class(status) ?: "-"); if (r < 0) return r; } @@ -2213,7 +2213,7 @@ static int help(int argc, char *argv[], void *userdata) { " dump Output state serialization of service manager\n" " cat-config Show configuration file and drop-ins\n" " unit-paths List load directories for units\n" - " exit-codes List exit code definitions\n" + " exit-status List exit status definitions\n" " syscall-filter [NAME...] Print list of syscalls in seccomp filter\n" " condition CONDITION... Evaluate conditions and asserts\n" " verify FILE... Check unit files for correctness\n" @@ -2418,7 +2418,7 @@ static int run(int argc, char *argv[]) { { "dump", VERB_ANY, 1, 0, dump }, { "cat-config", 2, VERB_ANY, 0, cat_config }, { "unit-paths", 1, 1, 0, dump_unit_paths }, - { "exit-codes", VERB_ANY, VERB_ANY, 0, dump_exit_codes }, + { "exit-status", VERB_ANY, VERB_ANY, 0, dump_exit_status }, { "syscall-filter", VERB_ANY, VERB_ANY, 0, dump_syscall_filters }, { "condition", 2, VERB_ANY, 0, do_condition }, { "verify", 2, VERB_ANY, 0, do_verify }, -- 2.39.2