debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DtSearch: processing multibyte characters based on locale settings

Browse Source 
to avoid confusion.
This commit is contained in:
Liang Chang
2022-03-02 09:07:33 +00:00
parent c983f2ffc9
commit 14c89d4578
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cde/lib/DtSearch/lang.c
View File

@@ -276,7 +276,7 @@ static int euro_mbtowc (wchar_t *pwc, const char *p, const char *s)
if (p == s) goto done; if (p == s) goto done;
mbtowc (NULL, NULL, 0); len = mbtowc (pwc, p - 1, 2); len = mbtowc (pwc, p - 1, MB_CUR_MAX);
done: done:
if (len < 0 || *pwc > 0xFF) *pwc = 0x100; if (len < 0 || *pwc > 0xFF) *pwc = 0x100;
@@ -302,18 +302,18 @@ static int euro_readchar (READCFP cofunction, void *cofunction_arg, char *outp,
if (*pwc >= 0 && *pwc <= 0x7F) goto done; if (*pwc >= 0 && *pwc <= 0x7F) goto done;
*(outp + len) = cofunction (NULL); *(outp + len++) = cofunction (NULL);
mbtowc (NULL, NULL, 0); if (mbtowc (pwc, outp, ++len) >= 0) goto done; if (mbtowc (pwc, outp, MB_CUR_MAX) >= 0) goto done;
*pwc = 0x100; *pwc = 0x100;
for (;;) { for (;;) {
if (len >= MB_CUR_MAX) break; if (len >= MB_CUR_MAX) break;
*(outp + len) = cofunction (NULL); *(outp + len++) = cofunction (NULL);
mblen (NULL, 0); if (mblen (outp, ++len) >= 0) break; if (mblen (outp, MB_CUR_MAX) >= 0) break;
} }
done: done: