Calculate new position before validtiy check in lseek() to simplify
code a bit as well as make following commit simpler. This should be
harmless thing to do, since we don't actually use calculated value
unless it passes the validity check.
Signed-off-by: Andrey Smirnov <andrew.smir...@gmail.com>
---
fs/fs.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/fs/fs.c b/fs/fs.c
index 6a62fb98b..9372b9981 100644
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -421,21 +421,21 @@ loff_t lseek(int fildes, loff_t offset, int whence)
switch (whence) {
case SEEK_SET:
+ pos = offset;
if (f->size != FILE_SIZE_STREAM && offset > f->size)
goto out;
if (IS_ERR_VALUE(offset))
goto out;
- pos = offset;
break;
case SEEK_CUR:
- if (f->size != FILE_SIZE_STREAM && offset + f->pos > f->size)
- goto out;
pos = f->pos + offset;
+ if (f->size != FILE_SIZE_STREAM && pos > f->size)
+ goto out;
break;
case SEEK_END:
+ pos = f->size + offset;
if (offset > 0)
goto out;
- pos = f->size + offset;
break;
default:
goto out;
--
2.20.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
