/[make]/make/main.c
ViewVC logotype

Diff of /make/main.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.210 by psmith, Tue Jul 12 04:35:13 2005 UTC revision 1.211 by psmith, Mon Aug 8 05:08:00 2005 UTC
# Line 662  handle_runtime_exceptions( struct _EXCEP Line 662  handle_runtime_exceptions( struct _EXCEP
662    if (! ISDB (DB_VERBOSE))    if (! ISDB (DB_VERBOSE))
663      {      {
664        sprintf(errmsg,        sprintf(errmsg,
665                _("%s: Interrupt/Exception caught (code = 0x%x, addr = 0x%x)\n"),                _("%s: Interrupt/Exception caught (code = 0x%lx, addr = 0x%lx)\n"),
666                prg, exrec->ExceptionCode, exrec->ExceptionAddress);                prg, exrec->ExceptionCode, exrec->ExceptionAddress);
667        fprintf(stderr, errmsg);        fprintf(stderr, errmsg);
668        exit(255);        exit(255);
669      }      }
670    
671    sprintf(errmsg,    sprintf(errmsg,
672            _("\nUnhandled exception filter called from program %s\nExceptionCode = %x\nExceptionFlags = %x\nExceptionAddress = %x\n"),            _("\nUnhandled exception filter called from program %s\nExceptionCode = %lx\nExceptionFlags = %lx\nExceptionAddress = %lx\n"),
673            prg, exrec->ExceptionCode, exrec->ExceptionFlags,            prg, exrec->ExceptionCode, exrec->ExceptionFlags,
674            exrec->ExceptionAddress);            exrec->ExceptionAddress);
675    
# Line 677  handle_runtime_exceptions( struct _EXCEP Line 677  handle_runtime_exceptions( struct _EXCEP
677        && exrec->NumberParameters >= 2)        && exrec->NumberParameters >= 2)
678      sprintf(&errmsg[strlen(errmsg)],      sprintf(&errmsg[strlen(errmsg)],
679              (exrec->ExceptionInformation[0]              (exrec->ExceptionInformation[0]
680               ? _("Access violation: write operation at address %x\n")               ? _("Access violation: write operation at address %lx\n")
681               : _("Access violation: read operation at address %x\n")),               : _("Access violation: read operation at address %lx\n")),
682              exrec->ExceptionInformation[1]);              exrec->ExceptionInformation[1]);
683    
684    /* turn this on if we want to put stuff in the event log too */    /* turn this on if we want to put stuff in the event log too */
# Line 751  find_and_set_default_shell (char *token) Line 751  find_and_set_default_shell (char *token)
751            && !strcmpi (tokend - 4, "cmd.exe"))) {            && !strcmpi (tokend - 4, "cmd.exe"))) {
752      batch_mode_shell = 1;      batch_mode_shell = 1;
753      unixy_shell = 0;      unixy_shell = 0;
754      sh_found = 0;      sprintf (sh_path, "%s", search_token);
755        default_shell = xstrdup (w32ify (sh_path, 0));
756        DB (DB_VERBOSE,
757            (_("find_and_set_shell setting default_shell = %s\n"), default_shell));
758        sh_found = 1;
759    } else if (!no_default_sh_exe &&    } else if (!no_default_sh_exe &&
760               (token == NULL || !strcmp (search_token, default_shell))) {               (token == NULL || !strcmp (search_token, default_shell))) {
761      /* no new information, path already set or known */      /* no new information, path already set or known */
# Line 838  extern int mkstemp PARAMS ((char *templa Line 842  extern int mkstemp PARAMS ((char *templa
842  FILE *  FILE *
843  open_tmpfile(char **name, const char *template)  open_tmpfile(char **name, const char *template)
844  {  {
845    #ifdef HAVE_FDOPEN
846    int fd;    int fd;
847    #endif
848    
849  #if defined HAVE_MKSTEMP || defined HAVE_MKTEMP  #if defined HAVE_MKSTEMP || defined HAVE_MKTEMP
850  # define TEMPLATE_LEN   strlen (template)  # define TEMPLATE_LEN   strlen (template)
# Line 1217  main (int argc, char **argv, char **envp Line 1223  main (int argc, char **argv, char **envp
1223    decode_switches (argc, argv, 0);    decode_switches (argc, argv, 0);
1224  #ifdef WINDOWS32  #ifdef WINDOWS32
1225    if (suspend_flag) {    if (suspend_flag) {
1226          fprintf(stderr, "%s (pid = %d)\n", argv[0], GetCurrentProcessId());          fprintf(stderr, "%s (pid = %ld)\n", argv[0], GetCurrentProcessId());
1227          fprintf(stderr, _("%s is suspending for 30 seconds..."), argv[0]);          fprintf(stderr, _("%s is suspending for 30 seconds..."), argv[0]);
1228          Sleep(30 * 1000);          Sleep(30 * 1000);
1229          fprintf(stderr, _("done sleep(30). Continuing.\n"));          fprintf(stderr, _("done sleep(30). Continuing.\n"));
# Line 2990  die (int status) Line 2996  die (int status)
2996          print_version ();          print_version ();
2997    
2998        /* Wait for children to die.  */        /* Wait for children to die.  */
2999        for (err = (status != 0); job_slots_used > 0; err = 0)        err = (status != 0);
3000          while (job_slots_used > 0)
3001          reap_children (1, err);          reap_children (1, err);
3002    
3003        /* Let the remote job module clean up its state.  */        /* Let the remote job module clean up its state.  */

Legend:
Removed from v.1.210  
changed lines
  Added in v.1.211

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26