github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

Accept k and m as well as K and M in util::getRealSize()

pull/43/head
Tatsuhiro Tsujikawa 2013-01-15 21:36:25 +09:00
parent 851eb137c1
commit 6a976a4118
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/util.cc
View File

@ -1266,16 +1266,21 @@ std::string getHomeDir()
int64_t getRealSize(const std::string& sizeWithUnit)
{
std::string::size_type p = sizeWithUnit.find_first_of("KM");
std::string::size_type p = sizeWithUnit.find_first_of("KMkm");
std::string size;
int32_t mult = 1;
if(p == std::string::npos) {
size = sizeWithUnit;
} else {
if(sizeWithUnit[p] == 'K') {
switch(sizeWithUnit[p]) {
case 'K':
case 'k':
mult = 1024;
} else if(sizeWithUnit[p] == 'M') {
break;
case 'M':
case 'm':
mult = 1024*1024;
break;
}
size.assign(sizeWithUnit.begin(), sizeWithUnit.begin()+p);
}

2
test/UtilTest.cc
View File

@ -1516,6 +1516,8 @@ void UtilTest::testGetRealSize()
{
CPPUNIT_ASSERT_EQUAL((int64_t)4294967296LL, util::getRealSize("4096M"));
CPPUNIT_ASSERT_EQUAL((int64_t)1024, util::getRealSize("1K"));
CPPUNIT_ASSERT_EQUAL((int64_t)4294967296LL, util::getRealSize("4096m"));
CPPUNIT_ASSERT_EQUAL((int64_t)1024, util::getRealSize("1k"));
try {
util::getRealSize("");
CPPUNIT_FAIL("exception must be thrown.");