diff options
| author | Thibault Ferrante <thibaultferrante@gmail.com> | 2021-08-24 17:29:50 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-09-02 10:17:45 -0400 |
| commit | a2bd1caf2328b1610de84ca28cc4e808805214e5 (patch) | |
| tree | 7187f3f64d348814e34d1e80937cde1837427132 | |
| parent | 4ddf370b937d1bedd45c6395f283a157832d8864 (diff) | |
| download | u-boot-WIP/2021-09-02-assorted-platform-and-bugfixes.tar.gz | |
tools: env: Handle shorter read callsWIP/2021-09-02-assorted-platform-and-bugfixes
On some cases, the actual number of bytes read can be shorter
than what was requested. This can be handled gracefully by
taking this difference into account instead of exiting.
Signed-off-by: Thibault Ferrante <thibault.ferrante@gmail.com>
| -rw-r--r-- | tools/env/fw_env.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c index 2a61a5d6f0..e39c39e23a 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -951,21 +951,23 @@ static int flash_read_buf(int dev, int fd, void *buf, size_t count, DEVNAME(dev), strerror(errno)); return -1; } - if (rc != readlen) { - fprintf(stderr, - "Read error on %s: Attempted to read %zd bytes but got %d\n", - DEVNAME(dev), readlen, rc); - return -1; - } #ifdef DEBUG fprintf(stderr, "Read 0x%x bytes at 0x%llx on %s\n", rc, (unsigned long long)blockstart + block_seek, DEVNAME(dev)); #endif - processed += readlen; - readlen = min(blocklen, count - processed); - block_seek = 0; - blockstart += blocklen; + processed += rc; + if (rc != readlen) { + fprintf(stderr, + "Warning on %s: Attempted to read %zd bytes but got %d\n", + DEVNAME(dev), readlen, rc); + readlen -= rc; + block_seek += rc; + } else { + blockstart += blocklen; + readlen = min(blocklen, count - processed); + block_seek = 0; + } } return processed; |