Changeset 1156 for cpp/frams

Timestamp:

10/01/21 22:46:49 (3 years ago)

Author:

Maciej Komosinski

Message:

Added sstringURLEncode(SString& target) and sstringURLDecode(SString &target)

Location:

cpp/frams/util

Files:

• sstringutils.cpp (modified) (2 diffs)
• sstringutils.h (modified) (2 diffs)

cpp/frams/util/sstringutils.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2021  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -367 +367 @@
         return false;
 }
+
+bool sstringURLEncode(SString& target)
+{
+        const char* x = target.c_str();
+        bool changed = 0;
+        SString tmp;
+        tmp.reserve(target.length());
+        static constexpr const char* ALLOWED_CHARS = "-_.~";
+        for (; *x; x++)
+        {
+                if (!(isalnum(*x) || strchr(ALLOWED_CHARS, *x)))
+                {
+                        tmp += "%";
+                        tmp += SString::sprintf("%02x", *x);
+                        changed = 1;
+                }
+                else
+                        tmp += *x;
+        }
+        if (changed) target = tmp;
+        return changed;
+}
+
+bool sstringURLDecode(SString &target)
+{
+        const char* x = target.c_str();
+        SString tmp;
+        char *f;
+        while (1)
+        {
+                f = strchr((char*)x, '%');
+                if (f)
+                {
+                        tmp.append(x, f - x);
+                        char hex[3] = { f[1],f[2],0 };
+                        char* after;
+                        unsigned long intvalue = strtoul(hex, &after, 16);
+                        tmp += (char)intvalue;
+                        x = f + 3;
+                }
+                else
+                {
+                        if (tmp.length() == 0) return false; // nothing was changed!
+                        tmp += x;
+                        target = tmp;
+                        return true;
+                }
+        }
+}

cpp/frams/util/sstringutils.h

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2021  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -22 +22 @@
 const char* skipQuoteString(const char* txt, const char* limit);
 int sstringUnquote(SString &target);
+
+bool sstringURLEncode(SString& target);
+bool sstringURLDecode(SString &target);
 
 int strFindField(const SString& txt, const SString& name, int &end);