From 2a876d901d8cccb3f633b65a93abaead81628a8f Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Thu, 8 Oct 2009 08:13:02 -0600 Subject: maint: move timeout exit statuses * src/timeout.c (EXIT_TIMEDOUT, EXIT_CANCELED): Remove as macros... * src/system.h (EXIT_TIMEDOUT, EXIT_CANCELED): ...and provide as enum values instead. * src/stdbuf.c (EXIT_CANCELED): Delete. --- src/stdbuf.c | 3 --- src/system.h | 6 ++++-- src/timeout.c | 6 ------ 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/stdbuf.c b/src/stdbuf.c index 05a6b9fe8..393071354 100644 --- a/src/stdbuf.c +++ b/src/stdbuf.c @@ -37,9 +37,6 @@ #define AUTHORS proper_name_utf8 ("Padraig Brady", "P\303\241draig Brady") -/* Internal error */ -enum { EXIT_CANCELED = 125 }; - static char *program_path; extern char **environ; diff --git a/src/system.h b/src/system.h index ce7114891..f3e26a835 100644 --- a/src/system.h +++ b/src/system.h @@ -107,8 +107,10 @@ you must include before including this file /* Exit statuses for programs like 'env' that exec other programs. */ enum { - EXIT_CANNOT_INVOKE = 126, - EXIT_ENOENT = 127 + EXIT_TIMEDOUT = 124, /* Time expired before child completed. */ + EXIT_CANCELED = 125, /* Internal error prior to exec attempt. */ + EXIT_CANNOT_INVOKE = 126, /* Program located, but not usable. */ + EXIT_ENOENT = 127 /* Could not find program to exec. */ }; #include "exitfail.h" diff --git a/src/timeout.c b/src/timeout.c index 7069f2c1a..7b0f1d7c5 100644 --- a/src/timeout.c +++ b/src/timeout.c @@ -73,12 +73,6 @@ #define AUTHORS proper_name_utf8 ("Padraig Brady", "P\303\241draig Brady") -/* Note ETIMEDOUT is 110 on GNU/Linux systems but this is non standard */ -#define EXIT_TIMEDOUT 124 - -/* Internal failure. */ -#define EXIT_CANCELED 125 - static int timed_out; static int term_signal = SIGTERM; /* same default as kill command. */ static int monitored_pid; -- cgit v1.2.3-54-g00ecf