--- parser3/src/main/pa_common.C 2003/01/24 14:36:10 1.143.2.3 +++ parser3/src/main/pa_common.C 2003/02/04 10:57:16 1.143.2.13 @@ -1,22 +1,32 @@ /** @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/01/24 14:36:10 $"; +static const char* IDENT_COMMON_C="$Date: 2003/02/04 10:57:16 $"; #include "pa_common.h" #include "pa_exception.h" -#include "pa_globals.h" +#include "pa_value_includes.h" #include "pa_hash.h" #include "pa_vstring.h" +#include "pa_vint.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 @@ -115,12 +125,12 @@ void fix_line_breaks(char* buf, size_t& } char* file_read_text(Pool& pool, Charset& charset, - ConstStringPtr file_spec, + StringPtr file_spec, bool fail_on_read_problem, HashStringValue *params, HashStringValue** out_fields) { - void *result; size_t size; - return file_read(pool, charset, file_spec, result, size, true, params, out_fields, fail_on_read_problem)? - (char *)result:0; + char *result; size_t size; + File_read_result file_read_result=file_read(pool, charset, file_spec, result, size, true, params, out_fields, fail_on_read_problem); + return file_read_result.success?result:0; } //http request stuff @@ -150,10 +160,10 @@ static int http_read_response(Pool& pool break; response.APPEND_TAINTED(buf, size, "remote HTTP server response", 0); if(!result && (EOLat=response.pos("\r\n", 2))>=0) { // checking status in first response - ConstStringPtr status_line=response.mid(0, (size_t)EOLat); - Array astatus; + StringPtr status_line=response.mid(0, (size_t)EOLat); + Array astatus; status_line->split(astatus, 0, " ", 1); - ConstStringPtr status_code=astatus.get(1); + StringPtr status_code=astatus.get(1); result=status_code->as_int(); if(fail_on_status_ne_200 && result!=200) @@ -185,7 +195,7 @@ static void timeout_handler(int sig){ static int http_request(Pool& pool, String& response, - ConstStringPtr origin_string, + StringPtr origin_string, const char* host, int port, const char* request, int timeout, @@ -243,7 +253,7 @@ static int http_request(Pool& pool, #ifdef WE_CAN_USE_ALARM alarm(0); #endif - /*re*/throw; + rethrow; } } @@ -258,30 +268,30 @@ struct Http_pass_header_info { static void http_pass_header(HashStringValue::key_type key, HashStringValue::value_type value, Http_pass_header_info *info) { *(info->request)<<*key<<": " - << *attributed_meaning_to_string(value, String::UL_HTTP_HEADER, false) + << *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; } -static HashStringValuePtr file_read_http(Pool& pool, Charset& charset, const String& file_spec, +static HashStringValuePtr file_read_http(Pool& pool, Charset& charset, StringPtr file_spec, char*& data, size_t& data_size, HashStringValue *options=0, bool return_outfields=false) { HashStringValuePtr result(0); char host[MAX_STRING]; const char* uri; int port; - ConstCharPtr method(0); + CharPtr method(0); int timeout=2; bool fail_on_status_ne_200=true; ValuePtr vheaders(0); 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 CharPtr connect_string_cstr=connect_string->cstr(String::UL_UNSPECIFIED); - const char *current=connect_string_cstr.get(); + const char* current=connect_string_cstr; if(strncmp(current, "http://", 7)!=0) throw Exception(0, connect_string, @@ -299,7 +309,7 @@ static HashStringValuePtr file_read_http int valid_options=0; if(ValuePtr vmethod=options->get(http_method_name)) { valid_options++; - method=vmethod->as_string(pool)->cstr(); + method=vmethod->as_string(&pool)->cstr(); } if(ValuePtr vtimeout=options->get(http_timeout_name)) { valid_options++; @@ -322,13 +332,13 @@ static HashStringValuePtr file_read_http //making request String request; if(method) - request<is_string()) { // allow empty - if(HashStringValuePtr headers=vheaders->get_hash(connect_string)) { + 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; @@ -343,9 +353,9 @@ static HashStringValuePtr file_read_http //sending request String response; - ConstCharPtr request_cstr=request.cstr(String::UL_UNSPECIFIED); + CharPtr request_cstr=request.cstr(String::UL_UNSPECIFIED); int status_code=http_request(pool, response, - connect_string, host, port, request_cstr.get(), + connect_string, host, port, request_cstr, timeout, fail_on_status_ne_200); //processing results @@ -358,18 +368,18 @@ static HashStringValuePtr file_read_http StringPtr header_block=response.mid(0, pos); StringPtr body=response.mid(pos+4, response.size()); - Array aheaders; + Array aheaders; HashStringValuePtr headers(new HashStringValue); header_block->split(aheaders, 0, "\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()); + "bad response from host - bad header \"%s\"", line->cstr().get()); headers->put( line->mid(0, pos)->change_case(pool, charset, String::CC_UPPER), @@ -380,31 +390,30 @@ static HashStringValuePtr file_read_http data=new(pool) char[data_size=body->size()]; body->store_to(data, String::UL_AS_IS); if(return_outfields) { - headers.put(file_status_name, VIntPtr); - *out_fields=&headers; - } - - return result; + headers->put(file_status_name, ValuePtr(new VInt(status_code))); + return headers; + } else + return HashStringValuePtr(0); } #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( +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 @@ -417,23 +426,23 @@ static void file_read_action( return; } } -bool file_read(ConstStringPtr file_spec, - void*& data, size_t& data_size, +File_read_result file_read(Pool& pool, Charset& charset, StringPtr file_spec, + char*& data, size_t& data_size, bool as_text, HashStringValue *params, HashStringValue** out_fields, 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.fields=file_read_http(pool, charset, file_spec, data, data_size, params); + result.success=true; } else { File_read_action_info info={&data, &data_size}; - result=file_read_action_under_lock(pool, file_spec, + 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; @@ -451,11 +460,11 @@ bool file_read(ConstStringPtr file_spec, return result; } -bool file_read_action_under_lock(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: @@ -471,31 +480,31 @@ bool file_read_action_under_lock(const S 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 PA_SAFE_MODE if(finfo.st_uid/*foreign?*/!=geteuid() && finfo.st_gid/*foreign?*/!=getegid()) throw Exception("parser.runtime", - &file_spec, + 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.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; } @@ -504,30 +513,30 @@ bool file_read_action_under_lock(const S } 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); @@ -538,9 +547,9 @@ bool file_write_action_under_lock( |(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; @@ -555,7 +564,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); - /*re*/throw; + rethrow; } #ifdef HAVE_FTRUNCATE @@ -566,9 +575,9 @@ bool file_write_action_under_lock( 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 } @@ -583,56 +592,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, + StringPtr file_spec, 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) { +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); } @@ -646,13 +655,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) { @@ -670,37 +679,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(StringPtr path, const 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; @@ -752,7 +760,7 @@ char* rsplit(char* string, char delim) { } /// @todo less stupid type detection -char* format(double value, char* fmt) { +const char* format(Pool& pool, double value, char* fmt) { char local_buf[MAX_NUMBER]; size_t size; @@ -767,9 +775,7 @@ char* format(double value, char* fmt) { 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) { @@ -788,8 +794,8 @@ size_t stdout_write(const void *buf, siz #endif } -char* unescape_chars(const char* cp, int len) { - char* s=(char *)pool.malloc(len + 1, 5); +char* unescape_chars(Pool& pool, const char* cp, int len) { + char* s=pool.malloc(len + 1); enum EscapeState { EscapeRest, EscapeFirst, @@ -910,7 +916,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)