--- parser3/src/main/pa_common.C 2003/03/26 07:45:23 1.143.2.21.2.15 +++ parser3/src/main/pa_common.C 2003/03/21 07:08:28 1.147 @@ -1,44 +1,23 @@ /** @file Parser: commonly functions. - Copyright(c) 2001-2003 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: 2003/03/26 07:45:23 $"; +static const char* IDENT_COMMON_C="$Date: 2003/03/21 07:08:28 $"; #include "pa_common.h" #include "pa_exception.h" -#include "pa_hash.h" #include "pa_globals.h" - -#define PA_HTTP - -#ifdef PA_HTTP +#include "pa_hash.h" #include "pa_vstring.h" -#include "pa_vint.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 +#include "pa_vdate.h" +#ifdef WIN32 +# include #else - -# if defined(WIN32) -# include -# endif - +# define closesocket close #endif // some maybe-undefined constants @@ -105,33 +84,8 @@ static int unlock(int fd) { FLOCK(F_TLOC #endif #endif -// defines for globals - -#define FILE_STATUS_NAME "status" - -// globals - -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" - -// 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); - -// defines - #define DEFAULT_USER_AGENT "parser3" -// functions void fix_line_breaks(char* buf, size_t& size) { if(size==0) @@ -161,17 +115,15 @@ void fix_line_breaks(char* buf, size_t& memcpy(dest, bol, eob-bol); } -char* file_read_text(Charset& charset, - const String& file_spec, +char* file_read_text(Pool& pool, const String& file_spec, bool fail_on_read_problem, - HashStringValue* params/*, HashStringValue* * out_fields*/) { - File_read_result file= - file_read(charset, file_spec, true, params, fail_on_read_problem); - return file.success?file.str:0; + 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; } -#ifdef PA_HTTP //http request stuff +/* ************************ http stuff *********************** */ static bool set_addr(struct sockaddr_in *addr, const char* host, const short port){ memset(addr, 0, sizeof(*addr)); @@ -188,199 +140,194 @@ static bool set_addr(struct sockaddr_in } static int http_read_response(String& response, int sock, bool fail_on_status_ne_200){ - int result=0; - size_t EOLat=0; + const String* status_code=0; + ssize_t EOLat=0; while(true) { - char *buf=new(PointerFreeGC) char[MAX_STRING]; + char *buf=(char *)response.pool().malloc(MAX_STRING); ssize_t size=recv(sock, buf, MAX_STRING, 0); if(size<=0) break; - response.append(buf, size, String::L_TAINTED); - if(!result && (EOLat=response.pos("\r\n", 2))!=STRING_NOT_FOUND) { // checking status in first response + response.APPEND_TAINTED(buf, size, "remote HTTP server response", 0); + if(!status_code && (EOLat=response.pos("\r\n", 2))>=0) { // checking status in first response const String& status_line=response.mid(0, (size_t)EOLat); - 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(); + Array astatus(response.pool()); + size_t pos_after_ref=0; status_line.split(astatus, &pos_after_ref, " ", 1); + status_code=astatus.get_string(1); - if(fail_on_status_ne_200 && result!=200) + if(fail_on_status_ne_200 && *status_code!="200") throw Exception("http.status", - &status_code, + status_code, "invalid HTTP response status"); } } - if(result) - return result; + if(status_code) + return status_code->as_int(); else throw Exception("http.response", 0, - "bad response from host - no status found (size=%lu)", response.length()); + "bad response from host - no status found (size=%lu)", response.size()); } /* ********************** 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 int http_request( - String& response, - const char* host, int port, - const char* request, - int timeout, - bool fail_on_status_ne_200) { +static int http_request(String& response, + const String *origin_string, + const char* host, int port, + const char* request, + int timeout, + bool fail_on_status_ne_200){ if(!host) throw Exception("http.host", - 0, + origin_string, "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 { - int result; -#ifdef WE_CAN_USE_ALARM - if(sigsetjmp(timeout_env, 1)) - throw Exception("http.timeout", - 0, - "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", - 0, + origin_string, "can not resolve hostname \"%s\"", host); if((sock=socket(AF_INET, SOCK_STREAM, IPPROTO_TCP/*0*/))<0) throw Exception("http.connect", - 0, + origin_string, "can not make socket: %s (%d)", strerror(errno), errno); if(connect(sock, (struct sockaddr *)&dest, sizeof(dest))) throw Exception("http.connect", - 0, + origin_string, "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", - 0, + origin_string, "error sending request: %s (%d)", strerror(errno), errno); result=http_read_response(response, sock, fail_on_status_ne_200); closesocket(sock); -#ifdef WE_CAN_USE_ALARM +#ifdef PA_USE_ALARM alarm(0); - } #endif - return result; - } catch(...) { - if(sock>=0) - closesocket(sock); -#ifdef WE_CAN_USE_ALARM - alarm(0); + return result; + } catch(...) { +#ifdef PA_USE_ALARM + alarm(0); #endif - rethrow; + if(sock>=0) + closesocket(sock); + /*re*/throw; + } } } #ifndef DOXYGEN struct Http_pass_header_info { - Charset* charset; String* request; bool user_agent_specified; }; #endif -static void http_pass_header(HashStringValue::key_type key, HashStringValue::value_type value, - Http_pass_header_info *info) { - *info->request <(info); + Pool& pool=i.request->pool(); + + *(i.request)<(value), String::UL_HTTP_HEADER, false) + <<"\n"; - if(String(key, String::L_TAINTED).change_case(*info->charset, String::CC_UPPER)=="USER-AGENT") - info->user_agent_specified=true; + if(key.change_case(pool, String::CC_UPPER)=="USER-AGENT") + i.user_agent_specified=true; } -#ifndef DOXYGEN -struct File_read_http_result { - char *str; size_t length; - HashStringValue* headers; -}; -#endif -static File_read_http_result file_read_http(Charset& charset, const String& file_spec, - HashStringValue *options=0) { - File_read_http_result result; +static void file_read_http(Pool& pool, const String& file_spec, + void*& data, size_t& data_size, + Hash *options=0, Hash** out_fields=0) { char host[MAX_STRING]; const char* uri; int port; - const char* method=0; + const char* method="GET"; int timeout=2; bool fail_on_status_ne_200=true; - Value* vheaders=0; + Value *vheaders=0; - 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* connect_string_cstr=connect_string.cstr(String::L_UNSPECIFIED); - const char* current=connect_string_cstr; - if(strncmp(current, "http://", 7)!=0) + String& connect_string=*new(pool) String(pool); // must not be local [exception may be reported outside] + // not in ^sql{... UL_SQL ...} spirit, but closer to ^file::load one + 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) throw Exception(0, &connect_string, "does not start with http://"); //never - current+=7; + connect_string_cstr+=7; - strncpy(host, current, sizeof(host)-1); host[sizeof(host)-1]=0; + strncpy(host, connect_string_cstr, sizeof(host)-1); host[sizeof(host)-1]=0; char* host_uri=lsplit(host, '/'); - uri=host_uri?current+(host_uri-1-host):"/"; + uri=host_uri?connect_string_cstr+(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=options->get(http_method_name)) { + if(Value *vmethod=static_cast(options->get(*http_method_name))) { valid_options++; - method=vmethod->as_string().cstr(); + method=vmethod->as_string().cstr(); } - if(Value* vtimeout=options->get(http_timeout_name)) { + if(Value *vtimeout=static_cast(options->get(*http_timeout_name))) { valid_options++; timeout=vtimeout->as_int(); } - if(vheaders=options->get(http_headers_name)) { + if(vheaders=static_cast(options->get(*http_headers_name))) { valid_options++; } - if(Value* vany_status=options->get(http_any_status_name)) { + if(Value *vany_status=static_cast(options->get(*http_any_status_name))) { valid_options++; fail_on_status_ne_200=!vany_status->as_bool(); } - if(valid_options!=options->count()) + if(valid_options!=options->size()) throw Exception("parser.runtime", 0, "invalid option passed"); } //making request - String request; - if(method) - request<is_string()) { // allow empty - if(HashStringValue *headers=vheaders->get_hash()) { - Http_pass_header_info info={&charset, &request}; + if(Hash *headers=vheaders->get_hash(&connect_string)) { + Http_pass_header_info info={&request}; headers->for_each(http_pass_header, &info); user_agent_specified=info.user_agent_specified; } else @@ -393,63 +340,65 @@ static File_read_http_result file_read_h request<<"\n"; //sending request - String response; - const char* request_cstr=request.cstr(String::L_UNSPECIFIED); + String response(pool); int status_code=http_request(response, - host, port, request_cstr, + &connect_string, host, port, request.cstr(String::UL_UNSPECIFIED), timeout, fail_on_status_ne_200); //processing results - size_t pos=response.pos("\r\n\r\n", 4); - if(pos==STRING_NOT_FOUND || pos<1){ + int pos=response.pos("\r\n\r\n", 4); + if(pos<1){ throw Exception("http.response", &connect_string, "bad response from host - no headers found"); } - const String& header_block=response.mid(0, pos); - const String& body=response.mid(pos+4, response.length()); + String header_block=response.mid(0, pos); + String body=response.mid(pos+4, response.size()); - ArrayString aheaders; - result.headers=new HashStringValue; - size_t pos_after=0; - header_block.split(aheaders, pos_after, "\r\n"); + 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); //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 throw Exception("http.response", - &connect_string, - "bad response from host - bad header \"%s\"", line.cstr()); - - result.headers->put( - line.mid(0, pos).change_case(charset, String::CC_UPPER), - new VString(line.mid(pos+2, line.length()))); + &connect_string, + "bad response from host - bad headers \"%s\"", header_block.cstr()); } // output response - result.str=body.cstrm(); - result.length=body.length(); - result.headers->put(file_status_name, new VInt(status_code)); - return result; + data=body.cstr(); data_size=body.size(); + if(out_fields) { + headers.put(*file_status_name, new(pool) VInt(pool, status_code)); + *out_fields=&headers; + } } -#endif - #ifndef DOXYGEN struct File_read_action_info { - char **data; size_t *data_size; + void **data; size_t *data_size; }; #endif -static void file_read_action( +static void file_read_action(Pool& pool, 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=new(PointerFreeGC) char[to_read_size+(as_text?1:0)]; + *info.data=pool.malloc(to_read_size+(as_text?1:0), 3); *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) @@ -459,7 +408,7 @@ static void file_read_action( *info.data_size, to_read_size); } else { // empty file if(as_text) { - *info.data=new(PointerFreeGC) char[1]; + *info.data=pool.malloc(1); *(char*)(*info.data)=0; } else *info.data=0; @@ -467,51 +416,45 @@ static void file_read_action( return; } } -File_read_result file_read(Charset& charset, const String& file_spec, - bool as_text, HashStringValue *params, +bool file_read(Pool& pool, const String& file_spec, + void*& data, size_t& data_size, + bool as_text, Hash *params, Hash** out_fields, bool fail_on_read_problem) { - File_read_result result={false}; -#ifdef PA_HTTP - if(file_spec.starts_with("http://")) { + bool result; + if(file_spec.starts_with("http://", 7)) { // fail on read problem - File_read_http_result http=file_read_http(charset, file_spec, params); - result.success=true; - result.str=http.str; - result.length=http.length; - result.headers=http.headers; + file_read_http(pool, file_spec, data, data_size, params, out_fields); + result=true; } else { -#endif - File_read_action_info info={&result.str, &result.length}; - result.success=file_read_action_under_lock(file_spec, + File_read_action_info info={&data, &data_size}; + result=file_read_action_under_lock(pool, file_spec, "read", file_read_action, &info, as_text, fail_on_read_problem); -#ifdef PA_HTTP } -#endif - if(result.success && as_text) { + if(result && as_text) { // UTF-8 signature: EF BB BF - if(result.length>=3) { - char *in=(char *)result.str; + if(data_size>=3) { + char *in=(char *)data; if((in[0] == '\xEF') && (in[1] == '\xBB') && (in[2] == '\xBF')) { - result.str=in+3; result.length-=3;// skip prefix + data=in+3; data_size-=3;// skip prefix } } - fix_line_breaks((char *)(result.str), result.length); + fix_line_breaks((char *)(data), data_size); // note: after fixing - ((char*&)(result.str))[result.length]=0; + ((char*&)(data))[data_size]=0; } return result; } -bool file_read_action_under_lock(const String& file_spec, +bool file_read_action_under_lock(Pool& pool, 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::L_FILE_SPEC); + const char* fname=file_spec.cstr(String::UL_FILE_SPEC); int f; // first open, next stat: @@ -529,14 +472,14 @@ bool file_read_action_under_lock(const S 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 PA_SAFE_MODE if(finfo.st_uid/*foreign?*/!=geteuid() @@ -544,14 +487,14 @@ bool file_read_action_under_lock(const S 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'", - fname); + fname); #endif - action(finfo, f, file_spec, fname, as_text, context); + action(pool, finfo, f, file_spec, fname, as_text, context); } catch(...) { unlock(f);close(f); if(fail_on_read_problem) - rethrow; + /*re*/throw; return false; } @@ -562,16 +505,16 @@ bool file_read_action_under_lock(const S 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; - 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); + 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); pos_after=pos_before+1; } } @@ -583,7 +526,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::L_FILE_SPEC); + const char* fname=file_spec.cstr(String::UL_FILE_SPEC); int f; if(access(fname, W_OK)!=0) // no create_dir_for_file(file_spec); @@ -596,7 +539,7 @@ bool file_write_action_under_lock( 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; @@ -611,7 +554,7 @@ bool file_write_action_under_lock( ftruncate(f, lseek(f, 0, SEEK_CUR)); // one can not use O_TRUNC, read lower #endif unlock(f);close(f); - rethrow; + /*re*/throw; } #ifdef HAVE_FTRUNCATE @@ -624,19 +567,19 @@ bool file_write_action_under_lock( 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 char* str; size_t length; + const void *data; size_t size; }; #endif static void file_write_action(int f, void *context) { File_write_action_info& info=*static_cast(context); - if(info.length) { - int written=write(f, info.str, info.length); + if(info.size) { + int written=write(f, info.data, info.size); if(written<0) throw Exception(0, 0, @@ -645,33 +588,33 @@ static void file_write_action(int f, voi } void file_write( const String& file_spec, - const char* data, size_t size, + const void *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) { - size_t pos_before; - if((pos_before=file_spec.pos('/', pos_after))!=STRING_NOT_FOUND) + int pos_before; + 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::L_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::L_FILE_SPEC); + const char* 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, "unlink failed: %s (%d), actual filename '%s'", - strerror(errno), errno, fname); + strerror(errno), errno, fname); else return false; @@ -679,8 +622,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::L_FILE_SPEC); - const char* new_spec_cstr=new_spec.cstr(String::L_FILE_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); create_dir_for_file(new_spec); @@ -688,7 +631,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); } @@ -703,12 +646,12 @@ bool entry_exists(const char* fname, str } bool entry_exists(const String& file_spec) { - const char* fname=file_spec.cstr(String::L_FILE_SPEC); + const char* 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.cstrm(String::L_FILE_SPEC); + char* fname=file_spec.cstr(String::UL_FILE_SPEC); if(need_dir) { size_t size=strlen(fname); while(size) { @@ -732,14 +675,14 @@ bool file_readable(const String& file_sp bool dir_readable(const String& file_spec) { return entry_readable(file_spec, true); } -const String* file_readable(const String& path, const String& name) { - String& result=*new String(path); - result << "/"; - result << name; - return file_readable(result)?&result:0; +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; } bool file_executable(const String& file_spec) { - return access(file_spec.cstr(String::L_FILE_SPEC), X_OK)==0; + return access(file_spec.cstr(String::UL_FILE_SPEC), X_OK)==0; } bool file_stat(const String& file_spec, @@ -748,14 +691,15 @@ bool file_stat(const String& file_spec, time_t& rmtime, time_t& rctime, bool fail_on_read_problem) { - const char* fname=file_spec.cstr(String::L_FILE_SPEC); - struct stat finfo; + Pool& pool=file_spec.pool(); + const char* 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, "getting file size failed: %s (%d), real filename '%s'", - strerror(errno), errno, fname); + strerror(errno), errno, fname); else return false; rsize=finfo.st_size; @@ -807,7 +751,7 @@ char* rsplit(char* string, char delim) { } /// @todo less stupid type detection -const char* format(double value, char* fmt) { +char* format(Pool& pool, double value, char* fmt) { char local_buf[MAX_NUMBER]; size_t size; @@ -822,13 +766,15 @@ const char* format(double value, char* f else size=snprintf(local_buf, sizeof(local_buf), "%d", (int)value); - return pa_strdup(local_buf, size); + char* pool_buf=(char *)pool.malloc(size+1, 4); + memcpy(pool_buf, local_buf, size+1); + return pool_buf; } size_t stdout_write(const void *buf, size_t size) { #ifdef WIN32 do{ - int chunk_written=fwrite(buf, 1, min((size_t)8*0x400, size), stdout); + int chunk_written=fwrite(buf, 1, min(8*0x400, size), stdout); if(chunk_written<=0) break; size-=chunk_written; @@ -841,8 +787,8 @@ size_t stdout_write(const void *buf, siz #endif } -char* unescape_chars(const char* cp, int len) { - char* s=new(PointerFreeGC) char[len + 1]; +char* unescape_chars(Pool& pool, const char* cp, int len) { + char* s=(char *)pool.malloc(len + 1, 5); enum EscapeState { EscapeRest, EscapeFirst, @@ -963,7 +909,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) @@ -1013,3 +959,74 @@ int pa_sleep(unsigned long secs, unsigne } +// attributed meaning + +static size_t date_attribute(const VDate& vdate, char *buf, size_t buf_size) { + const char month_names[12][4]={ + "Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"}; + const char days[7][4]={ + "Sun","Mon","Tue","Wed","Thu","Fri","Sat"}; + + time_t when=vdate.get_time(); + struct tm *tms=gmtime(&when); + if(!tms) + throw Exception(0, + 0, + "bad time in attribute value (seconds from epoch=%ld)", when); + return snprintf(buf, MAX_STRING, "%s, %.2d-%s-%.4d %.2d:%.2d:%.2d GMT", + days[tms->tm_wday], + tms->tm_mday,month_names[tms->tm_mon],tms->tm_year+1900, + tms->tm_hour,tms->tm_min,tms->tm_sec); +} +static void append_attribute_meaning(String& result, + Value& value, String::Untaint_lang lang, bool forced) { + if(const String *string=value.get_string()) + result.append(string->join_chains(result.pool(), 0), lang, forced); + else + if(Value *vdate=value.as(VDATE_TYPE, false)) { + char *buf=(char *)result.malloc(MAX_STRING); + size_t size=date_attribute(*static_cast(vdate), + buf, MAX_STRING); + + result.APPEND_CLEAN(buf, size, "converted from date", 0); + } else + throw Exception("parser.runtime", + &result, + "trying to append here neither string nor date (%s)", + value.type()); +} +#ifndef DOXYGEN +struct Attributed_meaning_info { + String *header; // header line being constructed + String::Untaint_lang lang; // language in which to append to that line + bool forced; // do they force that lang? +}; +#endif +static void append_attribute_subattribute(const Hash::Key& akey, Hash::Val *avalue, + void *info) { + if(akey==VALUE_NAME) + return; + + Attributed_meaning_info& ami=*static_cast(info); + + // ...; charset=windows1251 + *ami.header << "; "; + ami.header->append(akey, ami.lang, ami.forced); + *ami.header << "="; + append_attribute_meaning(*ami.header, *static_cast(avalue), ami.lang, ami.forced); +} +const String& attributed_meaning_to_string(Value& meaning, + String::Untaint_lang lang, bool forced) { + String &result=*new(meaning.pool()) String(meaning.pool()); + if(Hash *hash=meaning.get_hash(0)) { + // $value(value) $subattribute(subattribute value) + if(Value *value=static_cast(hash->get(*value_name))) + append_attribute_meaning(result, *value, lang, forced); + + Attributed_meaning_info attributed_meaning_info={&result, lang}; + hash->for_each(append_attribute_subattribute, &attributed_meaning_info); + } else // result value + append_attribute_meaning(result, meaning, lang, forced); + + return result; +}