cvs commit: apache/src mod_cgi.c mod_include.c util_script.c

[Marc Slemko]

marc        97/06/21 20:40:27

  Modified:    src       mod_cgi.c mod_include.c util_script.c
  Log:
  Include strerror() output in several messages instead of just
  printing errno.
  
  Reviewed by:  Chuck Murcko, Jim Jagielski, Alexei Kosut, Dean Gaudet
  
  Revision  Changes    Path
  1.41      +2 -1      apache/src/mod_cgi.c
  
  Index: mod_cgi.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/mod_cgi.c,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -C3 -r1.40 -r1.41
  *** mod_cgi.c 1997/06/15 19:22:28     1.40
  --- mod_cgi.c 1997/06/22 03:40:24     1.41
  ***************
  *** 337,343 ****
         */
        
        ap_snprintf(err_string, sizeof(err_string),
  !         "exec of %s failed, errno is %d\n", r->filename, errno);
        write(2, err_string, strlen(err_string));
        exit(0);
        /* NOT REACHED */
  --- 337,344 ----
         */
        
        ap_snprintf(err_string, sizeof(err_string),
  !         "exec of %s failed, reason: %s (errno = %d)\n", 
  !             r->filename, strerror(errno), errno);
        write(2, err_string, strlen(err_string));
        exit(0);
        /* NOT REACHED */
  
  
  
  1.35      +2 -2      apache/src/mod_include.c
  
  Index: mod_include.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/mod_include.c,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -C3 -r1.34 -r1.35
  *** mod_include.c     1997/06/15 19:22:29     1.34
  --- mod_include.c     1997/06/22 03:40:24     1.35
  ***************
  *** 653,660 ****
        fprintf (dbg, "Exec failed\n");
    #endif    
        ap_snprintf(err_string, sizeof(err_string),
  !     "httpd: exec of %s failed, errno is %d\n",
  !     SHELL_PATH,errno);
        write (2, err_string, strlen(err_string));
        exit(0);
        /* NOT REACHED */
  --- 653,660 ----
        fprintf (dbg, "Exec failed\n");
    #endif    
        ap_snprintf(err_string, sizeof(err_string),
  !     "httpd: exec of %s failed, reason: %s (errno = %d)\n",
  !     SHELL_PATH, strerror(errno), errno);
        write (2, err_string, strlen(err_string));
        exit(0);
        /* NOT REACHED */
  
  
  
  1.61      +4 -1      apache/src/util_script.c
  
  Index: util_script.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/util_script.c,v
  retrieving revision 1.60
  retrieving revision 1.61
  diff -C3 -r1.60 -r1.61
  *** util_script.c     1997/06/16 20:18:31     1.60
  --- util_script.c     1997/06/22 03:40:25     1.61
  ***************
  *** 503,509 ****
            program = fopen (r->filename, "r");
            if (!program) {
                char err_string[HUGE_STRING_LEN];
  !             ap_snprintf(err_string, sizeof(err_string), "open of %s failed, 
errno is %d\n", r->filename, errno);
                /* write(2, err_string, strlen(err_string)); */
                /* exit(0); */
                log_unixerr("fopen", NULL, err_string, r->server);
  --- 503,512 ----
            program = fopen (r->filename, "r");
            if (!program) {
                char err_string[HUGE_STRING_LEN];
  !             ap_snprintf(err_string, sizeof(err_string), 
  !              "open of %s failed, reason: fopen: %s (errno = %d)\n", 
  !              r->filename, strerror(errno), errno);
  ! 
                /* write(2, err_string, strlen(err_string)); */
                /* exit(0); */
                log_unixerr("fopen", NULL, err_string, r->server);