--- parser3/src/main/pa_exec.C 2001/04/17 19:00:41 1.2 +++ parser3/src/main/pa_exec.C 2001/06/28 07:41:59 1.6 @@ -5,8 +5,9 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: pa_exec.C,v 1.2 2001/04/17 19:00:41 paf Exp $ + $Id: pa_exec.C,v 1.6 2001/06/28 07:41:59 parser Exp $ */ +static char *RCSId="$Id: pa_exec.C,v 1.6 2001/06/28 07:41:59 parser Exp $"; #include "pa_config_includes.h" @@ -68,7 +69,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 +109,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,17 +117,18 @@ 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) { + 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) @@ -261,7 +263,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 +274,7 @@ static void append_env_pair(const Hash:: String& string=*static_cast(info); string << key << "=" << *static_cast(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(value); @@ -307,10 +309,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 @@ -367,8 +376,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()]"