From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LgP0Q-0004r6-0s
	for qemu-devel@nongnu.org; Sun, 08 Mar 2009 15:49:50 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LgP0O-0004pF-S3
	for qemu-devel@nongnu.org; Sun, 08 Mar 2009 15:49:49 -0400
Received: from [199.232.76.173] (port=51172 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LgP0O-0004p1-Lx
	for qemu-devel@nongnu.org; Sun, 08 Mar 2009 15:49:48 -0400
Received: from savannah.gnu.org ([199.232.41.3]:44005 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <aurelien@aurel32.net>)
	id 1LgP0O-0002aP-1E
	for qemu-devel@nongnu.org; Sun, 08 Mar 2009 15:49:48 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <aurelien@aurel32.net>) id 1LgP0L-0005hM-5G
	for qemu-devel@nongnu.org; Sun, 08 Mar 2009 19:49:45 +0000
Received: from aurel32 by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <aurel32@savannah.gnu.org>) id 1LgP0K-0005hI-VE
	for qemu-devel@nongnu.org; Sun, 08 Mar 2009 19:49:45 +0000
MIME-Version: 1.0
Errors-To: aurel32
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Aurelien Jarno <aurelien@aurel32.net>
Message-Id: <E1LgP0K-0005hI-VE@cvs.savannah.gnu.org>
Date: Sun, 08 Mar 2009 19:49:44 +0000
Subject: [Qemu-devel] [6786] qemu-img: accept sizes with decimal values
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 6786
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6786
Author:   aurel32
Date:     2009-03-08 19:49:44 +0000 (Sun, 08 Mar 2009)
Log Message:
-----------
qemu-img: accept sizes with decimal values

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

Modified Paths:
--------------
    trunk/qemu-img.c

Modified: trunk/qemu-img.c
===================================================================
--- trunk/qemu-img.c	2009-03-08 19:26:53 UTC (rev 6785)
+++ trunk/qemu-img.c	2009-03-08 19:49:44 UTC (rev 6786)
@@ -220,6 +220,7 @@
     const char *filename;
     const char *base_filename = NULL;
     uint64_t size;
+    double sizef;
     const char *p;
     BlockDriver *drv;
 
@@ -260,13 +261,13 @@
         if (optind >= argc)
             help();
         p = argv[optind];
-        size = strtoul(p, (char **)&p, 0);
+        sizef = strtod(p, (char **)&p);
         if (*p == 'M') {
-            size *= 1024 * 1024;
+            size = (uint64_t)(sizef * 1024 * 1024);
         } else if (*p == 'G') {
-            size *= 1024 * 1024 * 1024;
+            size = (uint64_t)(sizef * 1024 * 1024 * 1024);
         } else if (*p == 'k' || *p == 'K' || *p == '\0') {
-            size *= 1024;
+            size = (uint64_t)(sizef * 1024);
         } else {
             help();
         }