--- parser3/src/targets/cgi/parser3.C	2001/03/14 08:53:58	1.6
+++ parser3/src/targets/cgi/parser3.C	2001/03/14 16:47:34	1.10
@@ -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.6 2001/03/14 08:53:58 paf Exp $
+	$Id: parser3.C,v 1.10 2001/03/14 16:47:34 paf Exp $
 */
 
 #ifdef HAVE_CONFIG_H
@@ -27,6 +27,7 @@
 Pool pool; // global pool
 
 #ifdef WIN32
+#	if MSVC
 // intercept global system errors
 LONG WINAPI TopLevelExceptionFilter (
 									 struct _EXCEPTION_POINTERS *ExceptionInfo
@@ -51,19 +52,17 @@ LONG WINAPI TopLevelExceptionFilter (
 
 	return EXCEPTION_EXECUTE_HANDLER; // never reached
 }
+#	endif
 #endif
 
-void fill_vform_fields(Pool& pool, bool cgi, Hash& fields) {
-	String& ename=*new(pool) String(pool);
-	ename.APPEND_CONST("test");
-
-	String& evalue=*new(pool) String(pool);
-	evalue.APPEND_TAINTED("<value>", 0, "form", 0);
-
-	fields.put(ename, new(pool) VString(evalue));
+size_t read_post(char *&buf, size_t max_bytes) {
+	return 0;
 }
 
 int main(int argc, char *argv[]) {
+	// Service funcs 
+	service_funcs.read_post=read_post;
+	
 	// were we started as CGI?
 	bool cgi=
 		getenv("SERVER_SOFTWARE") || 
@@ -71,49 +70,64 @@ int main(int argc, char *argv[]) {
 		getenv("GATEWAY_INTERFACE") || 
 		getenv("REQUEST_METHOD");
 	
+	if(!cgi) {
+		if(argc<2) {
+			char *binary=argv[0];
+			rsplit(binary, PATH_DELIMITER_CHAR);
+			printf("Usage: %s <file>\n", binary);
+			exit(1);
+		}
+	}
+
+	const char *filespec_to_process=cgi?getenv("PATH_TRANSLATED"):argv[1];
+
 	char *result;  char error[MAX_STRING];  error[0]=0;
 	PTRY { // global try
 		// must be first in PTRY{}PCATCH
 #ifdef WIN32
+#	if MSVC
 		SetUnhandledExceptionFilter(&TopLevelExceptionFilter);
 		//TODO: initSocks();
+#	endif
 #endif
 
-		fill_globals(pool);
-		
+		// init global variables
+		globals_init(pool);
+
+		// Request info
 		// TODO: ifdef WIN32 flip \\ to /
-		const char *document_root="Y:/parser3/src/";
-		const char *page_filespec="Y:/parser3/src/test.p";
-		
+		Request::Info request_info;
+		request_info.document_root="Y:/parser3/src/";
+		request_info.path_translated=filespec_to_process;
+		request_info.request_method=getenv("REQUEST_METHOD");
+		request_info.query_string=getenv("QUERY_STRING");
+		request_info.request_uri=getenv("REQUEST_URI");
+		request_info.content_type=getenv("CONTENT_TYPE");
+		const char *content_length=getenv("CONTENT_LENGTH");
+		request_info.content_length=(content_length?atoi(content_length):0);
+
 		// prepare to process request
 		Request request(Pool(),
-			cgi ? String::Untaint_lang::HTML_TYPO : String::Untaint_lang::NO,
-			document_root,
-			page_filespec
+			request_info,
+			cgi ? String::Untaint_lang::HTML_TYPO : String::Untaint_lang::NO
 			);
 		
-		// fill user passed forms
-		fill_vform_fields(pool, cgi, request.form_class.fields());
-		
 		// some root-controlled location
 		char *sys_auto_path1;
 #ifdef WIN32
+		// c:\windows
 		sys_auto_path1=(char *)pool.malloc(MAX_STRING);
-		GetWindowsDirectory(sys_auto_path1, MAX_STRING-1/*for \*/);
-		strcat(sys_auto_path1, "\\");
+		GetWindowsDirectory(sys_auto_path1, MAX_STRING);
+		strcat(sys_auto_path1, PATH_DELIMITER_STRING);
 #else
+		// ~nobody
 		sys_auto_path1=getenv("HOME");
 #endif
 		
 		// beside by binary
 		char *sys_auto_path2=(char *)pool.malloc(MAX_STRING);
 		strncpy(sys_auto_path2, argv[0], MAX_STRING);  // filespec of my binary
-		// strip filename
-#ifdef WIN32
-		rsplit(sys_auto_path2, '\\');  
-#else
-		rsplit(sys_auto_path2, '/'); 
-#endif
+		rsplit(sys_auto_path2, PATH_DELIMITER_CHAR);  // strip filename
 		
 		// process the request
 		result=request.core(
@@ -124,9 +138,11 @@ int main(int argc, char *argv[]) {
 
 		// must be last in PTRY{}PCATCH
 #ifdef WIN32
+#	if MSVC
 		SetUnhandledExceptionFilter(0);
+#	endif
 #endif
-	} PCATCH(e) { // global problem [creating Request, preparing to .core()]
+	} PCATCH(e) { // global problem @globals fill @Request create @prepare to .core()
 		result=0;
 		strcpy(error, e.comment());
 	}