--- parser3/src/main/pa_exec.C 2003/01/31 12:10:47 1.48.2.4 +++ parser3/src/main/pa_exec.C 2003/03/17 14:48:06 1.48.4.1 @@ -7,14 +7,13 @@ @todo setrlimit */ -static const char* IDENT_EXEC_C="$Date: 2003/01/31 12:10:47 $"; +static const char* IDENT_EXEC_C="$Date: 2003/03/17 14:48:06 $"; #include "pa_config_includes.h" #include "pa_exec.h" #include "pa_exception.h" #include "pa_common.h" -#include "pa_value_includes.h" #ifdef WIN32 # include @@ -112,21 +111,23 @@ error: return result; } -static void read_pipe(Pool& pool, StringPtr result, HANDLE hOutRead, const char *file_spec, +static void read_pipe(String& result, HANDLE hOutRead, const char *file_spec, String::Untaint_lang lang){ while(true) { - char *buf=new(pool) char[MAX_STRING]; + char *buf=(char *)result.pool().malloc_atomic(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, file_spec, 0); } } -static CharPtr buildCommand(CharPtr file_spec_cstr, Array& argv) { - CharPtr result=file_spec_cstr; + +static const char *buildCommand(Pool& pool, + const String& origin_string, + const char *file_spec_cstr, const Array *argv) { + const char *result=file_spec_cstr; if(FILE *f=fopen(file_spec_cstr, "r")) { - try { char buf[MAX_STRING]; size_t size=fread(buf, 1, MAX_STRING-1, f); if(size>2) { @@ -136,26 +137,25 @@ static CharPtr buildCommand(CharPtr file if(*begin==' ') // alx: were an old magic for some linux-es begin++; if(char *end=strchr(begin, '\n')) { - String string(begin, end-begin); + String string(pool); + string.APPEND_AS_IS(begin, end-begin, + origin_string.origin().file, 0); string << " " << file_spec_cstr; result=string.cstr(); } } } - } catch(...) { - fclose(f); - rethrow; - } fclose(f); } - { // appending argv - String string(result); - for(int i=0; isize(); i++) { + buf << " "; + buf << *argv->get_string(i); } - result=string.cstr(); + result=buf.cstr(); } return result; @@ -280,7 +280,7 @@ static int get_exit_status(int pid) { static void read_pipe(String& result, int file, const char *file_spec, String::Untaint_lang lang){ while(true) { - char *buf=(char *)result.pool().malloc(MAX_STRING); + char *buf=(char *)result.pool().malloc_atomic(MAX_STRING); ssize_t size=read(file, buf, MAX_STRING); if(size<=0) break; @@ -291,38 +291,33 @@ static void read_pipe(String& result, in #endif ///@test maybe here and at argv construction --- cstr(String::UL_UNSPECIFIED -static void append_env_pair(HashStringString::key_type key, HashStringString::value_type value, -#ifdef WIN32 - String *string -#else - struct { - Pool *pool; - char ***env - } info -#endif - ) { +static void append_env_pair(const Hash::Key& key, Hash::Val *value, void *info) { #ifdef WIN32 - *string << key << "=" << value; - string->APPEND_AS_IS("", 1, 0, 0); // zero byte + String& string=*static_cast(info); + + string << key << "=" << *static_cast(value); + string.APPEND_AS_IS("", 1, 0, 0); // zero byte #else - String string; - string << key << "=" << value; + String string(key.pool()); + string << key << "=" << *static_cast(value); - **env=string.cstr(*info->pool, String::UL_UNSPECIFIED); (*env)++; + char ***env_ref=static_cast(info); + **env_ref=string.cstr(String::UL_UNSPECIFIED); (*env_ref)++; #endif } -/// @todonow unix part to smart_ptr -int pa_exec(Pool& pool, - bool forced_allow, - StringPtr file_spec, - HashStringString& env, - Array& argv, - StringPtr in, StringPtr out, StringPtr err) { +int pa_exec( + bool forced_allow, + const String& file_spec, + const Hash *env, + const Array *argv, + const String& in, String& out, String& err) { + Pool& pool=file_spec.pool(); + #ifdef NO_PA_EXECS if(!forced_allow) throw Exception("parser.runtime", - file_spec, + &file_spec, "parser execs are disabled [recompile parser without --disable-execs configure option]"); #endif @@ -330,12 +325,12 @@ int pa_exec(Pool& pool, PROCESS_INFORMATION pi; HANDLE hInWrite, hOutRead, hErrRead; - CharPtr file_spec_cstr=file_spec->cstr(String::UL_FILE_SPEC); - CharPtr cmd=buildCommand(file_spec_cstr, argv); - CharPtr env_cstr(0); - { // env - String string; - env.for_each(append_env_pair, &string); + char *file_spec_cstr=file_spec.cstr(String::UL_FILE_SPEC); + const char *cmd=buildCommand(file_spec.pool(), file_spec, file_spec_cstr, argv); + char *env_cstr=0; + if(env) { + String string(env->pool()); + env->for_each(append_env_pair, &string); env_cstr=string.cstr(String::UL_UNSPECIFIED); } if(DWORD error=CreateHiddenConsoleProcess(cmd, env_cstr, &pi, &hInWrite, &hOutRead, &hErrRead)) { @@ -349,21 +344,21 @@ int pa_exec(Pool& pool, szErrorDesc[error_size-3]=0; throw Exception(0, - file_spec, + &file_spec, "exec failed - %s (%ld). Consider adding shbang line (#!x:\\interpreter\\command line)", error_size?szErrorDesc:"", (long)error); } else { - CharPtr in_cstr=in->cstr(); + const char *in_cstr=in.cstr(); DWORD written_size; - WriteFile(hInWrite, in_cstr, in->size(), &written_size, NULL); + 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(pool, out, hOutRead, file_spec_cstr, String::UL_AS_IS); + read_pipe(out, hOutRead, file_spec_cstr, String::UL_AS_IS); CloseHandle(hOutRead); - read_pipe(pool, err, hErrRead, file_spec_cstr, String::UL_TAINTED); + read_pipe(err, hErrRead, file_spec_cstr, String::UL_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