From 089fd3f58a20defae9a36d34d5982ff50997b77f Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Thu, 4 Sep 2014 13:46:02 +0200 Subject: fs/fs.c: read up to EOF when len would read past EOF http://lists.denx.de/pipermail/u-boot/2012-September/134347.html allows for reading files in chunks from the shell. When this feature is used to read past the end of a file an error was returned instead of returning the bytes read up to the end of file. Thus the following fails in the shell: offset = 0 len = chunksize do read file, offset, len write data until bytes_read < len The patch changes the behaviour to printing an informational message and returning the actual read number of bytes. (cherry picked from commit 4641b92713300089c5980259ba31e668657aa75d) Conflicts: fs/fs.c --- fs/fs.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'fs') diff --git a/fs/fs.c b/fs/fs.c index 483273fe20..1433d35ab2 100644 --- a/fs/fs.c +++ b/fs/fs.c @@ -300,10 +300,8 @@ int fs_read(const char *filename, ulong addr, loff_t offset, loff_t len, unmap_sysmem(buf); /* If we requested a specific number of bytes, check we got it */ - if (ret == 0 && len && *actread != len) { - printf("** Unable to read file %s **\n", filename); - ret = -1; - } + if (ret == 0 && len && *actread != len) + printf("** %s shorter than offset + len **\n", filename); fs_close(); return ret; -- cgit v1.2.3