--- parser3/src/main/pa_exec.C	2003/02/04 12:00:37	1.48.2.9
+++ parser3/src/main/pa_exec.C	2003/03/18 15:14:18	1.48.2.18.2.1
@@ -7,14 +7,13 @@
 	@todo setrlimit
 */
 
-static const char* IDENT_EXEC_C="$Date: 2003/02/04 12:00:37 $";
+static const char* IDENT_EXEC_C="$Date: 2003/03/18 15:14:18 $";
 
 #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>
@@ -112,19 +111,21 @@ error:
     return result;
 }
 
-static void read_pipe(Pool& pool, StringPtr result, HANDLE hOutRead, const char* file_spec, 
+static const String& read_pipeHANDLE hOutRead, const char* file_spec, 
 					  String::Untaint_lang lang){
+	const String& result(new String);
 	while(true) {
-		char *buf=new(pool) char[MAX_STRING];
+		char *buf=new char[MAX_STRING];
 		unsigned long size;
 		if(!ReadFile(hOutRead, buf, MAX_STRING, &size, NULL) || !size) 
 			break;
 		result->APPEND(buf, size, lang, file_spec, 0);
     }
+	return result;
 }
 
-static CharPtr buildCommand(CharPtr file_spec_cstr, Array<StringPtr>& argv) {
-	CharPtr result=file_spec_cstr;
+static const char* buildCommand(const char* file_spec_cstr, const ArrayString& argv) {
+	const char* result=file_spec_cstr;
 	if(FILE *f=fopen(file_spec_cstr, "r")) {
 		try {
 		char buf[MAX_STRING];
@@ -278,14 +279,16 @@ static int get_exit_status(int pid) {
 		WEXITSTATUS(status) : -2;
 }
 
-static void read_pipe(Pool& pool, StringPtr result, int file, const char* file_spec, String::Untaint_lang lang){
+static const String& read_pipeint file, const char* file_spec, String::Untaint_lang lang){
+	const String& result(new String);
 	while(true) {
-		char *buf=new(pool) char[MAX_STRING];
+		char *buf=new char[MAX_STRING];
 		ssize_t size=read(file, buf, MAX_STRING);
 		if(size<=0)
 			break;
 		result->APPEND(buf, size, lang, file_spec, 0);
     }
+	return result;
 }
 
 #endif
@@ -295,7 +298,7 @@ struct Append_env_pair_info {
 #ifdef WIN32
 	String* string;
 #else
-	Pool *pool;
+	;
 	char **env_ref;
 #endif
 };
@@ -315,12 +318,14 @@ static void append_env_pair(HashStringSt
 }
 
 /// @todonow unix part to smart_ptr
-int pa_exec(Pool& pool,
+PA_exec_result pa_exec(
 			bool forced_allow, 
-			StringPtr file_spec, 
-			HashStringString& env, 
-			Array<StringPtr>& argv, 
-			StringPtr in, StringPtr out, StringPtr err) {
+			const String& file_spec, 
+			const HashStringString* env, 
+			const ArrayString& argv, 
+			String& in) {
+	PA_exec_result result;
+
 #ifdef NO_PA_EXECS
 	if(!forced_allow)
 		throw Exception("parser.runtime",
@@ -333,12 +338,12 @@ int pa_exec(Pool& pool,
 
 	PROCESS_INFORMATION pi;	
 	HANDLE hInWrite, hOutRead, hErrRead;
-	CharPtr cmd=buildCommand(file_spec->cstr(String::UL_FILE_SPEC), argv);
-	CharPtr env_cstr(0);
-	{ // env
+	const char* cmd=buildCommand(file_spec->cstr(String::UL_FILE_SPEC), argv);
+	const char* env_cstr;
+	if(env) {
 		String string;
 		Append_env_pair_info info={&string};
-		env.for_each(append_env_pair, &info);
+		env->for_each(append_env_pair, &info);
 		env_cstr=info.string->cstr(String::UL_UNSPECIFIED);
 	}
 	if(DWORD error=CreateHiddenConsoleProcess(cmd, env_cstr, &pi, &hInWrite, &hOutRead, &hErrRead)) {
@@ -356,17 +361,17 @@ int pa_exec(Pool& pool,
 			"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);
+		result.out=read_pipe(pool, hOutRead, file_spec_cstr, String::UL_AS_IS);
 		CloseHandle(hOutRead);
-		read_pipe(pool, err, hErrRead, file_spec_cstr, String::UL_TAINTED);		
+		result.err=read_pipe(pool, 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
@@ -408,15 +413,17 @@ from http://www.apache.org/websrc/cvsweb
 			file_spec,
 			"too many arguments (%d > max %d)", argv_size, argv_max);
 	for(int i=0; i<argv_size; i++)
-		argv_cstrs[1+i]=argv[i]->cstr(pool);
+		argv_cstrs[1+i]=argv[i]->cstr();
 	argv_cstrs[1+argv_size]=0;
 
-	char **env_cstrs=new(pool) char *[env.count()+1/*0*/];
-	{
+	char **env_cstrs;
+	if(env) {
+		env_cstrs=new char *[env->count()+1/*0*/];
 		Append_env_pair_info info={&pool, env_cstrs}; 
-		env.for_each(append_env_pair, &info);
+		env->for_each(append_env_pair, &info);
 		*info.env_ref=0;
-	}
+	} else
+		env_cstrs=0;
 
 	pid_t pid=execve_piped(
 		file_spec_cstr,
@@ -424,22 +431,22 @@ from http://www.apache.org/websrc/cvsweb
 		&pipe_write, &pipe_read, &pipe_err);
 	if(pid>0) {
 		// in child
-		if(in && in->size()) {// there is some in data
-			CharPtr in_cstr=in->cstr();
-			write(pipe_write, in_cstr, in->size());
+		if(in.size()) {// there is some in data
+			const char* in_cstr=in.cstr();
+			write(pipe_write, in_cstr, in.size());
 		}
 		close(pipe_write);
-		read_pipe(pool, out, pipe_read, file_spec_cstr, String::UL_AS_IS);
+		result.out=read_pipe(pool, pipe_read, file_spec_cstr, String::UL_AS_IS);
 		close(pipe_read);
-		read_pipe(pool, err, pipe_err, file_spec_cstr, String::UL_TAINTED);
+		result.err=read_pipe(pool, pipe_err, file_spec_cstr, String::UL_TAINTED);
 		close(pipe_err);
 
-		return get_exit_status(pid); // negative may mean "-errno[execl()]"
+		result.status=get_exit_status(pid); // negative may mean "-errno[execl()]"
 	} else 
 		throw Exception(0,
 			file_spec,
 			"%s error: %s (%d)", pid<0?"fork":"pipe", strerror(errno), errno); 
 #endif
 
-	return 0;
+	return result;
 }