--- parser3/src/main/pa_common.C 2002/11/26 09:02:14 1.130 +++ parser3/src/main/pa_common.C 2003/11/03 13:20:30 1.161 @@ -1,22 +1,48 @@ /** @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/26 09:02:14 $"; +static const char* IDENT_COMMON_C="$Date: 2003/11/03 13:20:30 $"; #include "pa_common.h" #include "pa_exception.h" -#include "pa_globals.h" #include "pa_hash.h" +#include "pa_globals.h" +#include "pa_request_charsets.h" +#include "pa_charsets.h" + +#define PA_HTTP + +#ifdef PA_HTTP #include "pa_vstring.h" +#include "pa_vint.h" +#include "pa_vhash.h" +#include "pa_vtable.h" + +#ifdef CYGWIN +#define _GNU_H_WINDOWS32_SOCKETS +// for PASCAL +#include +// SOCKET +typedef u_int SOCKET; +int PASCAL closesocket(SOCKET); +#else +# if defined(WIN32) +# include +# else +# define closesocket close +# endif +#endif -#ifdef WIN32 -# include #else -# define closesocket close + +# if defined(WIN32) +# include +# endif + #endif // some maybe-undefined constants @@ -28,7 +54,20 @@ 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 +//#define PA_DEBUG_NO_LOCKING + +#ifdef PA_DEBUG_NO_LOCKING #ifdef HAVE_FLOCK @@ -73,31 +112,54 @@ static int unlock(int fd) { FLOCK(F_TLOC #endif #endif -#define DEFAULT_USER_AGENT "parser3" +#else +static int lock_shared_blocking(int fd) { return 0; } +static int lock_exclusive_blocking(int fd) { return 0; } +static int lock_exclusive_nonblocking(int fd) { return 0; } +static int unlock(int fd) { return 0; } +#endif +// defines for globals -static char* strnchr(char* buf, size_t size, char c) { - // sanity check - if(!buf) - return 0; +#define FILE_STATUS_NAME "status" - for(; size-->0; buf++) { - if(*buf==c) - return buf; - } +// globals - return 0; -} +const String file_status_name(FILE_STATUS_NAME); + +// defines for statics + +#define HTTP_METHOD_NAME "method" +#define HTTP_TIMEOUT_NAME "timeout" +#define HTTP_HEADERS_NAME "headers" +#define HTTP_ANY_STATUS_NAME "any-status" +#define HTTP_CHARSET_NAME "charset" +#define HTTP_TABLES_NAME "tables" + +// statics + +static const String http_method_name(HTTP_METHOD_NAME); +static const String http_timeout_name(HTTP_TIMEOUT_NAME); +static const String http_headers_name(HTTP_HEADERS_NAME); +static const String http_any_status_name(HTTP_ANY_STATUS_NAME); +static const String http_charset_name(HTTP_CHARSET_NAME); +static const String http_tables_name(HTTP_TABLES_NAME); + +// defines + +#define DEFAULT_USER_AGENT "parser3" -void fix_line_breaks(char* buf, size_t& size) { +// functions + +void fix_line_breaks(char *str, size_t& length) { //_asm int 3; - const char* const eob=buf+size; - char* dest=buf; + const char* const eob=str+length; + char* dest=str; // fix DOS: \r\n -> \n // fix Macintosh: \r -> \n - char* bol=buf; - while(char* eol=strnchr(bol, eob -bol, '\r')) { + char* bol=str; + while(char* eol=(char*)memchr(bol, '\r', eob -bol)) { size_t len=eol-bol; if(dest!=bol) memcpy(dest, bol, len); @@ -106,24 +168,30 @@ void fix_line_breaks(char* buf, size_t& if(&eol[1]=0) { // checking status in first response - check_status=false; - + response.append_strdup(buf, size, String::L_TAINTED); + if(!result && (EOLat=response.pos(CRLF, 2))!=STRING_NOT_FOUND) { // checking status in first response 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); + ArrayString astatus; + size_t pos_after=0; + status_line.split(astatus, pos_after, " "); + const String& 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, + &status_code, "invalid HTTP response status"); } - } - if(check_status) + } + if(result) + return result; + else throw Exception("http.response", 0, - "bad response from host - no status found (size=%lu)", response.size()); + "bad response from host - no status found (size=%lu)", response.length()); } /* ********************** request *************************** */ #if defined(SIGALRM) && defined(HAVE_SIGSETJMP) && defined(HAVE_SIGLONGJMP) -# define WE_CAN_USE_ALARM +# define PA_USE_ALARM #endif -#ifdef WE_CAN_USE_ALARM +#ifdef PA_USE_ALARM static sigjmp_buf timeout_env; static void timeout_handler(int sig){ siglongjmp(timeout_env, 1); } #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(String& response, + const char* host, int port, + const char* request, + int timeout, + bool fail_on_status_ne_200) { if(!host) throw Exception("http.host", - origin_string, + 0, "zero hostname"); //never -#ifdef WE_CAN_USE_ALARM - signal(SIGALRM, timeout_handler); +#ifdef PA_USE_ALARM + signal(SIGALRM, timeout_handler); #endif int sock=-1; - try { -#ifdef WE_CAN_USE_ALARM - if(sigsetjmp(timeout_env, 1)) - throw Exception("http.timeout", - origin_string, - "timeout occured while retrieving document"); - else { - alarm(timeout); +#ifdef PA_USE_ALARM + if(sigsetjmp(timeout_env, 1)) { + // stupid gcc [2.95.4] generated bad code + // which failed to handle sigsetjmp+throw: crashed inside of pre-throw code. + // rewritten simplier [though duplicating closesocket code] + if(sock>=0) + closesocket(sock); + throw Exception("http.timeout", + origin_string, + "timeout occured while retrieving document"); + return 0; // never + } else { + alarm(timeout); #endif + try { + int result; struct sockaddr_in dest; - if(!set_addr(&dest, host, port)) + if(!set_addr(&dest, host, port)) throw Exception("http.host", - origin_string, + 0, "can not resolve hostname \"%s\"", host); if((sock=socket(AF_INET, SOCK_STREAM, IPPROTO_TCP/*0*/))<0) throw Exception("http.connect", - origin_string, + 0, "can not make socket: %s (%d)", strerror(errno), errno); if(connect(sock, (struct sockaddr *)&dest, sizeof(dest))) throw Exception("http.connect", - origin_string, + 0, "can not connect to host \"%s\": %s (%d)", host, strerror(errno), errno); size_t request_size=strlen(request); if(send(sock, request, request_size, 0)!=(ssize_t)request_size) throw Exception("http.connect", - origin_string, + 0, "error sending request: %s (%d)", strerror(errno), errno); - http_read_response(response, sock); + result=http_read_response(response, sock, fail_on_status_ne_200); + closesocket(sock); +#ifdef PA_USE_ALARM + alarm(0); +#endif + return result; + } catch(...) { +#ifdef PA_USE_ALARM + alarm(0); +#endif if(sock>=0) closesocket(sock); -#ifdef WE_CAN_USE_ALARM + rethrow; } -#endif - } catch(...) { - if(sock>=0) - closesocket(sock); -#ifdef WE_CAN_USE_ALARM - alarm(0); -#endif - /*re*/throw; +#ifdef PA_USE_ALARM } +#endif } #ifndef DOXYGEN struct Http_pass_header_info { + Request_charsets* charsets; 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(); - - *(i.request)<(value))->get_string()<<"\n"; - - if(key.change_case(pool, String::CC_UPPER)=="USER-AGENT") - i.user_agent_specified=true; -} -static void file_read_http(Pool& pool, const String& file_spec, - void*& data, size_t& data_size, - Hash *options=0, Hash** out_fields=0) { +static void http_pass_header(HashStringValue::key_type key, + HashStringValue::value_type value, + Http_pass_header_info *info) { + *info->request <charsets->source(), String::CC_UPPER)=="USER-AGENT") + info->user_agent_specified=true; +} + + +static Charset* detect_charset(Charset& source_charset, const String& content_type_value) { + const String::Body CONTENT_TYPE_VALUE= + content_type_value.change_case(source_charset, String::CC_UPPER); + // content-type: xxx/xxx; source_charset=WE-NEED-THIS + // content-type: xxx/xxx; source_charset="WE-NEED-THIS" + // content-type: xxx/xxx; source_charset="WE-NEED-THIS"; + size_t before_charseteq_pos=CONTENT_TYPE_VALUE.pos("CHARSET="); + if(before_charseteq_pos!=STRING_NOT_FOUND) { + size_t charset_begin=before_charseteq_pos+8/*CHARSET="*/; + size_t open_quote_pos=CONTENT_TYPE_VALUE.pos('"', charset_begin); + bool quoted=open_quote_pos==charset_begin; + if(quoted) + charset_begin++; // skip opening '"' + size_t charset_end=CONTENT_TYPE_VALUE.length(); + if(quoted) { + size_t close_quote_pos=CONTENT_TYPE_VALUE.pos('"', charset_begin); + if(close_quote_pos!=STRING_NOT_FOUND) + charset_end=close_quote_pos; + } else { + size_t delim_pos=CONTENT_TYPE_VALUE.pos(';', charset_begin); + if(delim_pos!=STRING_NOT_FOUND) + charset_end=delim_pos; + } + const String::Body CHARSET_NAME_BODY= + CONTENT_TYPE_VALUE.mid(charset_begin, charset_end); + + return &charsets.get(CHARSET_NAME_BODY); + } + + return 0; +} + + +#ifndef DOXYGEN +struct File_read_http_result { + char *str; size_t length; + HashStringValue* headers; +}; +#endif +/// @todo build .cookies field. use ^file.tables.SET-COOKIES.menu{ for now +static File_read_http_result file_read_http(Request_charsets& charsets, + const String& file_spec, + HashStringValue *options=0) { + File_read_http_result result; char host[MAX_STRING]; const char* uri; int port; - const char* method="GET"; + const char* method=0; int timeout=2; - Value *vheaders=0; - - char* connect_string=file_spec.cstr(String::UL_UNSPECIFIED); - if(strncmp(connect_string, "http://", 7)!=0) - throw Exception(0, - &file_spec, - "does not start with http://"); //never - connect_string+=7; - - strncpy(host, connect_string, sizeof(host)-1); host[sizeof(host)-1]=0; - char* host_uri=lsplit(host, '/'); - uri=host_uri?connect_string+(host_uri-1-host):"/"; - char* port_cstr=lsplit(host, ':'); - char* error_pos=0; - port=port_cstr?strtol(port_cstr, &error_pos, 0):80; + bool fail_on_status_ne_200=true; + Value* vheaders=0; + Charset *asked_remote_charset=0; if(options) { int valid_options=0; - if(Value *vmethod=static_cast(options->get(*http_method_name))) { + if(Value* vmethod=options->get(http_method_name)) { valid_options++; - method=vmethod->as_string().cstr(); + method=vmethod->as_string().cstr(); } - if(Value *vtimeout=static_cast(options->get(*http_timeout_name))) { + if(Value* 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(valid_options!=options->size()) + if(Value* vany_status=options->get(http_any_status_name)) { + valid_options++; + fail_on_status_ne_200=!vany_status->as_bool(); + } + if(Value* vcharset_name=options->get(http_charset_name)) { + valid_options++; + asked_remote_charset=&::charsets.get(vcharset_name->as_string(). + change_case(charsets.source(), String::CC_UPPER)); + } + + if(valid_options!=options->count()) throw Exception("parser.runtime", 0, "invalid option passed"); } + if(!asked_remote_charset) // defaulting to $request:charset + asked_remote_charset=&charsets.source(); - //making request - String request(pool); - request<< method <<" "<< uri <<" HTTP/1.0\nHost: "<< host<<"\n"; - bool user_agent_specified=false; - if(vheaders && !vheaders->is_string()) { // allow empty - if(Hash *headers=vheaders->get_hash(&file_spec)) { - Http_pass_header_info info={&request}; - headers->for_each(http_pass_header, &info); - user_agent_specified=info.user_agent_specified; - } else - throw Exception("parser.runtime", - &file_spec, - "headers param must be hash"); - }; - if(!user_agent_specified) // defaulting - request << "user-agent: " DEFAULT_USER_AGENT "\n"; - request<<"\n"; + //preparing request + String& connect_string=*new String; + // not in ^sql{... L_SQL ...} spirit, but closer to ^file::load one + connect_string.append(file_spec, String::L_URI); // tainted pieces -> URI pieces + + const char* request_cstr; + { + // influence URLencoding of tainted pieces to String::L_URI lang + Temp_client_charset temp(charsets, *asked_remote_charset); + + const char* connect_string_cstr=connect_string.cstr(String::L_UNSPECIFIED); + + const char* current=connect_string_cstr; + if(strncmp(current, "http://", 7)!=0) + throw Exception(0, + &connect_string, + "does not start with http://"); //never + current+=7; + + strncpy(host, current, sizeof(host)-1); host[sizeof(host)-1]=0; + char* host_uri=lsplit(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; + + + //making request + String request; + if(method) + request<is_string()) { // allow empty + if(HashStringValue *headers=vheaders->get_hash()) { + Http_pass_header_info info={&charsets, &request}; + headers->for_each(http_pass_header, &info); + user_agent_specified=info.user_agent_specified; + } else + throw Exception("parser.runtime", + &connect_string, + "headers param must be hash"); + }; + if(!user_agent_specified) // defaulting + request << "user-agent: " DEFAULT_USER_AGENT CRLF; + request << CRLF; + + request_cstr=request.cstr(String::L_UNSPECIFIED); + } + // recode those pieces which are not in String::L_URI lang + // [those violating HTTP standard, but widly used] + request_cstr=Charset::transcode( + String::C(request_cstr, strlen(request_cstr)), + charsets.source(), + *asked_remote_charset); //sending request - String response(pool); - http_request(response, - &file_spec, host, port, request.cstr(String::UL_UNSPECIFIED), timeout); + String response; + int status_code=http_request(response, + host, port, request_cstr, + timeout, fail_on_status_ne_200); //processing results - int pos=response.pos("\r\n\r\n", 4); - if(pos<1){ + size_t pos=response.pos(CRLF CRLF, 4); + if(pos==STRING_NOT_FOUND || pos<1) { throw Exception("http.response", - &file_spec, + &connect_string, "bad response from host - no headers found"); } - String header_block=response.mid(0, pos); - String body=response.mid(pos+4, response.size()); + const String& header_block=response.mid(0, pos); + const String& raw_body=response.mid(pos+4, response.length()); - 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=new HashStringValue; + VHash* vtables=new VHash; + result.headers->put(http_tables_name, vtables); + HashStringValue& tables=vtables->hash(); + + size_t pos_after=0; + header_block.split(aheaders, pos_after, CRLF); - //processing status code - const String *status_line=aheaders.get_string(0); - if(!status_line){ - throw Exception("http.response", - &file_spec, - "bad response from host - no status line "); - } //processing headers - for(int i=1;ipos(": ", 2); - if(pos<1) - throw Exception("http.response", - &file_spec, - "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 + size_t aheaders_count=aheaders.count(); + Charset* real_remote_charset=0; // undetected, yet + for(size_t i=1; iget_table(); + } else { + // first appearence + Table::columns_type columns =new ArrayString(1); + *columns+=new String("value"); + table=new Table(columns); + } + // this string becomes next row + ArrayString& row=*new ArrayString(1); + row+=&header_value; + *table+=&row; + // not existed before? add it + if(!existed) + tables.put(HEADER_NAME, new VTable(table)); + } + + result.headers->put(HEADER_NAME, new VString(header_value)); } + // defaulting to used-asked charset [it's never empty!] + if(!real_remote_charset) + real_remote_charset=asked_remote_charset; // output response - data=body.cstr(); data_size=body.size(); - if(out_fields) - *out_fields=&headers; + String::C real_body=Charset::transcode( + String::C(raw_body.cstrm()/*must be modifiable*/, raw_body.length()), + *real_remote_charset, + charsets.source()); + + result.str=const_cast(real_body.str); // hacking a little + result.length=real_body.length; + result.headers->put(file_status_name, new VInt(status_code)); + return result; } +#endif + #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, - struct stat& finfo, - int f, - const String& file_spec, const char* fname, bool as_text, - void *context) { +static void file_read_action( + struct stat& finfo, + int f, + const String& 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=new(PointerFreeGC) char[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, - "read failed: actually read %lu bytes count not in [0..%lu] valid range", + "read failed: actually read %l bytes count not in [0..%lu] valid range", *info.data_size, to_read_size); } else { // empty file if(as_text) { - *info.data=pool.malloc(1); + *info.data=new(PointerFreeGC) char[1]; *(char*)(*info.data)=0; } else *info.data=0; @@ -399,36 +597,72 @@ 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(Request_charsets& charsets, const String& 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={false}; +#ifdef PA_HTTP + if(file_spec.starts_with("http://")) { // fail on read problem - file_read_http(pool, file_spec, data, data_size, params, out_fields); - result=true; + File_read_http_result http=file_read_http(charsets, file_spec, params); + result.success=true; + result.str=http.str; + result.length=http.length; + result.headers=http.headers; } else { - File_read_action_info info={&data, &data_size}; - result=file_read_action_under_lock(pool, file_spec, +#endif + if(params && params->count()) + throw Exception("parser.runtime", + 0, + "invalid option passed"); + + File_read_action_info info={&result.str, &result.length}; + result.success=file_read_action_under_lock(file_spec, "read", file_read_action, &info, as_text, fail_on_read_problem); +#ifdef PA_HTTP } +#endif - if(result && as_text) { - fix_line_breaks((char *)(data), data_size); + if(result.success && as_text) { + // UTF-8 signature: EF BB BF + if(result.length>=3) { + char *in=(char *)result.str; + if(strncmp(in, "\xEF\xBB\xBF", 3)==0) { + result.str=in+3; result.length-=3;// skip prefix + } + } + + fix_line_breaks((char *)(result.str), result.length); // note: after fixing - ((char*&)(data))[data_size]=0; + ((char*&)(result.str))[result.length]=0; } return result; } -bool file_read_action_under_lock(Pool& pool, const String& file_spec, +#ifdef PA_SAFE_MODE +void check_safe_mode(struct stat finfo, const String& file_spec, const char* fname) { + if(finfo.st_uid/*foreign?*/!=geteuid() + && finfo.st_gid/*foreign?*/!=getegid()) + throw Exception("parser.runtime", + &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', " + "fuid(%d)!=euid(%d) or fgid(%d)!=egid(%d)", + fname, + finfo.st_uid, geteuid(), + finfo.st_gid, getegid()); +} +#endif + +bool file_read_action_under_lock(const String& 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); + const char* fname=file_spec.cstr(String::L_FILE_SPEC); int f; // first open, next stat: @@ -446,28 +680,24 @@ bool file_read_action_under_lock(Pool& p throw Exception("file.lock", &file_spec, "shared lock failed: %s (%d), actual filename '%s'", - strerror(errno), errno, fname); + strerror(errno), errno, fname); struct stat finfo; if(stat(fname, &finfo)!=0) throw Exception("file.missing", // hardly possible: we just opened it OK &file_spec, "stat failed: %s (%d), actual filename '%s'", - strerror(errno), errno, fname); + strerror(errno), errno, fname); -#ifdef NO_FOREIGN_GROUP_FILES - if(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); +#ifdef PA_SAFE_MODE + check_safe_mode(finfo, file_spec, fname); #endif - action(pool, finfo, f, file_spec, fname, as_text, context); + action(finfo, f, file_spec, fname, as_text, context); } catch(...) { unlock(f);close(f); if(fail_on_read_problem) - /*re*/throw; + rethrow; return false; } @@ -478,16 +708,16 @@ bool file_read_action_under_lock(Pool& p throw Exception(errno==EACCES?"file.access":errno==ENOENT?"file.missing":0, &file_spec, "%s failed: %s (%d), actual filename '%s'", - action_name, strerror(errno), errno, fname); + action_name, strerror(errno), errno, fname); return false; } } static void create_dir_for_file(const String& 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); + size_t pos_before; + while((pos_before=file_spec.pos('/', pos_after))!=STRING_NOT_FOUND) { + mkdir(file_spec.mid(0, pos_before).cstr(String::L_FILE_SPEC), 0775); pos_after=pos_before+1; } } @@ -499,7 +729,7 @@ bool file_write_action_under_lock( bool do_append, bool do_block, bool fail_on_lock_problem) { - const char* fname=file_spec.cstr(String::UL_FILE_SPEC); + const char* fname=file_spec.cstr(String::L_FILE_SPEC); int f; if(access(fname, W_OK)!=0) // no create_dir_for_file(file_spec); @@ -507,12 +737,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, "shared lock failed: %s (%d), actual filename '%s'", - strerror(errno), errno, fname); + strerror(errno), errno, fname); close(f); if(fail_on_lock_problem) throw e; @@ -522,33 +752,37 @@ 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, "%s failed: %s (%d), actual filename '%s'", - action_name, strerror(errno), errno, fname); + action_name, strerror(errno), errno, fname); // here should be nothing, see rethrow above } #ifndef DOXYGEN struct File_write_action_info { - const void *data; size_t size; + const char* str; size_t length; }; #endif static void file_write_action(int f, void *context) { File_write_action_info& info=*static_cast(context); - if(info.size) { - int written=write(f, info.data, info.size); + if(info.length) { + int written=write(f, info.str, info.length); if(written<0) throw Exception(0, 0, @@ -557,33 +791,33 @@ static void file_write_action(int f, voi } void file_write( const String& file_spec, - const void *data, size_t size, + 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) { - int pos_before; - if((pos_before=file_spec.pos("/", 1, pos_after))>=0) + size_t pos_before; + if((pos_before=file_spec.pos('/', pos_after))!=STRING_NOT_FOUND) 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::L_FILE_SPEC)); } bool file_delete(const String& file_spec, bool fail_on_read_problem) { - const char* fname=file_spec.cstr(String::UL_FILE_SPEC); + const char* fname=file_spec.cstr(String::L_FILE_SPEC); if(unlink(fname)!=0) if(fail_on_read_problem) throw Exception(errno==EACCES?"file.access":errno==ENOENT?"file.missing":0, &file_spec, "unlink failed: %s (%d), actual filename '%s'", - strerror(errno), errno, fname); + strerror(errno), errno, fname); else return false; @@ -591,8 +825,8 @@ bool file_delete(const String& file_spec 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); + const char* old_spec_cstr=old_spec.cstr(String::L_FILE_SPEC); + const char* new_spec_cstr=new_spec.cstr(String::L_FILE_SPEC); create_dir_for_file(new_spec); @@ -600,7 +834,7 @@ void file_move(const String& old_spec, c throw Exception(errno==EACCES?"file.access":errno==ENOENT?"file.missing":0, &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, new_spec_cstr); rmdir(old_spec, 1); } @@ -615,12 +849,12 @@ bool entry_exists(const char* fname, str } bool entry_exists(const String& file_spec) { - const char* fname=file_spec.cstr(String::UL_FILE_SPEC); + const char* fname=file_spec.cstr(String::L_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); + char* fname=file_spec.cstrm(String::L_FILE_SPEC); if(need_dir) { size_t size=strlen(fname); while(size) { @@ -644,14 +878,14 @@ bool file_readable(const String& file_sp bool dir_readable(const String& file_spec) { return entry_readable(file_spec, true); } -String *file_readable(const String& path, const String& name) { - String *result=new(path.pool()) String(path); - *result << "/"; - *result << name; - return file_readable(*result)?result:0; +const String* file_readable(const String& path, const String& name) { + String& result=*new String(path); + result << "/"; + result << name; + return file_readable(result)?&result:0; } bool file_executable(const String& file_spec) { - return access(file_spec.cstr(String::UL_FILE_SPEC), X_OK)==0; + return access(file_spec.cstr(String::L_FILE_SPEC), X_OK)==0; } bool file_stat(const String& file_spec, @@ -660,15 +894,14 @@ bool file_stat(const String& file_spec, 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); - struct stat finfo; + const char* fname=file_spec.cstr(String::L_FILE_SPEC); + struct stat finfo; if(stat(fname, &finfo)!=0) if(fail_on_read_problem) throw Exception("file.missing", &file_spec, "getting file size failed: %s (%d), real filename '%s'", - strerror(errno), errno, fname); + strerror(errno), errno, fname); else return false; rsize=finfo.st_size; @@ -720,7 +953,7 @@ char* rsplit(char* string, char delim) { } /// @todo less stupid type detection -char* format(Pool& pool, double value, char* fmt) { +const char* format(double value, char* fmt) { char local_buf[MAX_NUMBER]; size_t size; @@ -735,15 +968,13 @@ 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 pa_strdup(local_buf, size); } size_t stdout_write(const void *buf, size_t size) { #ifdef WIN32 do{ - int chunk_written=fwrite(buf, 1, min(8*0x400, size), stdout); + int chunk_written=fwrite(buf, 1, min((size_t)8*0x400, size), stdout); if(chunk_written<=0) break; size-=chunk_written; @@ -756,8 +987,8 @@ size_t stdout_write(const void *buf, siz #endif } -char* unescape_chars(Pool& pool, const char* cp, int len) { - char* s=(char *)pool.malloc(len + 1, 5); +char* unescape_chars(const char* cp, int len) { + char* s=new(PointerFreeGC) char[len + 1]; enum EscapeState { EscapeRest, EscapeFirst, @@ -878,7 +1109,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) @@ -926,3 +1157,5 @@ int pa_sleep(unsigned long secs, unsigne return (select(0, NULL, NULL, NULL, &t) == -1 ? errno : 0); #endif } + +