We have different implementations of read_full() and write_full() in our host tools, use a common implementation for these.
Signed-off-by: Sascha Hauer <[email protected]> --- scripts/common.c | 36 ++++++++++++++++++++++++++++++++++++ scripts/common.h | 2 ++ scripts/rkimage.c | 39 +++------------------------------------ scripts/socfpga_mkimage.c | 20 -------------------- 4 files changed, 41 insertions(+), 56 deletions(-) diff --git a/scripts/common.c b/scripts/common.c index 5e0139278a..bff08b0810 100644 --- a/scripts/common.c +++ b/scripts/common.c @@ -130,3 +130,39 @@ out: return ret; } + +int read_full(int fd, void *buf, size_t size) +{ + size_t insize = size; + int now; + int total = 0; + + while (size) { + now = read(fd, buf, size); + if (now == 0) + return total; + if (now < 0) + return now; + total += now; + size -= now; + buf += now; + } + + return insize; +} + +int write_full(int fd, void *buf, size_t size) +{ + size_t insize = size; + int now; + + while (size) { + now = write(fd, buf, size); + if (now <= 0) + return now; + size -= now; + buf += now; + } + + return insize; +} diff --git a/scripts/common.h b/scripts/common.h index a15691f039..820108c52c 100644 --- a/scripts/common.h +++ b/scripts/common.h @@ -4,5 +4,7 @@ int read_file_2(const char *filename, size_t *size, void **outbuf, size_t max_size); void *read_file(const char *filename, size_t *size); int write_file(const char *filename, const void *buf, size_t size); +int read_full(int fd, void *buf, size_t size); +int write_full(int fd, void *buf, size_t size); #endif /* __COMMON_H */ diff --git a/scripts/rkimage.c b/scripts/rkimage.c index dde9724886..be89c1ad34 100644 --- a/scripts/rkimage.c +++ b/scripts/rkimage.c @@ -13,6 +13,9 @@ #include <errno.h> #include <stdbool.h> +#include "../common.h" +#include "../common.c" + #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0])) #define ALIGN(x, a) (((x) + (a) - 1) & ~((a) - 1)) @@ -149,42 +152,6 @@ static void usage(const char *prgname) prgname); } -static int read_full(int fd, void *buf, size_t size) -{ - size_t insize = size; - int now; - int total = 0; - - while (size) { - now = read(fd, buf, size); - if (now == 0) - return total; - if (now < 0) - return now; - total += now; - size -= now; - buf += now; - } - - return insize; -} - -static int write_full(int fd, void *buf, size_t size) -{ - size_t insize = size; - int now; - - while (size) { - now = write(fd, buf, size); - if (now <= 0) - return now; - size -= now; - buf += now; - } - - return insize; -} - int main(int argc, char *argv[]) { int opt, i, fd; diff --git a/scripts/socfpga_mkimage.c b/scripts/socfpga_mkimage.c index 3ef41edf8f..d37ca8585a 100644 --- a/scripts/socfpga_mkimage.c +++ b/scripts/socfpga_mkimage.c @@ -68,26 +68,6 @@ static uint32_t bb_header[] = { 0xea00006b, /* entry. b 0x200 (offset may be adjusted) */ }; -static int read_full(int fd, void *buf, size_t size) -{ - size_t insize = size; - int now; - int total = 0; - - while (size) { - now = read(fd, buf, size); - if (now == 0) - return total; - if (now < 0) - return now; - total += now; - size -= now; - buf += now; - } - - return insize; -} - static const uint32_t crc_table[256] = { 0x00000000, 0x04c11db7, 0x09823b6e, 0x0d4326d9, 0x130476dc, 0x17c56b6b, 0x1a864db2, 0x1e475005, 0x2608edb8, 0x22c9f00f, 0x2f8ad6d6, 0x2b4bcb61, -- 2.30.2 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
