mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Made LDAP_UTF8_CHARLEN/ldap_utf8_charlen table-driven.

Browse Source
This commit is contained in:
Howard Chu 2001-12-29 02:57:32 +00:00
parent 40dc0aa329
commit 729fe56698
3 changed files with 19 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/ldap_pvt_uc.h
View File

@ -76,9 +76,11 @@ LDAP_F (char *) ldap_utf8_strpbrk( const char* str, const char *set);
LDAP_F (char*) ldap_utf8_strtok( char* sp, const char* sep, char **last); LDAP_F (char*) ldap_utf8_strtok( char* sp, const char* sep, char **last);
/* Optimizations */ /* Optimizations */
#define LDAP_UTF8_ISASCII(p) ( * (const unsigned char *) (p) < 0x80 ) LDAP_V (const char) ldap_utf8_lentab[128];
#define LDAP_UTF8_ISASCII(p) ( *(unsigned char *)(p) ^ 0x80 )
#define LDAP_UTF8_CHARLEN(p) ( LDAP_UTF8_ISASCII(p) \ #define LDAP_UTF8_CHARLEN(p) ( LDAP_UTF8_ISASCII(p) \
? 1 : ldap_utf8_charlen((p)) ) ? 1 : ldap_utf8_lentab[*(unsigned char *)(p) ^ 0x80] )
#define LDAP_UTF8_OFFSET(p) ( LDAP_UTF8_ISASCII(p) \ #define LDAP_UTF8_OFFSET(p) ( LDAP_UTF8_ISASCII(p) \
? 1 : ldap_utf8_offset((p)) ) ? 1 : ldap_utf8_offset((p)) )

4
libraries/libldap/getdn.c
View File

@ -1950,7 +1950,7 @@ strval2strlen( struct berval *val, unsigned flags, ber_len_t *len )
} }
for ( l = 0, p = val->bv_val; p[ 0 ]; p += cl ) { for ( l = 0, p = val->bv_val; p[ 0 ]; p += cl ) {
cl = ldap_utf8_charlen( p ); cl = LDAP_UTF8_CHARLEN( p );
if ( cl == 0 ) { if ( cl == 0 ) {
/* illegal utf-8 char! */ /* illegal utf-8 char! */
return( -1 ); return( -1 );
@ -2018,7 +2018,7 @@ strval2str( struct berval *val, char *str, unsigned flags, ber_len_t *len )
* of the value * of the value
*/ */
for ( s = 0, d = 0, end = val->bv_len - 1; s < val->bv_len; ) { for ( s = 0, d = 0, end = val->bv_len - 1; s < val->bv_len; ) {
ber_len_t cl = ldap_utf8_charlen( &val->bv_val[ s ] ); ber_len_t cl = LDAP_UTF8_CHARLEN( &val->bv_val[ s ] );
/* /*
* there might be some chars we want to escape in form * there might be some chars we want to escape in form

40
libraries/libldap/utf-8.c
View File

@ -76,36 +76,22 @@ int ldap_utf8_offset( const char * p )
* *
* This function should use a table lookup. * This function should use a table lookup.
*/ */
const char ldap_utf8_lentab[] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 0, 0 };
int ldap_utf8_charlen( const char * p ) int ldap_utf8_charlen( const char * p )
{ {
unsigned c = * (const unsigned char *) p; if (!(*p & 0x80))
return 1;
if ((c & 0xfe ) == 0xfc) { return ldap_utf8_lentab[*(unsigned char *)p ^ 0x80];
return 6;
}
if ((c & 0xfc ) == 0xf8) {
return 5;
}
if ((c & 0xf8 ) == 0xf0) {
return 4;
}
if ((c & 0xf0 ) == 0xe0) {
return 3;
}
if ((c & 0xe0 ) == 0xc0) {
return 2;
}
if ((c & 0x80 ) == 0x80) {
/* INVALID */
return 0;
}
return 1;
} }
/* conv UTF-8 to UCS-4, useful for comparisons */ /* conv UTF-8 to UCS-4, useful for comparisons */