From 25ead84c946e2f3b87531bd6c099f45cdbed08e6 Mon Sep 17 00:00:00 2001 From: juhosg Date: Wed, 21 Sep 2011 11:47:35 +0000 Subject: package/maccalc: don't expect to get all data in one read Signed-off-by: Alexander Gordeev git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28266 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/maccalc/src/main.c | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) (limited to 'package/maccalc') diff --git a/package/maccalc/src/main.c b/package/maccalc/src/main.c index e1e12cd96f..dcb5f55c55 100644 --- a/package/maccalc/src/main.c +++ b/package/maccalc/src/main.c @@ -9,6 +9,7 @@ * */ +#include #include #include #include @@ -124,6 +125,34 @@ static int maccalc_do_mac2bin(int argc, const char *argv[]) return 0; } +static ssize_t read_safe(int fd, void *buf, size_t count) +{ + ssize_t total = 0; + ssize_t r; + + while(count > 0) { + r = read(fd, buf, count); + if (r == 0) + /* EOF */ + break; + if (r < 0) { + if (errno == EINTR) + /* interrupted by a signal, restart */ + continue; + /* error */ + total = -1; + break; + } + + /* ok */ + total += r; + count -= r; + buf += r; + } + + return total; +} + static int maccalc_do_bin2mac(int argc, const char *argv[]) { unsigned char mac[MAC_ADDRESS_LEN]; @@ -134,7 +163,7 @@ static int maccalc_do_bin2mac(int argc, const char *argv[]) return ERR_INVALID; } - c = read(STDIN_FILENO, mac, sizeof(mac)); + c = read_safe(STDIN_FILENO, mac, sizeof(mac)); if (c != sizeof(mac)) { fprintf(stderr, "failed to read from stdin\n"); return ERR_IO; -- cgit v1.2.3