--- parser3/src/include/pa_exec.h 2003/07/24 11:31:21 1.13 +++ parser3/src/include/pa_exec.h 2020/12/15 17:10:31 1.24 @@ -1,14 +1,14 @@ /** @file Parser: program executing for different OS-es decls. - Copyright (c) 2000,2001-2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2000-2020 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ #ifndef PA_EXEC_H #define PA_EXEC_H -static const char* IDENT_EXEC_H="$Date: 2003/07/24 11:31:21 $"; +#define IDENT_PA_EXEC_H "$Id: pa_exec.h,v 1.24 2020/12/15 17:10:31 moko Exp $" #include "pa_string.h" #include "pa_hash.h" @@ -18,10 +18,10 @@ static const char* IDENT_EXEC_H="$Date: struct PA_exec_result { int status; ///< exit code - String out; - String err; + File_read_result out; + String& err; - PA_exec_result(): status(0) {} + PA_exec_result(): status(0), out(), err(*new String) {} }; PA_exec_result pa_exec( @@ -29,6 +29,6 @@ PA_exec_result pa_exec( const String& file_spec, const HashStringString* env, ///< 0 | Hash of String const ArrayString& argv, ///< 0 | Array of command line arguments - String& in); + String::C in); #endif