Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- Index: usr.bin/make/job.c
- ===================================================================
- --- usr.bin/make/job.c (revision 228107)
- +++ usr.bin/make/job.c (working copy)
- @@ -954,17 +954,18 @@
- lastNode = job->node;
- }
- fprintf(out,
- - "*** Completed successfully\n");
- + "*** [%s] Completed successfully\n",
- + job->node->name);
- }
- } else {
- if (usePipes && job->node != lastNode) {
- - MESSAGE(out, job->node);
- lastNode = job->node;
- }
- - fprintf(out, "*** Error code %d%s\n",
- + fprintf(out, "*** [%s] Error code %d%s\n",
- + job->node->name,
- WEXITSTATUS(*status),
- (job->flags & JOB_IGNERR) ?
- - "(ignored)" : "");
- + " (ignored)" : "");
- if (job->flags & JOB_IGNERR) {
- *status = 0;
- @@ -1002,10 +1003,10 @@
- */
- if (job->flags & (JOB_RESUME | JOB_RESTART)) {
- if (usePipes && job->node != lastNode) {
- - MESSAGE(out, job->node);
- lastNode = job->node;
- }
- - fprintf(out, "*** Continued\n");
- + fprintf(out, "*** [%s] Continued\n",
- + job->node->name);
- }
- if (!(job->flags & JOB_CONTINUING)) {
- DEBUGF(JOB, ("Warning: process %jd was not "
- @@ -1025,11 +1026,11 @@
- } else {
- if (usePipes && job->node != lastNode) {
- - MESSAGE(out, job->node);
- lastNode = job->node;
- }
- fprintf(out,
- - "*** Signal %d\n", WTERMSIG(*status));
- + "*** [%s] Signal %d\n", job->node->name,
- + WTERMSIG(*status));
- fflush(out);
- }
- }
- @@ -1053,10 +1054,10 @@
- DEBUGF(JOB, ("Process %jd stopped.\n", (intmax_t) job->pid));
- if (usePipes && job->node != lastNode) {
- - MESSAGE(out, job->node);
- lastNode = job->node;
- }
- - fprintf(out, "*** Stopped -- signal %d\n", WSTOPSIG(*status));
- + fprintf(out, "*** [%s] Stopped -- signal %d\n",
- + job->node->name, WSTOPSIG(*status));
- job->flags |= JOB_RESUME;
- TAILQ_INSERT_TAIL(&stoppedJobs, job, link);
- fflush(out);
- @@ -3042,13 +3043,15 @@
- if (status == 0) {
- return (0);
- } else {
- - printf("*** Error code %d", status);
- + printf("*** [%s] Error code %d",
- + gn->name, status);
- }
- } else if (WIFSTOPPED(reason)) {
- status = WSTOPSIG(reason);
- } else {
- status = WTERMSIG(reason);
- - printf("*** Signal %d", status);
- + printf("*** [%s] Signal %d",
- + gn->name, status);
- }
- if (ps.errCheck) {
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement