From: Jes Sorensen <jes.soren...@redhat.com> Signed-off-by: Jes Sorensen <jes.soren...@redhat.com> --- cutils.c | 34 ++++++++++++++++++++++++++-------- 1 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/cutils.c b/cutils.c index dabbed4..67767a9 100644 --- a/cutils.c +++ b/cutils.c @@ -259,34 +259,52 @@ int fcntl_setfl(int fd, int flag) */ uint64_t strtobytes(const char *nptr, char **end) { - uint64_t value; + uint64_t retval = 0; char *endptr; + int mul_required = 0; + double val, mul = 1; + + endptr = (char *)nptr + strspn(nptr, " 0123456789"); + if (*endptr == '.') { + mul_required = 1; + } + + val = strtod(nptr, &endptr); + + if (val < 0) + goto fail; - value = strtoll(nptr, &endptr, 0); switch (*endptr++) { case 'K': case 'k': - value <<= 10; + mul = 1 << 10; break; case 0: + case ' ': + if (mul_required) { + goto fail; + } case 'M': case 'm': - value <<= 20; + mul = 1ULL << 20; break; case 'G': case 'g': - value <<= 30; + mul = 1ULL << 30; break; case 'T': case 't': - value <<= 40; + mul = 1ULL << 40; break; default: - value = 0; + goto fail; } + retval = (uint64_t)(val * mul); + if (end) *end = endptr; - return value; +fail: + return retval; } -- 1.7.2.3