X-Git-Url: http://www.git.stargrave.org/?p=tofuproxy.git;a=blobdiff_plain;f=rounds%2Fgemini.go;h=987b62eb7115c8e9879a910ccd44163135a43ff6;hp=b87c18a19f69a78785e73f8a5bfa05cc9f251589;hb=HEAD;hpb=9088a7eaa3d2a6885adf47bee4c1cccead68630e

diff --git a/rounds/gemini.go b/rounds/gemini.go
index b87c18a..71da97f 100644
--- a/rounds/gemini.go
+++ b/rounds/gemini.go
@@ -124,7 +124,7 @@ func RoundGemini(
 		log.Printf("%s: can not read response: %+v\n", req.URL, err)
 		return false, err
 	}
-	cols := strings.SplitN(rawResp, " ", 2)
+	cols := strings.SplitN(strings.TrimRight(rawResp, "\r\n"), " ", 2)
 	if len(cols) < 2 {
 		err = fmt.Errorf("invalid response format: %s", rawResp)
 		log.Printf("%s: %s\n", req.URL, err)
@@ -222,18 +222,27 @@ func RoundGemini(
 			if strings.HasPrefix(line, "=>") {
 				line = strings.TrimLeft(line[2:], " ")
 				cols = strings.Fields(line)
-				u := geminifyURL(host, cols[0], paths...)
+				u1 := geminifyURL(host, cols[0], paths...)
+				u2 := geminifyURL(host, cols[0])
 				switch len(cols) {
 				case 1:
 					fmt.Fprintf(
-						&buf, "<a href=\"%s\">%s</a><br/>\n",
-						u, html.EscapeString(cols[0]),
+						&buf, "<a href=\"%s\">%s</a>",
+						u1, html.EscapeString(cols[0]),
 					)
+					if u1 != u2 {
+						fmt.Fprintf(&buf, "&nbsp;<a href=\"%s\">[2]</a>", u2)
+					}
+					fmt.Fprintf(&buf, "<br/>\n")
 				default:
 					fmt.Fprintf(
-						&buf, "<a href=\"%s\">%s</a> (<tt>%s</tt>)<br/>\n",
-						u, html.EscapeString(strings.Join(cols[1:], " ")), cols[0],
+						&buf, "<a href=\"%s\">%s</a>",
+						u1, html.EscapeString(strings.Join(cols[1:], " ")),
 					)
+					if u1 != u2 {
+						fmt.Fprintf(&buf, "&nbsp;<a href=\"%s\">[2]</a>", u2)
+					}
+					fmt.Fprintf(&buf, "(<tt>%s</tt>)<br/>\n", cols[0])
 				}
 				continue
 			}