--- parser3/src/main/pa_exec.C 2002/07/11 08:16:24 1.37 +++ parser3/src/main/pa_exec.C 2002/11/20 09:44:43 1.40 @@ -4,12 +4,11 @@ Copyright(c) 2000,2001, 2002 ArtLebedev Group(http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) - $Id: pa_exec.C,v 1.37 2002/07/11 08:16:24 paf Exp $ - - @todo setrlimit */ +static const char* IDENT_EXEC_C="$Date: 2002/11/20 09:44:43 $"; + #include "pa_config_includes.h" #include "pa_exec.h" @@ -281,8 +280,8 @@ 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); - size_t size=read(file, buf, MAX_STRING); - if(!size) + ssize_t size=read(file, buf, MAX_STRING); + if(size<=0) break; result.APPEND(buf, size, lang, file_spec, 0); } @@ -302,7 +301,7 @@ static void append_env_pair(const Hash:: string << key << "=" << *static_cast(value); char ***env_ref=static_cast(info); - **env_ref=string.cstr(); (*env_ref)++; + **env_ref=string.cstr(String::UL_PASSAPPENED); (*env_ref)++; #endif }