--- parser3/src/main/pa_exec.C 2001/04/17 19:00:41 1.2 +++ parser3/src/main/pa_exec.C 2001/08/02 09:58:34 1.9 @@ -4,9 +4,8 @@ Copyright(c) 2000,2001 ArtLebedev Group(http://www.artlebedev.com) Author: Alexander Petrosyan (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.9 2001/08/02 09:58:34 parser Exp $"; #include "pa_config_includes.h" @@ -29,12 +28,12 @@ #ifdef WIN32 /// this func from http://www.ccas.ru/~posp/popov/spawn.htm -static BOOL WINAPI CreateHiddenConsoleProcess( LPCTSTR szChildName, +static BOOL WINAPI CreateHiddenConsoleProcess(LPCTSTR szChildName, char *szEnv, PROCESS_INFORMATION* ppi, LPHANDLE phInWrite, LPHANDLE phOutRead, - LPHANDLE phErrRead ) + LPHANDLE phErrRead) { BOOL fCreated; STARTUPINFO si; @@ -45,58 +44,58 @@ static BOOL WINAPI CreateHiddenConsolePr // Create pipes // initialize security attributes for handle inheritance (for WinNT) - sa.nLength = sizeof( sa ); - sa.bInheritHandle = TRUE; - sa.lpSecurityDescriptor = NULL; + sa.nLength=sizeof(sa); + sa.bInheritHandle=TRUE; + sa.lpSecurityDescriptor=NULL; // create STDIN pipe - if( !CreatePipe( &hInRead, phInWrite, &sa, 0 )) + if(!CreatePipe(&hInRead, phInWrite, &sa, 0)) goto error; // create STDOUT pipe - if( !CreatePipe( phOutRead, &hOutWrite, &sa, 0 )) + if(!CreatePipe(phOutRead, &hOutWrite, &sa, 0)) goto error; // create STDERR pipe - if( !CreatePipe( phErrRead, &hErrWrite, &sa, 0 )) + if(!CreatePipe(phErrRead, &hErrWrite, &sa, 0)) goto error; // process startup information - memset( &si, 0, sizeof( si )); - si.cb = sizeof( si ); - si.dwFlags = STARTF_USESHOWWINDOW | STARTF_USESTDHANDLES; + memset(&si, 0, sizeof(si)); + si.cb=sizeof(si); + si.dwFlags=STARTF_USESHOWWINDOW | STARTF_USESTDHANDLES; // child process' console must be hidden for Win95 compatibility - si.wShowWindow = SW_HIDE; + si.wShowWindow=SW_HIDE; // assign "other" sides of pipes -// si.hStdInput = hInRead; - si.hStdOutput = hOutWrite; - si.hStdError = hErrWrite; + si.hStdInput=hInRead; + si.hStdOutput=hOutWrite; + si.hStdError=hErrWrite; // Create a child process (suspended) - fCreated = CreateProcess( NULL, + fCreated=CreateProcess(NULL, (LPTSTR)szChildName, NULL, NULL, TRUE, - DETACHED_PROCESS, + 0, //todo CREATE_NO_WINDOW, szEnv, NULL, &si, - ppi ); + ppi); - CloseHandle( hInRead ); - CloseHandle( hOutWrite ); - CloseHandle( hErrWrite ); + CloseHandle(hInRead); + CloseHandle(hOutWrite); + CloseHandle(hErrWrite); - if( !fCreated ) + if(!fCreated) goto error; return TRUE; error: - CloseHandle( *phInWrite ); - CloseHandle( *phOutRead ); - CloseHandle( *phErrRead ); + CloseHandle(*phInWrite); + CloseHandle(*phOutRead); + CloseHandle(*phErrRead); return FALSE; } @@ -105,10 +104,10 @@ static void read_pipe(String& result, HA while(true) { char *buf=(char *)result.pool().malloc(MAX_STRING); unsigned long size; - ReadFile( hOutRead, buf, MAX_STRING, &size, NULL ); + 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; isize(); 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; isize(); 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(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); @@ -304,14 +316,21 @@ int pa_exec(const String& file_spec, env->for_each(append_env_pair, &string); env_cstr=string.cstr(String::UL_AS_IS); } - if( CreateHiddenConsoleProcess(cmd, env_cstr, &pi, &hInWrite, &hOutRead, &hErrRead )) { + if(CreateHiddenConsoleProcess(cmd, env_cstr, &pi, &hInWrite, &hOutRead, &hErrRead)) { SetCurrentDirectory(pwd); + 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); - read_pipe(err, hErrRead, file_spec_cstr); - CloseHandle( hInWrite ); - CloseHandle( hOutRead ); - CloseHandle( hErrRead ); + 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()]"