--- parser3/src/main/pa_common.C 2002/11/29 07:48:38 1.134 +++ parser3/src/main/pa_common.C 2003/02/14 17:38:29 1.143.2.19 @@ -1,22 +1,32 @@ /** @file Parser: commonly functions. - Copyright(c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Copyright(c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_COMMON_C="$Date: 2002/11/29 07:48:38 $"; +static const char* IDENT_COMMON_C="$Date: 2003/02/14 17:38:29 $"; #include "pa_common.h" #include "pa_exception.h" -#include "pa_globals.h" #include "pa_hash.h" #include "pa_vstring.h" +#include "pa_vint.h" +#include "pa_globals.h" -#ifdef WIN32 -# include +#ifdef CYGWIN +#define _GNU_H_WINDOWS32_SOCKETS +// for PASCAL +#include +// SOCKET +typedef u_int SOCKET; +int PASCAL closesocket(SOCKET); #else -# define closesocket close +# if defined(WIN32) +# include +# else +# define closesocket close +# endif #endif // some maybe-undefined constants @@ -28,6 +38,16 @@ static const char* IDENT_COMMON_C="$Date # define _O_BINARY 0 #endif +#ifdef HAVE_FTRUNCATE +# define PA_O_TRUNC 0 +#else +# ifdef _O_TRUNC +# define PA_O_TRUNC _O_TRUNC +# else +# error you must have either ftruncate function or _O_TRUNC bit declared +# endif +#endif + // locking constants #ifdef HAVE_FLOCK @@ -73,31 +93,45 @@ static int unlock(int fd) { FLOCK(F_TLOC #endif #endif -#define DEFAULT_USER_AGENT "parser3" +// defines for globals +#define FILE_STATUS_NAME "status" +// globals -static char* strnchr(char* buf, size_t size, char c) { - // sanity check - if(!buf) - return 0; +StringPtr file_status_name(new String(FILE_STATUS_NAME)); - for(; size-->0; buf++) { - if(*buf==c) - return buf; - } +// defines for statics - return 0; -} +#define HTTP_METHOD_NAME "method" +#define HTTP_TIMEOUT_NAME "timeout" +#define HTTP_HEADERS_NAME "headers" +#define HTTP_ANY_STATUS_NAME "any-status" + +// statics + +static StringPtr http_method_name(new String(HTTP_METHOD_NAME)); +static StringPtr http_timeout_name(new String(HTTP_TIMEOUT_NAME)); +static StringPtr http_headers_name(new String(HTTP_HEADERS_NAME)); +static StringPtr http_any_status_name(new String(HTTP_ANY_STATUS_NAME)); + +// defines + +#define DEFAULT_USER_AGENT "parser3" + +// functions void fix_line_breaks(char* buf, size_t& size) { + if(size==0) + return; + //_asm int 3; const char* const eob=buf+size; char* dest=buf; // fix DOS: \r\n -> \n // fix Macintosh: \r -> \n char* bol=buf; - while(char* eol=strnchr(bol, eob -bol, '\r')) { + while(char* eol=(char*)memchr(bol, '\r', eob -bol)) { size_t len=eol-bol; if(dest!=bol) memcpy(dest, bol, len); @@ -115,11 +149,13 @@ void fix_line_breaks(char* buf, size_t& memcpy(dest, bol, eob-bol); } -char* file_read_text(Pool& pool, const String& file_spec, +char* file_read_text(Pool& pool, Charset& charset, + StringPtr file_spec, bool fail_on_read_problem, - Hash *params, Hash** out_fields) { - void *result; size_t size; - return file_read(pool, file_spec, result, size, true, params, out_fields, fail_on_read_problem)?(char *)result:0; + HashStringValue* params/*, HashStringValuePtr* out_fields*/) { + File_read_result file= + file_read(pool, charset, file_spec, true, params, fail_on_read_problem); + return file.success?file.data:0; } //http request stuff @@ -139,32 +175,33 @@ static bool set_addr(struct sockaddr_in return true; } -static void http_read_response(String& response, int sock){ - bool check_status=true; +static int http_read_response(Pool& pool, String& response, int sock, bool fail_on_status_ne_200){ + int result=0; ssize_t EOLat=0; while(true) { - char *buf=(char *)response.pool().malloc(MAX_STRING); + char *buf=(char *)pool.malloc(MAX_STRING); ssize_t size=recv(sock, buf, MAX_STRING, 0); if(size<=0) break; response.APPEND_TAINTED(buf, size, "remote HTTP server response", 0); - if(check_status && (EOLat=response.pos("\r\n", 2))>=0) { // checking status in first response - check_status=false; - - const String& status_line=response.mid(0, (size_t)EOLat); - Array astatus(response.pool()); - size_t pos_after_ref=0; status_line.split(astatus, &pos_after_ref, " ", 1); - const String* status_code=astatus.get_string(1); + if(!result && (EOLat=response.pos("\r\n", 2))>=0) { // checking status in first response + StringPtr status_line=response.mid(0, (size_t)EOLat); + ArrayString astatus; + status_line->split(astatus, 0, " ", 1); + StringPtr status_code=astatus.get(1); + result=status_code->as_int(); - if(!status_code || *status_code!="200") + if(fail_on_status_ne_200 && result!=200) throw Exception("http.status", status_code, "invalid HTTP response status"); } - } - if(check_status) + } + if(result) + return result; + else throw Exception("http.response", - 0, + Exception::undefined_source, "bad response from host - no status found (size=%lu)", response.size()); } @@ -181,11 +218,13 @@ static void timeout_handler(int sig){ } #endif -static void http_request(String& response, - const String *origin_string, - const char* host, int port, - const char* request, - int timeout){ +static int http_request(Pool& pool, + String& response, + StringPtr origin_string, + const char* host, int port, + const char* request, + int timeout, + bool fail_on_status_ne_200) { if(!host) throw Exception("http.host", origin_string, @@ -196,6 +235,7 @@ static void http_request(String& respons #endif int sock=-1; try { + int result; #ifdef WE_CAN_USE_ALARM if(sigsetjmp(timeout_env, 1)) throw Exception("http.timeout", @@ -225,101 +265,116 @@ static void http_request(String& respons origin_string, "error sending request: %s (%d)", strerror(errno), errno); - http_read_response(response, sock); - if(sock>=0) - closesocket(sock); + result=http_read_response(pool, response, sock, fail_on_status_ne_200); + closesocket(sock); #ifdef WE_CAN_USE_ALARM + alarm(0); } #endif + return result; } catch(...) { if(sock>=0) closesocket(sock); #ifdef WE_CAN_USE_ALARM alarm(0); #endif - /*re*/throw; + rethrow; } } #ifndef DOXYGEN struct Http_pass_header_info { + Pool* pool; + Charset* charset; String* request; bool user_agent_specified; }; #endif -static void http_pass_header(const Hash::Key& key, Hash::Val *value, void *info) -{ - Http_pass_header_info& i=*static_cast(info); - Pool& pool=i.request->pool(); - - // force all to URI lang - String& value_string=*new(pool) String(pool); - value_string.append(*(static_cast(value))->get_string(), String::UL_URI, true); - - *(i.request)<request)<<*key<<": " + << *attributed_meaning_to_string(*info->pool, value, String::UL_HTTP_HEADER, false) + <<"\n"; + + if(*key->change_case(*info->pool, *info->charset, String::CC_UPPER)=="USER-AGENT") + info->user_agent_specified=true; +} +#ifndef DOXYGEN +struct File_read_http_info { + char **data; size_t *data_size; + HashStringValuePtr headers; +}; +#endif +static File_read_http_info file_read_http(Pool& pool, Charset& charset, StringPtr file_spec, + HashStringValue *options=0) { + File_read_http_info result; char host[MAX_STRING]; const char* uri; int port; - const char* method="GET"; + CharPtr method(0); int timeout=2; - Value *vheaders=0; + bool fail_on_status_ne_200=true; + ValuePtr vheaders(0); - String connect_string(pool); + StringPtr connect_string(new String()); // not in ^sql{... UL_SQL ...} spirit, but closer to ^file::load one - connect_string.append(file_spec, String::UL_URI); // tainted pieces -> URI pieces + connect_string->append(*file_spec, String::UL_URI); // tainted pieces -> URI pieces - char* connect_string_cstr=connect_string.cstr(String::UL_UNSPECIFIED); - if(strncmp(connect_string_cstr, "http://", 7)!=0) + CharPtr connect_string_cstr=connect_string->cstr(String::UL_UNSPECIFIED); + const char* current=connect_string_cstr; + if(strncmp(current, "http://", 7)!=0) throw Exception(0, - &connect_string, + connect_string, "does not start with http://"); //never - connect_string_cstr+=7; + current+=7; - strncpy(host, connect_string_cstr, sizeof(host)-1); host[sizeof(host)-1]=0; + strncpy(host, current, sizeof(host)-1); host[sizeof(host)-1]=0; char* host_uri=lsplit(host, '/'); - uri=host_uri?connect_string_cstr+(host_uri-1-host):"/"; + uri=host_uri?current+(host_uri-1-host):"/"; char* port_cstr=lsplit(host, ':'); char* error_pos=0; port=port_cstr?strtol(port_cstr, &error_pos, 0):80; if(options) { int valid_options=0; - if(Value *vmethod=static_cast(options->get(*http_method_name))) { + if(ValuePtr vmethod=options->get(http_method_name)) { valid_options++; - method=vmethod->as_string().cstr(); + method=vmethod->as_string(&pool)->cstr(); } - if(Value *vtimeout=static_cast(options->get(*http_timeout_name))) { + if(ValuePtr vtimeout=options->get(http_timeout_name)) { valid_options++; timeout=vtimeout->as_int(); } - if(vheaders=static_cast(options->get(*http_headers_name))) { + if(vheaders=options->get(http_headers_name)) { + valid_options++; + } + if(ValuePtr vany_status=options->get(http_any_status_name)) { valid_options++; + fail_on_status_ne_200=!vany_status->as_bool(); } - if(valid_options!=options->size()) + + if(valid_options!=options->count()) throw Exception("parser.runtime", - 0, + Exception::undefined_source, "invalid option passed"); } //making request - String request(pool); - request<< method <<" "<< uri <<" HTTP/1.0\nHost: "<< host<<"\n"; + String request; + if(method) + request<is_string()) { // allow empty - if(Hash *headers=vheaders->get_hash(&connect_string)) { - Http_pass_header_info info={&request}; + if(HashStringValue *headers=vheaders->get_hash(connect_string)) { + Http_pass_header_info info={&pool, &charset, &request}; headers->for_each(http_pass_header, &info); user_agent_specified=info.user_agent_specified; } else throw Exception("parser.runtime", - &connect_string, + connect_string, "headers param must be hash"); }; if(!user_agent_specified) // defaulting @@ -327,74 +382,65 @@ static void file_read_http(Pool& pool, c request<<"\n"; //sending request - String response(pool); - http_request(response, - &connect_string, host, port, request.cstr(String::UL_UNSPECIFIED), timeout); + String response; + CharPtr request_cstr=request.cstr(String::UL_UNSPECIFIED); + int status_code=http_request(pool, response, + connect_string, host, port, request_cstr, + timeout, fail_on_status_ne_200); //processing results int pos=response.pos("\r\n\r\n", 4); if(pos<1){ throw Exception("http.response", - &connect_string, + connect_string, "bad response from host - no headers found"); } - String header_block=response.mid(0, pos); - String body=response.mid(pos+4, response.size()); + StringPtr header_block=response.mid(0, pos); + StringPtr body=response.mid(pos+4, response.size()); - Array aheaders(pool); - Hash& headers=*new(pool) Hash(pool); - size_t pos_after_ref=0; - header_block.split(aheaders, &pos_after_ref, "\r\n", 2); + ArrayString aheaders; + result.headers=HashStringValuePtr(new HashStringValue); + header_block->split(aheaders, 0, "\r\n", 2); - //processing status code - const String *status_line=aheaders.get_string(0); - if(!status_line){ - throw Exception("http.response", - &connect_string, - "bad response from host - no status line "); - } //processing headers - for(int i=1;ipos(": ", 2); - if(pos<1) - throw Exception("http.response", - &connect_string, - "bad response from host - bad header \"%s\"", line->cstr()); - - headers.put( - line->mid(0, pos).change_case(pool, String::CC_UPPER), - new(pool) VString(line->mid(pos+2, line->size()))); - } else + for(int i=1; ipos(": ", 2); + if(pos<1) throw Exception("http.response", - &connect_string, - "bad response from host - bad headers \"%s\"", header_block.cstr()); + connect_string, + "bad response from host - bad header \"%s\"", line->cstr().get()); + + result.headers->put( + line->mid(0, pos)->change_case(pool, charset, String::CC_UPPER), + ValuePtr(new VString(line->mid(pos+2, line->size())))); } // output response - data=body.cstr(); data_size=body.size(); - if(out_fields) - *out_fields=&headers; + *result.data=new(pool) char[*result.data_size=body->size()]; + body->store_to(*result.data, String::UL_AS_IS); + result.headers->put(file_status_name, ValuePtr(new VInt(status_code))); + return result; } #ifndef DOXYGEN struct File_read_action_info { - void **data; size_t *data_size; + char **data; size_t *data_size; }; #endif -static void file_read_action(Pool& pool, +static void file_read_action(Pool& pool, struct stat& finfo, int f, - const String& file_spec, const char* fname, bool as_text, + StringPtr file_spec, const char* fname, bool as_text, void *context) { File_read_action_info& info=*static_cast(context); if(size_t to_read_size=(size_t)finfo.st_size) { - *info.data=pool.malloc(to_read_size+(as_text?1:0), 3); + *info.data=pool.malloc(to_read_size+(as_text?1:0)); *info.data_size=(size_t)read(f, *info.data, to_read_size); if(ssize_t(*info.data_size)<0 || *info.data_size>to_read_size) throw Exception(0, - &file_spec, + file_spec, "read failed: actually read %lu bytes count not in [0..%lu] valid range", *info.data_size, to_read_size); } else { // empty file @@ -407,45 +453,44 @@ static void file_read_action(Pool& pool, return; } } -bool file_read(Pool& pool, const String& file_spec, - void*& data, size_t& data_size, - bool as_text, Hash *params, Hash** out_fields, +File_read_result file_read(Pool& pool, Charset& charset, StringPtr file_spec, + bool as_text, HashStringValue *params, bool fail_on_read_problem) { - bool result; - if(file_spec.starts_with("http://", 7)) { + File_read_result result; + if(file_spec->starts_with("http://", 7)) { // fail on read problem - file_read_http(pool, file_spec, data, data_size, params, out_fields); - result=true; + result.headers=file_read_http(pool, charset, file_spec, params).headers; + result.success=true; } else { - File_read_action_info info={&data, &data_size}; - result=file_read_action_under_lock(pool, file_spec, + File_read_action_info info={&result.data, &result.size}; + result.success=file_read_action_under_lock(pool, file_spec, "read", file_read_action, &info, as_text, fail_on_read_problem); } - if(result && as_text) { + if(result.success && as_text) { // UTF-8 signature: EF BB BF - if(data_size>=3) { - char *in=(char *)data; + if(result.size>=3) { + char *in=(char *)result.data; if((in[0] == '\xEF') && (in[1] == '\xBB') && (in[2] == '\xBF')) { - data=in+3; data_size-=3;// skip prefix + result.data=in+3; result.size-=3;// skip prefix } } - fix_line_breaks((char *)(data), data_size); + fix_line_breaks((char *)(result.data), result.size); // note: after fixing - ((char*&)(data))[data_size]=0; + ((char*&)(result.data))[result.size]=0; } return result; } -bool file_read_action_under_lock(Pool& pool, const String& file_spec, +bool file_read_action_under_lock(Pool& pool, StringPtr file_spec, const char* action_name, File_read_action action, void *context, bool as_text, bool fail_on_read_problem) { - const char* fname=file_spec.cstr(String::UL_FILE_SPEC); + CharPtr fname=file_spec->cstr(String::UL_FILE_SPEC); int f; // first open, next stat: @@ -461,30 +506,31 @@ bool file_read_action_under_lock(Pool& p try { if(lock_shared_blocking(f)!=0) throw Exception("file.lock", - &file_spec, + file_spec, "shared lock failed: %s (%d), actual filename '%s'", - strerror(errno), errno, fname); + strerror(errno), errno, fname.get()); struct stat finfo; if(stat(fname, &finfo)!=0) throw Exception("file.missing", // hardly possible: we just opened it OK - &file_spec, + file_spec, "stat failed: %s (%d), actual filename '%s'", - strerror(errno), errno, fname); + strerror(errno), errno, fname.get()); -#ifdef NO_FOREIGN_GROUP_FILES - if(finfo.st_gid/*foreign?*/!=getegid()) +#ifdef PA_SAFE_MODE + if(finfo.st_uid/*foreign?*/!=geteuid() + && finfo.st_gid/*foreign?*/!=getegid()) throw Exception("parser.runtime", - &file_spec, - "parser reading files of foreign group disabled [recompile parser without --disable-foreign-group-files configure option], actual filename '%s'", - fname); + file_spec, + "parser is in safe mode: reading files of foreign group and user disabled [recompile parser with --disable-safe-mode configure option], actual filename '%s'", + fname.get()); #endif action(pool, finfo, f, file_spec, fname, as_text, context); } catch(...) { unlock(f);close(f); if(fail_on_read_problem) - /*re*/throw; + rethrow; return false; } @@ -493,30 +539,30 @@ bool file_read_action_under_lock(Pool& p } else { if(fail_on_read_problem) throw Exception(errno==EACCES?"file.access":errno==ENOENT?"file.missing":0, - &file_spec, + file_spec, "%s failed: %s (%d), actual filename '%s'", - action_name, strerror(errno), errno, fname); + action_name, strerror(errno), errno, fname.get()); return false; } } -static void create_dir_for_file(const String& file_spec) { +static void create_dir_for_file(StringPtr file_spec) { size_t pos_after=1; int pos_before; - while((pos_before=file_spec.pos("/", 1, pos_after))>=0) { - mkdir(file_spec.mid(0, pos_before).cstr(String::UL_FILE_SPEC), 0775); + while((pos_before=file_spec->pos("/", 1, pos_after))>=0) { + mkdir(file_spec->mid(0, pos_before)->cstr(String::UL_FILE_SPEC), 0775); pos_after=pos_before+1; } } bool file_write_action_under_lock( - const String& file_spec, + StringPtr file_spec, const char* action_name, File_write_action action, void *context, bool as_text, bool do_append, bool do_block, bool fail_on_lock_problem) { - const char* fname=file_spec.cstr(String::UL_FILE_SPEC); + CharPtr fname=file_spec->cstr(String::UL_FILE_SPEC); int f; if(access(fname, W_OK)!=0) // no create_dir_for_file(file_spec); @@ -524,12 +570,12 @@ bool file_write_action_under_lock( if((f=open(fname, O_CREAT|O_RDWR |(as_text?_O_TEXT:_O_BINARY) - |(do_append?O_APPEND:0), 0664))>=0) { + |(do_append?O_APPEND:PA_O_TRUNC), 0664))>=0) { if((do_block?lock_exclusive_blocking(f):lock_exclusive_nonblocking(f))!=0) { Exception e("file.lock", - &file_spec, + file_spec, "shared lock failed: %s (%d), actual filename '%s'", - strerror(errno), errno, fname); + strerror(errno), errno, fname.get()); close(f); if(fail_on_lock_problem) throw e; @@ -539,27 +585,31 @@ bool file_write_action_under_lock( try { action(f, context); } catch(...) { +#ifdef HAVE_FTRUNCATE if(!do_append) ftruncate(f, lseek(f, 0, SEEK_CUR)); // one can not use O_TRUNC, read lower +#endif unlock(f);close(f); - /*re*/throw; + rethrow; } +#ifdef HAVE_FTRUNCATE if(!do_append) ftruncate(f, lseek(f, 0, SEEK_CUR)); // O_TRUNC truncates even exclusevely write-locked file [thanks to Igor Milyakov for discovering] +#endif unlock(f);close(f); return true; } else throw Exception(errno==EACCES?"file.access":0, - &file_spec, + file_spec, "%s failed: %s (%d), actual filename '%s'", - action_name, strerror(errno), errno, fname); + action_name, strerror(errno), errno, fname.get()); // here should be nothing, see rethrow above } #ifndef DOXYGEN struct File_write_action_info { - const void *data; size_t size; + const char *data; size_t size; }; #endif static void file_write_action(int f, void *context) { @@ -568,56 +618,56 @@ static void file_write_action(int f, voi int written=write(f, info.data, info.size); if(written<0) throw Exception(0, - 0, + Exception::undefined_source, "write failed: %s (%d)", strerror(errno), errno); } } void file_write( - const String& file_spec, - const void *data, size_t size, + StringPtr file_spec, + const char *data, size_t size, bool as_text, bool do_append) { File_write_action_info info={data, size}; file_write_action_under_lock( - file_spec, - "write", file_write_action, &info, - as_text, - do_append); + file_spec, + "write", file_write_action, &info, + as_text, + do_append); } // throws nothing! [this is required in file_move & file_delete] -static void rmdir(const String& file_spec, size_t pos_after) { +static void rmdir(StringPtr file_spec, size_t pos_after) { int pos_before; - if((pos_before=file_spec.pos("/", 1, pos_after))>=0) + if((pos_before=file_spec->pos("/", 1, pos_after))>=0) rmdir(file_spec, pos_before+1); - rmdir(file_spec.mid(0, pos_after-1/* / */).cstr(String::UL_FILE_SPEC)); + rmdir(file_spec->mid(0, pos_after-1/* / */)->cstr(String::UL_FILE_SPEC)); } -bool file_delete(const String& file_spec, bool fail_on_read_problem) { - const char* fname=file_spec.cstr(String::UL_FILE_SPEC); +bool file_delete(StringPtr file_spec, bool fail_on_read_problem) { + CharPtr fname=file_spec->cstr(String::UL_FILE_SPEC); if(unlink(fname)!=0) if(fail_on_read_problem) throw Exception(errno==EACCES?"file.access":errno==ENOENT?"file.missing":0, - &file_spec, + file_spec, "unlink failed: %s (%d), actual filename '%s'", - strerror(errno), errno, fname); + strerror(errno), errno, fname.get()); else return false; rmdir(file_spec, 1); return true; } -void file_move(const String& old_spec, const String& new_spec) { - const char* old_spec_cstr=old_spec.cstr(String::UL_FILE_SPEC); - const char* new_spec_cstr=new_spec.cstr(String::UL_FILE_SPEC); +void file_move(StringPtr old_spec, StringPtr new_spec) { + CharPtr old_spec_cstr=old_spec->cstr(String::UL_FILE_SPEC); + CharPtr new_spec_cstr=new_spec->cstr(String::UL_FILE_SPEC); create_dir_for_file(new_spec); if(rename(old_spec_cstr, new_spec_cstr)!=0) throw Exception(errno==EACCES?"file.access":errno==ENOENT?"file.missing":0, - &old_spec, + old_spec, "rename failed: %s (%d), actual filename '%s' to '%s'", - strerror(errno), errno, old_spec_cstr, new_spec_cstr); + strerror(errno), errno, old_spec_cstr.get(), new_spec_cstr.get()); rmdir(old_spec, 1); } @@ -631,13 +681,13 @@ bool entry_exists(const char* fname, str return result; } -bool entry_exists(const String& file_spec) { - const char* fname=file_spec.cstr(String::UL_FILE_SPEC); +bool entry_exists(StringPtr file_spec) { + CharPtr fname=file_spec->cstr(String::UL_FILE_SPEC); return entry_exists(fname, 0); } -static bool entry_readable(const String& file_spec, bool need_dir) { - char* fname=file_spec.cstr(String::UL_FILE_SPEC); +static bool entry_readable(StringPtr file_spec, bool need_dir) { + CharPtr fname=file_spec->cstr(String::UL_FILE_SPEC); if(need_dir) { size_t size=strlen(fname); while(size) { @@ -655,37 +705,36 @@ static bool entry_readable(const String& } return false; } -bool file_readable(const String& file_spec) { +bool file_readable(StringPtr file_spec) { return entry_readable(file_spec, false); } -bool dir_readable(const String& file_spec) { +bool dir_readable(StringPtr file_spec) { return entry_readable(file_spec, true); } -String *file_readable(const String& path, const String& name) { - String *result=new(path.pool()) String(path); +StringPtr file_readable(String& path, String& name) { + StringPtr result(new String(path)); *result << "/"; *result << name; - return file_readable(*result)?result:0; + return file_readable(result)?result:StringPtr(0); } -bool file_executable(const String& file_spec) { - return access(file_spec.cstr(String::UL_FILE_SPEC), X_OK)==0; +bool file_executable(StringPtr file_spec) { + return access(file_spec->cstr(String::UL_FILE_SPEC), X_OK)==0; } -bool file_stat(const String& file_spec, +bool file_stat(StringPtr file_spec, size_t& rsize, time_t& ratime, time_t& rmtime, time_t& rctime, bool fail_on_read_problem) { - Pool& pool=file_spec.pool(); - const char* fname=file_spec.cstr(String::UL_FILE_SPEC); + CharPtr fname=file_spec->cstr(String::UL_FILE_SPEC); struct stat finfo; if(stat(fname, &finfo)!=0) if(fail_on_read_problem) throw Exception("file.missing", - &file_spec, + file_spec, "getting file size failed: %s (%d), real filename '%s'", - strerror(errno), errno, fname); + strerror(errno), errno, fname.get()); else return false; rsize=finfo.st_size; @@ -737,7 +786,7 @@ char* rsplit(char* string, char delim) { } /// @todo less stupid type detection -char* format(Pool& pool, double value, char* fmt) { +const char* format(Pool& pool, double value, char* fmt) { char local_buf[MAX_NUMBER]; size_t size; @@ -752,9 +801,7 @@ char* format(Pool& pool, double value, c else size=snprintf(local_buf, sizeof(local_buf), "%d", (int)value); - char* pool_buf=(char *)pool.malloc(size+1, 4); - memcpy(pool_buf, local_buf, size+1); - return pool_buf; + return pool.copy(local_buf, size+1); } size_t stdout_write(const void *buf, size_t size) { @@ -774,7 +821,7 @@ size_t stdout_write(const void *buf, siz } char* unescape_chars(Pool& pool, const char* cp, int len) { - char* s=(char *)pool.malloc(len + 1, 5); + char* s=pool.malloc(len + 1); enum EscapeState { EscapeRest, EscapeFirst, @@ -895,7 +942,7 @@ int __vsnprintf(char* b, size_t s, const win32: mk:@MSITStore:C:\Program%20Files\Microsoft%20Visual%20Studio\MSDN\2001APR\1033\vccore.chm::/html/_crt__vsnprintf.2c_._vsnwprintf.htm - if the number of bytes to write exceeds buffer, then count bytes are written and –1 is returned + if the number of bytes to write exceeds buffer, then count bytes are written and Ö1 is returned */ r=_vsnprintf(b, s, f, l); if(r<0) @@ -943,3 +990,5 @@ int pa_sleep(unsigned long secs, unsigne return (select(0, NULL, NULL, NULL, &t) == -1 ? errno : 0); #endif } + +