--- parser3/src/targets/cgi/parser3.C	2001/03/14 09:12:06	1.9
+++ parser3/src/targets/cgi/parser3.C	2001/03/18 11:37:53	1.16
@@ -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.9 2001/03/14 09:12:06 paf Exp $
+	$Id: parser3.C,v 1.16 2001/03/18 11:37:53 paf Exp $
 */
 
 #ifdef HAVE_CONFIG_H
@@ -23,12 +23,11 @@
 #include "pa_globals.h"
 #include "pa_request.h"
 #include "pa_common.h"
-#include "vform_fields_fill.h"
 
 Pool pool; // global pool
 
 #ifdef WIN32
-#	if MSVC
+#	if _MSC_VER
 // intercept global system errors
 LONG WINAPI TopLevelExceptionFilter (
 									 struct _EXCEPTION_POINTERS *ExceptionInfo
@@ -56,7 +55,30 @@ LONG WINAPI TopLevelExceptionFilter (
 #	endif
 #endif
 
+int read_post(char *buf, int max_bytes) {
+	int read_size=0;
+	do {
+		int chunk_size=read
+			(fileno(stdin), buf+read_size, min(0x400*0x400, max_bytes-read_size));
+		if(chunk_size<0)
+			break;
+		read_size+=chunk_size;
+	} while(read_size<max_bytes);
+
+	return read_size;
+}
+
 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
+
+	// Service funcs 
+	service_funcs.read_post=read_post;
+	
 	// were we started as CGI?
 	bool cgi=
 		getenv("SERVER_SOFTWARE") || 
@@ -64,90 +86,134 @@ int main(int argc, char *argv[]) {
 		getenv("GATEWAY_INTERFACE") || 
 		getenv("REQUEST_METHOD");
 	
-	char *result;  char error[MAX_STRING];  error[0]=0;
+	if(!cgi) {
+		if(argc<2) {
+			char *binary=argv[0];
+			printf("Usage: %s <file>\n", binary?binary:"parser3");
+			exit(1);
+		}
+	}
+
+	const char *filespec_to_process=cgi?getenv("PATH_TRANSLATED"):argv[1];
+
 	PTRY { // global try
 		// must be first in PTRY{}PCATCH
 #ifdef WIN32
-#	if MSVC
+#	if _MSC_VER
 		SetUnhandledExceptionFilter(&TopLevelExceptionFilter);
 		//TODO: initSocks();
 #	endif
 #endif
 
+		// init global variables
 		globals_init(pool);
-		
+
+		if(!filespec_to_process)
+			PTHROW(0, 0,
+				0,
+				"no file to process");
+
+		// 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;
+		const char *document_root=getenv("DOCUMENT_ROOT");
+		if(!document_root) {
+			static char fake_document_root[MAX_STRING];
+			strncpy(fake_document_root, filespec_to_process, MAX_STRING);
+			rsplit(fake_document_root, '/');  rsplit(fake_document_root, '\\');// strip filename
+			document_root=fake_document_root;
+		}
+		request_info.document_root=document_root;
+		request_info.path_translated=filespec_to_process;
+		request_info.method=getenv("REQUEST_METHOD");
+		request_info.query_string=getenv("QUERY_STRING");
+		request_info.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
-		vform_fields_fill(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);
-		strcat(sys_auto_path1, "\\");
+		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
-		rsplit(sys_auto_path2, PATH_DELIMITER_CHAR);  // strip filename
+		rsplit(sys_auto_path2, '/');  rsplit(sys_auto_path2, '\\');// strip filename
+		strcat(sys_auto_path2, PATH_DELIMITER_STRING);
 		
 		// process the request
-		result=request.core(
+		request.core(pool.exception(),
 			sys_auto_path1, 
 			sys_auto_path2);
-		// set error, will be reported in case result==0
-		strcpy(error, "exception occured in request exception handler");
 
-		// must be last in PTRY{}PCATCH
-#ifdef WIN32
-#	if MSVC
-		SetUnhandledExceptionFilter(0);
-#	endif
-#endif
-	} PCATCH(e) { // global problem @globals fill @Request create @prepare to .core()
-		result=0;
-		strcpy(error, e.comment());
-	}
-	PEND_CATCH
+		// extract request.response body
+		Value *body_value=static_cast<Value *>(
+			request.response.fields().get(*body_name));
+		const char *body=body_value?
+			body_value->as_string().cstr():"no body";// TODO: IMAGE&FILE
+
+		// OK. write out the result
+		if(cgi) {
+			// content-type:
+			Value *content_type_value=static_cast<Value *>(
+				request.response.fields().get(*content_type_name));
+			const char *content_type=content_type_value?
+				content_type_value->as_string().cstr():"text/html";
 
-	// write out the result	
-	if(cgi) {
-		if(result) {
-			const char *content_type="text/html";
+			// header
 			printf(
 				"Content-type: %s\n"
 				"Content-length: %d\n"
 				"\n", 
 				content_type,
-				strlen(result));
-			stdout_write(result);
-		} else {
+				strlen(body));
+		}
+		// body
+		stdout_write(body);
+
+			// must be last in PTRY{}PCATCH
+#ifdef WIN32
+#	if _MSC_VER
+		SetUnhandledExceptionFilter(0);
+#	endif
+		// successful finish
+		return 0;
+#endif
+	} PCATCH(e) { // global problem 
+		// @globals fill 
+		// @Request create 
+		// @prepare to .core()
+		// @request.core when reporting request exception
+		// @write result
+		const char *error=e.comment();
+
+		if(cgi) {
 			printf(
 				"Content-type: text/plain\n"
 				"Content-length: %d\n"
 				"\n", 
 				strlen(error));
 			stdout_write(error);
-		}
-	} else
-		if(result)
-			printf("%s", result);
-		else
+		} else
 			fputs(error, stderr);
 
-	return 0;
+		// unsuccessful finish
+		return 1;
+	}
+	PEND_CATCH
 }