devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

open_utf8: Actually use the result of read/write.

Browse source 
This silences warnings on some compilers but is anyway a good idea.

Change-Id: Ib566ab59a5d1cb433da466f3ce0c32ff150eb52e
This commit is contained in:
Thomas Martitz 2014-06-29 12:23:48 +02:00
parent 7b377d29fb
commit 5877f7b5c0
1 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
apps/misc.c
View file

@ -1111,6 +1111,7 @@ int split_string(char *str, const char split_char, char *vector[], const int vec
int open_utf8(const char* pathname, int flags)
{
ssize_t ret;
int fd;
unsigned char bom[BOM_UTF_8_SIZE];
@ -1120,16 +1121,23 @@ int open_utf8(const char* pathname, int flags)
if(flags & (O_TRUNC | O_WRONLY))
{
write(fd, BOM_UTF_8, BOM_UTF_8_SIZE);
ret = write(fd, BOM_UTF_8, BOM_UTF_8_SIZE);
}
else
{
read(fd, bom, BOM_UTF_8_SIZE);
ret = read(fd, bom, BOM_UTF_8_SIZE);
/* check for BOM */
if(memcmp(bom, BOM_UTF_8, BOM_UTF_8_SIZE))
lseek(fd, 0, SEEK_SET);
if (ret == BOM_UTF_8_SIZE)
{
if(memcmp(bom, BOM_UTF_8, BOM_UTF_8_SIZE))
lseek(fd, 0, SEEK_SET);
}
}
return fd;
/* read or write failure, do not continue */
if (ret < 0)
close(fd);
return ret >= 0 ? fd : -1;
}