--- parser3/src/targets/cgi/parser3.C 2001/04/09 09:48:26 1.59 +++ parser3/src/targets/cgi/parser3.C 2001/04/09 15:49:01 1.61 @@ -5,7 +5,7 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: parser3.C,v 1.59 2001/04/09 09:48:26 paf Exp $ + $Id: parser3.C,v 1.61 2001/04/09 15:49:01 paf Exp $ */ #include "pa_config_includes.h" @@ -55,6 +55,39 @@ static LONG WINAPI TopLevelExceptionFilt #endif // SAPI +// appends to parser3.log located beside my binary +void SAPI::log(Pool& pool, const char *fmt, ...) { + bool opened; + FILE *f=0; + + if(argv0) { + // beside by binary + char file_spec[MAX_STRING]; + strncpy(file_spec, argv0, MAX_STRING); // filespec of my binary + rsplit(file_spec, '/'); rsplit(file_spec, '\\');// strip filename + strcat(file_spec, "/parser3.log"); + f=fopen(file_spec, "at"); + } + opened=f!=0; + if(!opened) + f=stderr; + + // prefix + time_t t=time(0); + const char *stamp=ctime(&t); + fprintf(f, "[%.*s] ", strlen(stamp)-1, stamp); + // message + va_list args; + va_start(args,fmt); + vfprintf(f, fmt, args); + va_end(args); + // newline + fprintf(f, "\n"); + + if(opened) + fclose(f); +} + const char *SAPI::get_env(Pool& pool, const char *name) { return getenv(name); } @@ -91,39 +124,6 @@ void SAPI::send_body(Pool& pool, const v stdout_write(buf, size); } -// appends to parser3.log located beside my binary -void SAPI::log(Pool& pool, const char *fmt, ...) { - bool opened; - FILE *f=0; - - if(argv0) { - // beside by binary - char file_spec[MAX_STRING]; - strncpy(file_spec, argv0, MAX_STRING); // filespec of my binary - rsplit(file_spec, '/'); rsplit(file_spec, '\\');// strip filename - strcat(file_spec, "/parser3.log"); - f=fopen(file_spec, "at"); - } - opened=f!=0; - if(!opened) - f=stderr; - - // prefix - time_t t=time(0); - const char *stamp=ctime(&t); - fprintf(f, "[%.*s] ", strlen(stamp)-1, stamp); - // message - va_list args; - va_start(args,fmt); - vfprintf(f, fmt, args); - va_end(args); - // newline - fprintf(f, "\n"); - - if(opened) - fclose(f); -} - int SAPI::execute(const String& file_spec, const Hash *env, const Array *argv, @@ -297,7 +297,7 @@ int main(int argc, char *argv[]) { // prepare header SAPI::add_header_attribute(pool, "content-type", "text/plain"); char content_length_cstr[MAX_NUMBER]; - snprintf(content_length_cstr, MAX_NUMBER, "%lu", content_length); + snprintf(content_length_cstr, MAX_NUMBER, "%u", content_length); SAPI::add_header_attribute(pool, "content-length", content_length_cstr); // send header