--- parser3/src/main/pa_exec.C	2001/04/17 19:00:41	1.2
+++ parser3/src/main/pa_exec.C	2001/07/18 16:11:11	1.8
@@ -4,9 +4,8 @@
 	Copyright(c) 2000,2001 ArtLebedev Group(http://www.artlebedev.com)
 
 	Author: Alexander Petrosyan <paf@design.ru>(http://design.ru/paf)
-
-	$Id: pa_exec.C,v 1.2 2001/04/17 19:00:41 paf Exp $
 */
+static const char *RCSId="$Id: pa_exec.C,v 1.8 2001/07/18 16:11:11 parser Exp $"; 
 
 #include "pa_config_includes.h"
 
@@ -68,7 +67,7 @@ static BOOL WINAPI CreateHiddenConsolePr
     // child process' console must be hidden for Win95 compatibility
     si.wShowWindow = SW_HIDE;
     // assign "other" sides of pipes
-//    si.hStdInput = hInRead;
+    si.hStdInput = hInRead;
     si.hStdOutput = hOutWrite;
     si.hStdError = hErrWrite;
 
@@ -108,7 +107,7 @@ static void read_pipe(String& result, HA
 		ReadFile( hOutRead, buf, MAX_STRING, &size, NULL );
 		if(!size) 
 			break;
-		result.APPEND_CLEAN(buf, size, file_spec, 0);
+		result.APPEND_AS_IS(buf, size, file_spec, 0);
     }
 }
 
@@ -116,39 +115,52 @@ static void read_pipe(String& result, HA
 static const char *buildCommand(Pool& pool, 
 								const String& origin_string,
 								const char *file_spec_cstr, const Array *argv) {
-	FILE *f=fopen(file_spec_cstr, "r");
-	if(f) {
+	const char *result=file_spec_cstr;
+	if(FILE *f=fopen(file_spec_cstr, "r")) {
 		char buf[MAX_STRING];
 		size_t size=fread(buf, 1, MAX_STRING-1, f);
 		if(size>2) {
 			buf[size]=0;
 			if(strncmp(buf, "#!", 2)==0) {
-				char *atEOL=strchr(buf, '\n');
-				if(atEOL) {
+				const char *begin=buf+2;
+				if(*begin==' ') // alx: were an old magic for some linux-es
+					begin++;
+				if(char *end=strchr(begin, '\n')) {
 					String string(pool);
-					string.APPEND_CLEAN(buf+2, atEOL-(buf+2), 
+					string.APPEND_AS_IS(begin, end-begin, 
 						origin_string.origin().file, 0);
 					string << " " << file_spec_cstr;
 					if(argv)
 						for(int i=0; i<argv->size(); i++)
 							string << argv->get_string(i)->cstr(String::UL_AS_IS);
-					file_spec_cstr=string.cstr();
+					result=string.cstr();
 				}
 			}
 		}
 		fclose(f);
 	}
-	return file_spec_cstr;
+	if(argv) {
+		String buf(pool);
+		buf << result;
+		for(int i=0; i<argv->size(); i++) {
+			buf << " ";
+			buf << *argv->get_string(i);
+		}
+
+		result=buf.cstr(String::UL_AS_IS);
+	}
+
+	return result;
 }
 
 #else
 
 static int execle_piped(const char *path, 
-						const char *arg1,
-						const char *arg2,
-						const char *arg3,
-						const char *arg4,
-						const char *arg5,
+						const char *arg1, const char *arg2,
+						const char *arg3, const char *arg4,
+						const char *arg5, const char *arg6,
+						const char *arg7, const char *arg8,
+						const char *arg9, const char *arg10,
 						char * const env[],
 						int *pipe_in, int *pipe_out, int *pipe_err) {
 	int pid;
@@ -261,7 +273,7 @@ static void read_pipe(String& result, in
 		size_t size=read(file, buf, MAX_STRING);
 		if(!size) 
 			break;
-		result.APPEND_CLEAN(buf, size, file_spec, 0);
+		result.APPEND_AS_IS(buf, size, file_spec, 0);
     }
 }
 
@@ -272,7 +284,7 @@ static void append_env_pair(const Hash::
 	String& string=*static_cast<String *>(info);
 	
 	string << key << "=" << *static_cast<String *>(value);
-	string.APPEND_CLEAN("", 1, 0, 0); // zero byte
+	string.APPEND_AS_IS("", 1, 0, 0); // zero byte
 #else
 	String string(key.pool());
 	string << key << "=" << *static_cast<String *>(value);
@@ -307,10 +319,17 @@ int pa_exec(const String& file_spec,
 	if( CreateHiddenConsoleProcess(cmd, env_cstr, &pi, &hInWrite, &hOutRead, &hErrRead )) {
 		SetCurrentDirectory(pwd);
 
-		read_pipe(out, hOutRead, file_spec_cstr);
-		read_pipe(err, hErrRead, file_spec_cstr);
+		const char *in_cstr=in.cstr(String::UL_AS_IS);
+		DWORD written_size;
+		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(out, hOutRead, file_spec_cstr);
 		CloseHandle( hOutRead );
+		read_pipe(err, hErrRead, file_spec_cstr);		
 		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
@@ -360,6 +379,7 @@ from http://www.apache.org/websrc/cvsweb
 	if(int pid=execle_piped(
 		file_spec_cstr,
 		argv_cstrs[0], argv_cstrs[1], argv_cstrs[2], argv_cstrs[3], argv_cstrs[4],
+		argv_cstrs[5], argv_cstrs[6], argv_cstrs[7], argv_cstrs[8], argv_cstrs[9],
 		env_cstrs,
 		&pipe_write, &pipe_read, &pipe_err)) {
 
@@ -367,8 +387,8 @@ from http://www.apache.org/websrc/cvsweb
 		write(pipe_write, in_cstr, in.size());
 		close(pipe_write);
 		read_pipe(out, pipe_read, file_spec_cstr);
-		read_pipe(err, pipe_err, file_spec_cstr);
 		close(pipe_read);
+		read_pipe(err, pipe_err, file_spec_cstr);
 		close(pipe_err);
 
 		return get_exit_status(pid); // negative may mean "-errno[execl()]"