Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* patch by vzsolt which really fixes the problem with zero byte buffers

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22895 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus 2007-11-11 12:56:46 +00:00
parent 0d8939aea7
commit 1185d93240
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/add-ons/translators/stxt/STXTTranslator.cpp
View File

@ -214,21 +214,23 @@ file_ascmagic(const unsigned char *buf, size_t nbytes, BMimeType* mimeType,
* the text converted into one-my_unichar-per-character Unicode in
* ubuf, and the number of characters converted in ulen.
*/
if (looks_ascii(buf, nbytes, ubuf, &ulen)) {
code = "ASCII";
encoding = NULL; //"us-ascii";
type = "text";
if (nbytes == 1)
rv = 1;
} else if (nbytes == 0 || looks_utf8(buf, nbytes, ubuf, &ulen)) {
if (nbytes == 0) {
code = "UTF-8 Unicode";
encoding = NULL; // "UTF-8";
type = "text";
if (nbytes == 0) {
// this is also the Haiku default encoding
// in case we have an empty buffer
rv = 1;
} else if (looks_ascii(buf, nbytes, ubuf, &ulen)) {
code = "ASCII";
encoding = NULL; //"us-ascii";
type = "text";
if (nbytes == 1) {
// no further tests
rv = 1;
}
} else if (looks_utf8(buf, nbytes, ubuf, &ulen)) {
code = "UTF-8 Unicode";
encoding = NULL; // "UTF-8";
type = "text";
} else if ((i = looks_unicode(buf, nbytes, ubuf, &ulen)) != 0) {
if (i == 1) {
code = "Little-endian UTF-16 Unicode";