phone-side
/
nuttx-bb
9
0
Fork 0
Code Releases Activity

Not setting error on driver errors 

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@1014 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
patacongo 2008-10-09 20:22:21 +00:00
parent 50ef17e81a
commit 4c22932c47
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nuttx/ChangeLog
View File

@ -492,6 +492,7 @@
* Added USB device side driver for the DM320 (untested at initial checkin)
* Fixed an error in a previous (post 0.3.15) check-in that broke the LPC214x system timer.
* Fixed serial drive bugs related to (1) open counts and (2) recognizing O_NONBLOCK on read.
* Fixed an error in read(); it was not setting the errno on errors returned from the driver.

1
nuttx/Documentation/NuttX.html
View File

@ -1082,6 +1082,7 @@ nuttx-0.3.16 2008-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr>
* Added USB device side driver for the DM320 (untested at initial checkin)
* Fixed an error in a previous (post 0.3.15) check-in that broke the LPC214x system timer.
* Fixed serial drive bugs related to (1) open counts and (2) recognizing O_NONBLOCK on read.
* Fixed an error in read(); it was not setting the errno on errors returned from the driver.
pascal-0.1.3 2008-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr>

15
nuttx/fs/fs_read.c
View File

@ -52,14 +52,14 @@
ssize_t read(int fd, FAR void *buf, size_t nbytes)
{
FAR struct filelist *list;
int ret = EBADF;
int ret = -EBADF;
/* Get the thread-specific file list */
list = sched_getfiles();
if (!list)
{
*get_errno_ptr() = EMFILE;
errno = EMFILE;
return ERROR;
}
@ -90,6 +90,17 @@ ssize_t read(int fd, FAR void *buf, size_t nbytes)
}
}
}
/* If an error occurred, set errno and return -1 (ERROR) */
if (ret < 0)
{
errno = -ret;
return ERROR;
}
/* Otherwise, return the number of bytes read */
return ret;
}