shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-26 10:03:40 +03:00
Code

exit-status: rename EXIT_STATUS_GLIBC → EXIT_STATUS_LIBC

Browse Source 
After all these two exit codes are defined by ISO C as part of the C
library, and it's not the GNU implementation defines them.
This commit is contained in:
Lennart Poettering 2019-07-29 19:05:25 +02:00
parent 1d7458fbb1
commit e04ed6db6b
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/execute.c
View File

@ -3881,7 +3881,7 @@ int exec_spawn(Unit *unit,
if (r < 0) { if (r < 0) {
const char *status = const char *status =
exit_status_to_string(exit_status, exit_status_to_string(exit_status,
EXIT_STATUS_GLIBC | EXIT_STATUS_SYSTEMD); EXIT_STATUS_LIBC | EXIT_STATUS_SYSTEMD);
log_struct_errno(LOG_ERR, r, log_struct_errno(LOG_ERR, r,
"MESSAGE_ID=" SD_MESSAGE_SPAWN_FAILED_STR, "MESSAGE_ID=" SD_MESSAGE_SPAWN_FAILED_STR,

2
src/core/main.c
View File

@ -223,7 +223,7 @@ _noreturn_ static void crash(int sig) {
log_emergency_errno(r, "Caught <%s>, waitpid() failed: %m", signal_to_string(sig)); log_emergency_errno(r, "Caught <%s>, waitpid() failed: %m", signal_to_string(sig));
else if (status.si_code != CLD_DUMPED) { else if (status.si_code != CLD_DUMPED) {
const char *s = status.si_code == CLD_EXITED const char *s = status.si_code == CLD_EXITED
? exit_status_to_string(status.si_status, EXIT_STATUS_GLIBC) ? exit_status_to_string(status.si_status, EXIT_STATUS_LIBC)
: signal_to_string(status.si_status); : signal_to_string(status.si_status);
log_emergency("Caught <%s>, core dump failed (child "PID_FMT", code=%s, status=%i/%s).", log_emergency("Caught <%s>, core dump failed (child "PID_FMT", code=%s, status=%i/%s).",

8
src/shared/exit-status.c
View File

@ -26,8 +26,8 @@ const ExitStatusMapping exit_status_mappings[256] = {
* │ signal or such, and we follow that logic here.) * │ signal or such, and we follow that logic here.)
*/ */
[EXIT_SUCCESS] = { "SUCCESS", EXIT_STATUS_GLIBC }, [EXIT_SUCCESS] = { "SUCCESS", EXIT_STATUS_LIBC },
[EXIT_FAILURE] = { "FAILURE", EXIT_STATUS_GLIBC }, [EXIT_FAILURE] = { "FAILURE", EXIT_STATUS_LIBC },
[EXIT_CHDIR] = { "CHDIR", EXIT_STATUS_SYSTEMD }, [EXIT_CHDIR] = { "CHDIR", EXIT_STATUS_SYSTEMD },
[EXIT_NICE] = { "NICE", EXIT_STATUS_SYSTEMD }, [EXIT_NICE] = { "NICE", EXIT_STATUS_SYSTEMD },
@ -107,8 +107,8 @@ const char* exit_status_class(int code) {
return NULL; return NULL;
switch (exit_status_mappings[code].class) { switch (exit_status_mappings[code].class) {
case EXIT_STATUS_GLIBC: case EXIT_STATUS_LIBC:
return "glibc"; return "libc";
case EXIT_STATUS_SYSTEMD: case EXIT_STATUS_SYSTEMD:
return "systemd"; return "systemd";
case EXIT_STATUS_LSB: case EXIT_STATUS_LSB:

4
src/shared/exit-status.h
View File

@ -75,11 +75,11 @@ enum {
}; };
typedef enum ExitStatusClass { typedef enum ExitStatusClass {
EXIT_STATUS_GLIBC = 1 << 0, /* libc EXIT_STATUS/EXIT_FAILURE */ EXIT_STATUS_LIBC = 1 << 0, /* libc EXIT_STATUS/EXIT_FAILURE */
EXIT_STATUS_SYSTEMD = 1 << 1, /* systemd's own exit codes */ EXIT_STATUS_SYSTEMD = 1 << 1, /* systemd's own exit codes */
EXIT_STATUS_LSB = 1 << 2, /* LSB exit codes */ EXIT_STATUS_LSB = 1 << 2, /* LSB exit codes */
EXIT_STATUS_BSD = 1 << 3, /* BSD (EX_xyz) exit codes */ EXIT_STATUS_BSD = 1 << 3, /* BSD (EX_xyz) exit codes */
EXIT_STATUS_FULL = EXIT_STATUS_GLIBC | EXIT_STATUS_SYSTEMD | EXIT_STATUS_LSB | EXIT_STATUS_BSD, EXIT_STATUS_FULL = EXIT_STATUS_LIBC | EXIT_STATUS_SYSTEMD | EXIT_STATUS_LSB | EXIT_STATUS_BSD,
} ExitStatusClass; } ExitStatusClass;
typedef struct ExitStatusSet { typedef struct ExitStatusSet {

4
src/systemctl/systemctl.c
View File

@ -4380,7 +4380,7 @@ static void print_status_info(
printf("status=%i", p->status); printf("status=%i", p->status);
c = exit_status_to_string(p->status, EXIT_STATUS_GLIBC | EXIT_STATUS_SYSTEMD); c = exit_status_to_string(p->status, EXIT_STATUS_LIBC | EXIT_STATUS_SYSTEMD);
if (c) if (c)
printf("/%s", c); printf("/%s", c);
@ -4422,7 +4422,7 @@ static void print_status_info(
printf("status=%i", i->exit_status); printf("status=%i", i->exit_status);
c = exit_status_to_string(i->exit_status, c = exit_status_to_string(i->exit_status,
EXIT_STATUS_GLIBC | EXIT_STATUS_SYSTEMD); EXIT_STATUS_LIBC | EXIT_STATUS_SYSTEMD);
if (c) if (c)
printf("/%s", c); printf("/%s", c);