godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-03 18:11:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Unify http- and percent- encode/decode"

Browse Source 
This reverts commit b76ee30917.
This commit is contained in:
Pedro J. Estébanez
2018-04-12 21:12:34 +02:00
parent 3a5b25d5b4
commit 00e98458ba
7 changed files with 110 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
core/ustring.cpp
View File

@@ -3165,7 +3165,7 @@ String String::word_wrap(int p_chars_per_line) const {
return ret;
}
String String::percent_encode() const {
String String::http_escape() const {
const CharString temp = utf8();
String res;
for (int i = 0; i < temp.length(); ++i) {
@@ -3189,7 +3189,7 @@ String String::percent_encode() const {
return res;
}
String String::percent_decode() const {
String String::http_unescape() const {
String res;
for (int i = 0; i < length(); ++i) {
if (ord_at(i) == '%' && i + 2 < length()) {
@@ -3727,6 +3727,68 @@ String String::plus_file(const String &p_file) const {
return *this + "/" + p_file;
}
String String::percent_encode() const {
CharString cs = utf8();
String encoded;
for (int i = 0; i < cs.length(); i++) {
uint8_t c = cs[i];
if ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || (c >= '0' && c <= '9') || c == '-' || c == '_' || c == '~' || c == '.') {
char p[2] = { (char)c, 0 };
encoded += p;
} else {
char p[4] = { '%', 0, 0, 0 };
static const char hex[16] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
p[1] = hex[c >> 4];
p[2] = hex[c & 0xF];
encoded += p;
}
}
return encoded;
}
String String::percent_decode() const {
CharString pe;
CharString cs = utf8();
for (int i = 0; i < cs.length(); i++) {
uint8_t c = cs[i];
if (c == '%' && i < length() - 2) {
uint8_t a = LOWERCASE(cs[i + 1]);
uint8_t b = LOWERCASE(cs[i + 2]);
c = 0;
if (a >= '0' && a <= '9')
c = (a - '0') << 4;
else if (a >= 'a' && a <= 'f')
c = (a - 'a' + 10) << 4;
else
continue;
uint8_t d = 0;
if (b >= '0' && b <= '9')
d = (b - '0');
else if (b >= 'a' && b <= 'f')
d = (b - 'a' + 10);
else
continue;
c += d;
i += 2;
}
pe.push_back(c);
}
pe.push_back(0);
return String::utf8(pe.ptr());
}
String String::get_basename() const {
int pos = find_last(".");