You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by Dean Gaudet <dg...@hyperreal.com> on 1997/06/16 22:18:34 UTC
cvs commit: apache/src util_script.c
dgaudet 97/06/16 13:18:32
Modified: src util_script.c
Log:
use sizeof rather than manifest constants
Revision Changes Path
1.60 +3 -3 apache/src/util_script.c
Index: util_script.c
===================================================================
RCS file: /export/home/cvs/apache/src/util_script.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -C3 -r1.59 -r1.60
*** util_script.c 1997/06/15 19:22:34 1.59
--- util_script.c 1997/06/16 20:18:31 1.60
***************
*** 509,515 ****
log_unixerr("fopen", NULL, err_string, r->server);
return(pid);
}
! fgets (interpreter, 2048, program);
fclose (program);
if (!strncmp (interpreter, "#!", 2)) {
is_script = 1;
--- 509,515 ----
log_unixerr("fopen", NULL, err_string, r->server);
return(pid);
}
! fgets (interpreter, sizeof(interpreter), program);
fclose (program);
if (!strncmp (interpreter, "#!", 2)) {
is_script = 1;
***************
*** 604,610 ****
log_unixerr("fopen", NULL, err_string, r->server);
return(pid);
}
! sz = fread (interpreter, 1, 2047, program);
if(sz < 0) {
char err_string[HUGE_STRING_LEN];
ap_snprintf(err_string, sizeof(err_string), "open of %s failed, errno is %d\n", r->filename, errno);
--- 604,610 ----
log_unixerr("fopen", NULL, err_string, r->server);
return(pid);
}
! sz = fread (interpreter, 1, sizeof(interpreter)-1, program);
if(sz < 0) {
char err_string[HUGE_STRING_LEN];
ap_snprintf(err_string, sizeof(err_string), "open of %s failed, errno is %d\n", r->filename, errno);
***************
*** 616,622 ****
fclose (program);
if (!strncmp (interpreter, "#!", 2)) {
is_script = 1;
! for(i=2; i<2048; i++)
{
if((interpreter[i] == '\r') ||
(interpreter[i] == '\n'))
--- 616,622 ----
fclose (program);
if (!strncmp (interpreter, "#!", 2)) {
is_script = 1;
! for(i=2; i<sizeof(interpreter); i++)
{
if((interpreter[i] == '\r') ||
(interpreter[i] == '\n'))