--- parser3/src/main/pa_exec.C 2003/01/21 15:51:14 1.48 +++ parser3/src/main/pa_exec.C 2003/01/31 12:34:37 1.48.2.5 @@ -1,19 +1,20 @@ /** @file Parser: program executing for different OS-es. - Copyright(c) 2000,2001, 2003 ArtLebedev Group(http://www.artlebedev.com) + Copyright(c) 2000,2001-2003 ArtLebedev Group(http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) @todo setrlimit */ -static const char* IDENT_EXEC_C="$Date: 2003/01/21 15:51:14 $"; +static const char* IDENT_EXEC_C="$Date: 2003/01/31 12:34:37 $"; #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 @@ -111,51 +112,50 @@ error: return result; } -static void read_pipe(String& result, HANDLE hOutRead, const char *file_spec, +static void read_pipe(Pool& pool, StringPtr result, HANDLE hOutRead, const char* file_spec, String::Untaint_lang lang){ while(true) { - char *buf=(char *)result.pool().malloc(MAX_STRING); + char *buf=new(pool) 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, file_spec, 0); } } - -static const char *buildCommand(Pool& pool, - const String& origin_string, - const char *file_spec_cstr, const Array *argv) { - const char *result=file_spec_cstr; +static CharPtr buildCommand(CharPtr file_spec_cstr, Array& argv) { + CharPtr 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) { buf[size]=0; if(strncmp(buf, "#!", 2)==0) { - const char *begin=buf+2; + 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_AS_IS(begin, end-begin, - origin_string.origin().file, 0); + String string(begin, end-begin); string << " " << file_spec_cstr; result=string.cstr(); } } } + } catch(...) { + fclose(f); + rethrow; + } fclose(f); } - if(argv) { - String buf(pool); - buf << result; - for(int i=0; isize(); i++) { - buf << " "; - buf << *argv->get_string(i); + { // appending argv + String string(result); + for(int i=0; i(info); - - string << key << "=" << *static_cast(value); - string.APPEND_AS_IS("", 1, 0, 0); // zero byte + String *string #else - String string(key.pool()); - string << key << "=" << *static_cast(value); + struct { + Pool *pool; + char ***env + } info +#endif + ) { +#ifdef WIN32 + *string << key << "=" << value; + string->APPEND_AS_IS("", 1, 0, 0); // zero byte +#else + String string; + string << key << "=" << value; - char ***env_ref=static_cast(info); - **env_ref=string.cstr(String::UL_UNSPECIFIED); (*env_ref)++; + **env=string.cstr(*info->pool, String::UL_UNSPECIFIED); (*env)++; #endif } -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(); - +/// @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) { #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 @@ -325,12 +330,12 @@ int pa_exec( PROCESS_INFORMATION pi; HANDLE hInWrite, hOutRead, hErrRead; - 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); + 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); env_cstr=string.cstr(String::UL_UNSPECIFIED); } if(DWORD error=CreateHiddenConsoleProcess(cmd, env_cstr, &pi, &hInWrite, &hOutRead, &hErrRead)) { @@ -344,21 +349,21 @@ int pa_exec( 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 { - const char *in_cstr=in.cstr(); + CharPtr 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(out, hOutRead, file_spec_cstr, String::UL_AS_IS); + read_pipe(pool, out, hOutRead, file_spec_cstr, String::UL_AS_IS); CloseHandle(hOutRead); - read_pipe(err, hErrRead, file_spec_cstr, String::UL_TAINTED); + read_pipe(pool, 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 @@ -420,7 +425,7 @@ from http://www.apache.org/websrc/cvsweb &pipe_write, &pipe_read, &pipe_err); if(pid>0) { // in child - const char *in_cstr=in.cstr(); + const char* in_cstr=in.cstr(); if(*in_cstr) // there is some in data write(pipe_write, in_cstr, in.size()); close(pipe_write);