Print this page
make: unifdef SUN5_0 (defined)

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/make/lib/mksh/dosys.cc
          +++ new/usr/src/cmd/make/lib/mksh/dosys.cc
↓ open down ↓ 619 lines elided ↑ open up ↑
 620  620   *              filter_stderr   Set if -X is on
 621  621   */
 622  622  #if defined(DISTRIBUTED) || defined(MAKETOOL) /* tolik */
 623  623  Boolean
 624  624  await(register Boolean ignore_error, register Boolean silent_error, Name target, wchar_t *command, pid_t running_pid, Boolean send_mtool_msgs, XDR *xdrs_p, int job_msg_id)
 625  625  #else
 626  626  Boolean
 627  627  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)
 628  628  #endif
 629  629  {
 630      -#ifdef SUN5_0
 631  630          int                     status;
 632      -#else
 633      -#ifndef WEXITSTATUS
 634      -#define WEXITSTATUS(stat)       stat.w_T.w_Retcode
 635      -#endif
 636      -#ifndef WTERMSIG
 637      -#define WTERMSIG(stat)          stat.w_T.w_Termsig
 638      -#endif
 639      -#ifndef WCOREDUMP
 640      -#define WCOREDUMP(stat)         stat.w_T.w_Coredump
 641      -#endif
 642      -#if defined (HP_UX) || defined (linux)
 643      -        int                     status;
 644      -#else
 645      -        union wait              status;
 646      -#endif
 647      -#endif
 648  631          char                    *buffer;
 649  632          int                     core_dumped;
 650  633          int                     exit_status;
 651  634  #if defined(DISTRIBUTED) || defined(MAKETOOL) /* tolik */
 652  635          Avo_CmdOutput           *make_output_msg;
 653  636  #endif
 654  637          FILE                    *outfp;
 655  638          register pid_t          pid;
 656  639          struct stat             stat_buff;
 657  640          int                     termination_signal;
↓ open down ↓ 3 lines elided ↑ open up ↑
 661  644  #endif
 662  645  
 663  646          while ((pid = wait(&status)) != running_pid) {
 664  647                  if (pid == -1) {
 665  648                          fatal_mksh(catgets(libmksdmsi18n_catd, 1, 98, "wait() failed: %s"), errmsg(errno));
 666  649                  }
 667  650          }
 668  651          (void) fflush(stdout);
 669  652          (void) fflush(stderr);
 670  653  
 671      -#if defined(SUN5_0) || defined(HP_UX) || defined(linux)
 672  654          if (status == 0) {
 673  655  
 674  656  #ifdef PRINT_EXIT_STATUS
 675  657                  warning_mksh(NOCATGETS("I'm in await(), and status is 0."));
 676  658  #endif
 677  659  
 678  660                  return succeeded;
 679  661          }
 680  662  
 681  663  #ifdef PRINT_EXIT_STATUS
 682  664          warning_mksh(NOCATGETS("I'm in await(), and status is *NOT* 0."));
 683  665  #endif
 684  666  
 685      -#else
 686      -        if (status.w_status == 0) {
 687      -                return succeeded;
 688      -        }
 689      -#endif
 690  667  
 691  668          exit_status = WEXITSTATUS(status);
 692  669  
 693  670  #ifdef PRINT_EXIT_STATUS
 694  671          warning_mksh(NOCATGETS("I'm in await(), and exit_status is %d."), exit_status);
 695  672  #endif
 696  673  
 697  674          termination_signal = WTERMSIG(status);
 698  675          core_dumped = WCOREDUMP(status);
 699  676  
↓ open down ↓ 12 lines elided ↑ open up ↑
 712  689                  if (exit_status != 0) {
 713  690                          (void) fprintf(stdout,
 714  691                                         catgets(libmksdmsi18n_catd, 1, 103, "*** Error code %d"),
 715  692                                         exit_status);
 716  693                          SEND_MTOOL_MSG(
 717  694                                  (void) sprintf(&tmp_buf[strlen(tmp_buf)],
 718  695                                                 catgets(libmksdmsi18n_catd, 1, 104, "*** Error code %d"),
 719  696                                                 exit_status);
 720  697                          );
 721  698                  } else {
 722      -#if ! defined(SUN5_0) && ! defined(HP_UX) && ! defined(linux)
 723      -                        if (termination_signal > NSIG) {
 724      -#endif
 725  699                                  (void) fprintf(stdout,
 726  700                                                 catgets(libmksdmsi18n_catd, 1, 105, "*** Signal %d"),
 727  701                                                 termination_signal);
 728  702                                  SEND_MTOOL_MSG(
 729  703                                          (void) sprintf(&tmp_buf[strlen(tmp_buf)],
 730  704                                                         catgets(libmksdmsi18n_catd, 1, 106, "*** Signal %d"),
 731  705                                                         termination_signal);
 732  706                                  );
 733      -#if ! defined(SUN5_0) && ! defined(HP_UX) && ! defined(linux)
 734      -                        } else {
 735      -                                (void) fprintf(stdout,
 736      -                                               "*** %s",
 737      -                                               sys_siglist[termination_signal]);
 738      -                                SEND_MTOOL_MSG(
 739      -                                        (void) sprintf(&tmp_buf[strlen(tmp_buf)],
 740      -                                                       "*** %s",
 741      -                                                       sys_siglist[termination_signal]);
 742      -                                );
 743      -                        }
 744      -#endif
 745  707                          if (core_dumped) {
 746  708                                  (void) fprintf(stdout,
 747  709                                                 catgets(libmksdmsi18n_catd, 1, 107, " - core dumped"));
 748  710                                  SEND_MTOOL_MSG(
 749  711                                          (void) sprintf(&tmp_buf[strlen(tmp_buf)],
 750  712                                                         catgets(libmksdmsi18n_catd, 1, 108, " - core dumped"));
 751  713                                  );
 752  714                          }
 753  715                  }
 754  716                  if (ignore_error) {
↓ open down ↓ 93 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX