--- parser3/src/main/pa_common.C 2003/01/27 15:07:48 1.143.2.4 +++ parser3/src/main/pa_common.C 2003/02/06 14:24:50 1.143.2.16 @@ -1,23 +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/27 15:07:48 $"; +static const char* IDENT_COMMON_C="$Date: 2003/02/06 14:24:50 $"; #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 @@ -84,8 +93,33 @@ static int unlock(int fd) { FLOCK(F_TLOC #endif #endif +// defines for globals + +#define FILE_STATUS_NAME "status" + +// globals + +StringPtr file_status_name(new String(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 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) @@ -116,11 +150,16 @@ 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) { + HashStringValue* params/*, HashStringValuePtr* out_fields*/) { 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); + File_read_result file_read_result=file_read(pool, charset, file_spec, result, size, true, params, fail_on_read_problem); +/* + // they asked to return out_fields + if(out_fields) + *out_fields=file_read_result.fields; +*/ return file_read_result.success?result:0; } @@ -151,10 +190,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); + ArrayString 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) @@ -186,7 +225,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, @@ -244,7 +283,7 @@ static int http_request(Pool& pool, #ifdef WE_CAN_USE_ALARM alarm(0); #endif - /*re*/throw; + rethrow; } } @@ -259,20 +298,25 @@ 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, ConstStringPtr file_spec, - char*& data, size_t& data_size, - HashStringValue *options=0, bool return_outfields=false) { - HashStringValuePtr result(0); +#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; - ConstCharPtr method(0); + CharPtr method(0); int timeout=2; bool fail_on_status_ne_200=true; ValuePtr vheaders(0); @@ -282,7 +326,7 @@ static HashStringValuePtr file_read_http 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; + const char* current=connect_string_cstr; if(strncmp(current, "http://", 7)!=0) throw Exception(0, connect_string, @@ -300,7 +344,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++; @@ -329,7 +373,7 @@ static HashStringValuePtr file_read_http request<< " "<< uri <<" HTTP/1.0\nHost: "<< host<<"\n"; bool user_agent_specified=false; if(vheaders && !vheaders->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; @@ -344,7 +388,7 @@ 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, timeout, fail_on_status_ne_200); @@ -359,32 +403,29 @@ static HashStringValuePtr file_read_http StringPtr header_block=response.mid(0, pos); StringPtr body=response.mid(pos+4, response.size()); - Array aheaders; - HashStringValuePtr headers(new HashStringValue); + ArrayString aheaders; + result.headers=HashStringValuePtr(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( + 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=new(pool) char[data_size=body->size()]; - body->store_to(data, String::UL_AS_IS); - if(return_outfields) { - headers->put(file_status_name, ValuePtr(new VInt(status_code))); - return headers; - } else - return HashStringValuePtr(0); + *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 @@ -395,7 +436,7 @@ struct File_read_action_info { static void file_read_action(Pool& pool, struct stat& finfo, int f, - ConstStringPtr 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) { @@ -417,17 +458,16 @@ static void file_read_action(Pool& pool, return; } } -File_read_result file_read(Pool& pool, Charset& charset, ConstStringPtr file_spec, - char*& data, size_t& data_size, - bool as_text, HashStringValue *params, HashStringValue** out_fields, +File_read_result file_read(Pool& pool, Charset& charset, StringPtr file_spec, + bool as_text, HashStringValue *params, bool fail_on_read_problem) { File_read_result result; if(file_spec->starts_with("http://", 7)) { // fail on read problem - result.fields=file_read_http(pool, charset, file_spec, data, data_size, params); + result.headers=file_read_http(pool, charset, file_spec, params).headers; result.success=true; } else { - File_read_action_info info={&data, &data_size}; + File_read_action_info info={&result.data, &result.data_size}; result.success=file_read_action_under_lock(pool, file_spec, "read", file_read_action, &info, as_text, fail_on_read_problem); @@ -435,27 +475,27 @@ File_read_result file_read(Pool& pool, C if(result.success && as_text) { // UTF-8 signature: EF BB BF - if(data_size>=3) { - char *in=(char *)data; + if(result.data_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.data_size-=3;// skip prefix } } - fix_line_breaks((char *)(data), data_size); + fix_line_breaks((char *)(result.data), result.data_size); // note: after fixing - ((char*&)(data))[data_size]=0; + ((char*&)(result.data))[result.data_size]=0; } return result; } -bool file_read_action_under_lock(Pool& pool, ConstStringPtr 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) { - ConstCharPtr fname=file_spec->cstr(String::UL_FILE_SPEC); + CharPtr fname=file_spec->cstr(String::UL_FILE_SPEC); int f; // first open, next stat: @@ -473,14 +513,14 @@ 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.get()); 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.get()); #ifdef PA_SAFE_MODE if(finfo.st_uid/*foreign?*/!=geteuid() @@ -488,14 +528,14 @@ bool file_read_action_under_lock(Pool& p 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.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; } @@ -506,12 +546,12 @@ 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.get()); return false; } } -static void create_dir_for_file(ConstStringPtr 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) { @@ -521,13 +561,13 @@ static void create_dir_for_file(ConstStr } bool file_write_action_under_lock( - ConstStringPtr 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) { - ConstCharPtr 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); @@ -540,7 +580,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.get()); close(f); if(fail_on_lock_problem) throw e; @@ -555,7 +595,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 @@ -568,7 +608,7 @@ 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.get()); // here should be nothing, see rethrow above } @@ -588,7 +628,7 @@ static void file_write_action(int f, voi } } void file_write( - ConstStringPtr file_spec, + StringPtr file_spec, const void *data, size_t size, bool as_text, bool do_append) { @@ -601,30 +641,30 @@ void file_write( } // throws nothing! [this is required in file_move & file_delete] -static void rmdir(ConstStringPtr 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) rmdir(file_spec, pos_before+1); rmdir(file_spec->mid(0, pos_after-1/* / */)->cstr(String::UL_FILE_SPEC)); } -bool file_delete(ConstStringPtr file_spec, bool fail_on_read_problem) { - ConstCharPtr 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, "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(ConstStringPtr old_spec, ConstStringPtr new_spec) { - ConstCharPtr old_spec_cstr=old_spec->cstr(String::UL_FILE_SPEC); - ConstCharPtr 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); @@ -632,7 +672,7 @@ void file_move(ConstStringPtr old_spec, 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.get(), new_spec_cstr.get()); rmdir(old_spec, 1); } @@ -646,12 +686,12 @@ bool entry_exists(const char* fname, str return result; } -bool entry_exists(ConstStringPtr file_spec) { - ConstCharPtr 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(ConstStringPtr file_spec, bool need_dir) { +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); @@ -670,36 +710,36 @@ static bool entry_readable(ConstStringPt } return false; } -bool file_readable(ConstStringPtr file_spec) { +bool file_readable(StringPtr file_spec) { return entry_readable(file_spec, false); } -bool dir_readable(ConstStringPtr file_spec) { +bool dir_readable(StringPtr file_spec) { return entry_readable(file_spec, true); } -ConstStringPtr file_readable(ConstStringPtr path, const String& name) { +StringPtr file_readable(StringPtr path, const String& name) { StringPtr result(new String(*path)); *result << "/"; *result << name; - return file_readable(result)?result:ConstStringPtrZero; + return file_readable(result)?result:StringPtr(0); } -bool file_executable(ConstStringPtr file_spec) { +bool file_executable(StringPtr file_spec) { return access(file_spec->cstr(String::UL_FILE_SPEC), X_OK)==0; } -bool file_stat(ConstStringPtr 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) { - ConstCharPtr 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, "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; @@ -751,7 +791,7 @@ char* rsplit(char* string, char delim) { } /// @todo less stupid type detection -const 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; @@ -766,7 +806,7 @@ const char *format(Pool& pool, double va else size=snprintf(local_buf, sizeof(local_buf), "%d", (int)value); - return pool.malloc(local_buf, size+1); + return pool.copy(local_buf, size+1); } size_t stdout_write(const void *buf, size_t size) { @@ -907,7 +947,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)