--- parser3/src/main/pa_exec.C	2004/12/23 16:34:50	1.65
+++ parser3/src/main/pa_exec.C	2007/11/15 19:44:39	1.71
@@ -1,13 +1,13 @@
 /** @file
 	Parser: program executing for different OS-es.
 
-	Copyright(c) 2000,2001-2004 ArtLebedev Group(http://www.artlebedev.com)
+	Copyright(c) 2000,2001-2005 ArtLebedev Group(http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
 	@todo setrlimit
 */
 
-static const char * const IDENT_EXEC_C="$Date: 2004/12/23 16:34:50 $";
+static const char * const IDENT_EXEC_C="$Date: 2007/11/15 19:44:39 $";
 
 #include "pa_config_includes.h"
 
@@ -122,6 +122,37 @@ static void read_pipe(String& result, HA
 	}
 }
 
+static void read_pipe(File_read_result& result, HANDLE hOutRead){
+
+	char *buf=new(PointerFreeGC) char[MAX_STRING];
+
+	unsigned long size = 0;
+	unsigned long bufsize = 0;
+	unsigned long newsize = 0;
+
+	result.headers = 0;
+	result.length = 0;
+	result.str = 0;
+	result.success = false;
+
+	while(true) {
+		if(!ReadFile(hOutRead, buf, MAX_STRING-1, &size, NULL) || !size) 
+			break;
+		newsize = (size + result.length);
+		if(newsize > bufsize){
+			bufsize = (size==MAX_STRING-1)?newsize*2:newsize;
+			char *tmp = new(PointerFreeGC) char[bufsize];
+			if(result.str)
+				memcpy(tmp, result.str, result.length);
+			memcpy(tmp+result.length, buf, size);
+			result.str = tmp;
+		}else{
+			memcpy(result.str+result.length, buf, size);
+		}
+		result.length = newsize;
+	}
+}
+
 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")) {
@@ -134,7 +165,7 @@ static const char* buildCommand(const ch
 				const char* begin=buf+2;
 				while(*begin==' ') // alx: were an old magic for some linux-es
 					begin++;
-				if(char *end=strchr(begin, '\n')) {
+				if(const char *end=strchr(begin, '\n')) {
 					String string(pa_strdup(begin, end-begin));
 					string << " " << file_spec_cstr;
 					result=string.cstr();
@@ -290,6 +321,36 @@ static void read_pipe(String& result, in
 	}
 }
 
+static void read_pipe(File_read_result& result, int file){
+	char *buf=new(PointerFreeGC) char[MAX_STRING];
+
+	unsigned long bufsize = 0;
+	unsigned long newsize = 0;
+
+	result.headers = 0;
+	result.length = 0;
+	result.str = 0;
+	result.success = false;
+
+	while(true) {
+		ssize_t size=read(file, buf, MAX_STRING-1);
+		if(size <= 0)
+			break;
+		newsize = (size + result.length);
+		if(newsize > bufsize){
+			bufsize = (size==MAX_STRING-1)?newsize*2:newsize;
+			char *tmp = new(PointerFreeGC) char[bufsize];
+			if(result.str)
+				memcpy(tmp, result.str, result.length);
+			memcpy(tmp+result.length, buf, size);
+			result.str = tmp;
+		}else{
+			memcpy(result.str+result.length, buf, size);
+		}
+		result.length = newsize;
+	}
+}
+
 #endif
 
 #ifndef DOXYGEN
@@ -330,7 +391,7 @@ PA_exec_result pa_exec(
 
 #ifdef NO_PA_EXECS
 	if(!forced_allow)
-		throw Exception("parser.runtime",
+		throw Exception(PARSER_RUNTIME,
 			&file_spec,
 			"parser execs are disabled [recompile parser without --disable-execs configure option]");
 #endif
@@ -345,7 +406,7 @@ PA_exec_result pa_exec(
 	if(env) {
 		String::Body body;
 		Append_env_pair_info info(body);
-		env->for_each(append_env_pair, &info);
+		env->for_each<Append_env_pair_info*>(append_env_pair, &info);
 		env_cstr=info.body.cstrm();
 		for(char* replacer=env_cstr; *replacer; replacer++)
 			if(*replacer=='\1')
@@ -374,7 +435,7 @@ PA_exec_result pa_exec(
 		// without this char
 		WriteFile(hInWrite, "\x1A", 1, &written_size, NULL);
 		CloseHandle(hInWrite);
-		read_pipe(result.out, hOutRead, String::L_AS_IS);
+		read_pipe(result.out, hOutRead);
 		CloseHandle(hOutRead);
 		read_pipe(result.err, hErrRead, String::L_TAINTED);		
 		CloseHandle(hErrRead);
@@ -408,11 +469,11 @@ from http://www.apache.org/websrc/cvsweb
 	}
 #endif
 
-	char* argv_cstrs[1+10+1]={file_spec_cstr, 0};
+	char* argv_cstrs[1+50+1]={file_spec_cstr, 0};
 	const int argv_size=argv.count();
 	const int argv_max=sizeof(argv_cstrs)/sizeof(argv_cstrs[0])-1-1;
 	if(argv_size>argv_max)
-		throw Exception("parser.runtime",
+		throw Exception(PARSER_RUNTIME,
 			&file_spec,
 			"too many arguments (%d > max %d)", argv_size, argv_max);
 	for(int i=0; i<argv_size; i++)
@@ -439,7 +500,7 @@ from http://www.apache.org/websrc/cvsweb
 			write(pipe_write, in_cstr, in.length());
 		}
 		close(pipe_write);
-		read_pipe(result.out, pipe_read, String::L_AS_IS);
+		read_pipe(result.out, pipe_read);
 		close(pipe_read);
 		read_pipe(result.err, pipe_err, String::L_TAINTED);
 		close(pipe_err);