--- parser3/src/main/pa_exec.C	2003/03/20 08:11:14	1.48.2.18.2.2
+++ parser3/src/main/pa_exec.C	2003/03/21 14:49:00	1.48.2.18.2.6
@@ -7,7 +7,7 @@
 	@todo setrlimit
 */
 
-static const char* IDENT_EXEC_C="$Date: 2003/03/20 08:11:14 $";
+static const char* IDENT_EXEC_C="$Date: 2003/03/21 14:49:00 $";
 
 #include "pa_config_includes.h"
 
@@ -111,16 +111,16 @@ error:
     return result;
 }
 
-static const String& read_pipeHANDLE hOutRead, const char* file_spec, 
-					  String::Untaint_lang lang){
-	const String& result(new String);
+static const String& read_pipe(HANDLE hOutRead, const char* file_spec, 
+			       String::Language lang){
+	String& result=*new String;
 	while(true) {
-		char *buf=new char[MAX_STRING];
+		char *buf=new(PointerFreeGC) char[MAX_STRING];
 		unsigned long size;
 		if(!ReadFile(hOutRead, buf, MAX_STRING, &size, NULL) || !size) 
 			break;
-		result->APPEND(buf, size, lang, file_spec, 0);
-    }
+		result.append(buf, size, lang);
+	}
 	return result;
 }
 
@@ -279,7 +279,7 @@ static int get_exit_status(int pid) {
 		WEXITSTATUS(status) : -2;
 }
 
-static const String& read_pipeint file, const char* file_spec, String::Untaint_lang lang){
+static const String& read_pipeint file, const char* file_spec, String::Language lang){
 	const String& result(new String);
 	while(true) {
 		char *buf=new char[MAX_STRING];
@@ -296,24 +296,24 @@ static const String& read_pipeint file,
 #ifndef DOXYGEN
 struct Append_env_pair_info {
 #ifdef WIN32
-	String* string;
+	String& string;
+	Append_env_pair_info(String& astring): string(astring) {}
 #else
-	;
 	char **env_ref;
 #endif
 };
 #endif
-///@test maybe here and at argv construction --- cstr(String::UL_UNSPECIFIED
+///@test maybe here and at argv construction --- cstr(String::L_UNSPECIFIED
 static void append_env_pair(HashStringString::key_type key, HashStringString::value_type value,
 		Append_env_pair_info *info) {
 #ifdef WIN32
-	*info->string << key << "=" << value;
+	info->string << key << "=" << value;
 	info->string->APPEND_AS_IS("", 1, 0, 0); // zero byte
 #else
 	String string;
 	string << key << "=" << value;
 
-	*(info->env_ref++)=string.cstr(*info->String::UL_UNSPECIFIED);
+	*(info->env_ref++)=string.cstr(*info->String::L_UNSPECIFIED);
 #endif
 }
 
@@ -333,22 +333,22 @@ PA_exec_result pa_exec(
 			"parser execs are disabled [recompile parser without --disable-execs configure option]");
 #endif
 
-	char* file_spec_cstr=file_spec->cstr(String::UL_FILE_SPEC); 
+	char* file_spec_cstr=file_spec->cstr(String::L_FILE_SPEC); 
 #ifdef WIN32
 
 	PROCESS_INFORMATION pi;	
 	HANDLE hInWrite, hOutRead, hErrRead;
-	const char* cmd=buildCommand(file_spec->cstr(String::UL_FILE_SPEC), argv);
+	const char* cmd=buildCommand(file_spec->cstr(String::L_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_cstr=info.string->cstr(String::UL_UNSPECIFIED);
+		env_cstr=info.string->cstr(String::L_UNSPECIFIED);
 	}
 	if(DWORD error=CreateHiddenConsoleProcess(cmd, env_cstr, &pi, &hInWrite, &hOutRead, &hErrRead)) {
 		char szErrorDesc[MAX_STRING];
-		const char *param="the file you tried to run";
+		const char* param="the file you tried to run";
 		size_t error_size=FormatMessage(
 			FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_ARGUMENT_ARRAY , NULL, error,
 			MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL),
@@ -363,15 +363,15 @@ PA_exec_result pa_exec(
 	} else {
 		const char* in_cstr=in.cstr();
 		DWORD written_size;
-		WriteFile(hInWrite, in_cstr, in.size(), &written_size, NULL);
+		WriteFile(hInWrite, in_cstr, in.length(), &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);
-		result.out=read_pipe(hOutRead, file_spec_cstr, String::UL_AS_IS);
+		result.out=read_pipe(hOutRead, file_spec_cstr, String::L_AS_IS);
 		CloseHandle(hOutRead);
-		result.err=read_pipe(hErrRead, file_spec_cstr, String::UL_TAINTED);		
+		result.err=read_pipe(hErrRead, file_spec_cstr, String::L_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
@@ -431,14 +431,14 @@ from http://www.apache.org/websrc/cvsweb
 		&pipe_write, &pipe_read, &pipe_err);
 	if(pid>0) {
 		// in child
-		if(in.size()) {// there is some in data
+		if(in.length()) {// there is some in data
 			const char* in_cstr=in.cstr();
-			write(pipe_write, in_cstr, in.size());
+			write(pipe_write, in_cstr, in.length());
 		}
 		close(pipe_write);
-		result.out=read_pipe(pipe_read, file_spec_cstr, String::UL_AS_IS);
+		result.out=read_pipe(pipe_read, file_spec_cstr, String::L_AS_IS);
 		close(pipe_read);
-		result.err=read_pipe(pipe_err, file_spec_cstr, String::UL_TAINTED);
+		result.err=read_pipe(pipe_err, file_spec_cstr, String::L_TAINTED);
 		close(pipe_err);
 
 		result.status=get_exit_status(pid); // negative may mean "-errno[execl()]"