From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=57528 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ovr29-0005NA-Hy for qemu-devel@nongnu.org; Wed, 15 Sep 2010 08:24:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Ovr21-00037L-71 for qemu-devel@nongnu.org; Wed, 15 Sep 2010 08:24:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60443) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Ovr20-00037F-UE for qemu-devel@nongnu.org; Wed, 15 Sep 2010 08:24:09 -0400 From: Jes.Sorensen@redhat.com Date: Wed, 15 Sep 2010 14:23:57 +0200 Message-Id: <1284553440-17985-3-git-send-email-Jes.Sorensen@redhat.com> In-Reply-To: <1284553440-17985-1-git-send-email-Jes.Sorensen@redhat.com> References: <1284553440-17985-1-git-send-email-Jes.Sorensen@redhat.com> Subject: [Qemu-devel] [PATCH 2/5] Support human unit formats in strtobytes, eg. 1.0G List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: armbru@redhat.com, quintela@redhat.com From: Jes Sorensen Signed-off-by: Jes Sorensen --- cutils.c | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) diff --git a/cutils.c b/cutils.c index a3087fe..d34ed08 100644 --- a/cutils.c +++ b/cutils.c @@ -259,16 +259,38 @@ int fcntl_setfl(int fd, int flag) */ uint64_t strtobytes(const char *nptr, char **end) { - uint64_t value; + uint64_t value, value2; char *endptr; + int divider = 0; value = strtoll(nptr, &endptr, 0); + if (endptr[0] == '.') { + endptr++; + value2 = 0; + divider = 10; + while ((endptr[0] == '0') && (endptr[1] >= '0') && (endptr[1] <= '9')) { + divider = divider * 10; + endptr++; + } + + if ((endptr[0] >= '0') && (endptr[0] <= '9')) { + value2 = strtoll(endptr, &endptr, 0); + value = value * divider + value2; + } else { + value = 0; + goto fail; + } + } switch (*endptr++) { case 'K': case 'k': value <<= 10; break; case 0: + if (divider) { + value = 0; + break; + } case 'M': case 'm': value <<= 20; @@ -284,9 +306,12 @@ uint64_t strtobytes(const char *nptr, char **end) default: value = 0; } + if (divider) + value /= divider; if (end) *end = endptr; +fail: return value; } -- 1.7.2.2