jrd/irssi
1
0
Fork 0
forked from PsychoticNinja/irssi
Code Issues Pull Requests Projects Releases Wiki Activity

Factor code to check if a string is ascii only into a function.

Browse Source 
git-svn-id: file:///var/www/svn.irssi.org/SVN/irssi/trunk@4926 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Emanuele Giaquinta 2008-11-28 23:01:45 +00:00 committed by exg
parent 3ddd984bfc
commit d6be6b9cff
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/core/recode.c
View File

@ -77,6 +77,16 @@ static char *find_conversion(const SERVER_REC *server, const char *target)
return conv; return conv;
} }
static int str_is_ascii(const char *str)
{
int i;
for (i = 0; str[i] != '\0'; i++)
if (str[i] & 0x80)
return 0;
return 1;
}
char *recode_in(const SERVER_REC *server, const char *str, const char *target) char *recode_in(const SERVER_REC *server, const char *str, const char *target)
{ {
const char *from = NULL; const char *from = NULL;
@ -84,7 +94,6 @@ char *recode_in(const SERVER_REC *server, const char *str, const char *target)
char *recoded = NULL; char *recoded = NULL;
gboolean str_is_utf8, recode, autodetect; gboolean str_is_utf8, recode, autodetect;
int len; int len;
int i;
if (!str) if (!str)
return NULL; return NULL;
@ -97,12 +106,8 @@ char *recode_in(const SERVER_REC *server, const char *str, const char *target)
/* Only validate for UTF-8 if an 8-bit encoding. */ /* Only validate for UTF-8 if an 8-bit encoding. */
str_is_utf8 = 0; str_is_utf8 = 0;
for (i = 0; i < len; ++i) { if (!str_is_ascii(str))
if (str[i] & 0x80) { str_is_utf8 = g_utf8_validate(str, len, NULL);
str_is_utf8 = g_utf8_validate(str, len, NULL);
break;
}
}
autodetect = settings_get_bool("recode_autodetect_utf8"); autodetect = settings_get_bool("recode_autodetect_utf8");
if (autodetect && str_is_utf8) if (autodetect && str_is_utf8)