Changeset 1179 for cpp/frams

Timestamp:

07/26/22 02:33:45 (2 years ago)

Author:

Maciej Komosinski

Message:

"eof" quoting and unquoting functions (used in client-server communication)

Location:

cpp/frams/util

Files:

• sstringutils.cpp (modified) (5 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-2021  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2022  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -8 +8 @@
 #include <common/nonstd.h>
 #include <common/Convert.h>
+#include <common/nonstd_span.h>
 
 int loadSString(const char* filename, SString& s, const char* framsgmodule, const char* error, bool remove_cr)
@@ -30 +31 @@
         while (!f->Veof())
         {
-                len = f->Vread(buf, 1, sizeof(buf));
+                len = (int)f->Vread(buf, 1, sizeof(buf));
                 s.append(buf, len);
         }
@@ -49 +50 @@
                 if (r == NULL) break;
                 ret = true;
-                int d = strlen(r);
+                int d = (int)strlen(r);
                 if (d > 0)
                 {
@@ -416 +417 @@
         }
 }
+
+static span<char> findEof(span<char> field, const char* pos) // 'eof' includes any number of leading '\'s and is only detected when there is nothing else in the line
+{
+        const char* eof = strstr(pos, "eof");
+        if (!eof)
+                return span<char>();
+
+        if (!(((eof + 3) == field.end()) || (eof[3] == '\n')))
+                return span<char>();
+
+        const char* begin = eof - 1;
+        for (; begin >= field.begin(); begin--)
+        {
+                if (*begin == '\n')
+                        break;
+                if (*begin != '\\')
+                        return span<char>();
+        }
+
+        return span<char>((char*)(begin + 1), (eof + 3) - (begin + 1));
+}
+
+bool sstringQuoteEOF(SString& target)
+{
+        span<char> field((char*)target.c_str(), target.size());
+        const char* pos = field.begin();
+
+        bool changed = false;
+
+        SString tmp;
+
+        while (true)
+        {
+                auto eof = findEof(field, pos);
+                if (eof.size())
+                {
+                        if (!changed)
+                        {
+                                tmp.reserve(target.length() + 10);
+                                changed = true;
+                        }
+                        tmp.append(pos, eof.begin() - pos);
+                        tmp += "\\";
+                        tmp.append(eof.begin(), (int)eof.size());
+                        pos = eof.end();
+                }
+                else
+                {
+                        if (!changed)
+                                return false;
+                        tmp.append(pos, field.end() - pos);
+                        break;
+                }
+        }
+
+        target = tmp;
+        return true;
+}
+
+bool sstringUnquoteEOF(SString& target)
+{
+        span<char> field((char*)target.c_str(), target.size());
+        const char* pos = field.begin();
+
+        bool changed = false;
+
+        SString tmp;
+
+        while (true)
+        {
+                auto eof = findEof(field, pos);
+                if (eof.size() > 3)
+                {
+                        if (!changed)
+                        {
+                                tmp.reserve(target.length());
+                                changed = true;
+                        }
+                        tmp.append(pos, eof.begin() - pos);
+                        tmp.append(eof.begin() + 1, (int)eof.size() - 1);
+                        pos = eof.end();
+                }
+                else
+                {
+                        if (eof.size() == 3) //size()==3 means bare 'eof', which cannot be unquoted (and means something went wrong somewhere else)
+                                logPrintf("String", "unquoteEof", LOG_WARN, "Unexpected bare \"eof\" line");
+                        if (!changed)
+                                return false;
+                        tmp.append(pos, field.end() - pos);
+                        break;
+                }
+        }
+
+        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-2021  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2022  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -25 +25 @@
 bool sstringURLEncode(SString& target);
 bool sstringURLDecode(SString &target);
+bool sstringQuoteEOF(SString& target);
+bool sstringUnquoteEOF(SString& target);
 
 int strFindField(const SString& txt, const SString& name, int &end);