--- parser3/src/targets/cgi/parser3.C	2001/03/24 14:31:01	1.44
+++ parser3/src/targets/cgi/parser3.C	2001/04/03 07:20:54	1.55
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru>(http://design.ru/paf)
 
-	$Id: parser3.C,v 1.44 2001/03/24 14:31:01 paf Exp $
+	$Id: parser3.C,v 1.55 2001/04/03 07:20:54 paf Exp $
 */
 
 #include "pa_config_includes.h"
@@ -18,6 +18,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <fcntl.h>
+#include <time.h>
 
 #include "pa_sapi.h"
 #include "pa_common.h"
@@ -27,6 +28,7 @@
 /// IIS refuses to read bigger chunks
 const size_t READ_POST_CHUNK_SIZE=0x400*0x400; // 1M 
 
+const char *argv0;
 Pool pool(0); // global pool [dont describe to doxygen: it confuses it with param names]
 bool cgi; ///< we were started as CGI?
 
@@ -36,7 +38,7 @@ static LONG WINAPI TopLevelExceptionFilt
 	char buf[MAX_STRING];
 	if(ExceptionInfo && ExceptionInfo->ExceptionRecord) {
 		struct _EXCEPTION_RECORD *er=ExceptionInfo->ExceptionRecord;
-		snprintf(buf, MAX_STRING, "Exception %#X at %p", 
+		snprintf(buf, MAX_STRING, "Exception 0x%X at %p", 
 			er->ExceptionCode, 
 			er->ExceptionAddress);
 	} else 
@@ -50,8 +52,7 @@ static LONG WINAPI TopLevelExceptionFilt
 }
 #endif
 
-//@{
-/// SAPI funcs decl
+// SAPI
 const char *SAPI::get_env(Pool& pool, const char *name) {
  	return getenv(name);
 }
@@ -74,7 +75,7 @@ void SAPI::add_header_attribute(Pool& po
 		printf("%s: %s\n", key, value);
 }
 
-/// @todo intelligent cache-control
+/// @todo parser4: intelligent cache-control
 void SAPI::send_header(Pool& pool) {
 	if(cgi) {
 		puts("expires: Fri, 23 Mar 2001 09:32:23 GMT");
@@ -84,46 +85,54 @@ void SAPI::send_header(Pool& pool) {
 	}
 }
 
-void SAPI::send_body(Pool& pool, const char *buf, size_t size) {
+void SAPI::send_body(Pool& pool, const void *buf, size_t size) {
 	stdout_write(buf, size);
 }
 
+// appends to parser3.log located beside my binary
 void SAPI::log(Pool& pool, const char *fmt, ...) {
-#if 1 //winnt
-	if(HANDLE elh=OpenEventLog(0, "Application")) {
-		va_list args;
-		va_start(args,fmt);
-		char buf[MAX_STRING];
-		vsnprintf(buf, MAX_STRING, fmt, args);
-		
-		const char *strings[]={buf};
-		ReportEvent(elh, EVENTLOG_ERROR_TYPE, 0, 
-			1234, 0, 1, 0, strings, 0);
-
-		va_end(args);
-		CloseEventLog(elh);
-	} else {
-		DWORD id=GetLastError();
-		if(FILE *f=fopen("c:\\temp\\a", "wt")) {
-		fprintf(f, "%d",id);
-		fclose(f);
-		}
+	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");
 	}
-#else
-	// todo: file
-#endif
+	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);
 }
-//@}
 
 /**
 	main workhorse
 
-	@todo 
+	@todo parser4:
 		IIS: remove trailing default-document[index.html] from $request.uri.
 		to do that we need to consult metabase,
 		wich is tested but seems slow.
 */
 int main(int argc, char *argv[]) {
+	argv0=argv[0];
+
 	umask(2);
 
 #ifdef WIN32
@@ -141,8 +150,7 @@ int main(int argc, char *argv[]) {
 	
 	if(!cgi) {
 		if(argc<2) {
-			char *binary=argv[0];
-			printf("Usage: %s <file>\n", binary?binary:"parser3");
+			printf("Usage: %s <file>\n", argv0?argv0:"parser3");
 			exit(1);
 		}
 	}
@@ -172,9 +180,9 @@ int main(int argc, char *argv[]) {
 		// Request info
 		Request::Info request_info;
 		if(cgi) {
-			if(const char *env_document_root=getenv("DOCUMENT_ROOT"))
+			if(const char *env_document_root=SAPI::get_env(pool, "DOCUMENT_ROOT"))
 				request_info.document_root=env_document_root;
-			else if(const char *path_info=getenv("PATH_INFO")) {
+			else if(const char *path_info=SAPI::get_env(pool, "PATH_INFO")) {
 				// IIS
 				size_t len=strlen(filespec_to_process)-strlen(path_info);
 				char *buf=(char *)pool.malloc(len+1);
@@ -193,12 +201,12 @@ int main(int argc, char *argv[]) {
 		}
 		request_info.path_translated=filespec_to_process;
 		request_info.method=request_method;
-		const char *query_string=getenv("QUERY_STRING");
+		const char *query_string=SAPI::get_env(pool, "QUERY_STRING");
 		request_info.query_string=query_string;
 		if(cgi) 
-			if(const char *env_request_uri=getenv("REQUEST_URI"))
+			if(const char *env_request_uri=SAPI::get_env(pool, "REQUEST_URI"))
 				request_info.uri=env_request_uri;
-			else if(const char *path_info=getenv("PATH_INFO"))
+			else if(const char *path_info=SAPI::get_env(pool, "PATH_INFO"))
 				if(query_string) {
 					char *reconstructed_uri=(char *)malloc(
 						strlen(path_info)+1/*'?'*/+
@@ -216,15 +224,16 @@ int main(int argc, char *argv[]) {
 		else
 			request_info.uri=0;
 
-		request_info.content_type=getenv("CONTENT_TYPE");
-		const char *content_length=getenv("CONTENT_LENGTH");
+		request_info.content_type=SAPI::get_env(pool, "CONTENT_TYPE");
+		const char *content_length=SAPI::get_env(pool, "CONTENT_LENGTH");
 		request_info.content_length=(content_length?atoi(content_length):0);
-		request_info.cookie=getenv("HTTP_COOKIE");
+		request_info.cookie=SAPI::get_env(pool, "HTTP_COOKIE");
+		request_info.user_agent=SAPI::get_env(pool, "HTTP_USER_AGENT");
 
 		// prepare to process request
 		Request request(pool,
 			request_info,
-			cgi ? String::UL_HTML_TYPO : String::UL_NO
+			1||cgi ? String::UL_HTML_TYPO : String::UL_CLEAN
 			);
 		
 		// some root-controlled location
@@ -234,7 +243,7 @@ int main(int argc, char *argv[]) {
 		GetWindowsDirectory(root_auto_path, MAX_STRING);
 #else
 		// ~nobody  todo: figure out a better place
-		char *root_auto_path=getenv("HOME");
+		char *root_auto_path=SAPI::get_env(pool, "HOME");
 #endif
 		
 		// beside by binary