From 24aff819a4db1764de61fb70279558159f5786dd Mon Sep 17 00:00:00 2001 From: patacongo Date: Thu, 9 Oct 2008 20:22:21 +0000 Subject: [PATCH] Not setting error on driver errors git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1014 42af7a65-404d-4744-a932-0658087f49c3 --- ChangeLog | 1 + Documentation/NuttX.html | 1 + fs/fs_read.c | 15 +++++++++++++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 181967a05d..3ceb813c5e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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. diff --git a/Documentation/NuttX.html b/Documentation/NuttX.html index 09f2b465c7..7445634d04 100644 --- a/Documentation/NuttX.html +++ b/Documentation/NuttX.html @@ -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> diff --git a/fs/fs_read.c b/fs/fs_read.c index 9f171a3165..6deb674b16 100644 --- a/fs/fs_read.c +++ b/fs/fs_read.c @@ -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; }