|
|
| version 1.78, 2001/11/21 08:26:55 | version 1.115.2.9, 2003/02/14 12:59:10 |
|---|---|
| Line 1 | Line 1 |
| /** @file | /** @file |
| Parser: String class part: untaint mechanizm. | Parser: String class part: untaint mechanizm. |
| Copyright(c) 2001 ArtLebedev Group(http://www.artlebedev.com) | Copyright(c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) |
| Author: Alexander Petrosyan <paf@design.ru>(http://paf.design.ru) | Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru) |
| $Id$ | |
| */ | */ |
| static const char* IDENT_UNTAINT_C="$Date$"; | |
| #include "pa_pool.h" | #include "pa_pool.h" |
| #include "pa_string.h" | #include "pa_string.h" |
| #include "pa_hash.h" | #include "pa_hash.h" |
| Line 16 | Line 16 |
| #include "pa_sql_connection.h" | #include "pa_sql_connection.h" |
| #include "pa_dictionary.h" | #include "pa_dictionary.h" |
| #include "pa_common.h" | #include "pa_common.h" |
| #include "pa_charset.h" | |
| #include "pa_request_charsets.h" | |
| #define escape(action) \ | #define escape(action) \ |
| { \ | { \ |
| const char *src=row->item.ptr; \ | const char* src=fragment->ptr; \ |
| for(int size=row->item.size; size--; src++) \ | for(int size=fragment->size; size--; src++) \ |
| action \ | action \ |
| } | } |
| #define _default default: *dest++=*src; break | #define _default default: *dest++=*src; break |
| #define encode(need_encode_func, prefix) \ | #define encode(need_encode_func, prefix) \ |
| default: \ | |
| if(need_encode_func(*src)) { \ | if(need_encode_func(*src)) { \ |
| static const char *hex="0123456789ABCDEF"; \ | static const char* hex="0123456789ABCDEF"; \ |
| char chunk[3]={prefix}; \ | char chunk[3]={prefix}; \ |
| chunk[1]=hex[((unsigned char)*src)/0x10]; \ | chunk[1]=hex[((unsigned char)*src)/0x10]; \ |
| chunk[2]=hex[((unsigned char)*src)%0x10]; \ | chunk[2]=hex[((unsigned char)*src)%0x10]; \ |
| Line 41 | Line 42 |
| dest+=bsize; \ | dest+=bsize; \ |
| inline bool need_file_encode(unsigned char c){ | inline bool need_file_encode(unsigned char c){ |
| if((c>='0') &&(c<='9') ||(c>='A') &&(c<='Z') ||(c>='a') &&(c<='z')) | // russian letters and space ENABLED |
| return false; | // encoding only these... |
| return strchr( | |
| return !strchr( | "*?'\"<>|" |
| #ifdef WIN32 | #ifndef WIN32 |
| ":\\~" | ":\\~" |
| #endif | #endif |
| "./()_-", c); | , c)!=0; |
| } | } |
| inline bool need_uri_encode(unsigned char c){ | inline bool need_uri_encode(unsigned char c){ |
| if((c>='0') &&(c<='9') ||(c>='A') &&(c<='Z') ||(c>='a') &&(c<='z')) | if((c>='0') &&(c<='9') ||(c>='A') &&(c<='Z') ||(c>='a') &&(c<='z')) |
| Line 65 inline bool need_http_header_encode(unsi | Line 66 inline bool need_http_header_encode(unsi |
| // | // |
| static const char * String_Untaint_lang_name[]={ | static const char* String_Untaint_lang_name[]={ |
| "U", ///< zero value handy for hash lookup @see untaint_lang_name2enum | "U", ///< zero value handy for hash lookup @see untaint_lang_name2enum |
| "C", ///< clean | "C", ///< clean |
| "T", ///< tainted, untaint language as assigned later | "T", ///< tainted, untaint language as assigned later |
| Line 84 static const char * String_Untaint_lang_ | Line 85 static const char * String_Untaint_lang_ |
| "SQL", ///< ^table:sql body | "SQL", ///< ^table:sql body |
| "JS", ///< JavaScript code | "JS", ///< JavaScript code |
| "XML", ///< ^dom:set xml | "XML", ///< ^dom:set xml |
| "HTML", ///< HTML code (for editing) | "HTML" ///< HTML code (for editing) |
| "UHTML", ///< HTML code with USER chars | |
| }; | }; |
| Line 126 quoted-pair = "\" CHAR | Line 126 quoted-pair = "\" CHAR |
| if(strchr("()<>@,;:\\\"/[]?={} \t", *ptr)) | if(strchr("()<>@,;:\\\"/[]?={} \t", *ptr)) |
| */ | */ |
| inline bool need_quote_http_header(const char *ptr, size_t size) { | inline bool need_quote_http_header(const char* ptr, size_t size) { |
| for(; size--; ptr++) | for(; size--; ptr++) |
| if(strchr(";\\\"= \t" /* excluded ()<>@, :/ ? []{} */, *ptr)) | if(strchr(";\\\"= \t" /* excluded ()<>@, :/ ? []{} */, *ptr)) |
| return true; | return true; |
| return false; | return false; |
| } | } |
| String& String::append(const String& src, uchar lang, bool forced) { | //#include "pa_sapi.h" |
| /** | |
| appends to other String, | |
| marking all tainted pieces of it with @a lang. | |
| or marking ALL pieces of it with a @a lang when @a forced to, | |
| and propagating OPTIMIZE language bit. | |
| */ | |
| String& String::append_to(String& dest, uchar lang, bool forced) const { | |
| if(is_empty()) | |
| return dest; | |
| // without language-chage string? | |
| if(lang==UL_PASS_APPENDED) { | |
| // can simply append elements | |
| ssize_t delta=fused-(dest.fallocated-dest.fused); | |
| if(delta>0) // they don't fit? | |
| dest.expand(delta); | |
| // felements[fused...]=src.felements[0..fused], fused+=src.fused | |
| memcpy(&dest.felements[dest.fused], felements, sizeof(felements[0])*fused); | |
| dest.fused+=fused; | |
| return dest; | |
| } | |
| // manually unrolled code to avoid do{if(const)} constructs | // manually unrolled code to avoid do{if(const)} constructs |
| if(forced) | if(forced) |
| STRING_SRC_FOREACH_ROW( | STRING_FOREACH_FRAGMENT( |
| APPEND(row->item.ptr, row->item.size, | dest.APPEND(fragment->ptr, fragment->size, |
| lang, //forcing passed lang | lang, //forcing passed lang |
| row->item.origin.file, row->item.origin.line); | fragment->origin.file, fragment->origin.line); |
| ) | ) |
| else if(lang==UL_PASS_APPENDED) | else if(lang==UL_PASS_APPENDED) |
| STRING_SRC_FOREACH_ROW( | STRING_FOREACH_FRAGMENT( |
| APPEND(row->item.ptr, row->item.size, | dest.APPEND(fragment->ptr, fragment->size, |
| row->item.lang, // passing item's lang | fragment->lang, // passing item's lang |
| row->item.origin.file, row->item.origin.line); | fragment->origin.file, fragment->origin.line); |
| ) | ) |
| else if(lang&UL_OPTIMIZE_BIT) // main idea here | else if(lang&UL_OPTIMIZE_BIT) // main idea here |
| // tainted piece would get OPTIMIZED bit from 'lang' | // tainted piece would get OPTIMIZED bit from 'lang' |
| // clean piece would be marked OPTIMIZED manually | // clean piece would be marked OPTIMIZED manually |
| // pieces with determined languages [not tainted|clean] would retain theirs langs | // pieces with determined languages [not tainted|clean] would retain theirs langs |
| STRING_SRC_FOREACH_ROW( | STRING_FOREACH_FRAGMENT( |
| APPEND(row->item.ptr, row->item.size, | dest.APPEND(fragment->ptr, fragment->size, |
| row->item.lang==UL_TAINTED?lang:( | fragment->lang==UL_TAINTED?lang:( |
| row->item.lang==UL_CLEAN?UL_CLEAN|UL_OPTIMIZE_BIT: // ORing with OPTIMIZED flag | fragment->lang==UL_CLEAN?UL_CLEAN|UL_OPTIMIZE_BIT: // ORing with OPTIMIZED flag |
| row->item.lang | fragment->lang |
| ), | ), |
| row->item.origin.file, row->item.origin.line); | fragment->origin.file, fragment->origin.line); |
| ) | ) |
| else | else |
| STRING_SRC_FOREACH_ROW( | STRING_FOREACH_FRAGMENT( |
| APPEND(row->item.ptr, row->item.size, | dest.APPEND(fragment->ptr, fragment->size, |
| row->item.lang==UL_TAINTED?lang:row->item.lang, | fragment->lang==UL_TAINTED?lang:fragment->lang, |
| row->item.origin.file, row->item.origin.line); | fragment->origin.file, fragment->origin.line); |
| ); | ); |
| break2: | |
| return *this; | return dest; |
| } | } |
| size_t String::cstr_bufsize(Untaint_lang lang, | size_t String::cstr_bufsize(Untaint_lang lang, |
| SQL_Connection *connection, | SQL_Connection *connection, |
| const char *charset) const { | const Request_charsets *charsets) const { |
| size_t dest=1; // for terminating 0 | size_t dest=1; // for terminating 0 |
| STRING_FOREACH_ROW( | STRING_FOREACH_FRAGMENT( |
| uchar to_lang=lang==UL_UNSPECIFIED?row->item.lang:lang; | uchar to_lang=lang==UL_UNSPECIFIED?fragment->lang:lang; |
| switch(to_lang & ~UL_OPTIMIZE_BIT) { | switch(to_lang & ~UL_OPTIMIZE_BIT) { |
| case UL_CLEAN: | case UL_CLEAN: |
| Line 187 size_t String::cstr_bufsize(Untaint_lang | Line 210 size_t String::cstr_bufsize(Untaint_lang |
| // for ^process{body} evaluation | // for ^process{body} evaluation |
| // tainted, untaint language: as-is | // tainted, untaint language: as-is |
| dest+=row->item.size; | dest+=fragment->size; |
| break; | break; |
| case UL_FILE_SPEC: | case UL_FILE_SPEC: |
| // tainted, untaint language: file [name] | // tainted, untaint language: file [name] |
| dest+=row->item.size*3/* worst: Z->%XX */; | dest+=fragment->size*3/* worst: Z->%XX */; |
| break; | break; |
| case UL_URI: | case UL_URI: |
| // tainted, untaint language: uri | // tainted, untaint language: uri |
| dest+=row->item.size*3/* worst: Z->%XX */; | dest+=fragment->size*6*3/* worst utf8 x worst Z->%XX */; |
| break; | break; |
| case UL_HTTP_HEADER: | case UL_HTTP_HEADER: |
| // tainted, untaint language: http-field-content-text | // tainted, untaint language: http-field-content-text |
| dest+=row->item.size*3/* worst: Z->%XX */; | dest+=fragment->size*3/* worst: Z->%XX */; |
| break; | break; |
| case UL_MAIL_HEADER: | case UL_MAIL_HEADER: |
| // tainted, untaint language: mail-header | // tainted, untaint language: mail-header |
| if(charset) { | if(charsets) { |
| int parts_count=1; | |
| const char* prev=fragment->ptr; | |
| size_t size=fragment->size; | |
| while(const char* comma_at=(const char*)memchr(prev, ',', size)) { | |
| parts_count++; | |
| size-=comma_at-prev; | |
| prev=comma_at+1; | |
| } | |
| // Subject: Re: parser3: =?koi8-r?Q?=D3=C5=CD=C9=CE=C1=D2?= | // Subject: Re: parser3: =?koi8-r?Q?=D3=C5=CD=C9=CE=C1=D2?= |
| dest+=row->item.size*3+MAX_STRING/* worst: =?charset?Q?=%XX?= */; | dest+= |
| } else { | fragment->size*3+ |
| dest+=row->item.size; | parts_count*(charsets->mail().name()->size()+MAX_STRING/* worst: =?charset?Q?=%XX?= */); |
| } | } else |
| dest+=fragment->size; | |
| break; | break; |
| case UL_TABLE: | case UL_TABLE: |
| // tainted, untaint language: table | // tainted, untaint language: table |
| dest+=row->item.size; | dest+=fragment->size; |
| break; | break; |
| case UL_SQL: | case UL_SQL: |
| // tainted, untaint language: sql | // tainted, untaint language: sql |
| if(connection) | if(connection) |
| dest+=connection->quote(0, row->item.ptr, row->item.size); | dest+=connection->quote(0, fragment->ptr, fragment->size); |
| break; | break; |
| case UL_JS: | case UL_JS: |
| escape(switch(*src) { | escape(switch(*src) { |
| Line 248 size_t String::cstr_bufsize(Untaint_lang | Line 280 size_t String::cstr_bufsize(Untaint_lang |
| break; | break; |
| } | } |
| ); | ); |
| break2: | |
| return dest; | return dest; |
| } | } |
| /** http://www.ietf.org/rfc/rfc2047.txt | |
| RFC | |
| (3) As a replacement for a 'word' entity within a 'phrase', for example, | |
| one that precedes an address in a From, To, or Cc header. The ABNF | |
| definition for 'phrase' from RFC 822 thus becomes: | |
| phrase = 1*( encoded-word / word ) | |
| In this case the set of characters that may be used in a "Q"-encoded | |
| 'encoded-word' is restricted to: <upper and lower case ASCII | |
| letters, decimal digits, "!", "*", "+", "-", "/", "=", and "_" | |
| (underscore, ASCII 95.)>. An 'encoded-word' that appears within a | |
| 'phrase' MUST be separated from any adjacent 'word', 'text' or | |
| 'special' by 'linear-white-space'. | |
| ... | |
| (2) The 8-bit hexadecimal value 20 (e.g., ISO-8859-1 SPACE) may be | |
| represented as "_" (underscore, ASCII 95.). (This character may | |
| not pass through some internetwork mail gateways, but its use | |
| will greatly enhance readability of "Q" encoded data with mail | |
| readers that do not support this encoding.) Note that the "_" | |
| always represents hexadecimal 20, even if the SPACE character | |
| occupies a different code position in the character set in use. | |
| paf: obviously, | |
| without "=", or one could not differ "=E0" and "russian letter a" | |
| and without "_", or in would mean 0x20 | |
| */ | |
| static bool mail_header_char_valid_within_Qencoded(char c) { | |
| return c>='A' && c<='Z' | |
| || c>='a' && c<='Z' | |
| || c>='0' && c<='9' | |
| || strchr("!*+-/", c); | |
| } | |
| char *String::store_to(char *dest, Untaint_lang lang, | char *String::store_to(char *dest, Untaint_lang lang, |
| SQL_Connection *connection, | SQL_Connection *connection, |
| const char *charset) const { | const Request_charsets *charsets) const { |
| // WARNING: | // WARNING: |
| // before any changes check cstr_bufsize first!!! | // before any changes check cstr_bufsize first!!! |
| bool whitespace=true; | bool whitespace=true; |
| const Chunk *chunk=&head; \ | // STRING_FOREACH_FRAGMENT( |
| do { \ | element_type *last = felements+fused; element_type *fragment = felements; for(; fragment<last; fragment++) { |
| const Chunk::Row *row=chunk->rows; \ | |
| for(uint i=0; i<chunk->count; i++, row++) { \ | uchar to_lang=lang==UL_UNSPECIFIED?fragment->lang:lang; |
| if(row==append_here) \ | |
| goto break2; \ | |
| \ | |
| uchar to_lang=lang==UL_UNSPECIFIED?row->item.lang:lang; | |
| char *start=dest; | char *start=dest; |
| Line 280 char *String::store_to(char *dest, Untai | Line 340 char *String::store_to(char *dest, Untai |
| // for ^process{body} evaluation | // for ^process{body} evaluation |
| // tainted, untaint language: as-is | // tainted, untaint language: as-is |
| memcpy(dest, row->item.ptr, row->item.size); | memcpy(dest, fragment->ptr, fragment->size); |
| dest+=row->item.size; | dest+=fragment->size; |
| break; | break; |
| case UL_FILE_SPEC: | case UL_FILE_SPEC: |
| // tainted, untaint language: file [name] | // tainted, untaint language: file [name] |
| escape(switch(*src) { | escape( |
| case ' ': to_char('_'); break; | // Macintosh has problems with small Russian letter 'r' |
| encode(need_file_encode, '+'); | if( *src=='\xF0' && charsets && *charsets->source().name()=="windows-1251" ) { |
| }); | // fixing that letter for most common charset |
| to_char('p'); | |
| } else // fallback to default | |
| encode(need_file_encode, '_'); | |
| ); | |
| break; | break; |
| case UL_URI: | case UL_URI: |
| // tainted, untaint language: uri | // tainted, untaint language: uri |
| escape(switch(*src) { | const void *client_ptr; |
| case ' ': to_char('+'); break; | size_t client_size; |
| encode(need_uri_encode, '%'); | if(charsets) |
| }); | Charset::transcode(charsets->pool(), |
| charsets->source(), fragment->ptr, fragment->size, | |
| charsets->client(), client_ptr, client_size); | |
| else { | |
| client_ptr=fragment->ptr; | |
| client_size=fragment->size; | |
| } | |
| { | |
| const char* src=(const char* )client_ptr; | |
| for(int size=client_size; size--; src++) | |
| encode(need_uri_encode, '%'); | |
| } | |
| break; | break; |
| case UL_HTTP_HEADER: | case UL_HTTP_HEADER: |
| // tainted, untaint language: http-field-content-text | // tainted, untaint language: http-field-content-text |
| escape(switch(*src) { | escape( |
| case ' ': to_char('+'); break; | |
| encode(need_uri_encode, '%'); | encode(need_uri_encode, '%'); |
| }); | ); |
| break; | break; |
| case UL_MAIL_HEADER: | case UL_MAIL_HEADER: |
| // tainted, untaint language: mail-header | // tainted, untaint language: mail-header |
| if(charset) { | // http://www.ietf.org/rfc/rfc2047.txt |
| if(charsets) { | |
| const void *mail_ptr; | |
| size_t mail_size; | |
| Charset::transcode(charsets->pool(), | |
| charsets->source(), fragment->ptr, fragment->size, | |
| charsets->mail(), mail_ptr, mail_size); | |
| CharPtr charset_name=charsets->mail().name()->cstr(); | |
| // Subject: Re: parser3: =?koi8-r?Q?=D3=C5=CD=C9=CE=C1=D2?= | // Subject: Re: parser3: =?koi8-r?Q?=D3=C5=CD=C9=CE=C1=D2?= |
| const char *src=row->item.ptr; | const char* src=(const char* )mail_ptr; |
| bool to_quoted_printable=false; | bool to_quoted_printable=false; |
| for(int size=row->item.size; size--; src++) { | |
| if(*src & 0x80) { | bool email=false; |
| for(const char* end=src+mail_size; src<end; src++) { | |
| //RFC + An 'encoded-word' MUST NOT appear in any portion of an 'addr-spec'. | |
| if(to_quoted_printable && (*src==',' || *src=='<')) { | |
| email=*src=='<'; | |
| dest+=sprintf(dest, "?="); | |
| to_quoted_printable=false; | |
| } | |
| if(!email && ( | |
| !to_quoted_printable && (*src & 0x80) // starting quote-printable-encoding on first 8bit char | |
| || to_quoted_printable && !mail_header_char_valid_within_Qencoded(*src) | |
| )) { | |
| if(!to_quoted_printable) { | if(!to_quoted_printable) { |
| dest+=sprintf(dest, "=?%.15s?Q?", charset); | dest+=sprintf(dest, "=?%s?Q?", charset_name.get()); |
| to_quoted_printable=true; | to_quoted_printable=true; |
| } | } |
| dest+=sprintf(dest, "=%02X", *src & 0xFF); | //RFC Upper case should be used for hexadecimal digits "A" through "F" |
| } else { | if(*src == 0x20) // RFC The 8-bit hexadecimal value 20 (e.g., ISO-8859-1 SPACE) |
| *dest++=*src; | *dest++='_'; // RFC may be represented as "_" |
| } | else |
| dest+=sprintf(dest, "=%02X", *src & 0xFF); | |
| } else | |
| *dest++=*src; | |
| if(*src=='>') | |
| email=false; | |
| } | } |
| if(to_quoted_printable) // close | if(to_quoted_printable) // close |
| dest+=sprintf(dest, "?="); | dest+=sprintf(dest, "?="); |
| } else { | } else { |
| memcpy(dest, row->item.ptr, row->item.size); | memcpy(dest, fragment->ptr, fragment->size); |
| dest+=row->item.size; | dest+=fragment->size; |
| } | } |
| break; | break; |
| case UL_TABLE: | case UL_TABLE: |
| Line 339 char *String::store_to(char *dest, Untai | Line 439 char *String::store_to(char *dest, Untai |
| case UL_SQL: | case UL_SQL: |
| // tainted, untaint language: sql | // tainted, untaint language: sql |
| if(connection) | if(connection) |
| dest+=connection->quote(dest, row->item.ptr, row->item.size); | dest+=connection->quote(dest, fragment->ptr, fragment->size); |
| else | else |
| throw Exception(0, 0, | throw Exception(Exception::undefined_type, |
| this, | Exception::undefined_source, |
| "untaint in SQL language failed - no connection specified"); | "untaint in SQL language failed - no connection specified"); |
| break; | break; |
| case UL_JS: | case UL_JS: |
| Line 375 char *String::store_to(char *dest, Untai | Line 475 char *String::store_to(char *dest, Untai |
| }); | }); |
| break; | break; |
| default: | default: |
| throw Exception(0, 0, | throw Exception(Exception::undefined_type, |
| this, | Exception::undefined_source, |
| "unknown untaint language #%d of %d piece", | "unknown untaint language #%d", |
| static_cast<int>(row->item.lang), | static_cast<int>(to_lang)); // should never |
| i); // never | |
| break; // never | break; // never |
| } | } |
| Line 389 char *String::store_to(char *dest, Untai | Line 488 char *String::store_to(char *dest, Untai |
| for(char *src=start; src<stop; src++) | for(char *src=start; src<stop; src++) |
| switch(*src) { | switch(*src) { |
| // of all consequent white space chars leaving only first one | // of all consequent white space chars leaving only first one |
| case ' ': case '\n': case '\t': | case ' ': case '\r': case '\n': case '\t': |
| if(!whitespace) { | if(!whitespace) { |
| *dest++=*src; | *dest++=*src; |
| whitespace=true; | whitespace=true; |
| Line 402 char *String::store_to(char *dest, Untai | Line 501 char *String::store_to(char *dest, Untai |
| }; | }; |
| } else // piece without optimization | } else // piece without optimization |
| whitespace=false; | whitespace=false; |
| // ); | |
| } | |
| } \ | |
| chunk=row->link; \ | |
| } while(chunk); \ | |
| break2: | |
| return dest; | return dest; |
| } | } |
| char *String::cstr_debug_origins() const { | char *String::cstr_debug_origins(Pool& pool) const { |
| char *result=(char *)malloc(size()+used_rows()*MAX_STRING*2); | //_asm int 3; |
| char *result=new(pool) char[size()+fused*MAX_STRING*2]; | |
| char *dest=result; | char *dest=result; |
| const Chunk *chunk=&head; | STRING_FOREACH_FRAGMENT( |
| do { | IFNDEF_NO_STRING_ORIGIN( |
| const Chunk::Row *row=chunk->rows; | if(fragment->origin.file) |
| for(uint i=0; i<chunk->count; i++, row++) { | dest+=sprintf(dest, ORIGIN_FILE_LINE_FORMAT, |
| if(row==append_here) | fragment->origin.file, |
| goto break2; | 1+fragment->origin.line); |
| else | |
| #ifndef NO_STRING_ORIGIN | dest+=sprintf(dest, "<unknown>"); |
| if(row->item.origin.file) | ); |
| dest+=sprintf(dest, ORIGIN_FILE_LINE_FORMAT, | uchar show_lang=fragment->lang & ~UL_OPTIMIZE_BIT; |
| row->item.origin.file, | if(show_lang>=sizeof(String_Untaint_lang_name)/sizeof(String_Untaint_lang_name[0])) |
| 1+row->item.origin.line); | throw Exception(Exception::undefined_type, |
| else | Exception::undefined_source, |
| dest+=sprintf(dest, "<unknown>"); | "unknown untaint language #%d", |
| #endif | static_cast<int>(show_lang)); // sould never |
| dest+=sprintf(dest, "#%s: ", | |
| String_Untaint_lang_name[row->item.lang]); | dest+=sprintf(dest, "#%s%s: ", |
| char *dest_after_origins=dest; | String_Untaint_lang_name[show_lang], |
| fragment->lang & UL_OPTIMIZE_BIT?".O":""); | |
| char *dest_after_origins=dest; | |
| memcpy(dest, row->item.ptr, row->item.size); | memcpy(dest, fragment->ptr, fragment->size); |
| dest+=row->item.size; | dest+=fragment->size; |
| remove_crlf(dest_after_origins, dest); | remove_crlf(dest_after_origins, dest); |
| to_char('\n'); | to_char('\n'); |
| } | ); |
| chunk=row->link; | |
| } while(chunk); | |
| break2: | |
| *dest=0; | *dest=0; |
| return result; | return result; |
| } | } |