From: Max Krummenacher Date: Wed, 5 Aug 2015 15:16:58 +0000 (+0200) Subject: fs/fs.c: read up to EOF when len would read past EOF X-Git-Tag: v2025.01-rc5-pxa1908~12054 X-Git-Url: http://git.dujemihanovic.xyz/%22http:/www.sics.se/static/%7B%7B?a=commitdiff_plain;h=7a3e70c;p=u-boot.git 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 aka read(2) behaviour for convenient use in U-Boot scripts. Signed-off-by: Max Krummenacher Signed-off-by: Marcel Ziswiler Acked-by: Marek Vasut Signed-off-by: Stefan Agner Signed-off-by: Marcel Ziswiler --- diff --git a/fs/fs.c b/fs/fs.c index ac0897d94a..827b143e85 100644 --- a/fs/fs.c +++ b/fs/fs.c @@ -301,10 +301,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;