From bf4c4fa9ef0576aee9bc5f1a599993642f2033a9 Mon Sep 17 00:00:00 2001
From: Tommaso Pecorella <tommaso.pecorella@unifi.it>
Date: Sat, 17 Sep 2022 02:07:07 +0200
Subject: [PATCH] core: partially revert c35d3f5d - some chars must not be
 escaped

---
 src/core/model/command-line.cc | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/core/model/command-line.cc b/src/core/model/command-line.cc
index 734c58502..f7e597241 100644
--- a/src/core/model/command-line.cc
+++ b/src/core/model/command-line.cc
@@ -71,8 +71,24 @@ Encode (const std::string & source)
         case '&':  buffer.append ("&amp;");          break;
         case '\"': buffer.append ("&quot;");         break;
         case '\'': buffer.append ("&apos;");         break;
-        case '>':  buffer.append ("&gt;");           break;
-        case '<':  buffer.append ("&lt;");           break;
+        // case '>':  buffer.append ("&gt;");           break;
+
+        case '<':  {
+          // Special case:
+          // "...blah <file..." is not allowed
+          // "...foo<bar..."  is allowed
+          if (buffer.back () == ' ')
+            {
+              buffer.append ("&lt;");
+            }
+          else
+            {
+              buffer.append ("<");
+            }
+
+          break;
+        }
+
         default:   buffer.append (&source[pos], 1);  break;
         }
       /* *NS_CHECK_STYLE_ON* */