From 8de07f3e4a67fa1c9bd5293d183090ad08b7be6f Mon Sep 17 00:00:00 2001 From: Hartmut Becker Date: Sun, 24 Aug 2014 22:06:15 +0200 Subject: Enhance/fix VMS exit code handling. * commands.c, function.c, hash.c, job.c, main.c, output.c: use MAKE exit codes. * makeint.h: encode make exit codes so that they are VMS compatible. * job.c: check child exit code for VMS style exit codes. * vmsjobs.c: save and return VMS style exit code. --- job.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'job.c') diff --git a/job.c b/job.c index b3eab13..c52a03a 100644 --- a/job.c +++ b/job.c @@ -510,9 +510,14 @@ child_error (struct child *child, OUTPUT_UNSET (); return; } - - error (NILF, l + INTSTR_LENGTH, - _("%s[%s] Error 0x%x%s"), pre, f->name, exit_code, post); + /* Check for a Posix compatible VMS style exit code: + decode and print the Posix exit code */ + if ((exit_code & 0x35a000) == 0x35a000) + error(NILF, l + INTSTR_LENGTH, _("%s[%s] Error %d%s"), pre, f->name, + ((exit_code & 0x7f8) >> 3), post); + else + error(NILF, l + INTSTR_LENGTH, _("%s[%s] Error 0x%x%s"), pre, f->name, + exit_code, post); #else if (exit_sig == 0) error (NILF, l + INTSTR_LENGTH, @@ -982,7 +987,7 @@ reap_children (int block, int err) if (!err && child_failed && !dontcare && !keep_going_flag && /* fatal_error_signal will die with the right signal. */ !handling_fatal_signal) - die (2); + die (MAKE_FAILURE); /* Only block for one child. */ block = 0; -- cgit v1.2.3