--- parser3/src/main/pa_common.C 2003/02/06 14:24:50 1.143.2.16 +++ parser3/src/main/pa_common.C 2003/03/18 15:14:18 1.143.2.21.2.1 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_COMMON_C="$Date: 2003/02/06 14:24:50 $"; +static const char* IDENT_COMMON_C="$Date: 2003/03/18 15:14:18 $"; #include "pa_common.h" #include "pa_exception.h" @@ -99,7 +99,7 @@ static int unlock(int fd) { FLOCK(F_TLOC // globals -StringPtr file_status_name(new String(FILE_STATUS_NAME)); +const String& file_status_name(new String(FILE_STATUS_NAME)); // defines for statics @@ -110,10 +110,10 @@ StringPtr file_status_name(new String(FI // 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)); +static const String& http_method_name(new String(HTTP_METHOD_NAME)); +static const String& http_timeout_name(new String(HTTP_TIMEOUT_NAME)); +static const String& http_headers_name(new String(HTTP_HEADERS_NAME)); +static const String& http_any_status_name(new String(HTTP_ANY_STATUS_NAME)); // defines @@ -149,18 +149,13 @@ void fix_line_breaks(char* buf, size_t& memcpy(dest, bol, eob-bol); } -char* file_read_text(Pool& pool, Charset& charset, - StringPtr file_spec, +char* file_read_textCharset& charset, + const String& file_spec, bool fail_on_read_problem, 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, 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; + 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 @@ -180,20 +175,20 @@ static bool set_addr(struct sockaddr_in return true; } -static int http_read_response(Pool& pool, String& response, int sock, bool fail_on_status_ne_200){ +static int http_read_responseString& response, int sock, bool fail_on_status_ne_200){ int result=0; ssize_t EOLat=0; while(true) { - char *buf=(char *)pool.malloc(MAX_STRING); + char *buf=new char[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(!result && (EOLat=response.pos("\r\n", 2))>=0) { // checking status in first response - StringPtr status_line=response.mid(0, (size_t)EOLat); + const String& status_line=response.mid(0, (size_t)EOLat); ArrayString astatus; status_line->split(astatus, 0, " ", 1); - StringPtr status_code=astatus.get(1); + const String& status_code=astatus.get(1); result=status_code->as_int(); if(fail_on_status_ne_200 && result!=200) @@ -223,9 +218,9 @@ static void timeout_handler(int sig){ } #endif -static int http_request(Pool& pool, +static int http_request( String& response, - StringPtr origin_string, + const String* origin_string, const char* host, int port, const char* request, int timeout, @@ -289,7 +284,7 @@ static int http_request(Pool& pool, #ifndef DOXYGEN struct Http_pass_header_info { - Pool* pool; + ; Charset* charset; String* request; bool user_agent_specified; @@ -305,27 +300,27 @@ static void http_pass_header(HashStringV info->user_agent_specified=true; } #ifndef DOXYGEN -struct File_read_http_info { - char **data; size_t *data_size; +struct File_read_http_result { + char *data; size_t size; HashStringValuePtr headers; }; #endif -static File_read_http_info file_read_http(Pool& pool, Charset& charset, StringPtr file_spec, +static File_read_http_result file_read_httpCharset& charset, const String& file_spec, HashStringValue *options=0) { - File_read_http_info result; + File_read_http_result result; char host[MAX_STRING]; const char* uri; int port; - CharPtr method(0); + const char* method(0); int timeout=2; bool fail_on_status_ne_200=true; ValuePtr vheaders(0); - StringPtr connect_string(new String()); + const String& 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 - CharPtr connect_string_cstr=connect_string->cstr(String::UL_UNSPECIFIED); + const char* connect_string_cstr=connect_string->cstr(String::UL_UNSPECIFIED); const char* current=connect_string_cstr; if(strncmp(current, "http://", 7)!=0) throw Exception(0, @@ -388,7 +383,7 @@ static File_read_http_info file_read_htt //sending request String response; - CharPtr request_cstr=request.cstr(String::UL_UNSPECIFIED); + const char* 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); @@ -400,8 +395,8 @@ static File_read_http_info file_read_htt connect_string, "bad response from host - no headers found"); } - StringPtr header_block=response.mid(0, pos); - StringPtr body=response.mid(pos+4, response.size()); + const String& header_block=response.mid(0, pos); + const String& body=response.mid(pos+4, response.size()); ArrayString aheaders; result.headers=HashStringValuePtr(new HashStringValue); @@ -409,7 +404,7 @@ static File_read_http_info file_read_htt //processing headers for(int i=1; ipos(": ", 2); if(pos<1) throw Exception("http.response", @@ -422,8 +417,8 @@ static File_read_http_info file_read_htt } // output response - *result.data=new(pool) char[*result.data_size=body->size()]; - body->store_to(*result.data, String::UL_AS_IS); + result.data=new char[1/*as text puts terminating zero later*/+(result.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; } @@ -433,14 +428,14 @@ struct File_read_action_info { char **data; size_t *data_size; }; #endif -static void file_read_action(Pool& pool, +static void file_read_action( struct stat& finfo, int f, - StringPtr file_spec, const char* fname, bool as_text, + 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)); + *info.data=new 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) @@ -450,7 +445,7 @@ static void file_read_action(Pool& pool, *info.data_size, to_read_size); } else { // empty file if(as_text) { - *info.data=pool.malloc(1); + *info.data=new char[1]; *(char*)(*info.data)=0; } else *info.data=0; @@ -458,16 +453,19 @@ static void file_read_action(Pool& pool, return; } } -File_read_result file_read(Pool& pool, Charset& charset, StringPtr file_spec, +File_read_result file_readCharset& charset, const String& 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.headers=file_read_http(pool, charset, file_spec, params).headers; + File_read_http_result http=file_read_http(pool, charset, file_spec, params); result.success=true; + result.data=http.data; + result.size=http.size; + result.headers=http.headers; } else { - File_read_action_info info={&result.data, &result.data_size}; + 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); @@ -475,27 +473,27 @@ File_read_result file_read(Pool& pool, C if(result.success && as_text) { // UTF-8 signature: EF BB BF - if(result.data_size>=3) { + if(result.size>=3) { char *in=(char *)result.data; if((in[0] == '\xEF') && (in[1] == '\xBB') && (in[2] == '\xBF')) { - result.data=in+3; result.data_size-=3;// skip prefix + result.data=in+3; result.size-=3;// skip prefix } } - fix_line_breaks((char *)(result.data), result.data_size); + fix_line_breaks((char *)(result.data), result.size); // note: after fixing - ((char*&)(result.data))[result.data_size]=0; + ((char*&)(result.data))[result.size]=0; } return result; } -bool file_read_action_under_lock(Pool& pool, StringPtr file_spec, +bool file_read_action_under_lockconst String& file_spec, const char* action_name, File_read_action action, void *context, bool as_text, bool fail_on_read_problem) { - CharPtr fname=file_spec->cstr(String::UL_FILE_SPEC); + const char* fname=file_spec->cstr(String::UL_FILE_SPEC); int f; // first open, next stat: @@ -551,7 +549,7 @@ bool file_read_action_under_lock(Pool& p } } -static void create_dir_for_file(StringPtr file_spec) { +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) { @@ -561,13 +559,13 @@ static void create_dir_for_file(StringPt } bool file_write_action_under_lock( - StringPtr file_spec, + const String& 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) { - CharPtr fname=file_spec->cstr(String::UL_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); @@ -614,7 +612,7 @@ bool file_write_action_under_lock( #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) { @@ -628,8 +626,8 @@ static void file_write_action(int f, voi } } void file_write( - StringPtr file_spec, - const void *data, size_t size, + const String& file_spec, + const char *data, size_t size, bool as_text, bool do_append) { File_write_action_info info={data, size}; @@ -641,15 +639,15 @@ void file_write( } // throws nothing! [this is required in file_move & file_delete] -static void rmdir(StringPtr file_spec, size_t pos_after) { +static void rmdir(const String& 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(StringPtr file_spec, bool fail_on_read_problem) { - CharPtr fname=file_spec->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); if(unlink(fname)!=0) if(fail_on_read_problem) throw Exception(errno==EACCES?"file.access":errno==ENOENT?"file.missing":0, @@ -662,9 +660,9 @@ bool file_delete(StringPtr file_spec, bo rmdir(file_spec, 1); return true; } -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); +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); create_dir_for_file(new_spec); @@ -686,13 +684,13 @@ bool entry_exists(const char* fname, str return result; } -bool entry_exists(StringPtr file_spec) { - CharPtr fname=file_spec->cstr(String::UL_FILE_SPEC); +bool entry_exists(const String& file_spec) { + const char* fname=file_spec->cstr(String::UL_FILE_SPEC); return entry_exists(fname, 0); } -static bool entry_readable(StringPtr file_spec, bool need_dir) { - CharPtr fname=file_spec->cstr(String::UL_FILE_SPEC); +static bool entry_readable(const String& file_spec, bool need_dir) { + const char* fname=file_spec->cstr(String::UL_FILE_SPEC); if(need_dir) { size_t size=strlen(fname); while(size) { @@ -710,29 +708,29 @@ static bool entry_readable(StringPtr fil } return false; } -bool file_readable(StringPtr file_spec) { +bool file_readable(const String& file_spec) { return entry_readable(file_spec, false); } -bool dir_readable(StringPtr file_spec) { +bool dir_readable(const String& file_spec) { return entry_readable(file_spec, true); } -StringPtr file_readable(StringPtr path, const String& name) { - StringPtr result(new String(*path)); +const String& file_readable(String& path, String& name) { + const String& result(new String(path)); *result << "/"; *result << name; - return file_readable(result)?result:StringPtr(0); + return file_readable(result)?result:0; } -bool file_executable(StringPtr file_spec) { +bool file_executable(const String& file_spec) { return access(file_spec->cstr(String::UL_FILE_SPEC), X_OK)==0; } -bool file_stat(StringPtr file_spec, +bool file_stat(const String& file_spec, size_t& rsize, time_t& ratime, time_t& rmtime, time_t& rctime, bool fail_on_read_problem) { - CharPtr fname=file_spec->cstr(String::UL_FILE_SPEC); + const char* fname=file_spec->cstr(String::UL_FILE_SPEC); struct stat finfo; if(stat(fname, &finfo)!=0) if(fail_on_read_problem) @@ -791,7 +789,7 @@ char* rsplit(char* string, char delim) { } /// @todo less stupid type detection -const char* format(Pool& pool, double value, char* fmt) { +const char* formatdouble value, char* fmt) { char local_buf[MAX_NUMBER]; size_t size; @@ -825,8 +823,8 @@ size_t stdout_write(const void *buf, siz #endif } -char* unescape_chars(Pool& pool, const char* cp, int len) { - char* s=pool.malloc(len + 1); +char* unescape_charsconst char* cp, int len) { + char* s=new char[len + 1]; enum EscapeState { EscapeRest, EscapeFirst,