d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use strcasecmp() instead of strcmp() when checking user-supplied encoding

Browse Source 
names so that encoding names are treated as case-insensitive.  This allows
the use of 'utf-8' instead of 'UTF-8' for example and matches the behavior
of iconv(1).

PR:		167977
Submitted by:	buganini@gmail.com
MFC after:	1 week
This commit is contained in:
John Baldwin 2014-06-09 19:27:47 +00:00
parent 238b419f41
commit 0cbce0671e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/libkern/iconv.c
View File

@ -168,8 +168,8 @@ iconv_lookupcs(const char *to, const char *from, struct iconv_cspair **cspp)
struct iconv_cspair *csp;
TAILQ_FOREACH(csp, &iconv_cslist, cp_link) {
if (strcmp(csp->cp_to, to) == 0 &&
strcmp(csp->cp_from, from) == 0) {
if (strcasecmp(csp->cp_to, to) == 0 &&
strcasecmp(csp->cp_from, from) == 0) {
if (cspp)
*cspp = csp;
return 0;

4
sys/libkern/iconv_ucs.c
View File

@ -102,9 +102,9 @@ iconv_ucs_open(struct iconv_converter_class *dcp,
if (cspf)
dp->convtype |= KICONV_UCS_COMBINE;
for (i = 0; unicode_family[i].name; i++) {
if (strcmp(from, unicode_family[i].name) == 0)
if (strcasecmp(from, unicode_family[i].name) == 0)
dp->convtype |= unicode_family[i].from_flag;
if (strcmp(to, unicode_family[i].name) == 0)
if (strcasecmp(to, unicode_family[i].name) == 0)
dp->convtype |= unicode_family[i].to_flag;
}
if (strcmp(ENCODING_UNICODE, ENCODING_UTF16) == 0)