u/joerg-krause / upmpdcli - Code / Diff of /src/smallut.cpp

Diff of /src/smallut.cpp [46374a] .. [bae4dc]

Switch to unified view

-a/src/smallut.cpp
+b/src/smallut.cpp
 ...
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the
  *   Free Software Foundation, Inc.,
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
-#ifdef BUILDING_RECOLL
-#include "autoconfig.h"
-#else
-#include "config.h"
-#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
 #include <ctype.h>
 #include <errno.h>
 ...
 // Escape things that would look like markup
 string escapeHtml(const string& in)
+{
     string out;
     for (string::size_type pos = 0; pos < in.length(); pos++) {
-        switch (in.at(pos)) {
+  switch(in.at(pos)) {
-        case '<':
+  case '<': out += "&lt;"; break;
-            out += "&lt;";
+  case '>': out += "&gt;"; break;
-            break;
+  case '&': out += "&amp;"; break;
-        case '&':
+  case '"': out += "&quot;"; break;
-            out += "&amp;";
+  default: out += in.at(pos); break;
-            break;
+  }
-        default:
-            out += in.at(pos);
+    }
     return out;
+}
 string escapeShell(const string& in)
 ...
 bool SimpleRegexp::operator() (const string& val) const
+{
     return simpleMatch(val);
+}
+string flagsToString(const vector<CharFlags>& flags, unsigned int val)
+{
+    const char *s;
+    string out;
+    for (auto& flag : flags) {
+        if ((val & flag.value) == flag.value) {
+            s = flag.yesname;
+        } else {
+            s = flag.noname;
+        }
+        if (s && *s) {
+            /* We have something to write */
+            if (out.length()) {
+                // If not first, add '|' separator
+                out.append("|");
+            }
+            out.append(s);
+        }
+    }
+    return out;
+}
+string valToString(const vector<CharFlags>& flags, unsigned int val)
+{
+    string out;
+    for (auto& flag : flags) {
+        if (flag.value == val) {
+            out = flag.yesname;
+            return out;
+        }
+    }
+    {
+        char mybuf[100];
+        sprintf(mybuf, "Unknown Value 0x%x", val);
+        out = mybuf;
+    }
+    return out;
+}
+unsigned int stringToFlags(const vector<CharFlags>& flags,
+                           const string& input, const char *sep)
+{
+    unsigned int out = 0;
+    vector<string> toks;
+    stringToTokens(input, toks, sep);
+    for (auto& tok: toks) {
+        trimstring(tok);
+        for (auto& flag : flags) {
+            if (!tok.compare(flag.yesname)) {
+                /* Note: we don't break: the same name could conceivably
+                   set several flags. */
+                out |= flag.value;
+            }
+        }
+    }
+    return out;
+}
 // Initialization for static stuff to be called from main thread before going
 // multiple
 void smallut_init_mt()
+{
     // Init langtocode() static table