Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:12.2
vsftpd
vsftpd-2.0.5-utf8-log-names.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File vsftpd-2.0.5-utf8-log-names.patch of Package vsftpd
Index: str.c =================================================================== --- str.c.orig 2012-03-28 17:25:40.000000000 +0200 +++ str.c 2012-04-10 16:10:59.965767345 +0200 @@ -27,6 +27,24 @@ const char* p_buf2, unsigned int buf2_len); /* Private functions */ +static int +continuation_char(unsigned char str, int* val) +{ + if ((str & 0xc0) != 0x80) /* 10xxxxxx */ + return 0; + (*val) <<= 6; + (*val) |= str & 0x3f; + return 1; +} + +static int +unicode_valid(int b) +{ + return (b < 0x110000 && ((b & 0xFFFFF800) != 0xD800) + && (b < 0xFDD0 || b > 0xFDEF) + && (b & 0xFFFE) != 0xFFFE); +} + static void s_setbuf(struct mystr* p_str, char* p_newbuf) { @@ -181,6 +199,45 @@ p_str->p_buf[res_len - 1] = '\0'; } +int str_is_utf8( const struct mystr* p_str ) +{ + unsigned int i; + int min = 0, val = 0; + + for(i = 0; i < p_str->len; i++) + { + if( (unsigned char)p_str->p_buf[i] < 128) continue; + + if((p_str->p_buf[i] & 0xe0) == 0xc0) { /* 110xxxxx */ + if((p_str->p_buf[i] & 0x1e) == 0) return 0; + i++; + if((p_str->p_buf[i] & 0xc0) != 0x80) /* 10xxxxxx */ + return 0; + } else { + if((p_str->p_buf[i] & 0xf0) == 0xe0) { /* 1110xxxx */ + min = (1 << 11); + val = p_str->p_buf[i] & 0x0f; + goto TWO_REMAINING; + } else if((p_str->p_buf[i] & 0xf8) == 0xf0) { /* 11110xxx */ + min = (1 << 16); + val = p_str->p_buf[i] & 0x07; + } else { + return 0; + } + i++; + if(!continuation_char(p_str->p_buf[i], &val)) return 0; +TWO_REMAINING: + i++; + if(!continuation_char(p_str->p_buf[i], &val)) return 0; + i++; + if(!continuation_char(p_str->p_buf[i], &val)) return 0; + if(val < min || !unicode_valid(val)) return 0; + } + } + return 1; +} + + int str_isempty(const struct mystr* p_str) { @@ -702,11 +759,13 @@ str_replace_unprintable(struct mystr* p_str, char new_char) { unsigned int i; - for (i=0; i < p_str->len; i++) - { - if (!vsf_sysutil_isprint(p_str->p_buf[i])) + if( !str_is_utf8( p_str ) ) { + for (i=0; i < p_str->len; i++) { - p_str->p_buf[i] = new_char; + if (!vsf_sysutil_isprint(p_str->p_buf[i])) + { + p_str->p_buf[i] = new_char; + } } } } Index: str.h =================================================================== --- str.h.orig 2008-12-17 06:53:23.000000000 +0100 +++ str.h 2012-04-10 16:10:59.965767345 +0200 @@ -36,6 +36,7 @@ void str_trunc(struct mystr* p_str, unsigned int trunc_len); void str_reserve(struct mystr* p_str, unsigned int res_len); +int str_is_utf8(const struct mystr* p_str); int str_isempty(const struct mystr* p_str); unsigned int str_getlen(const struct mystr* p_str); const char* str_getbuf(const struct mystr* p_str);
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor