third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improvements in urlencode

Browse Source
This commit is contained in:
Luis Díaz Más 2022-02-16 15:16:23 +01:00
parent 0b17cc31f7
commit 3d370cc2ae
2 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/exiv2/futils.hpp
View File

@ -63,7 +63,7 @@ namespace Exiv2
@note Source: http://www.geekhideout.com/urlcode.shtml
@todo This function can probably be hidden into the implementation details
*/
EXIV2API std::string urlencode(const char* str);
EXIV2API std::string urlencode(const std::string_view& str);
/*!
@brief Decode the input url.

34
src/futils.cpp
View File

@ -101,25 +101,23 @@ namespace Exiv2 {
return isdigit(ch) ? ch - '0' : tolower(ch) - 'a' + 10;
}
std::string urlencode(const char* str) {
const char* pstr = str;
// \todo try to use std::string for buf and avoid the creation of another string for just
// returning the final value
auto buf = new char[strlen(str) * 3 + 1];
char* pbuf = buf;
while (*pstr) {
if (isalnum(*pstr) || *pstr == '-' || *pstr == '_' || *pstr == '.' || *pstr == '~')
*pbuf++ = *pstr;
else if (*pstr == ' ')
*pbuf++ = '+';
else
*pbuf++ = '%', *pbuf++ = to_hex(*pstr >> 4), *pbuf++ = to_hex(*pstr & 15);
pstr++;
std::string urlencode(const std::string_view& str)
{
std::string encoded;
encoded.reserve(str.size() * 3);
for (auto c : str) {
if (isalnum(c) || c == '-' || c == '_' || c == '.' || c == '~')
encoded += c;
else if (c == ' ')
encoded += '+';
else {
encoded += '%';
encoded += to_hex(c >> 4);
encoded += to_hex(c & 15);
}
}
*pbuf = '\0';
std::string ret(buf);
delete [] buf;
return ret;
encoded.shrink_to_fit();
return encoded;
}
char* urldecode(const char* str) {