From 4bc97ce307f717166909f303d766d495fb477e6a Mon Sep 17 00:00:00 2001
From: bptato <nincsnevem662@gmail.com>
Date: Wed, 21 Oct 2020 12:56:36 +0200
Subject: Improved gopher support

---
 file.c | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

(limited to 'file.c')

diff --git a/file.c b/file.c
index 52ace23..41e8f58 100644
--- a/file.c
+++ b/file.c
@@ -1959,7 +1959,7 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
 #endif				/* USE_NNTP */
 #ifdef USE_GOPHER
     else if (pu.scheme == SCM_GOPHER) {
-	switch (*pu.file) {
+	switch (pu.file[strlen(pu.file)-1]) {
 	case '0':
 	    t = "text/plain";
 	    break;
@@ -7393,8 +7393,9 @@ Str
 loadGopherDir(URLFile *uf, ParsedURL *pu, wc_ces * charset)
 {
     Str volatile tmp;
-    Str lbuf, name, file, host, port;
+    Str lbuf, name, file, host, port, type;
     char *volatile p, *volatile q;
+    int link;
     MySignalHandler(*volatile prevtrap) (SIGNAL_ARG) = NULL;
 #ifdef USE_M17N
     wc_ces doc_charset = DocumentCharset;
@@ -7440,6 +7441,7 @@ loadGopherDir(URLFile *uf, ParsedURL *pu, wc_ces * charset)
 	for (q = p; *q && *q != '\t' && *q != '\r' && *q != '\n'; q++) ;
 	port = Strnew_charp_n(p, q - p);
 
+	link = 1;
 	switch (name->ptr[0]) {
 	case '0':
 	    p = "[text file]";
@@ -7459,15 +7461,22 @@ loadGopherDir(URLFile *uf, ParsedURL *pu, wc_ces * charset)
 	case 'h':
 	    p = "[HTML]";
 	    break;
+	case 'i':
+	    link = 0;
+	    break;
 	default:
 	    p = "[unsupported]";
 	    break;
 	}
-	q = Strnew_m_charp("gopher://", host->ptr, ":", port->ptr,
-			   "/", file->ptr, NULL)->ptr;
-	Strcat_m_charp(tmp, "<a href=\"",
-		       html_quote(url_encode(q, NULL, *charset)),
-		       "\">", p, html_quote(name->ptr + 1), "</a>\n", NULL);
+	type = Strsubstr(name, 0, 1);
+	q = Strnew_m_charp("gopher://", host->ptr, ":", port->ptr, file->ptr, type->ptr, NULL)->ptr;
+	if(link) {
+	    Strcat_m_charp(tmp, "<a href=\"",
+			   html_quote(url_encode(q, NULL, *charset)),
+			   "\">", p, " ", html_quote(name->ptr + 1), "</a><br>\n", NULL);
+	} else {
+	    Strcat_m_charp(tmp, "<p>", html_quote(name->ptr + 1), "</p>\n", NULL);
+	}
     }
 
   gopher_end:
-- 
cgit v1.2.3


From 16e0b6aa63541c83726ade3df6f8c23f9c15c1ff Mon Sep 17 00:00:00 2001
From: bptato <nincsnevem662@gmail.com>
Date: Wed, 21 Oct 2020 13:30:01 +0200
Subject: Improved gopher directory display

---
 file.c | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

(limited to 'file.c')

diff --git a/file.c b/file.c
index 41e8f58..12f439a 100644
--- a/file.c
+++ b/file.c
@@ -7395,7 +7395,7 @@ loadGopherDir(URLFile *uf, ParsedURL *pu, wc_ces * charset)
     Str volatile tmp;
     Str lbuf, name, file, host, port, type;
     char *volatile p, *volatile q;
-    int link;
+    int link, pre;
     MySignalHandler(*volatile prevtrap) (SIGNAL_ARG) = NULL;
 #ifdef USE_M17N
     wc_ces doc_charset = DocumentCharset;
@@ -7415,6 +7415,7 @@ loadGopherDir(URLFile *uf, ParsedURL *pu, wc_ces * charset)
 	goto gopher_end;
     TRAP_ON;
 
+    pre = 0;
     while (1) {
 	if (lbuf = StrUFgets(uf), lbuf->length == 0)
 	    break;
@@ -7469,19 +7470,33 @@ loadGopherDir(URLFile *uf, ParsedURL *pu, wc_ces * charset)
 	    break;
 	}
 	type = Strsubstr(name, 0, 1);
-	q = Strnew_m_charp("gopher://", host->ptr, ":", port->ptr, file->ptr, type->ptr, NULL)->ptr;
+	if(file->ptr[0] == '/')
+	    q = Strnew_m_charp("gopher://", host->ptr, ":", port->ptr, file->ptr, type->ptr, NULL)->ptr;
+	else
+	    q = Strnew_m_charp("gopher://", host->ptr, ":", port->ptr, "/", file->ptr, type->ptr, NULL)->ptr;
 	if(link) {
+	    if(pre) {
+		Strcat_charp(tmp, "</pre>");
+		pre = 0;
+	    }
 	    Strcat_m_charp(tmp, "<a href=\"",
 			   html_quote(url_encode(q, NULL, *charset)),
 			   "\">", p, " ", html_quote(name->ptr + 1), "</a><br>\n", NULL);
 	} else {
-	    Strcat_m_charp(tmp, "<p>", html_quote(name->ptr + 1), "</p>\n", NULL);
+	    if(!pre) {
+		Strcat_charp(tmp, "<pre>");
+		pre = 1;
+	    }
+
+	    Strcat_m_charp(tmp, html_quote(name->ptr + 1), "\n", NULL);
 	}
     }
 
   gopher_end:
     TRAP_OFF;
 
+    if(pre)
+	Strcat_charp(tmp, "</pre>");
     Strcat_charp(tmp, "</table>\n</body>\n</html>\n");
     return tmp;
 }
-- 
cgit v1.2.3


From 26876fc89b09cf34e88130c2d976fa220bf52dd6 Mon Sep 17 00:00:00 2001
From: bptato <nincsnevem662@gmail.com>
Date: Wed, 21 Oct 2020 16:31:05 +0200
Subject: Moved back filetype indicator to the beginning of file names

---
 file.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'file.c')

diff --git a/file.c b/file.c
index 12f439a..358f20a 100644
--- a/file.c
+++ b/file.c
@@ -1712,6 +1712,8 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
     URLOption url_option;
     Str tmp;
     Str volatile page = NULL;
+#ifdef USE_GOPHER
+#endif
 #ifdef USE_M17N
     wc_ces charset = WC_CES_US_ASCII;
 #endif
@@ -1959,7 +1961,10 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
 #endif				/* USE_NNTP */
 #ifdef USE_GOPHER
     else if (pu.scheme == SCM_GOPHER) {
-	switch (pu.file[strlen(pu.file)-1]) {
+	p = pu.file;
+	while(*p == '/')
+	    ++p;
+	switch (*p) {
 	case '0':
 	    t = "text/plain";
 	    break;
@@ -7470,10 +7475,7 @@ loadGopherDir(URLFile *uf, ParsedURL *pu, wc_ces * charset)
 	    break;
 	}
 	type = Strsubstr(name, 0, 1);
-	if(file->ptr[0] == '/')
-	    q = Strnew_m_charp("gopher://", host->ptr, ":", port->ptr, file->ptr, type->ptr, NULL)->ptr;
-	else
-	    q = Strnew_m_charp("gopher://", host->ptr, ":", port->ptr, "/", file->ptr, type->ptr, NULL)->ptr;
+	q = Strnew_m_charp("gopher://", host->ptr, ":", port->ptr, "/", type->ptr, file->ptr, NULL)->ptr;
 	if(link) {
 	    if(pre) {
 		Strcat_charp(tmp, "</pre>");
-- 
cgit v1.2.3