--- parser3/src/main/pa_string.C 2001/01/27 13:09:45 1.9 +++ parser3/src/main/pa_string.C 2001/04/23 13:38:31 1.78 @@ -1,72 +1,93 @@ -/* - $Id: pa_string.C,v 1.9 2001/01/27 13:09:45 paf Exp $ +/** @file + Parser: string class. @see untasize_t.C. + + Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) + + Author: Alexander Petrosyan (http://design.ru/paf) + + $Id: pa_string.C,v 1.78 2001/04/23 13:38:31 paf Exp $ */ -#include +#include "pa_config_includes.h" + +#include "pcre.h" #include "pa_pool.h" +#include "pa_string.h" #include "pa_hash.h" - -void *String::operator new(size_t size, Pool *apool) { - return apool->malloc(size); -} - -void String::construct(Pool *apool) { - pool=apool; - head.count=curr_chunk_rows=CR_PREALLOCATED_COUNT; +#include "pa_exception.h" +#include "pa_common.h" +#include "pa_array.h" +#include "pa_globals.h" +#include "pa_table.h" +#include "pa_threads.h" + +//#include "pa_sapi.h" + +// String + +String::String(Pool& apool, const char *src, size_t src_size, bool tainted) : + Pooled(apool) { + last_chunk=&head; + head.count=CR_PREALLOCATED_COUNT; append_here=head.rows; head.preallocated_link=0; - link_row=&head.rows[curr_chunk_rows]; + link_row=&head.rows[head.count]; fused_rows=fsize=0; + + if(src) + if(tainted) + APPEND_TAINTED(src, src_size, 0, 0); + else + APPEND_CLEAN(src, src_size, 0, 0); } void String::expand() { - curr_chunk_rows+=curr_chunk_rows*CR_GROW_PERCENT/100; - Chunk *chunk=static_cast( - pool->malloc(sizeof(Chunk::Row)*curr_chunk_rows+sizeof(Chunk *))); - chunk->count=curr_chunk_rows; - link_row->link=chunk; - append_here=chunk->rows; - link_row=&chunk->rows[curr_chunk_rows]; + size_t new_chunk_count=last_chunk->count+last_chunk->count*CR_GROW_PERCENT/100; + last_chunk=static_cast( + malloc(sizeof(size_t)+sizeof(Chunk::Row)*new_chunk_count+sizeof(Chunk *))); + last_chunk->count=new_chunk_count; + link_row->link=last_chunk; + append_here=last_chunk->rows; + link_row=&last_chunk->rows[last_chunk->count]; link_row->link=0; } -String::String(String& src) { - pool=src.pool; +String::String(const String& src) : Pooled(src.pool()) { head.count=CR_PREALLOCATED_COUNT; - int src_used_rows=src.used_rows(); + size_t src_used_rows=src.fused_rows; if(src_used_rows<=head.count) { - // new rows fit into preallocated area - curr_chunk_rows=head.count; + // all new rows fit size_to preallocated area + size_t curr_chunk_rows=head.count; memcpy(head.rows, src.head.rows, sizeof(Chunk::Row)*src_used_rows); append_here=&head.rows[src_used_rows]; link_row=&head.rows[curr_chunk_rows]; } else { // warning: - // heavy relies on the fact - // that preallocated area is the same for all strings + // heavily relies on the fact + // "preallocated area is the same for all strings" // // info: // allocating only enough mem to fit src string rows // next append would allocate a new chunk // - // new rows don't fit into preallocated area: splitting into two chunks + // new rows don't fit size_to preallocated area: splitting size_to two chunks // preallocated chunk src to constructing head memcpy(head.rows, src.head.rows, sizeof(Chunk::Row)*head.count); - // remaining rows into new_chunk - curr_chunk_rows=src_used_rows-head.count; + // remaining rows size_to new_chunk + size_t curr_chunk_rows=src_used_rows-head.count; Chunk *new_chunk=static_cast( - pool->malloc(sizeof(Chunk::Row)*curr_chunk_rows+sizeof(Chunk *))); + malloc(sizeof(size_t)+sizeof(Chunk::Row)*curr_chunk_rows+sizeof(Chunk *))); new_chunk->count=curr_chunk_rows; head.preallocated_link=new_chunk; - append_here=link_row=&new_chunk->rows[curr_chunk_rows]; + append_here=link_row=&new_chunk->rows[new_chunk->count]; Chunk *old_chunk=src.head.preallocated_link; Chunk::Row *new_rows=new_chunk->rows; - int rows_left_to_copy=curr_chunk_rows; + size_t rows_left_to_copy=new_chunk->count; while(true) { - int old_count=old_chunk->count; + size_t old_count=old_chunk->count; Chunk *next_chunk=old_chunk->rows[old_count].link; if(next_chunk) { // not last source chunk @@ -89,117 +110,479 @@ String::String(String& src) { fsize=src.fsize; } -String& String::operator += (char *src) { +String& String::append(const String& src, Untaint_lang lang, bool forced) { + const Chunk *chunk=&src.head; + do { + const Chunk::Row *row=chunk->rows; + for(size_t i=0; icount; i++, row++) { + if(row==src.append_here) + goto break2; + + APPEND(row->item.ptr, row->item.size, + (lang!=UL_PASS_APPENDED && (row->item.lang==UL_TAINTED || forced))?lang:row->item.lang, + row->item.origin.file, row->item.origin.line); + } + chunk=row->link; + } while(chunk); +break2: + return *this; +} + +String& String::real_append(STRING_APPEND_PARAMS) { if(!src) return *this; - int len=strlen(src); - if(!len) + if(!size) + size=strlen(src); + if(!size) return *this; if(chunk_is_full()) expand(); append_here->item.ptr=src; - fsize+=append_here->item.size=len; + fsize+=append_here->item.size=size; + append_here->item.lang=lang; +#ifndef NO_STRING_ORIGIN + append_here->item.origin.file=file; + append_here->item.origin.line=line; +#endif append_here++; fused_rows++; return *this; } -char *String::c_str() { - char *result=static_cast(pool->malloc(size()+1)); +uint String::hash_code() const { + uint result=0; - char *copy_here=result; - Chunk *chunk=&head; + const Chunk *chunk=&head; do { - Chunk::Row *row=chunk->rows; - for(int i=0; icount; i++) { + const Chunk::Row *row=chunk->rows; + for(size_t i=0; icount; i++) { if(row==append_here) goto break2; - memcpy(copy_here, row->item.ptr, row->item.size); - copy_here+=row->item.size; + result=Hash::generic_code(result, row->item.ptr, row->item.size); row++; } chunk=row->link; } while(chunk); break2: - *copy_here=0; return result; } -uint String::hash_code() { - uint result=0; +/// @todo move 'lang' skipping to pos +int String::cmp(int& partial, const String& src, + size_t this_offset, Untaint_lang lang) const { + partial=-1; + this_offset=min(this_offset, size()-1); + + const Chunk *a_chunk=&head; + const Chunk *b_chunk=&src.head; + const Chunk::Row *a_row=a_chunk->rows; + const Chunk::Row *b_row=b_chunk->rows; + size_t a_offset=this_offset; + size_t b_offset=0; + Chunk::Row *a_end=append_here; + Chunk::Row *b_end=src.append_here; + size_t a_countdown=a_chunk->count; + size_t b_countdown=b_chunk->count; + bool a_break=false; + bool b_break=false; + size_t result; + size_t pos=0; + while(true) { + a_break=a_row==a_end; + b_break=b_row==b_end; + if(a_break || b_break) + break; + + if(pos+a_row->item.size > this_offset) { + if(lang!=UL_UNSPECIFIED && a_row->item.lang!=lang) + return -1; // wrong lang -- bail out + + int size_diff= + (a_row->item.size-a_offset)- + (b_row->item.size-b_offset); + + if(size_diff==0) { // a has same size as b + result=memcmp(a_row->item.ptr+a_offset, b_row->item.ptr+b_offset, + a_row->item.size-a_offset); + if(result) + return result; + pos+=a_row->item.size; + a_row++; a_countdown--; a_offset=0; + b_row++; b_countdown--; b_offset=0; + } else if (size_diff>0) { // a longer + result=memcmp(a_row->item.ptr+a_offset, b_row->item.ptr+b_offset, + b_row->item.size-b_offset); + if(result) + return result; + a_offset+=b_row->item.size-b_offset; + b_row++; b_countdown--; b_offset=0; + } else { // b longer + result=memcmp(a_row->item.ptr+a_offset, b_row->item.ptr+b_offset, + a_row->item.size-a_offset); + if(result) + return result; + b_offset+=a_row->item.size-a_offset; + pos+=a_row->item.size; + a_row++; a_countdown--; a_offset=0; + } + + if(!b_countdown) { + b_chunk=b_row->link; + b_row=b_chunk->rows; + b_countdown=b_chunk->count; + } + } else { + a_offset-=a_row->item.size; + pos+=a_row->item.size; + a_row++; a_countdown--; + } + + if(!a_countdown) { + a_chunk=a_row->link; + a_row=a_chunk->rows; + a_countdown=a_chunk->count; + } + } + if(a_break==b_break) { // ended simultaneously + partial=0; return 0; + } else if(a_break) { // first bytes equal, but a ended before b + partial=1; return -1; + } else { + partial=2; return +1; + } +} - Chunk *chunk=&head; +/// @todo move 'lang' skipping to pos +int String::cmp(int& partial, const char* b_ptr, size_t src_size, + size_t this_offset, Untaint_lang lang) const { + partial=-1; + size_t b_size=src_size?src_size:b_ptr?strlen(b_ptr):0; + this_offset=min(this_offset, size()-1); + + const Chunk *a_chunk=&head; + const Chunk::Row *a_row=a_chunk->rows; + size_t a_offset=this_offset; + size_t b_offset=0; + Chunk::Row *a_end=append_here; + size_t a_countdown=a_chunk->count; + bool a_break=false; + bool b_break=false; + size_t pos=0; + while(true) { + a_break=a_row==a_end; + if(a_break || b_break) + break; + + if(pos+a_row->item.size > this_offset) { + if(lang!=UL_UNSPECIFIED && a_row->item.lang!=lang) + return -1; // wrong lang -- bail out + + int size_diff= + (a_row->item.size-a_offset)- + (b_size-b_offset); + + if(size_diff==0) { // a has same size as b + if(size_t result=memcmp(a_row->item.ptr+a_offset, b_ptr+b_offset, + a_row->item.size-a_offset)!=0) + return result; + pos+=a_row->item.size; + a_row++; a_countdown--; a_offset=0; + b_break=true; + } else if (size_diff>0) { // a longer + if(size_t result=memcmp(a_row->item.ptr+a_offset, b_ptr+b_offset, + b_size-b_offset)!=0) + return result; + a_offset+=b_size-b_offset; + b_break=true; + } else { // b longer + if(size_t result=memcmp(a_row->item.ptr+a_offset, b_ptr+b_offset, + a_row->item.size-a_offset)!=0) + return result; + b_offset+=a_row->item.size-a_offset; + pos+=a_row->item.size; + a_row++; a_countdown--; a_offset=0; + } + } else { + a_offset-=a_row->item.size; + pos+=a_row->item.size; + a_row++; a_countdown--; + } + + if(!a_countdown) { + a_chunk=a_row->link; + a_row=a_chunk->rows; + a_countdown=a_chunk->count; + } + } + if(a_break==b_break) { // ended simultaneously + partial=0; return 0; + } else if(a_break) { // first bytes equal, but a ended before b + partial=1; return -1; + } else { + partial=2; return +1; + } +} + +#ifndef NO_STRING_ORIGIN +const Origin& String::origin() const { + if(!fused_rows) + THROW(0, 0, + 0, + "String::origin() of empty string called"); + + // determining origin by last appended piece + // because first one frequently constant. + // ex: ^load[/file] "document_root" + "/file" + return append_here[-1].item.origin; +} +#endif + +String& String::mid(size_t start, size_t finish) const { + start=max(0, start); + finish=min(size(), finish); + if(start==finish) + return *empty_string; + + String& result=*NEW String(pool()); + + size_t pos=0; + const Chunk *chunk=&head; do { - Chunk::Row *row=chunk->rows; - for(int i=0; icount; i++) { + const Chunk::Row *row=chunk->rows; + for(size_t i=0; icount; pos+=row->item.size, i++, row++) { if(row==append_here) goto break2; - result=Hash::generic_code(result, row->item.ptr, row->item.size); - row++; + size_t item_finish=pos+row->item.size; + if(item_finish > start) { // started now or already? + bool started=result.size()==0; // started now? + bool finished=finish <= item_finish; // finished now? + size_t offset=started?start-pos:0; + size_t size=finished?finish-pos:row->item.size; + result.APPEND( + row->item.ptr+offset, size-offset, + row->item.lang, + row->item.origin.file, row->item.origin.line); + if(finished) + goto break2; + } } chunk=row->link; } while(chunk); break2: +// SAPI::log(pool(), "piece of '%s' from %d to %d is '%s'", + //cstr(), start, finish, result.cstr()); return result; } -bool String::operator == (String& src) { - if(size() != src.size()) - return false; - - Chunk *a_chunk=&head; - Chunk *b_chunk=&src.head; - Chunk::Row *a_row=a_chunk->rows; - Chunk::Row *b_row=b_chunk->rows; - int a_offset=0; - int b_offset=0; - Chunk::Row *a_end=append_here; - Chunk::Row *b_end=src.append_here; - int a_count=a_chunk->count; - int b_count=b_chunk->count; - bool a_break=false; - bool b_break=false; +int String::pos(const String& substr, + size_t result, Untaint_lang lang) const { + for(; result=0 && limit; limit--) { + result+=&mid(pos_after, pos_before); + pos_after=pos_before+delim_size; + } + // last piece + if(pos_after=0 && limit; limit--) { + result+=&mid(pos_after, pos_before); + pos_after=pos_before+delim.size(); + } + // last piece + if(pos_afterkey; o++) + if( + strchr(options, o->key) || + strchr(options, toupper(o->key))) { + *(o->result)&=~o->clear; + *(o->result)|=o->set; + } +} + +/** + returns true if fills table. + table format is defined and fixed[can be used by others]: + @verbatim + pre-match/match/post-match/1/2/3/... + @endverbatim +*/ +bool String::match(const unsigned char *pcre_tables, + const String *aorigin, + const String& regexp, + const String *options, + Table **table, + Row_action row_action, void *info) const { + + if(!regexp.size()) + THROW(0, 0, + aorigin, + "regexp is empty"); + const char *pattern=regexp.cstr(UL_AS_IS); + const char *errptr; + int erroffset; + int option_bits[2]; regex_options(options?options->cstr():0, option_bits); + pcre *code=pcre_compile(pattern, option_bits[0], + &errptr, &erroffset, + pcre_tables); + + if(!code) + THROW(0, 0, + ®exp.mid(erroffset, regexp.size()), + "regular expression syntax error - %s", errptr); + + int info_substrings=pcre_info(code, 0, 0); + if(info_substrings<0) { + (*pcre_free)(code); + THROW(0, 0, + aorigin, + "pcre_info error (%d)", + info_substrings); + } + + int startoffset=0; + const char *subject=cstr(UL_AS_IS); + int length=strlen(subject); + int ovecsize; + int *ovector=(int *)malloc(sizeof(int)* + (ovecsize=(1/*match*/+info_substrings)*3)); + + { // create table + Array& columns=*NEW Array(pool()); + columns+=string_pre_match_name; + columns+=string_match_name; + columns+=string_post_match_name; + for(int i=1; i<=info_substrings; i++) { + char *column=(char *)malloc(MAX_NUMBER); + snprintf(column, MAX_NUMBER, "%d", i); + columns+=NEW String(pool(), column); // .i column name + } + *table=NEW Table(pool(), aorigin, &columns); + } + + int exec_option_bits=0; while(true) { - int size_diff= - (a_row->item.size-a_offset)- - (b_row->item.size-b_offset); - - if(size_diff==0) { // a has same size as b - if(memcmp(a_row->item.ptr+a_offset, b_row->item.ptr+b_offset, a_row->item.size-a_offset)!=0) - return false; - a_row++; a_count--; a_offset=0; - b_row++; b_count--; b_offset=0; - } else if (size_diff>0) { // a longer - if(memcmp(a_row->item.ptr+a_offset, b_row->item.ptr+b_offset, b_row->item.size-b_offset)!=0) - return false; - a_offset+=b_row->item.size-b_offset; - b_row++; b_count--; b_offset=0; - } else { // b longer - if(memcmp(a_row->item.ptr+a_offset, b_row->item.ptr+b_offset, a_row->item.size-a_offset)!=0) - return false; - b_offset+=a_row->item.size-a_offset; - a_row++; a_count--; a_offset=0; + int exec_substrings=pcre_exec(code, 0, + subject, length, startoffset, + exec_option_bits, ovector, ovecsize); + + if(exec_substrings==PCRE_ERROR_NOMATCH) { + (*pcre_free)(code); + (*row_action)(**table, 0/*last time, no row*/, 0, 0, info); + return option_bits[1]!=0; // global=true+table, not global=false } - a_break=a_row==a_end; - b_break=b_row==b_end; - if(a_break || b_break) - break; + if(exec_substrings<0) { + (*pcre_free)(code); + THROW(0, 0, + aorigin, + "regular expression execute error (%d)", + exec_substrings); + } - if(!a_count) { - a_chunk=a_row->link; - a_row=a_chunk->rows; - a_count=a_chunk->count; + Array& row=*NEW Array(pool()); + row+=&mid(0, ovector[0]); // .pre-match column value + row+=&mid(ovector[0], ovector[1]); // .match + row+=&mid(ovector[1], size()); // .post-match + + for(int i=1; ilink; - b_row=b_chunk->rows; - b_count=b_chunk->count; + + (*row_action)(**table, &row, startoffset, ovector[0], info); + + if(!option_bits[1] || !(startoffset=ovector[1])) { // not global | going to hang + (*pcre_free)(code); + (*row_action)(**table, 0/*last time, no row*/, 0, 0, info); + return true; } + +/* + if(option_bits[0] & PCRE_MULTILINE) + exec_option_bits|=PCRE_NOTBOL; // start of subject+startoffset not BOL +*/ } - return a_break==b_break; }