Added functions to escape binary arrays and renamed string escaping functions.

[evaf] / src / libs / Common / util.cpp

diff --git a/src/libs/Common/util.cpp b/src/libs/Common/util.cpp
index 1a07a4a0c33f7d7c081f6a4a3a8cdbbb1e8ef66b..33f6b4dfe375d861782bb6140d201c439af4eb81 100644 (file)
--- a/src/libs/Common/util.cpp
+++ b/src/libs/Common/util.cpp
@@ -98,12 +98,12 @@ QVariant eVaf::Common::toVariant(QString const & value, QVariant const & default
     }
 }
 
-QByteArray eVaf::Common::toEscapedString(QString const & str)
+QByteArray eVaf::Common::strToEscapedCharArray(QString const & str)
 {
     QByteArray rval;
     foreach (QChar c, str) {
         if (c.unicode() < 32 || c.unicode() >= 127)
-            rval.append("&#" + QByteArray::number(c.unicode()) + ";");
+            rval.append("&#x" + QByteArray::number(c.unicode(), 16) + ";");
         else if (c == '\"')
             rval.append("&quot;");
         else if (c == '&')
@@ -121,7 +121,7 @@ QByteArray eVaf::Common::toEscapedString(QString const & str)
     return rval;
 }
 
-QString eVaf::Common::fromEscapedString(QByteArray const & str)
+QString eVaf::Common::strFromEscapedCharArray(QByteArray const & str)
 {
     QString rval;
 
@@ -181,3 +181,87 @@ QString eVaf::Common::fromEscapedString(QByteArray const & str)
 
     return rval;
 }
+
+QByteArray eVaf::Common::binToEscapedCharArray(QByteArray const & src)
+{
+    QByteArray rval;
+    foreach (uchar c, src) {
+        if (c < 32 || c >= 127)
+            rval.append("&#x" + QByteArray::number(c, 16) + ";");
+        else if (c == '\"')
+            rval.append("&quot;");
+        else if (c == '&')
+            rval.append("&amp;");
+        else if (c == '\'')
+            rval.append("&apos;");
+        else if (c == '<')
+            rval.append("&lt;");
+        else if (c == '>')
+            rval.append("&gt;");
+        else
+            rval.append(c);
+    }
+
+    return rval;
+}
+
+QByteArray eVaf::Common::binFromEscapedCharArray(QByteArray const & str)
+{
+    QByteArray rval;
+
+    bool e = false;
+    QByteArray ref;
+    foreach (char c, str) {
+        if (!e) {
+            if (c == '&') {
+                e = true;
+                ref = "&";
+            }
+            else
+                rval.append(c);
+        }
+        else {
+            ref.append(c);
+            if (c == ';') {
+                e = false;
+                ref = ref.toLower();
+
+                if (ref.startsWith("&#x")) {
+                    // Numeric character reference in the HEX format
+                    bool ok;
+                    uchar ucode = ref.mid(3, ref.size() - 4).toUInt(&ok, 16);
+                    if (ok)
+                        rval.append(ucode);
+                    else
+                        // Invalid numeric character reference; output as is
+                        rval.append(ref);
+                }
+                else if (ref.startsWith("&#")) {
+                    // Numeric character reference in the DEC format
+                    bool ok;
+                    uchar ucode = ref.mid(2, ref.size() - 3).toUInt(&ok, 10);
+                    if (ok)
+                        rval.append(ucode);
+                    else
+                        // Invalid numeric character reference; output as is
+                        rval.append(ref);
+                }
+                else if (ref == "&quot;")
+                    rval.append('\"');
+                else if (ref == "&amp;")
+                    rval.append('&');
+                else if (ref == "&apos;")
+                    rval.append('\'');
+                else if (ref == "&lt;")
+                    rval.append('<');
+                else if (ref == "&gt;")
+                    rval.append('>');
+                else
+                    // Unknown reference, output as is
+                    rval.append(ref);
+            }
+        }
+    }
+
+    return rval;
+}