--- parser3/src/main/untaint.C 2002/12/05 13:00:53 1.112 +++ parser3/src/main/untaint.C 2003/01/21 15:51:15 1.115 @@ -1,11 +1,11 @@ /** @file Parser: String class part: untaint mechanizm. - Copyright(c) 2001, 2002 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_UNTAINT_C="$Date: 2002/12/05 13:00:53 $"; +static const char* IDENT_UNTAINT_C="$Date: 2003/01/21 15:51:15 $"; #include "pa_pool.h" #include "pa_string.h" @@ -414,7 +414,12 @@ char *String::store_to(char *dest, Untai case UL_FILE_SPEC: // tainted, untaint language: file [name] escape( - encode(need_file_encode, '_'); + // Macintosh has problems with small Russian letter 'r' + if( *src=='\xF0' && pool().get_source_charset().name()=="windows-1251" ) { + // fixing that letter for most common charset + to_char('p'); + } else // fallback to default + encode(need_file_encode, '_'); ); break; case UL_URI: