--- parser3/src/classes/string.C 2009/04/24 06:29:26 1.176 +++ parser3/src/classes/string.C 2009/07/07 05:47:43 1.185 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_STRING_C="$Date: 2009/04/24 06:29:26 $"; +static const char * const IDENT_STRING_C="$Date: 2009/07/07 05:47:43 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -303,12 +303,12 @@ static void split_with_options(Request& const String* column_name=0; if(params_count>2){ column_name=¶ms.as_string(2, COLUMN_NAME_MUST_BE_STRING); - if (horizontal && column_name->length()) + if (horizontal && !column_name->is_empty()) throw Exception(PARSER_RUNTIME, column_name, "column name can't be specified with horisontal split"); } - if(!column_name || !column_name->length()) + if(!column_name || column_name->is_empty()) column_name=new String("piece"); Table& table=horizontal?split_horizontal(pieces, right):split_vertical(pieces, right, column_name); @@ -332,17 +332,18 @@ static void search_action(Table& table, #ifndef DOXYGEN struct Replace_action_info { - Request* request; - const String* src; String* dest; + Request* request; + const String* src; + String* dest; VTable* vtable; Value* replacement_code; }; #endif /// @todo they can do $global[$result] there, getting pointer to later-invalid local var, kill this static void replace_action(Table& table, ArrayString* row, - int prestart, int prefinish, - int poststart, int postfinish, - void *info) { + int prestart, int prefinish, + int poststart, int postfinish, + void *info) { Replace_action_info& ai=*static_cast(info); if(row) { // begin&middle // piece from last match['prestart'] to beginning of this match['prefinish'] @@ -353,10 +354,12 @@ static void replace_action(Table& table, table.put(0, row); else // begin table+=row; - { // execute 'replacement_code' in 'table' context - ai.vtable->set_table(table); - *ai.dest << ai.request->process_to_string(*ai.replacement_code); + { // execute 'replacement_code' in 'table' context + if(ai.replacement_code){ + ai.vtable->set_table(table); + *ai.dest << ai.request->process_to_string(*ai.replacement_code); + } } } else // end *ai.dest << ai.src->mid(poststart, postfinish); @@ -402,7 +405,21 @@ static void _match(Request& r, MethodPar } } else { // replace - Value& replacement_code=params.as_junction(2, "replacement param must be code"); + + Value* replacement_code=0; + bool is_junction=false; + + Value* replacement=¶ms[2]; + if(replacement->get_junction()){ + replacement_code=replacement; + is_junction=true; + } else if(replacement->is_string()){ + if(replacement->is_defined()) + replacement_code=replacement; + } else if(!replacement->is_void()) + throw Exception(PARSER_RUNTIME, + 0, + "replacement option should be junction or string"); String result; VTable* vtable=new VTable; @@ -411,16 +428,23 @@ static void _match(Request& r, MethodPar &src, &result, vtable, - &replacement_code + replacement_code }; - Temp_value_element temp_match_var( - *replacement_code.get_junction()->method_frame, - match_var_name, vtable); + + Temp_value_element* temp_match_var=0; + + if(is_junction) + temp_match_var=new Temp_value_element( + *replacement_code->get_junction()->method_frame, + match_var_name, vtable); src.match(vregex, replace_action, &info, matches_count); + if(temp_match_var) + delete temp_match_var; + r.write_assign_lang(result); } } @@ -538,8 +562,8 @@ const String* sql_result_string(Request& Temp_lang temp_lang(r, String::L_SQL); const String& statement_string=r.process_to_string(statement); - const char* statement_cstr= - statement_string.cstr(String::L_UNSPECIFIED, r.connection()); + const char* statement_cstr=statement_string.untaint_cstr(r.flang, r.connection()); + String_sql_event_handlers handlers(statement_string, statement_cstr); r.connection()->query( @@ -606,9 +630,8 @@ static void _save(Request& r, MethodPara } // write - const char* buf=src.cstr(String::L_UNSPECIFIED, r.connection(false/*no error if none*/)); - file_write(r.absolute(file_name), - buf, strlen(buf), true, do_append); + String::Body sbody=src.cstr_to_string_body_untaint(String::L_AS_IS, r.connection(false/*no error if none*/)); + file_write(r.absolute(file_name), sbody.cstr(), sbody.length(), true, do_append); } static void _normalize(Request& r, MethodParams&) { @@ -625,8 +648,7 @@ static void _trim(Request& r, MethodPara const char* chars=0; if(params_count>0) { const String& skind=params.as_string(0, "'where' must be string"); - "'where' must be string"); - if(skind.length()) + if(!skind.is_empty()) if(skind==TRIM_BOTH_OPTION) kind=String::TRIM_BOTH; else if(skind==TRIM_START_OPTION || skind=="start") @@ -640,12 +662,12 @@ static void _trim(Request& r, MethodPara if(params_count>1) { const String& schars=params.as_string(1, "'chars' must be string"); - if(schars.length()) + if(!schars.is_empty()) chars=schars.cstr(); } } - r.write_assign_lang(src.trim(kind, chars)); + r.write_assign_lang(src.trim(kind, chars, &r.charsets.source())); } static void _append(Request& r, MethodParams& params) { @@ -672,16 +694,15 @@ static void _base64(Request& r, MethodPa "Invalid \\x00 character found while decode to string. Decode it to file instead."); fix_line_breaks(decoded, length); - if(length){ - r.write_assign_lang(*new String(decoded, length, true/*tainted*/)); - } + if(length) + r.write_assign_lang(*new String(decoded, String::L_TAINTED)); } } else { // encode: ^str.base64[] VString& self=GET_SELF(r, VString); const char* cstr=self.string().cstr(); const char* encoded=pa_base64_encode(cstr, strlen(cstr)); - r.write_assign_lang(*new String(encoded, 0, true/*tainted. once ?param=base64(something) was needed*/)); + r.write_assign_lang(*new String(encoded, String::L_TAINTED/*once ?param=base64(something) was needed*/)); } }