--- parser3/src/main/pa_exec.C 2003/01/29 12:02:23 1.48.2.3 +++ parser3/src/main/pa_exec.C 2003/02/04 12:08:57 1.48.2.10 @@ -1,20 +1,19 @@ /** @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/29 12:02:23 $"; +static const char* IDENT_EXEC_C="$Date: 2003/02/04 12:08:57 $"; #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,7 +111,7 @@ error: return result; } -static void read_pipe(Pool& pool, StringPtr 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=new(pool) char[MAX_STRING]; @@ -123,7 +122,7 @@ static void read_pipe(Pool& pool, String } } -static CharPtr buildCommand(CharPtr file_spec_cstr, const Array& argv) { +static CharPtr buildCommand(CharPtr file_spec_cstr, Array& argv) { CharPtr result=file_spec_cstr; if(FILE *f=fopen(file_spec_cstr, "r")) { try { @@ -132,7 +131,7 @@ static CharPtr buildCommand(CharPtr file 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')) { @@ -163,7 +162,7 @@ static CharPtr buildCommand(CharPtr file #else -static pid_t execve_piped(const char *file_spec_cstr, +static pid_t execve_piped(const char* file_spec_cstr, char * const argv[], char * const env[], int *pipe_in, int *pipe_out, int *pipe_err) { pid_t pid; @@ -278,47 +277,49 @@ static int get_exit_status(int pid) { WEXITSTATUS(status) : -2; } -static void read_pipe(String& result, int file, const char *file_spec, String::Untaint_lang lang){ +static void read_pipe(Pool& pool, StringPtr result, int file, 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]; ssize_t size=read(file, buf, MAX_STRING); if(size<=0) break; - result.APPEND(buf, size, lang, file_spec, 0); + result->APPEND(buf, size, lang, file_spec, 0); } } #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, +#ifndef DOXYGEN +struct Append_env_pair_info { #ifdef WIN32 - String *string + String* string; #else - struct { - Pool *pool; - char ***env - } info + Pool *pool; + char **env_ref; #endif - ) { +}; +#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, + Append_env_pair_info *info) { #ifdef WIN32 - *string << key << "=" << value; - string->APPEND_AS_IS("", 1, 0, 0); // zero byte + *info->string << key << "=" << value; + info->string->APPEND_AS_IS("", 1, 0, 0); // zero byte #else String string; string << key << "=" << value; - **env=string.cstr(*info->pool, String::UL_UNSPECIFIED); (*env)++; + *(info->env_ref++)=string.cstr(*info->pool, String::UL_UNSPECIFIED); #endif } /// @todonow unix part to smart_ptr int pa_exec(Pool& pool, bool forced_allow, - ConstStringPtr file_spec, + StringPtr file_spec, HashStringString& env, - Array& argv, - ConstStringPtr in, StringPtr out, StringPtr err) { + Array& argv, + StringPtr in, StringPtr out, StringPtr err) { #ifdef NO_PA_EXECS if(!forced_allow) throw Exception("parser.runtime", @@ -326,25 +327,26 @@ int pa_exec(Pool& pool, "parser execs are disabled [recompile parser without --disable-execs configure option]"); #endif + char* file_spec_cstr=file_spec->cstr(pool, String::UL_FILE_SPEC); #ifdef WIN32 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 cmd=buildCommand(file_spec->cstr(String::UL_FILE_SPEC), argv); CharPtr env_cstr(0); { // env String string; - env.for_each(append_env_pair, &string); - env_cstr=string.cstr(String::UL_UNSPECIFIED); + Append_env_pair_info info={&string}; + env.for_each(append_env_pair, &info); + env_cstr=info.string->cstr(String::UL_UNSPECIFIED); } if(DWORD error=CreateHiddenConsoleProcess(cmd, env_cstr, &pi, &hInWrite, &hOutRead, &hErrRead)) { char szErrorDesc[MAX_STRING]; - char *param="the file you tried to run"; + const char *param="the file you tried to run"; size_t error_size=FormatMessage( FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_ARGUMENT_ARRAY , NULL, error, MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), - szErrorDesc, sizeof(szErrorDesc), ¶m); + szErrorDesc, sizeof(szErrorDesc), (va_list *)¶m); if(error_size>3) // ".\r\n" szErrorDesc[error_size-3]=0; @@ -378,45 +380,41 @@ from http://www.apache.org/websrc/cvsweb #else int pipe_write, pipe_read, pipe_err; - char *file_spec_cstr=file_spec.cstr(String::UL_FILE_SPEC); #ifdef PA_SAFE_MODE if(!forced_allow) { struct stat finfo; if(stat(file_spec_cstr, &finfo)!=0) throw Exception("file.missing", - &file_spec, + file_spec, "stat failed: %s (%d), actual filename '%s'", strerror(errno), errno, file_spec_cstr); if(finfo.st_uid/*foreign?*/!=geteuid() && finfo.st_gid/*foreign?*/!=getegid()) throw Exception("parser.runtime", - &file_spec, + file_spec, "parser is in safe mode: executing files of foreign group and user disabled [recompile parser with --disable-safe-mode configure option], actual filename '%s'", file_spec_cstr); } #endif - char *argv_cstrs[1+10+1]={file_spec_cstr, 0}; - if(argv) { - const int argv_size=argv->size(); - const int argv_max=sizeof(argv_cstrs)/sizeof(argv_cstrs[0])-1-1; - if(argv_size>argv_max) - throw Exception("parser.runtime", - &file_spec, - "too many arguments (%d > max %d)", argv_size, argv_max); - for(int i=0; iget_string(i)->cstr(); - argv_cstrs[1+argv_size]=0; - } - char **env_cstrs=0; - if(env) { - env_cstrs= - (char **)env->pool().malloc(sizeof(char *)*(env->size()+1/*0*/)); - char **env_ref=env_cstrs; - env->for_each(append_env_pair, &env_ref); - *env_ref=0; + char * argv_cstrs[1+10+1]={file_spec_cstr, 0}; + const int argv_size=argv.count(); + const int argv_max=sizeof(argv_cstrs)/sizeof(argv_cstrs[0])-1-1; + if(argv_size>argv_max) + throw Exception("parser.runtime", + file_spec, + "too many arguments (%d > max %d)", argv_size, argv_max); + for(int i=0; icstr(pool); + argv_cstrs[1+argv_size]=0; + + char **env_cstrs=new(pool) char *[env.count()+1/*0*/]; + { + Append_env_pair_info info={&pool, env_cstrs}; + env.for_each(append_env_pair, &info); + *info.env_ref=0; } pid_t pid=execve_piped( @@ -425,19 +423,20 @@ from http://www.apache.org/websrc/cvsweb &pipe_write, &pipe_read, &pipe_err); if(pid>0) { // in child - const char *in_cstr=in.cstr(); - if(*in_cstr) // there is some in data - write(pipe_write, in_cstr, in.size()); + if(in && in->size()) {// there is some in data + CharPtr in_cstr=in->cstr(); + write(pipe_write, in_cstr, in->size()); + } close(pipe_write); - read_pipe(out, pipe_read, file_spec_cstr, String::UL_AS_IS); + read_pipe(pool, out, pipe_read, file_spec_cstr, String::UL_AS_IS); close(pipe_read); - read_pipe(err, pipe_err, file_spec_cstr, String::UL_TAINTED); + read_pipe(pool, err, pipe_err, file_spec_cstr, String::UL_TAINTED); close(pipe_err); return get_exit_status(pid); // negative may mean "-errno[execl()]" } else throw Exception(0, - &file_spec, + file_spec, "%s error: %s (%d)", pid<0?"fork":"pipe", strerror(errno), errno); #endif