--- parser3/src/targets/cgi/parser3.C	2001/08/27 13:27:26	1.97
+++ parser3/src/targets/cgi/parser3.C	2001/09/24 14:34:25	1.112
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru>(http://design.ru/paf)
 */
-static const char *RCSId="$Id: parser3.C,v 1.97 2001/08/27 13:27:26 parser Exp $"; 
+static const char *RCSId="$Id: parser3.C,v 1.112 2001/09/24 14:34:25 parser Exp $"; 
 
 #include "pa_config_includes.h"
 
@@ -22,6 +22,7 @@ static const char *RCSId="$Id: parser3.C
 
 //#define DEBUG_POOL_MALLOC
 
+// consts
 
 /// IIS refuses to read bigger chunks
 const size_t READ_POST_CHUNK_SIZE=0x400*0x400; // 1M 
@@ -60,7 +61,7 @@ void SAPI::log(Pool& pool, const char *f
 	if(argv0) {
 		// beside by binary
 		char file_spec[MAX_STRING];
-		strncpy(file_spec, argv0, MAX_STRING);  // filespec of my binary
+		strncpy(file_spec, argv0, MAX_STRING-1);  file_spec[MAX_STRING-1]=0; // filespec of my binary
 		rsplit(file_spec, '/');  rsplit(file_spec, '\\');// strip filename
 		strcat(file_spec, "/parser3.log");
 		f=fopen(file_spec, "at");
@@ -88,7 +89,7 @@ void SAPI::log(Pool& pool, const char *f
 }
 
 const char *SAPI::get_env(Pool& pool, const char *name) {
- 	return getenv(name);
+	return getenv(name);
 }
 
 size_t SAPI::read_post(Pool& pool, char *buf, size_t max_bytes) {
@@ -126,7 +127,7 @@ void SAPI::send_body(Pool& pool, const v
 //
 
 char *full_file_spec(char *file_name) {
-	if(!strchr(file_name, '/')) {
+	if(file_name && !strchr(file_name, '/')) {
 		static char cwd[MAX_STRING];  getcwd(cwd, MAX_STRING);
 		static char buf[MAX_STRING];
 		snprintf(buf, MAX_STRING, "%s/%s", cwd, file_name);
@@ -144,16 +145,11 @@ char *full_file_spec(char *file_name) {
 		wich is tested but seems slow.
 */
 int main(int argc, char *argv[]) {
+	int result;
 	argv0=argv[0];
 
 	umask(2);
 
-#ifdef WIN32
-	setmode(fileno(stdin), _O_BINARY);
-	setmode(fileno(stdout), _O_BINARY);
-	setmode(fileno(stderr), _O_BINARY);
-#endif
-
 	// were we started as CGI?
 	cgi=
 		getenv("SERVER_SOFTWARE") || 
@@ -174,6 +170,12 @@ int main(int argc, char *argv[]) {
 		}
 	}
 
+#ifdef WIN32
+	setmode(fileno(stdin), _O_BINARY);
+	setmode(fileno(stdout), _O_BINARY);
+	setmode(fileno(stderr), _O_BINARY);
+#endif
+
 	char *filespec_to_process=cgi?getenv("PATH_TRANSLATED"):argv[1];
 #ifdef WIN32
 	back_slashes_to_slashes(filespec_to_process);
@@ -210,8 +212,7 @@ int main(int argc, char *argv[]) {
 				// IIS
 				size_t len=strlen(filespec_to_process)-strlen(path_info);
 				char *buf=(char *)pool.malloc(len+1);
-				strncpy(buf, filespec_to_process, len);
-				buf[len]=0;
+				memcpy(buf, filespec_to_process, len); buf[len]=0;
 				request_info.document_root=buf;
 			} else
 				PTHROW(0, 0,
@@ -219,14 +220,14 @@ int main(int argc, char *argv[]) {
 					"CGI: no PATH_INFO defined(in reinventing DOCUMENT_ROOT)");
 		} else {
 			static char buf[MAX_STRING];
-			strncpy(buf, filespec_to_process, MAX_STRING);
+			strncpy(buf, filespec_to_process, MAX_STRING-1); buf[MAX_STRING-1]=0;
 			if(rsplit(buf, '/') || rsplit(buf, '\\')) // strip filename
 				request_info.document_root=buf;
 			else
 				request_info.document_root="";
 		}
 		request_info.path_translated=filespec_to_process;
-		request_info.method=request_method;
+		request_info.method=request_method ? request_method : "GET";
 		const char *query_string=SAPI::get_env(pool, "QUERY_STRING");
 		request_info.query_string=query_string;
 		if(cgi) {
@@ -273,29 +274,43 @@ int main(int argc, char *argv[]) {
 			);
 		
 		// some root-controlled location
-#ifdef WIN32
-		// c:\windows
-		static char root_auto_path[MAX_STRING];
-		GetWindowsDirectory(root_auto_path, MAX_STRING);
+#ifdef SYSCONFDIR
+		const char *root_config_filespec=SYSCONFDIR "/" CONFIG_FILE_NAME;
 #else
-		// ~nobody  todo: figure out a better place
-		const char *root_auto_path=SAPI::get_env(pool, "HOME");
+#	ifdef WIN32
+		// c:\windows
+		char root_config_path[MAX_STRING];
+		GetWindowsDirectory(root_config_path, MAX_STRING);
+
+		char root_config_filespec[MAX_STRING];
+		snprintf(root_config_filespec, MAX_STRING, 
+			"%s/%s", 
+			root_config_path, CONFIG_FILE_NAME);
+#	else
+		#error must be compiled either configure/make or MSVC++
+#	endif
 #endif
 		
 		// beside by binary
-		static char site_auto_path[MAX_STRING];
-		strncpy(site_auto_path, argv0, MAX_STRING);  // filespec of my binary
+		// @todo full path, not ./!
+		static char site_config_path[MAX_STRING];
+		strncpy(site_config_path, argv0, MAX_STRING-1);  site_config_path[MAX_STRING-1]=0; // filespec of my binary
 		if(!(
-			rsplit(site_auto_path, '/') || 
-			rsplit(site_auto_path, '\\'))) { // strip filename
+			rsplit(site_config_path, '/') || 
+			rsplit(site_config_path, '\\'))) { // strip filename
 			// no path, just filename
-			site_auto_path[0]='.'; site_auto_path[1]=0;
+			site_config_path[0]='.'; site_config_path[1]=0;
 		}
+
+		char site_config_filespec[MAX_STRING];
+		snprintf(site_config_filespec, MAX_STRING, 
+			"%s/%s", 
+			site_config_path, CONFIG_FILE_NAME);
 		
 		// process the request
 		request.core(
-			root_auto_path, false,
-			site_auto_path, false,
+			root_config_filespec, false,
+			site_config_filespec, false,
 			header_only);
 
 		//
@@ -310,12 +325,9 @@ int main(int argc, char *argv[]) {
 #ifdef WIN32
 		SetUnhandledExceptionFilter(0);
 #endif
-		// 
-		if(!cgi)
-			SAPI::send_body(pool, "\n", 1);
 
 		// successful finish
-		return 0;
+		result=0;
 	} PCATCH(e) { // global problem 
 		// must be first in PCATCH{}
 #ifdef WIN32
@@ -345,12 +357,15 @@ int main(int argc, char *argv[]) {
 		if(!header_only)
 			SAPI::send_body(pool, body, content_length);
 
-		// 
-		if(!cgi)
-			SAPI::send_body(pool, "\n", 1);
-
 		// unsuccessful finish
-		return 1;
+		result=1;
 	}
 	PEND_CATCH
+
+#ifndef WIN32
+	// 
+	if(!cgi)
+		SAPI::send_body(pool, "\n", 1);
+#endif
+	return result;
 }