Skip to content
Snippets Groups Projects
Commit 24aff819 authored by patacongo's avatar patacongo
Browse files

Not setting error on driver errors

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1014 42af7a65-404d-4744-a932-0658087f49c3
parent fed58710
No related branches found
No related tags found
No related merge requests found
......@@ -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.
......@@ -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>
......
......@@ -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;
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment