--- parser3/src/targets/cgi/parser3.C	2001/05/15 11:36:15	1.78
+++ parser3/src/targets/cgi/parser3.C	2001/09/04 15:57:23	1.105
@@ -1,12 +1,12 @@
+//3
 /** @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.78 2001/05/15 11:36:15 parser Exp $
 */
+static const char *RCSId="$Id: parser3.C,v 1.105 2001/09/04 15:57:23 parser Exp $"; 
 
 #include "pa_config_includes.h"
 
@@ -21,6 +21,9 @@
 #include "pa_socks.h"
 #include "pa_version.h"
 
+//#define DEBUG_POOL_MALLOC
+
+
 /// IIS refuses to read bigger chunks
 const size_t READ_POST_CHUNK_SIZE=0x400*0x400; // 1M 
 
@@ -49,7 +52,8 @@ static LONG WINAPI TopLevelExceptionFilt
 #endif
 
 // SAPI
-// appends to parser3.log located beside my binary
+
+// appends to parser3.log located beside my binary if openable, to stderr otherwize
 void SAPI::log(Pool& pool, const char *fmt, ...) {
 	bool opened;
 	FILE *f=0;
@@ -57,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");
@@ -80,6 +84,8 @@ void SAPI::log(Pool& pool, const char *f
 
 	if(opened)
 		fclose(f);
+	else
+		fflush(f);
 }
 
 const char *SAPI::get_env(Pool& pool, const char *name) {
@@ -118,6 +124,18 @@ void SAPI::send_body(Pool& pool, const v
 	stdout_write(buf, size);
 }
 
+//
+
+char *full_file_spec(char *file_name) {
+	if(!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);
+		return buf;
+	}
+	return file_name;
+}
+
 /**
 	main workhorse
 
@@ -131,12 +149,6 @@ int main(int argc, char *argv[]) {
 
 	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") || 
@@ -157,10 +169,17 @@ 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);
 #endif
+	filespec_to_process=full_file_spec(filespec_to_process);
 
 	const char *request_method=getenv("REQUEST_METHOD");
 	bool header_only=request_method && strcasecmp(request_method, "HEAD")==0;
@@ -192,8 +211,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,
@@ -201,7 +219,7 @@ 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
@@ -255,19 +273,27 @@ int main(int argc, char *argv[]) {
 			);
 		
 		// some root-controlled location
-#ifdef WIN32
+#ifdef SYSCONFDIR
+		const char *root_auto_path=SYSCONFDIR;
+#else
+#	ifdef WIN32
 		// c:\windows
 		static char root_auto_path[MAX_STRING];
 		GetWindowsDirectory(root_auto_path, MAX_STRING);
-#else
-		// ~nobody  todo: figure out a better place
-		const char *root_auto_path=SAPI::get_env(pool, "HOME");
+#	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, argv[0], MAX_STRING);  // filespec of my binary
-		rsplit(site_auto_path, '/');  rsplit(site_auto_path, '\\');// strip filename
+		strncpy(site_auto_path, argv0, MAX_STRING-1);  site_auto_path[MAX_STRING-1]=0; // filespec of my binary
+		if(!(
+			rsplit(site_auto_path, '/') || 
+			rsplit(site_auto_path, '\\'))) { // strip filename
+			// no path, just filename
+			site_auto_path[0]='.'; site_auto_path[1]=0;
+		}
 		
 		// process the request
 		request.core(
@@ -278,13 +304,22 @@ int main(int argc, char *argv[]) {
 		//
 		done_socks();
 
+#ifdef DEBUG_POOL_MALLOC
 		extern void log_pool_stats(Pool& pool);
 		log_pool_stats(pool);
+#endif
 
 		// must be last in PTRY{}PCATCH
 #ifdef WIN32
 		SetUnhandledExceptionFilter(0);
 #endif
+
+#ifndef WIN32
+		// 
+		if(!cgi)
+			SAPI::send_body(pool, "\n", 1);
+#endif
+
 		// successful finish
 		return 0;
 	} PCATCH(e) { // global problem 
@@ -316,6 +351,12 @@ int main(int argc, char *argv[]) {
 		if(!header_only)
 			SAPI::send_body(pool, body, content_length);
 
+#ifndef WIN32
+		// 
+		if(!cgi)
+			SAPI::send_body(pool, "\n", 1);
+#endif
+
 		// unsuccessful finish
 		return 1;
 	}