Rockbox open source high quality audio player as a Music Player Daemon
mpris
rockbox
mpd
libadwaita
audio
rust
zig
deno
unicode: Unify check for UTF-16 BOM
Adds utf16_has_bom function
Change-Id: I67ea474c9cf6ca6e6684351c2f54131164b7903c
+43
-33
+7
-8
apps/cuesheet.c
+7
-8
apps/cuesheet.c
···
231
231
char_enc = CHAR_ENC_UTF_8;
232
232
bom_read = BOM_UTF_8_SIZE;
233
233
}
234
-
else if(!memcmp(line, BOM_UTF_16_LE, BOM_UTF_16_SIZE))
234
+
else
235
235
{
236
-
char_enc = CHAR_ENC_UTF_16_LE;
237
-
bom_read = BOM_UTF_16_SIZE;
238
-
}
239
-
else if(!memcmp(line, BOM_UTF_16_BE, BOM_UTF_16_SIZE))
240
-
{
241
-
char_enc = CHAR_ENC_UTF_16_BE;
242
-
bom_read = BOM_UTF_16_SIZE;
236
+
bool le;
237
+
if (utf16_has_bom(line, &le))
238
+
{
239
+
char_enc = le ? CHAR_ENC_UTF_16_LE : CHAR_ENC_UTF_16_BE;
240
+
bom_read = BOM_UTF_16_SIZE;
241
+
}
243
242
}
244
243
}
245
244
+22
firmware/common/unicode.c
+22
firmware/common/unicode.c
···
437
437
return utf8;
438
438
}
439
439
440
+
bool utf16_has_bom(const unsigned char *utf16, bool *le)
441
+
{
442
+
unsigned long ucs = utf16[0] << 8 | utf16[1];
443
+
444
+
if (ucs == 0xFEFF) /* Check for BOM */
445
+
{
446
+
*le = false;
447
+
return true;
448
+
}
449
+
450
+
if (ucs == 0xFFFE)
451
+
{
452
+
*le = true;
453
+
return true;
454
+
}
455
+
456
+
/* If there is no BOM let's try to guess it. If one of the bytes is 0x00, it is
457
+
probably the most significant one. */
458
+
*le = utf16[1] == 0;
459
+
return false;
460
+
}
461
+
440
462
#if 0 /* currently unused */
441
463
/* Recode any UTF-16 string to UTF-8 */
442
464
unsigned char* utf16decode(const unsigned char *utf16, unsigned char *utf8,
+2
firmware/include/rbunicode.h
+2
firmware/include/rbunicode.h
···
29
29
#define _RBUNICODE_H_
30
30
31
31
#include "config.h"
32
+
#include <stdbool.h>
32
33
33
34
#define MASK 0xC0 /* 11000000 */
34
35
#define COMP 0x80 /* 10x */
···
58
59
unsigned char* iso_decode(const unsigned char *latin1, unsigned char *utf8, int cp, int count);
59
60
unsigned char* utf16LEdecode(const unsigned char *utf16, unsigned char *utf8, int count);
60
61
unsigned char* utf16BEdecode(const unsigned char *utf16, unsigned char *utf8, int count);
62
+
bool utf16_has_bom(const unsigned char *utf16, bool *le);
61
63
unsigned long utf8length(const unsigned char *utf8);
62
64
const unsigned char* utf8decode(const unsigned char *utf8, unsigned short *ucs);
63
65
void set_codepage(int cp);