twtstr: import functions from gopher2html

1 files changed, 2 insertions, 17 deletions

diff --git a/adapter/gopher/gopher2html.nim b/adapter/gopher/gopher2html.nim
index 4821814f..cfdeab1e 100644
--- a/adapter/gopher/gopher2html.nim
+++ b/adapter/gopher/gopher2html.nim
@@ -5,6 +5,8 @@ import std/os
 import std/streams
 import std/strutils
 
+import utils/twtstr
+
 type GopherType = enum
   UNKNOWN = "unsupported"
   TEXT_FILE = "text file"
@@ -38,23 +40,6 @@ func gopherType(c: char): GopherType =
   of 'p': PNG
   else: UNKNOWN
 
-func htmlEscape(s: string): string =
-  result = ""
-  for c in s:
-    case c
-    of '<': result &= "&lt;"
-    of '>': result &= "&gt;"
-    of '&': result &= "&amp;"
-    of '"': result &= "&quot;"
-    of '\'': result &= "&apos;"
-    else: result &= c
-
-func until(s: string, c: char, starti = 0): string =
-  for i in starti ..< s.len:
-    if s[i] == c:
-      break
-    result &= s[i]
-
 const ControlPercentEncodeSet = {char(0x00)..char(0x1F), char(0x7F)..char(0xFF)}
 const QueryPercentEncodeSet = (ControlPercentEncodeSet + {' ', '"', '#', '<', '>'})
 const PathPercentEncodeSet = (QueryPercentEncodeSet + {'?', '`', '{', '}'})