--- parser3/src/main/pa_exec.C	2003/02/04 12:08:57	1.48.2.10
+++ parser3/src/main/pa_exec.C	2003/03/04 16:26:30	1.48.2.16
@@ -7,7 +7,7 @@
 	@todo setrlimit
 */
 
-static const char* IDENT_EXEC_C="$Date: 2003/02/04 12:08:57 $";
+static const char* IDENT_EXEC_C="$Date: 2003/03/04 16:26:30 $";
 
 #include "pa_config_includes.h"
 
@@ -111,8 +111,9 @@ error:
     return result;
 }
 
-static void read_pipe(Pool& pool, StringPtr result, HANDLE hOutRead, const char* file_spec, 
+static StringPtr read_pipe(Pool& pool, HANDLE hOutRead, const char* file_spec, 
 					  String::Untaint_lang lang){
+	StringPtr result(new String);
 	while(true) {
 		char *buf=new(pool) char[MAX_STRING];
 		unsigned long size;
@@ -120,9 +121,10 @@ static void read_pipe(Pool& pool, String
 			break;
 		result->APPEND(buf, size, lang, file_spec, 0);
     }
+	return result;
 }
 
-static CharPtr buildCommand(CharPtr file_spec_cstr, Array<StringPtr>& argv) {
+static CharPtr buildCommand(CharPtr file_spec_cstr, const ArrayString& argv) {
 	CharPtr result=file_spec_cstr;
 	if(FILE *f=fopen(file_spec_cstr, "r")) {
 		try {
@@ -277,7 +279,8 @@ 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 StringPtr read_pipe(Pool& pool, int file, const char* file_spec, String::Untaint_lang lang){
+	StringPtr result(new String);
 	while(true) {
 		char *buf=new(pool) char[MAX_STRING];
 		ssize_t size=read(file, buf, MAX_STRING);
@@ -285,6 +288,7 @@ static void read_pipe(Pool& pool, String
 			break;
 		result->APPEND(buf, size, lang, file_spec, 0);
     }
+	return result;
 }
 
 #endif
@@ -314,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(Pool& pool,
 			bool forced_allow, 
 			StringPtr file_spec, 
-			HashStringString& env, 
-			Array<StringPtr>& argv, 
-			StringPtr in, StringPtr out, StringPtr err) {
+			const HashStringString& env, 
+			const ArrayString& argv, 
+			String& in) {
+	PA_exec_result result;
+
 #ifdef NO_PA_EXECS
 	if(!forced_allow)
 		throw Exception("parser.runtime",
@@ -333,7 +339,7 @@ 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);
+	CharPtr env_cstr;
 	{ // env
 		String string;
 		Append_env_pair_info info={&string};
@@ -355,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();
+		CharPtr 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
@@ -423,22 +429,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
+			CharPtr 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;
 }