Print this page
make: unifdef SUN5_0 (defined)
@@ -625,28 +625,11 @@
#else
Boolean
await(register Boolean ignore_error, register Boolean silent_error, Name target, wchar_t *command, pid_t running_pid, Boolean send_mtool_msgs, void *xdrs_p, int job_msg_id)
#endif
{
-#ifdef SUN5_0
int status;
-#else
-#ifndef WEXITSTATUS
-#define WEXITSTATUS(stat) stat.w_T.w_Retcode
-#endif
-#ifndef WTERMSIG
-#define WTERMSIG(stat) stat.w_T.w_Termsig
-#endif
-#ifndef WCOREDUMP
-#define WCOREDUMP(stat) stat.w_T.w_Coredump
-#endif
-#if defined (HP_UX) || defined (linux)
- int status;
-#else
- union wait status;
-#endif
-#endif
char *buffer;
int core_dumped;
int exit_status;
#if defined(DISTRIBUTED) || defined(MAKETOOL) /* tolik */
Avo_CmdOutput *make_output_msg;
@@ -666,11 +649,10 @@
}
}
(void) fflush(stdout);
(void) fflush(stderr);
-#if defined(SUN5_0) || defined(HP_UX) || defined(linux)
if (status == 0) {
#ifdef PRINT_EXIT_STATUS
warning_mksh(NOCATGETS("I'm in await(), and status is 0."));
#endif
@@ -680,15 +662,10 @@
#ifdef PRINT_EXIT_STATUS
warning_mksh(NOCATGETS("I'm in await(), and status is *NOT* 0."));
#endif
-#else
- if (status.w_status == 0) {
- return succeeded;
- }
-#endif
exit_status = WEXITSTATUS(status);
#ifdef PRINT_EXIT_STATUS
warning_mksh(NOCATGETS("I'm in await(), and exit_status is %d."), exit_status);
@@ -717,33 +694,18 @@
(void) sprintf(&tmp_buf[strlen(tmp_buf)],
catgets(libmksdmsi18n_catd, 1, 104, "*** Error code %d"),
exit_status);
);
} else {
-#if ! defined(SUN5_0) && ! defined(HP_UX) && ! defined(linux)
- if (termination_signal > NSIG) {
-#endif
(void) fprintf(stdout,
catgets(libmksdmsi18n_catd, 1, 105, "*** Signal %d"),
termination_signal);
SEND_MTOOL_MSG(
(void) sprintf(&tmp_buf[strlen(tmp_buf)],
catgets(libmksdmsi18n_catd, 1, 106, "*** Signal %d"),
termination_signal);
);
-#if ! defined(SUN5_0) && ! defined(HP_UX) && ! defined(linux)
- } else {
- (void) fprintf(stdout,
- "*** %s",
- sys_siglist[termination_signal]);
- SEND_MTOOL_MSG(
- (void) sprintf(&tmp_buf[strlen(tmp_buf)],
- "*** %s",
- sys_siglist[termination_signal]);
- );
- }
-#endif
if (core_dumped) {
(void) fprintf(stdout,
catgets(libmksdmsi18n_catd, 1, 107, " - core dumped"));
SEND_MTOOL_MSG(
(void) sprintf(&tmp_buf[strlen(tmp_buf)],