diff options
author | Max Krummenacher <max.krummenacher@toradex.com> | 2014-09-04 13:46:02 +0200 |
---|---|---|
committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2015-04-15 13:56:53 +0200 |
commit | 089fd3f58a20defae9a36d34d5982ff50997b77f (patch) | |
tree | af474a1427d5c35b096aba9d1f7a1fc51eb07f0d /fs | |
parent | 6e1476cadb428edcc9549962fc0a6e90415db54a (diff) |
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
Diffstat (limited to 'fs')
-rw-r--r-- | fs/fs.c | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -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; |