From 7b1ab1592ecd503e5f16589af162f8700d91b754 Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Tue, 2 Feb 2016 11:33:44 +0100
Subject: [PATCH] Fixed: Support new ISO units (KiB, MiB, etc...) in
 humanReadableToBytes

--HG--
branch : develop
---
 code/nel/src/misc/common.cpp | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/code/nel/src/misc/common.cpp b/code/nel/src/misc/common.cpp
index 4c7d4fe02..5115547a5 100644
--- a/code/nel/src/misc/common.cpp
+++ b/code/nel/src/misc/common.cpp
@@ -394,7 +394,8 @@ uint32 humanReadableToBytes (const string &str)
 	if(str[0]<'0' || str[0]>'9')
 		return 0;
 
-	res = atoi (str.c_str());
+	if (!fromString(str, res))
+		return 0;
 
 	if(str[str.size()-1] == 'B')
 	{
@@ -404,10 +405,28 @@ uint32 humanReadableToBytes (const string &str)
 		// there's no break and it's **normal**
 		switch (str[str.size()-2])
 		{
-		case 'G': res *= 1024;
-		case 'M': res *= 1024;
-		case 'K': res *= 1024;
-		default: ;
+			// kB/KB, MB, GB and TB are 1000 multiples
+			case 'T': res *= 1000;
+			case 'G': res *= 1000;
+			case 'M': res *= 1000;
+			case 'k': res *= 1000; break; // kilo symbol should be a lowercase K
+			case 'K': res *= 1000; break;
+			case 'i':
+			{
+				// KiB, MiB, GiB and TiB are 1024 multiples
+				if (str.size()<4)
+					return res;
+
+				switch (str[str.size()-3])
+				{
+					case 'T': res *= 1024;
+					case 'G': res *= 1024;
+					case 'M': res *= 1024;
+					case 'K': res *= 1024;
+					default: ;
+				}
+			}
+			default: ;
 		}
 	}