Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-05-25 00:53:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use fl_tolower() for case-insensitive Unicode-aware comparisons

Browse Source
This commit is contained in:
ManoloFLTK
2023-02-06 18:40:19 +01:00
parent 55cb8081c7
commit 18c363a0d9
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/numericsort.c
+7 -7
View File
@@ -43,33 +43,33 @@ static int numericsort(struct dirent **A, struct dirent **B, int cs) {
a += len_a;
UTF_B = fl_utf8decode(b, end_b, &len_b);
b += len_b;
if (UTF_A < 255 && UTF_B < 255 && isdigit(UTF_A) && isdigit(UTF_B)) {
if (UTF_A <= 255 && UTF_B <= 255 && isdigit(UTF_A) && isdigit(UTF_B)) {
int diff,magdiff;
while (UTF_A == '0') {UTF_A = fl_utf8decode(a, end_a, &len_a); a += len_a;}
while (UTF_B == '0') {UTF_B = fl_utf8decode(b, end_b, &len_b); b += len_b;}
while (UTF_A < 255 && isdigit(UTF_A) && UTF_A == UTF_B) {
while (UTF_A <= 255 && isdigit(UTF_A) && UTF_A == UTF_B) {
UTF_A = fl_utf8decode(a, end_a, &len_a); a += len_a;
UTF_B = fl_utf8decode(b, end_b, &len_b); b += len_b;
}
diff = (UTF_A < 255 && UTF_B < 255 && isdigit(UTF_A) && isdigit(UTF_B)) ? UTF_A - UTF_B : 0;
diff = (UTF_A <= 255 && UTF_B <= 255 && isdigit(UTF_A) && isdigit(UTF_B)) ? UTF_A - UTF_B : 0;
magdiff = 0;
while (UTF_A < 255 && isdigit(UTF_A)) {
while (UTF_A <= 255 && isdigit(UTF_A)) {
magdiff++;
UTF_A = fl_utf8decode(a, end_a, &len_a); a += len_a;
}
while (UTF_B < 255 && isdigit(UTF_B)) {
while (UTF_B <= 255 && isdigit(UTF_B)) {
magdiff--;
UTF_B = fl_utf8decode(b, end_b, &len_b); b += len_b;
}
if (magdiff) {ret = magdiff; break;} /* compare # of significant digits */
if (diff) {ret = diff; break;} /* compare first non-zero digit */
} else {
if (cs || UTF_A >= 255 || UTF_B >= 255) {
if (cs) {
/* compare case-sensitive */
if ((ret = UTF_A - UTF_B)) break;
} else {
/* compare case-insensitive */
if ((ret = tolower(UTF_A)-tolower(UTF_B))) break;
if ((ret = fl_tolower(UTF_A) - fl_tolower(UTF_B))) break;
}
if (a >= end_a) break;