--- parser3/src/targets/cgi/parser3.C	2001/03/19 16:06:15	1.24
+++ parser3/src/targets/cgi/parser3.C	2001/03/20 18:55:44	1.26.2.3
@@ -3,7 +3,7 @@
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: parser3.C,v 1.24 2001/03/19 16:06:15 paf Exp $
+	$Id: parser3.C,v 1.26.2.3 2001/03/20 18:55:44 paf Exp $
 */
 
 #ifdef HAVE_CONFIG_H
@@ -14,7 +14,15 @@
 #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>
@@ -54,8 +62,17 @@ LONG WINAPI TopLevelExceptionFilter (
 	return EXCEPTION_EXECUTE_HANDLER; // never reached
 }
 #	endif
+
 #endif
 
+//\if
+void fix_slashes(char *s) {
+	for(; *s; s++)
+		if(*s=='\\')
+			*s='/';
+}
+//\endif
+
 // service funcs
 
 int read_post(char *buf, int max_bytes) {
@@ -87,11 +104,11 @@ void output_body(const char *buf, size_t
 
 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
+//\#ifdef WIN32
+	setmode(fileno(stdin), _O_BINARY);
+	setmode(fileno(stdout), _O_BINARY);
+	setmode(fileno(stderr), _O_BINARY);
+//\#endif
 
 	// Service funcs 
 	service_funcs.read_post=read_post;
@@ -113,7 +130,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 +153,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 +172,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 +209,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);