undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

precompose-utf8: do not call checks for non-ascii "utf8"

Browse Source 
As suggested by Linus, this function is not checking UTF-8-ness of the
string; it only is seeing if it is pure US-ASCII.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2012-08-20 11:12:58 -07:00
parent 5f8580ad47
commit 9a27f96705
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
compat/precompose_utf8.c
View File

@ -13,20 +13,20 @@ typedef char *iconv_ibp;
static const char *repo_encoding = "UTF-8"; static const char *repo_encoding = "UTF-8";
static const char *path_encoding = "UTF-8-MAC"; static const char *path_encoding = "UTF-8-MAC";
static size_t has_utf8(const char *s, size_t maxlen, size_t *strlen_c) static size_t has_non_ascii(const char *s, size_t maxlen, size_t *strlen_c)
{ {
const uint8_t *utf8p = (const uint8_t *)s; const uint8_t *ptr = (const uint8_t *)s;
size_t strlen_chars = 0; size_t strlen_chars = 0;
size_t ret = 0; size_t ret = 0;
if (!utf8p || !*utf8p) if (!ptr || !*ptr)
return 0; return 0;
while (*utf8p && maxlen) { while (*ptr && maxlen) {
if (*utf8p & 0x80) if (*ptr & 0x80)
ret++; ret++;
strlen_chars++; strlen_chars++;
utf8p++; ptr++;
maxlen--; maxlen--;
} }
if (strlen_c) if (strlen_c)
@ -77,7 +77,7 @@ void precompose_argv(int argc, const char **argv)
while (i < argc) { while (i < argc) {
size_t namelen; size_t namelen;
oldarg = argv[i]; oldarg = argv[i];
if (has_utf8(oldarg, (size_t)-1, &namelen)) { if (has_non_ascii(oldarg, (size_t)-1, &namelen)) {
newarg = reencode_string_iconv(oldarg, namelen, ic_precompose); newarg = reencode_string_iconv(oldarg, namelen, ic_precompose);
if (newarg) if (newarg)
argv[i] = newarg; argv[i] = newarg;
@ -130,7 +130,7 @@ struct dirent_prec_psx *precompose_utf8_readdir(PREC_DIR *prec_dir)
prec_dir->dirent_nfc->d_ino = res->d_ino; prec_dir->dirent_nfc->d_ino = res->d_ino;
prec_dir->dirent_nfc->d_type = res->d_type; prec_dir->dirent_nfc->d_type = res->d_type;
if ((precomposed_unicode == 1) && has_utf8(res->d_name, (size_t)-1, NULL)) { if ((precomposed_unicode == 1) && has_non_ascii(res->d_name, (size_t)-1, NULL)) {
if (prec_dir->ic_precompose == (iconv_t)-1) { if (prec_dir->ic_precompose == (iconv_t)-1) {
die("iconv_open(%s,%s) failed, but needed:\n" die("iconv_open(%s,%s) failed, but needed:\n"
" precomposed unicode is not supported.\n" " precomposed unicode is not supported.\n"