--- parser3/src/main/pa_exec.C	2003/01/31 12:10:47	1.48.2.4
+++ parser3/src/main/pa_exec.C	2003/04/07 07:03:05	1.50
@@ -1,20 +1,21 @@
 /** @file
 	Parser: program executing for different OS-es.
 
-	Copyright(c) 2000,2001, 2003 ArtLebedev Group(http://www.artlebedev.com)
+	Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
+  	portions by Victor Fedoseev" <vvf_ru@mail.ru> [January 23, 2003]
+
 	@todo setrlimit
 */
 
-static const char* IDENT_EXEC_C="$Date: 2003/01/31 12:10:47 $";
+static const char* IDENT_EXEC_C="$Date: 2003/04/07 07:03:05 $";
 
 #include "pa_config_includes.h"
 
 #include "pa_exec.h"
 #include "pa_exception.h"
 #include "pa_common.h"
-#include "pa_value_includes.h"
 
 #ifdef WIN32
 #	include <windows.h>
@@ -28,7 +29,7 @@ static const char* IDENT_EXEC_C="$Date:
 
 /// this func from http://www.ccas.ru/~posp/popov/spawn.htm
 static DWORD CreateHiddenConsoleProcess(LPCTSTR szCmdLine,
-										char *szEnv,
+					char *szEnv,
                                         PROCESS_INFORMATION* ppi, 
                                         LPHANDLE phInWrite,
                                         LPHANDLE phOutRead,
@@ -112,21 +113,11 @@ error:
     return result;
 }
 
-static void read_pipe(Pool& pool, StringPtr result, HANDLE hOutRead, const char *file_spec, 
-					  String::Untaint_lang lang){
-	while(true) {
-		char *buf=new(pool) char[MAX_STRING];
-		unsigned long size;
-		if(!ReadFile(hOutRead, buf, MAX_STRING, &size, NULL) || !size) 
-			break;
-		result->APPEND(buf, size, lang, file_spec, 0);
-    }
-}
-
-static CharPtr buildCommand(CharPtr file_spec_cstr, Array<StringPtr>& argv) {
-	CharPtr result=file_spec_cstr;
+static const char *buildCommand(Pool& pool, 
+								const String& origin_string,
+								const char *file_spec_cstr, const Array *argv) {
+	const char *result=file_spec_cstr;
 	if(FILE *f=fopen(file_spec_cstr, "r")) {
-		try {
 		char buf[MAX_STRING];
 		size_t size=fread(buf, 1, MAX_STRING-1, f);
 		if(size>2) {
@@ -136,32 +127,31 @@ static CharPtr buildCommand(CharPtr file
 				if(*begin==' ') // alx: were an old magic for some linux-es
 					begin++;
 				if(char *end=strchr(begin, '\n')) {
-					String string(begin, end-begin);
+					String string(pool);
+					string.APPEND_AS_IS(begin, end-begin, 
+						origin_string.origin().file, 0);
 					string << " " << file_spec_cstr;
 					result=string.cstr();
 				}
 			}
 		}
-		} catch(...) {
-			fclose(f);
-			rethrow;
-		}
 		fclose(f);
 	}
-	{ // appending argv
-		String string(result);
-		for(int i=0; i<argv.count(); i++) {
-			string << " ";
-			string << *argv[i];
+	if(argv) {
+		String buf(pool);
+		buf << result;
+		for(int i=0; i<argv->size(); i++) {
+			buf << " ";
+			buf << *argv->get_string(i);
 		}
 
-		result=string.cstr();
+		result=buf.cstr();
 	}
 
 	return result;
 }
 
-#else
+#else // WIN32
 
 static pid_t execve_piped(const char *file_spec_cstr, 
 			char * const argv[], char * const env[],
@@ -278,51 +268,109 @@ static int get_exit_status(int pid) {
 		WEXITSTATUS(status) : -2;
 }
 
-static void read_pipe(String& result, int file, const char *file_spec, String::Untaint_lang lang){
+#endif // WIN32
+
+static void read_pipe(String& result,
+#ifdef WIN32
+					  HANDLE hOutRead,
+#else // WIN32
+					   int file,
+#endif // WIN32
+					  const char *file_spec, 
+					  String::Untaint_lang lang,
+					  int *header_pos=0, const char **eol_marker=0, size_t *eol_marker_size=0){
+
+	if(header_pos) *header_pos = -1;
+	if(eol_marker) *eol_marker = "";
+	if(eol_marker_size) *eol_marker_size = 0;
+
+	int dos_seq_match = 0;
+	int unix_seq_match = 0;
+	int blk_pos = 0;
+	bool do_search = (header_pos || eol_marker || eol_marker_size);
+
 	while(true) {
 		char *buf=(char *)result.pool().malloc(MAX_STRING);
-		ssize_t size=read(file, buf, MAX_STRING);
+#ifdef WIN32
+		unsigned long size, i;
+		if(!ReadFile(hOutRead, buf, MAX_STRING, &size, NULL) || !size) 
+			break;
+#else // WIN32
+		ssize_t i, size=read(file, buf, MAX_STRING);
 		if(size<=0)
 			break;
+#endif // WIN32
+		if(do_search){
+			for(i=0; i<size; ++i){
+				if(buf[i] == '\n'){
+					if(++unix_seq_match==2){
+						do_search = false;
+						if(header_pos) *header_pos = blk_pos+i-1;
+						if(eol_marker) *eol_marker = "\n";
+						if(eol_marker_size) *eol_marker_size = 1;
+						break;
+					}
+					if(dos_seq_match==1){
+						++dos_seq_match;
+					}else if(dos_seq_match==3){
+						do_search = false;
+						if(header_pos) *header_pos = blk_pos+i-3;
+						if(eol_marker) *eol_marker = "\r\n";
+						if(eol_marker_size) *eol_marker_size = 2;
+						break;
+					}else
+						dos_seq_match = 0;
+				}else if(buf[i] == '\r'){
+					unix_seq_match = 0;
+					if(dos_seq_match==0 || dos_seq_match==2)
+						++dos_seq_match;
+					else
+						dos_seq_match = 0;
+				}else if(buf[i] == 0){
+					// assuming that the header may not contain 0
+					do_search = false;
+					break;
+				}else{
+					dos_seq_match = 0;
+					unix_seq_match = 0;
+				}
+			}
+			blk_pos += size;
+		}
 		result.APPEND(buf, size, lang, file_spec, 0);
     }
 }
 
-#endif
 
 ///@test maybe here and at argv construction --- cstr(String::UL_UNSPECIFIED
-static void append_env_pair(HashStringString::key_type key, HashStringString::value_type value, 
+static void append_env_pair(const Hash::Key& key, Hash::Val *value, void *info) {
 #ifdef WIN32
-								String *string
-#else
-								struct {
-									Pool *pool;
-									char ***env
-								} info
-#endif
-							) {
-#ifdef WIN32
-	*string << key << "=" << value;
-	string->APPEND_AS_IS("", 1, 0, 0); // zero byte
+	String& string=*static_cast<String *>(info);
+	
+	string << key << "=" << *static_cast<String *>(value);
+	string.APPEND_AS_IS("", 1, 0, 0); // zero byte
 #else
-	String string;
-	string << key << "=" << value;
+	String string(key.pool());
+	string << key << "=" << *static_cast<String *>(value);
 
-	**env=string.cstr(*info->pool, String::UL_UNSPECIFIED);  (*env)++;
+	char ***env_ref=static_cast<char ***>(info);
+	**env_ref=string.cstr(String::UL_UNSPECIFIED);  (*env_ref)++;
 #endif
 }
 
-/// @todonow unix part to smart_ptr
-int pa_exec(Pool& pool,
-			bool forced_allow, 
-			StringPtr file_spec, 
-			HashStringString& env, 
-			Array<StringPtr>& argv, 
-			StringPtr in, StringPtr out, StringPtr err) {
+int pa_exec(
+			bool forced_allow,
+			const String& file_spec, 
+			const Hash *env,
+			const Array *argv,
+			const String& in, String& out, String& err,
+			int *header_pos, const char **eol_marker, size_t *eol_marker_size) {
+	Pool& pool=file_spec.pool();
+
 #ifdef NO_PA_EXECS
 	if(!forced_allow)
 		throw Exception("parser.runtime",
-			file_spec,
+			&file_spec,
 			"parser execs are disabled [recompile parser without --disable-execs configure option]");
 #endif
 
@@ -330,12 +378,12 @@ int pa_exec(Pool& pool,
 
 	PROCESS_INFORMATION pi;	
 	HANDLE hInWrite, hOutRead, hErrRead;
-	CharPtr file_spec_cstr=file_spec->cstr(String::UL_FILE_SPEC); 
-	CharPtr cmd=buildCommand(file_spec_cstr, argv);
-	CharPtr env_cstr(0);
-	{ // env
-		String string;
-		env.for_each(append_env_pair, &string);
+	char *file_spec_cstr=file_spec.cstr(String::UL_FILE_SPEC); 
+	const char *cmd=buildCommand(file_spec.pool(), file_spec, file_spec_cstr, argv);
+	char *env_cstr=0;
+	if(env) {
+		String string(env->pool());
+		env->for_each(append_env_pair, &string);
 		env_cstr=string.cstr(String::UL_UNSPECIFIED);
 	}
 	if(DWORD error=CreateHiddenConsoleProcess(cmd, env_cstr, &pi, &hInWrite, &hOutRead, &hErrRead)) {
@@ -349,21 +397,21 @@ int pa_exec(Pool& pool,
 			szErrorDesc[error_size-3]=0;
             
 		throw Exception(0,
-			file_spec,
+			&file_spec,
 			"exec failed - %s (%ld). Consider adding shbang line (#!x:\\interpreter\\command line)", 
 				error_size?szErrorDesc:"<unknown>", (long)error);
 	} else {
-		CharPtr in_cstr=in->cstr();
+		const char *in_cstr=in.cstr();
 		DWORD written_size;
-		WriteFile(hInWrite, in_cstr, in->size(), &written_size, NULL);
+		WriteFile(hInWrite, in_cstr, in.size(), &written_size, NULL);
 		// EOF for stupid text reads
 		// normally they should read CONTENT_LENGTH bytes,
 		// without this char
 		WriteFile(hInWrite, "\x1A", 1, &written_size, NULL);
 		CloseHandle(hInWrite);
-		read_pipe(pool, out, hOutRead, file_spec_cstr, String::UL_AS_IS);
+		read_pipe(out, hOutRead, file_spec_cstr, String::UL_AS_IS, header_pos, eol_marker, eol_marker_size);
 		CloseHandle(hOutRead);
-		read_pipe(pool, err, hErrRead, file_spec_cstr, String::UL_TAINTED);		
+		read_pipe(err, hErrRead, file_spec_cstr, String::UL_TAINTED);		
 		CloseHandle(hErrRead);
 /*	
 from http://www.apache.org/websrc/cvsweb.cgi/apache-1.3/src/main/util_script.c?rev=1.151&content-type=text/vnd.viewcvs-markup
@@ -389,12 +437,7 @@ from http://www.apache.org/websrc/cvsweb
 					"stat failed: %s (%d), actual filename '%s'", 
 						strerror(errno), errno, file_spec_cstr);
 
-		if(finfo.st_uid/*foreign?*/!=geteuid()
-			&& finfo.st_gid/*foreign?*/!=getegid())
-			throw Exception("parser.runtime", 
-				&file_spec, 
-				"parser is in safe mode: executing files of foreign group and user disabled [recompile parser with --disable-safe-mode configure option], actual filename '%s'", 
-					file_spec_cstr);
+		check_safe_mode(finfo, file_spec, file_spec_cstr);
 	}
 #endif
 
@@ -429,7 +472,7 @@ from http://www.apache.org/websrc/cvsweb
 		if(*in_cstr) // there is some in data
 			write(pipe_write, in_cstr, in.size());
 		close(pipe_write);
-		read_pipe(out, pipe_read, file_spec_cstr, String::UL_AS_IS);
+		read_pipe(out, pipe_read, file_spec_cstr, String::UL_AS_IS, header_pos, eol_marker, eol_marker_size);
 		close(pipe_read);
 		read_pipe(err, pipe_err, file_spec_cstr, String::UL_TAINTED);
 		close(pipe_err);