--- parser3/src/targets/cgi/parser3.C	2001/03/20 18:55:44	1.26.2.3
+++ parser3/src/targets/cgi/parser3.C	2001/03/22 15:30:47	1.31
@@ -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.26.2.3 2001/03/20 18:55:44 paf Exp $
+	$Id: parser3.C,v 1.31 2001/03/22 15:30:47 paf Exp $
 */
 
 #ifdef HAVE_CONFIG_H
@@ -33,25 +35,20 @@
 #include "pa_request.h"
 
 Pool pool; // global pool
-bool cgi;
+bool cgi; ///< we were started as CGI?
 
 #ifdef WIN32
 #	if _MSC_VER
 // intercept global system errors
-LONG WINAPI TopLevelExceptionFilter (
+static LONG WINAPI TopLevelExceptionFilter (
 									 struct _EXCEPTION_POINTERS *ExceptionInfo
 									 ) {
 	char buf[MAX_STRING];
 	if(ExceptionInfo && ExceptionInfo->ExceptionRecord) {
-		struct _EXCEPTION_RECORD *r=ExceptionInfo->ExceptionRecord;
-		
-		int printed=0;
-		printed+=snprintf(buf+printed, MAX_STRING-printed, "Exception 0x%X at 0x%p", 
-			r->ExceptionCode, 
-			r->ExceptionAddress);
-		for(unsigned int i=0; i<r->NumberParameters; i++)
-			printed+=snprintf(buf+printed, MAX_STRING-printed, ", 0x%X", 
-				r->ExceptionInformation[i]);
+		struct _EXCEPTION_RECORD *rr=ExceptionInfo->ExceptionRecord;
+		snprintf(buf, MAX_STRING, "Exception %#X at %p", 
+			er->ExceptionCode, 
+			er->ExceptionAddress);
 	} else 
 		strcpy(buf, "Exception <unknown>");
 	
@@ -66,16 +63,21 @@ LONG WINAPI TopLevelExceptionFilter (
 #endif
 
 //\if
-void fix_slashes(char *s) {
-	for(; *s; s++)
-		if(*s=='\\')
-			*s='/';
+static void fix_slashes(char *s) {
+	if(s)
+		for(; *s; s++)
+			if(*s=='\\')
+				*s='/';
 }
 //\endif
 
 // service funcs
 
-int read_post(char *buf, int max_bytes) {
+static const char *get_env(Pool& pool, const char *name) {
+ 	return getenv(name);
+}
+
+static uint read_post(char *buf, uint max_bytes) {
 	int read_size=0;
 	do {
 		int chunk_size=read
@@ -88,18 +90,30 @@ int read_post(char *buf, int max_bytes)
 	return read_size;
 }
 
-void output_header_attribute(const char *key, const char *value) {
+static void add_header_attribute(const char *key, const char *value) {
 	if(cgi)
 		printf("%s: %s\n", key, value);
 }
 
-void output_body(const char *buf, size_t size) {
+static void send_header(const char *buf, size_t size) {
 	if(cgi) // header | body  delimiter
 		puts("");
+}
 
+static void send_body(const char *buf, size_t size) {
 	stdout_write(buf, size);
 }
 
+/// Service funcs 
+ Service_funcs service_funcs={
+		get_env,
+		read_post,
+		add_header_attribute,
+		send_header,
+		send_body
+ };
+
+
 // main
 
 int main(int argc, char *argv[]) {
@@ -110,11 +124,6 @@ int main(int argc, char *argv[]) {
 	setmode(fileno(stderr), _O_BINARY);
 //\#endif
 
-	// Service funcs 
-	service_funcs.read_post=read_post;
-	service_funcs.output_header_attribute=output_header_attribute;
-	service_funcs.output_body=output_body;
-	
 	// were we started as CGI?
 	cgi=
 		getenv("SERVER_SOFTWARE") || 
@@ -179,30 +188,28 @@ int main(int argc, char *argv[]) {
 			);
 		
 		// some root-controlled location
-		char *sys_auto_path1;
+		char *root_auto_path;
 #ifdef WIN32
 		// c:\windows
-		sys_auto_path1=(char *)pool.malloc(MAX_STRING);
-		GetWindowsDirectory(sys_auto_path1, MAX_STRING);
-		strcat(sys_auto_path1, PATH_DELIMITER_STRING);
+		root_auto_path=(char *)pool.malloc(MAX_STRING);
+		GetWindowsDirectory(root_auto_path, MAX_STRING);
+		strcat(root_auto_path, "/");
 #else
 		// ~nobody
-		sys_auto_path1=getenv("HOME");
+		root_auto_path=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, '/');  rsplit(sys_auto_path2, '\\');// strip filename
-		strcat(sys_auto_path2, PATH_DELIMITER_STRING);
+		char *site_auto_path=(char *)pool.malloc(MAX_STRING);
+		strncpy(site_auto_path, argv[0], MAX_STRING);  // filespec of my binary
+		rsplit(site_auto_path, '/');  rsplit(site_auto_path, '\\');// strip filename
+		strcat(site_auto_path, "/");
 		
 		// process the request
 		request.core(pool.exception(),
-			sys_auto_path1, 
-			sys_auto_path2);
-		// no actions with request' data past this point
-		// request.exception not not handled here, but all
-		// request' data are associated with it's pool=exception
+			root_auto_path, false,
+			site_auto_path, false,
+			strcasecmp(request_info.method, "HEAD")==0);
 
 		// must be last in PTRY{}PCATCH
 #ifdef WIN32