Mercurial > sdl-ios-xcode
annotate autogen.sh @ 3539:f2846bf19360
Fixed bug #896
John Popplewell 2009-12-08 23:05:50 PST
Originally reported by AKFoerster on the mailing list.
Error decoding UTF8 Russian text to UTF-16LE on Windows, but specifically on
platforms without iconv support (the default on Windows).
Valid UTF8 characters are flagged as being overlong and then substituted by the
UNKNOWN_UNICODE character.
After studying the testiconv.c example program, reading the RFCs and putting
some printf statements in SDL_iconv.c the problem is in a test for 'Maximum
overlong sequences', specifically 4.2.1, which is carried out by the following
code:
} else if ( p[0] >= 0xC0 ) {
if ( (p[0] & 0xE0) != 0xC0 ) {
/* Skip illegal sequences
return SDL_ICONV_EILSEQ;
*/
ch = UNKNOWN_UNICODE;
} else {
if ( (p[0] & 0xCE) == 0xC0 ) { <<<<<<<< here
overlong = SDL_TRUE;
}
ch = (Uint32)(p[0] & 0x1F);
left = 1;
}
} else {
Here is the 2-byte encoding of a character in range 00000080 - 000007FF
110xxxxx 10xxxxxx
The line in question is supposed to be checking for an overlong sequence which
would be less than
11000001 10111111
which should be represented as a single byte.
BUT, the mask value (0xCE) is wrong, it isn't checking the top-most bit:
11000001 value
11001110 mask (incorrect)
^
and should be (0xDE):
11000001 value
11011110 mask (correct)
making the above code:
} else if ( p[0] >= 0xC0 ) {
if ( (p[0] & 0xE0) != 0xC0 ) {
/* Skip illegal sequences
return SDL_ICONV_EILSEQ;
*/
ch = UNKNOWN_UNICODE;
} else {
if ( (p[0] & 0xDE) == 0xC0 ) { <<<<<<<< here
overlong = SDL_TRUE;
}
ch = (Uint32)(p[0] & 0x1F);
left = 1;
}
} else {
I can supply a test program and/or a patch if required,
best regards,
John Popplewell
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Fri, 11 Dec 2009 08:03:43 +0000 |
parents | c8d350c981ff |
children |
rev | line source |
---|---|
0 | 1 #!/bin/sh |
2 # | |
1376
4a47f20705eb
I don't think we need aclocal anymore (comes from the automake package)
Sam Lantinga <slouken@libsdl.org>
parents:
1361
diff
changeset
|
3 echo "Generating build information using autoconf" |
0 | 4 echo "This may take a while ..." |
5 | |
3377
c8d350c981ff
gcc can't generate dependencies for a file that doesn't exist, so first create SDL_revision.h
Sam Lantinga <slouken@libsdl.org>
parents:
3342
diff
changeset
|
6 # Generate SDL_revision.h |
c8d350c981ff
gcc can't generate dependencies for a file that doesn't exist, so first create SDL_revision.h
Sam Lantinga <slouken@libsdl.org>
parents:
3342
diff
changeset
|
7 sh build-scripts/updaterev.sh |
c8d350c981ff
gcc can't generate dependencies for a file that doesn't exist, so first create SDL_revision.h
Sam Lantinga <slouken@libsdl.org>
parents:
3342
diff
changeset
|
8 |
0 | 9 # Regenerate configuration files |
3342
3da232c5980a
Split acinclude.m4 into its constituent parts for easy upgrading
Sam Lantinga <slouken@libsdl.org>
parents:
1832
diff
changeset
|
10 cat acinclude/* >aclocal.m4 |
1564
4950a25bd91e
Show an error message if autoconf isn't found
Sam Lantinga <slouken@libsdl.org>
parents:
1563
diff
changeset
|
11 found=false |
1832
c687a8691de3
Added yet another variant of autoconf to the list
Sam Lantinga <slouken@libsdl.org>
parents:
1564
diff
changeset
|
12 for autoconf in autoconf autoconf259 autoconf-2.59 |
1564
4950a25bd91e
Show an error message if autoconf isn't found
Sam Lantinga <slouken@libsdl.org>
parents:
1563
diff
changeset
|
13 do if which $autoconf >/dev/null 2>&1; then $autoconf && found=true; break; fi |
1563
b054590b967a
Fall back to autogen259 if autogen isn't available
Sam Lantinga <slouken@libsdl.org>
parents:
1380
diff
changeset
|
14 done |
1564
4950a25bd91e
Show an error message if autoconf isn't found
Sam Lantinga <slouken@libsdl.org>
parents:
1563
diff
changeset
|
15 if test x$found = xfalse; then |
4950a25bd91e
Show an error message if autoconf isn't found
Sam Lantinga <slouken@libsdl.org>
parents:
1563
diff
changeset
|
16 echo "Couldn't find autoconf, aborting" |
4950a25bd91e
Show an error message if autoconf isn't found
Sam Lantinga <slouken@libsdl.org>
parents:
1563
diff
changeset
|
17 exit 1 |
4950a25bd91e
Show an error message if autoconf isn't found
Sam Lantinga <slouken@libsdl.org>
parents:
1563
diff
changeset
|
18 fi |
1380
d94b080ff6ce
Completely removed dependency on automake
Sam Lantinga <slouken@libsdl.org>
parents:
1376
diff
changeset
|
19 (cd test; sh autogen.sh) |
0 | 20 |
21 # Run configure for this platform | |
22 echo "Now you are ready to run ./configure" |