5 files changed, 269 insertions, 149 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cb97185c..0d311682 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -103,6 +103,8 @@ set (SOURCES
     src/gmrequest.h
     src/gmutil.c
     src/gmutil.h
+    src/gopher.c
+    src/gopher.h
     src/history.c
     src/history.h
     src/lookup.c
diff --git a/res/about/version.gmi b/res/about/version.gmi
index 12c00b3b..d73fdf25 100644
--- a/res/about/version.gmi
+++ b/res/about/version.gmi
@@ -7,6 +7,7 @@
 # Release notes
 
 ## 0.8
+* Added support for Gopher.
 * Added support for the full palette of 8-bit ANSI foreground colors.
 * Added option to disable smooth scrolling.
 * Added keybindings for Back/Forward navigation.
diff --git a/src/gmrequest.c b/src/gmrequest.c
index 8a9226a1..d143e8da 100644
--- a/src/gmrequest.c
+++ b/src/gmrequest.c
@@ -23,6 +23,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "gmrequest.h"
 #include "gmutil.h"
 #include "gmcerts.h"
+#include "gopher.h"
 #include "app.h" /* dataDir_App() */
 #include "embedded.h"
 #include "ui/text.h"
@@ -121,10 +122,7 @@ struct Impl_GmRequest {
     enum iGmRequestState state;
     iString              url;
     iTlsRequest *        req;
-    iSocket *            gopher; /* socket for Gopher connections */
-    char                 gopherType;
-    iBlock               gopherBody;
-    iBool                gopherPre;
+    iGopher              gopher;
     iGmResponse          resp;
     iAudience *          updated;
     iAudience *          finished;
@@ -341,127 +339,13 @@ static const iBlock *replaceVariables_(const iBlock *block) {
     return block;
 }
 
-iLocalDef iBool isLineTerminator_(const char *str) {
-    return str[0] == '\r' && str[1] == '\n';
-}
-
-iLocalDef iBool isPreformatted_(iRangecc text) {
-    int numPunct = 0;
-    iBool isSpace = iFalse;
-    for (const char *ch = text.start; ch != text.end; ch++) {
-        if (ispunct(*ch)) {
-            if (++numPunct == 4)
-                return iTrue;
-        }
-        else {
-            numPunct = 0;
-        }
-        if (*ch == ' ' || *ch == '\n') {
-            if (isSpace) return iTrue;
-            isSpace = iTrue;
-        }
-        else {
-            isSpace = iFalse;
-        }
-    }
-    return iFalse;
-}
-
-static void setGopherPre_GmRequest_(iGmRequest *d, iBool pre) {
-    if (pre && !d->gopherPre) {
-        appendCStr_Block(&d->resp.body, "```\n");
-    }
-    else if (!pre && d->gopherPre) {
-        appendCStr_Block(&d->resp.body, "```\n");
-    }
-    d->gopherPre = pre;
-}
-
-static iBool convertGopherLines_GmRequest_(iGmRequest *d) {
-    iBool converted = iFalse;
-    iRangecc body = range_Block(&d->gopherBody);
-    iRegExp *pattern = new_RegExp("(.)([^\t]*)\t([^\t]*)\t([^\t]*)\t([0-9]+)", caseInsensitive_RegExpOption);
-    for (;;) {
-        /* Find the end of the line. */
-        iRangecc line = { body.start, body.start };
-        while (line.end < body.end - 1 && !isLineTerminator_(line.end)) {
-            line.end++;
-        }
-        if (line.end >= body.end - 1 || !isLineTerminator_(line.end)) {
-            /* Not a complete line. */
-            break;
-        }
-        body.start = line.end + 2;
-        iRegExpMatch m;
-        init_RegExpMatch(&m);
-        if (matchRange_RegExp(pattern, line, &m)) {
-            const char     lineType = *capturedRange_RegExpMatch(&m, 1).start;
-            const iRangecc text     = capturedRange_RegExpMatch(&m, 2);
-            const iRangecc path     = capturedRange_RegExpMatch(&m, 3);
-            const iRangecc domain   = capturedRange_RegExpMatch(&m, 4);
-            const iRangecc port     = capturedRange_RegExpMatch(&m, 5);
-            iString *out = new_String();
-            switch (lineType) {
-                case 'i':
-                case '3': {
-                    setGopherPre_GmRequest_(d, isPreformatted_(text));
-                    appendData_Block(&d->resp.body, text.start, size_Range(&text));
-                    appendCStr_Block(&d->resp.body, "\n");
-                    break;
-                }
-                case '0':
-                case '1':
-                case '7':
-                case '4':
-                case '5':
-                case '9':
-                case 'g':
-                case 'I':
-                case 's': {
-                    iBeginCollect();
-                    setGopherPre_GmRequest_(d, iFalse);
-                    format_String(out,
-                                  "=> gopher://%s:%s/%c%s %s\n",
-                                  cstr_Rangecc(domain),
-                                  cstr_Rangecc(port),
-                                  lineType,
-                                  cstr_Rangecc(path),
-                                  cstr_Rangecc(text));
-                    appendData_Block(&d->resp.body, constBegin_String(out), size_String(out));
-                    iEndCollect();
-                    break;
-                }
-                default:
-                    break; /* Ignore unknown types. */
-            }
-            delete_String(out);
-        }
-    }
-    iRelease(pattern);
-    remove_Block(&d->gopherBody, 0, body.start - constBegin_Block(&d->gopherBody));
-    return converted;
-}
-
 static void gopherRead_GmRequest_(iGmRequest *d, iSocket *socket) {
     iBool notifyUpdate = iFalse;
     lock_Mutex(&d->mutex);
     d->resp.statusCode = success_GmStatusCode;
     iBlock *data = readAll_Socket(socket);
     if (!isEmpty_Block(data)) {
-        if (d->gopherType == '1') {
-            setCStr_String(&d->resp.meta, "text/gemini");
-            append_Block(&d->gopherBody, data);
-            if (convertGopherLines_GmRequest_(d)) {
-                notifyUpdate = iTrue;
-            }
-        }
-        else {
-            if (d->gopherType == '0') {
-                setCStr_String(&d->resp.meta, "text/plain");
-            }
-            append_Block(&d->resp.body, data);
-            notifyUpdate = iTrue;
-        }
+        processResponse_Gopher(&d->gopher, data);
     }
     delete_Block(data);
     unlock_Mutex(&d->mutex);
@@ -499,28 +383,15 @@ static void beginGopherConnection_GmRequest_(iGmRequest *d, const iString *host,
     if (port == 0) {
         port = 70; /* default port */
     }
-    clear_Block(&d->gopherBody);
-    d->state = receivingBody_GmRequestState;
-    d->gopher = new_Socket(cstr_String(host), port);
-    iConnect(Socket, d->gopher, readyRead,    d, gopherRead_GmRequest_);
-    iConnect(Socket, d->gopher, disconnected, d, gopherDisconnected_GmRequest_);
-    iConnect(Socket, d->gopher, error,        d, gopherError_GmRequest_);
-    open_Socket(d->gopher);
-    iUrl parts;
-    init_Url(&parts, &d->url);
-    d->gopherType = '1';
-    if (!isEmpty_Range(&parts.path)) {
-        if (*parts.path.start == '/') {
-            parts.path.start++;
-        }
-        if (parts.path.start < parts.path.end) {
-            d->gopherType = *parts.path.start;
-            parts.path.start++;
-        }
-    }
-    d->gopherPre = iFalse;
-    writeData_Socket(d->gopher, parts.path.start, size_Range(&parts.path));
-    writeData_Socket(d->gopher, "\r\n", 2);
+    clear_Block(&d->gopher.source);
+    d->gopher.meta   = &d->resp.meta;
+    d->gopher.output = &d->resp.body;
+    d->state         = receivingBody_GmRequestState;
+    d->gopher.socket = new_Socket(cstr_String(host), port);
+    iConnect(Socket, d->gopher.socket, readyRead,    d, gopherRead_GmRequest_);
+    iConnect(Socket, d->gopher.socket, disconnected, d, gopherDisconnected_GmRequest_);
+    iConnect(Socket, d->gopher.socket, error,        d, gopherError_GmRequest_);
+    open_Gopher(&d->gopher, &d->url);
 }
 
 /*----------------------------------------------------------------------------------------------*/
@@ -529,11 +400,9 @@ void init_GmRequest(iGmRequest *d, iGmCerts *certs) {
     init_Mutex(&d->mutex);
     init_GmResponse(&d->resp);
     init_String(&d->url);
-    init_Block(&d->gopherBody, 0);
+    init_Gopher(&d->gopher);
     d->certs      = certs;
     d->req        = NULL;
-    d->gopher     = NULL;
-    d->gopherType = 0;
     d->updated    = NULL;
     d->finished   = NULL;
     d->state      = initialized_GmRequestState;
@@ -554,8 +423,7 @@ void deinit_GmRequest(iGmRequest *d) {
         unlock_Mutex(&d->mutex);
     }
     iReleasePtr(&d->req);
-    iReleasePtr(&d->gopher);
-    deinit_Block(&d->gopherBody);
+    deinit_Gopher(&d->gopher);
     delete_Audience(d->finished);
     delete_Audience(d->updated);
     deinit_GmResponse(&d->resp);
@@ -719,9 +587,7 @@ void cancel_GmRequest(iGmRequest *d) {
     if (d->req) {
         cancel_TlsRequest(d->req);
     }
-    if (d->gopher) {
-        close_Socket(d->gopher);
-    }
+    cancel_Gopher(&d->gopher);
 }
 
 iBool isFinished_GmRequest(const iGmRequest *d) {
diff --git a/src/gopher.c b/src/gopher.c
new file mode 100644
index 00000000..9a503442
--- /dev/null
+++ b/src/gopher.c
@@ -0,0 +1,206 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
+
+#include "gopher.h"
+
+#include <ctype.h>
+
+iDefineTypeConstruction(Gopher)
+
+iLocalDef iBool isLineTerminator_(const char *str) {
+    return str[0] == '\r' && str[1] == '\n';
+}
+
+static iBool isPreformatted_(iRangecc text) {
+    int numPunct = 0;
+    int numSpace = 0;
+    for (const char *ch = text.start; ch != text.end; ch++) {
+        if (*ch > 32 && ispunct(*ch)) {
+            if (++numPunct == 4)
+                return iTrue;
+        }
+        else {
+            numPunct = 0;
+        }
+        if (*ch == ' ' || *ch == '\n') {
+            if (++numSpace == 3) return iTrue;
+        }
+        else {
+            numSpace = 0;
+        }
+    }
+    return iFalse;
+}
+
+static void setPre_Gopher_(iGopher *d, iBool pre) {
+    if (pre && !d->isPre) {
+        appendCStr_Block(d->output, "```\n");
+    }
+    else if (!pre && d->isPre) {
+        appendCStr_Block(d->output, "```\n");
+    }
+    d->isPre = pre;
+}
+
+static iBool convertSource_Gopher_(iGopher *d) {
+    iBool    converted = iFalse;
+    iRangecc body      = range_Block(&d->source);
+    iRegExp *pattern   = new_RegExp("(.)([^\t]*)\t([^\t]*)\t([^\t]*)\t([0-9]+)",
+                                    caseInsensitive_RegExpOption);
+    for (;;) {
+        /* Find the end of the line. */
+        iRangecc line = { body.start, body.start };
+        while (line.end < body.end - 1 && !isLineTerminator_(line.end)) {
+            line.end++;
+        }
+        if (line.end >= body.end - 1 || !isLineTerminator_(line.end)) {
+            /* Not a complete line. */
+            break;
+        }
+        body.start = line.end + 2;
+        iRegExpMatch m;
+        init_RegExpMatch(&m);
+        if (matchRange_RegExp(pattern, line, &m)) {
+            const char     lineType = *capturedRange_RegExpMatch(&m, 1).start;
+            const iRangecc text     = capturedRange_RegExpMatch(&m, 2);
+            const iRangecc path     = capturedRange_RegExpMatch(&m, 3);
+            const iRangecc domain   = capturedRange_RegExpMatch(&m, 4);
+            const iRangecc port     = capturedRange_RegExpMatch(&m, 5);
+            iString *buf = new_String();
+            switch (lineType) {
+                case 'i':
+                case '3': {
+                    setPre_Gopher_(d, isPreformatted_(text));
+                    appendData_Block(d->output, text.start, size_Range(&text));
+                    appendCStr_Block(d->output, "\n");
+                    break;
+                }
+                case '0':
+                case '1':
+                case '7':
+                case '4':
+                case '5':
+                case '9':
+                case 'g':
+                case 'I':
+                case 's': {
+                    iBeginCollect();
+                    setPre_Gopher_(d, iFalse);
+                    format_String(buf,
+                                  "=> gopher://%s:%s/%c%s %s\n",
+                                  cstr_Rangecc(domain),
+                                  cstr_Rangecc(port),
+                                  lineType,
+                                  cstr_Rangecc(path),
+                                  cstr_Rangecc(text));
+                    appendData_Block(d->output, constBegin_String(buf), size_String(buf));
+                    iEndCollect();
+                    break;
+                }
+                default:
+                    break; /* Ignore unknown types. */
+            }
+            delete_String(buf);
+        }
+    }
+    iRelease(pattern);
+    remove_Block(&d->source, 0, body.start - constBegin_Block(&d->source));
+    return converted;
+}
+
+void init_Gopher(iGopher *d) {
+    d->socket = NULL;
+    d->type = 0;
+    init_Block(&d->source, 0);
+    d->isPre = iFalse;
+    d->meta = NULL;
+    d->output = NULL;
+}
+
+void deinit_Gopher(iGopher *d) {
+    deinit_Block(&d->source);
+    iReleasePtr(&d->socket);
+}
+
+void open_Gopher(iGopher *d, const iString *url) {
+    open_Socket(d->socket);
+    iUrl parts;
+    init_Url(&parts, url);
+    d->type = '1';
+    if (!isEmpty_Range(&parts.path)) {
+        if (*parts.path.start == '/') {
+            parts.path.start++;
+        }
+        if (parts.path.start < parts.path.end) {
+            d->type = *parts.path.start;
+            parts.path.start++;
+        }
+    }
+    /* MIME type determined by the URI. */
+    switch (d->type) {
+        case '0':
+            setCStr_String(d->meta, "text/plain");
+            break;
+        case '1':
+            setCStr_String(d->meta, "text/gemini");
+            break;
+        case '4':
+            setCStr_String(d->meta, "application/mac-binhex");
+            break;
+        case 'g':
+            setCStr_String(d->meta, "image/gif");
+            break;
+        case 'I':
+            setCStr_String(d->meta, "image/generic");
+            break;
+        case 's':
+            setCStr_String(d->meta, "audio/wave");
+            break;
+        default:
+            setCStr_String(d->meta, "application/octet-stream");
+            break;
+    }
+    d->isPre = iFalse;
+    writeData_Socket(d->socket, parts.path.start, size_Range(&parts.path));
+    writeData_Socket(d->socket, "\r\n", 2);
+}
+
+void cancel_Gopher(iGopher *d) {
+    if (d->socket) {
+        close_Socket(d->socket);
+    }
+}
+
+iBool processResponse_Gopher(iGopher *d, const iBlock *data) {
+    iBool changed = iFalse;
+    if (d->type == '1') {
+        append_Block(&d->source, data);
+        if (convertSource_Gopher_(d)) {
+            changed = iTrue;
+        }
+    }
+    else {
+        append_Block(d->output, data);
+        changed = iTrue;
+    }
+    return changed;
+}
diff --git a/src/gopher.h b/src/gopher.h
new file mode 100644
index 00000000..c085267b
--- /dev/null
+++ b/src/gopher.h
@@ -0,0 +1,45 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
+
+#pragma once
+
+#include "gmutil.h"
+
+#include <the_Foundation/regexp.h>
+#include <the_Foundation/socket.h>
+
+iDeclareType(Gopher)
+
+struct Impl_Gopher {
+    iSocket *socket;
+    char     type;
+    iBlock   source;
+    iBool    isPre;
+    iString *meta;
+    iBlock * output;
+};
+
+iDeclareTypeConstruction(Gopher)
+
+void    open_Gopher             (iGopher *, const iString *url);
+iBool   processResponse_Gopher  (iGopher *, const iBlock *data);
+void    cancel_Gopher           (iGopher *);