--- parser3/src/targets/cgi/parser3.C	2001/03/18 20:32:53	1.22
+++ parser3/src/targets/cgi/parser3.C	2001/03/21 16:59:07	1.29
@@ -1,9 +1,11 @@
-/*
-	Parser
+/** @file
+	Parser: scripting and CGI main.
+
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
+
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: parser3.C,v 1.22 2001/03/18 20:32:53 paf Exp $
+	$Id: parser3.C,v 1.29 2001/03/21 16:59:07 paf Exp $
 */
 
 #ifdef HAVE_CONFIG_H
@@ -14,18 +16,26 @@
 #ifdef WIN32
 #	include <windows.h>
 #	include <io.h>
+#else
+#	include <unistd.h>
 #endif
+
+//\ifwin32
+#include <io.h>
+//#include <fcntl.h>
+//\endifwin32
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <fcntl.h>
 
+#include "pa_common.h"
 #include "pa_globals.h"
 #include "pa_request.h"
-#include "pa_common.h"
 
 Pool pool; // global pool
-bool cgi;
+bool cgi; ///< we were started as CGI?
 
 #ifdef WIN32
 #	if _MSC_VER
@@ -54,10 +64,24 @@ LONG WINAPI TopLevelExceptionFilter (
 	return EXCEPTION_EXECUTE_HANDLER; // never reached
 }
 #	endif
+
 #endif
 
+//\if
+void fix_slashes(char *s) {
+	if(s)
+		for(; *s; s++)
+			if(*s=='\\')
+				*s='/';
+}
+//\endif
+
 // service funcs
 
+const char *get_env(Pool& pool, const char *name) {
+ 	return getenv(name);
+}
+
 int read_post(char *buf, int max_bytes) {
 	int read_size=0;
 	do {
@@ -86,14 +110,15 @@ void output_body(const char *buf, size_t
 // main
 
 int main(int argc, char *argv[]) {
-	//TODO: umask(2);
-#ifdef WIN32
-	_setmode(fileno(stdin), _O_BINARY);
-	_setmode(fileno(stdout), _O_BINARY);
-	_setmode(fileno(stderr), _O_BINARY);
-#endif
+	// TODO:umask(2);
+//\#ifdef WIN32
+	setmode(fileno(stdin), _O_BINARY);
+	setmode(fileno(stdout), _O_BINARY);
+	setmode(fileno(stderr), _O_BINARY);
+//\#endif
 
 	// Service funcs 
+	service_funcs.get_env=get_env;
 	service_funcs.read_post=read_post;
 	service_funcs.output_header_attribute=output_header_attribute;
 	service_funcs.output_body=output_body;
@@ -113,7 +138,10 @@ int main(int argc, char *argv[]) {
 		}
 	}
 
-	const char *filespec_to_process=cgi?getenv("PATH_TRANSLATED"):argv[1];
+	char *filespec_to_process=cgi?getenv("PATH_TRANSLATED"):argv[1];
+//\#ifdef WIN32
+	fix_slashes(filespec_to_process);
+//\#endif
 
 	PTRY { // global try
 		// must be first in PTRY{}PCATCH
@@ -133,7 +161,6 @@ int main(int argc, char *argv[]) {
 				"no file to process");
 
 		// Request info
-		// TODO: ifdef WIN32 flip \\ to /
 		Request::Info request_info;
 		const char *document_root=getenv("DOCUMENT_ROOT");
 		if(!document_root) {
@@ -153,9 +180,10 @@ int main(int argc, char *argv[]) {
 		request_info.cookie=getenv("HTTP_COOKIE");
 
 		// prepare to process request
-		Request request(Pool(),
+		Pool request_pool;
+		Request request(request_pool,
 			request_info,
-			cgi ? String::Untaint_lang::HTML_TYPO : String::Untaint_lang::NO
+			cgi ? String::UL_HTML_TYPO : String::UL_NO
 			);
 		
 		// some root-controlled location
@@ -189,9 +217,9 @@ int main(int argc, char *argv[]) {
 #	if _MSC_VER
 		SetUnhandledExceptionFilter(0);
 #	endif
+#endif
 		// successful finish
 		return 0;
-#endif
 	} PCATCH(e) { // global problem 
 		const char *body=e.comment();
 		int content_length=strlen(body);