--- parser3/src/main/pa_exec.C 2003/03/27 14:51:28 1.48.2.18.2.12 +++ parser3/src/main/pa_exec.C 2003/03/17 14:48:06 1.48.4.1 @@ -1,13 +1,13 @@ /** @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/03/27 14:51:28 $"; +static const char* IDENT_EXEC_C="$Date: 2003/03/17 14:48:06 $"; #include "pa_config_includes.h" @@ -111,50 +111,51 @@ error: return result; } -static void read_pipe(String& result, HANDLE hOutRead, String::Language lang){ +static void read_pipe(String& result, HANDLE hOutRead, const char *file_spec, + String::Untaint_lang lang){ while(true) { - char *buf=new(PointerFreeGC) char[MAX_STRING]; + char *buf=(char *)result.pool().malloc_atomic(MAX_STRING); unsigned long size; - if(!ReadFile(hOutRead, buf, MAX_STRING-1, &size, NULL) || !size) + if(!ReadFile(hOutRead, buf, MAX_STRING, &size, NULL) || !size) break; - buf[size]=0; - result.append_help_length(buf, size, lang); - } + result.APPEND(buf, size, lang, file_spec, 0); + } } -static const char* buildCommand(const char* file_spec_cstr, const ArrayString& argv) { - const char* 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) { 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(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(size_t i=0; isize(); i++) { + buf << " "; + buf << *argv->get_string(i); } - result=string.cstr(); + result=buf.cstr(); } return result; @@ -162,7 +163,7 @@ static const char* buildCommand(const ch #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; @@ -277,50 +278,41 @@ static int get_exit_status(int pid) { WEXITSTATUS(status) : -2; } -static void read_pipe(String& result, int file, String::Language lang){ +static void read_pipe(String& result, int file, const char *file_spec, String::Untaint_lang lang){ while(true) { - char *buf=new(PointerFreeGC) char[MAX_STRING]; + char *buf=(char *)result.pool().malloc_atomic(MAX_STRING); ssize_t size=read(file, buf, MAX_STRING); if(size<=0) break; - result.append(buf, size, lang); - } + result.APPEND(buf, size, lang, file_spec, 0); + } } #endif -#ifndef DOXYGEN -struct Append_env_pair_info { +///@test maybe here and at argv construction --- cstr(String::UL_UNSPECIFIED +static void append_env_pair(const Hash::Key& key, Hash::Val *value, void *info) { #ifdef WIN32 - String& string; - Append_env_pair_info(String& astring): string(astring) {} -#else - char **env_ref; -#endif -}; -#endif -///@test maybe here and at argv construction --- cstr(String::L_UNSPECIFIED -static void append_env_pair(HashStringString::key_type key, HashStringString::value_type value, - Append_env_pair_info *info) { -#ifdef WIN32 - info->string << key << "=" << value; - info->string.append_help_length("", 1, String::L_AS_IS); // zero byte + String& string=*static_cast(info); + + string << key << "=" << *static_cast(value); + string.APPEND_AS_IS("", 1, 0, 0); // zero byte #else - StringBody body; - body << key << "=" << value; + String string(key.pool()); + string << key << "=" << *static_cast(value); - *(info->env_ref++)=body.cstrm(); + char ***env_ref=static_cast(info); + **env_ref=string.cstr(String::UL_UNSPECIFIED); (*env_ref)++; #endif } -/// @todonow unix part to smart_ptr -PA_exec_result pa_exec( - bool forced_allow, +int pa_exec( + bool forced_allow, const String& file_spec, - const HashStringString* env, - const ArrayString& argv, - String& in) { - PA_exec_result result; + 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) @@ -329,27 +321,25 @@ PA_exec_result pa_exec( "parser execs are disabled [recompile parser without --disable-execs configure option]"); #endif - // execve needs non const - char* file_spec_cstr=file_spec.cstrm(String::L_FILE_SPEC); #ifdef WIN32 PROCESS_INFORMATION pi; HANDLE hInWrite, hOutRead, hErrRead; - const char* cmd=buildCommand(file_spec.cstr(String::L_FILE_SPEC), argv); - char* env_cstr; + 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; - Append_env_pair_info info(string); - env->for_each(append_env_pair, &info); - env_cstr=info.string.cstrm(String::L_UNSPECIFIED); + 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)) { char szErrorDesc[MAX_STRING]; - const char* param="the file you tried to run"; + 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), (va_list *)¶m); + szErrorDesc, sizeof(szErrorDesc), ¶m); if(error_size>3) // ".\r\n" szErrorDesc[error_size-3]=0; @@ -358,17 +348,17 @@ PA_exec_result pa_exec( "exec failed - %s (%ld). Consider adding shbang line (#!x:\\interpreter\\command line)", error_size?szErrorDesc:"", (long)error); } else { - const char* in_cstr=in.cstr(); + const char *in_cstr=in.cstr(); DWORD written_size; - WriteFile(hInWrite, in_cstr, in.length(), &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(result.out, hOutRead, String::L_AS_IS); + read_pipe(out, hOutRead, file_spec_cstr, String::UL_AS_IS); CloseHandle(hOutRead); - read_pipe(result.err, hErrRead, String::L_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 @@ -383,15 +373,16 @@ 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, - "stat failed: %s (%d), actual filename '%s'", - strerror(errno), errno, file_spec_cstr); + &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()) @@ -402,25 +393,26 @@ from http://www.apache.org/websrc/cvsweb } #endif - 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; icstrm(); - argv_cstrs[1+argv_size]=0; - - char **env_cstrs; + 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=new(PointerFreeGC) char *[env->count()+1/*0*/]; - Append_env_pair_info info={env_cstrs}; - env->for_each(append_env_pair, &info); - *info.env_ref=0; - } else - env_cstrs=0; + 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; + } pid_t pid=execve_piped( file_spec_cstr, @@ -428,22 +420,21 @@ from http://www.apache.org/websrc/cvsweb &pipe_write, &pipe_read, &pipe_err); if(pid>0) { // in child - if(in.length()) {// there is some in data - const char* in_cstr=in.cstr(); - write(pipe_write, in_cstr, in.length()); - } + const char *in_cstr=in.cstr(); + if(*in_cstr) // there is some in data + write(pipe_write, in_cstr, in.size()); close(pipe_write); - read_pipe(result.out, pipe_read, String::L_AS_IS); + read_pipe(out, pipe_read, file_spec_cstr, String::UL_AS_IS); close(pipe_read); - read_pipe(result.err, pipe_err, String::L_TAINTED); + read_pipe(err, pipe_err, file_spec_cstr, String::UL_TAINTED); close(pipe_err); - result.status=get_exit_status(pid); // negative may mean "-errno[execl()]" + return get_exit_status(pid); // negative may mean "-errno[execl()]" } else throw Exception(0, &file_spec, "%s error: %s (%d)", pid<0?"fork":"pipe", strerror(errno), errno); #endif - return result; + return 0; }