From 372038882797184c478ff1d60ee36b02fd384b33 Mon Sep 17 00:00:00 2001
From: "yakumo.izuru" <yakumo.izuru@f3bd38d9-da89-464d-a02a-eb04e43141b5>
Date: Thu, 21 Mar 2024 11:19:06 +0000
Subject: [PATCH] Merge safe values into a single source file, also skip
 fmt.Println() altogether for yukari.FullVersion()

Signed-off-by: Izuru Yakumo <yakumo.izuru@chaotic.ninja>

git-svn-id: file:///srv/svn/repo/yukari/trunk@148 f3bd38d9-da89-464d-a02a-eb04e43141b5
---
 cmd/yukari/link_http_equiv_safe_values.go              | 9 ---------
 cmd/yukari/main.go                                     | 4 ++--
 cmd/yukari/{link_rel_safe_values.go => safe_values.go} | 8 ++++++++
 3 files changed, 10 insertions(+), 11 deletions(-)
 delete mode 100644 cmd/yukari/link_http_equiv_safe_values.go
 rename cmd/yukari/{link_rel_safe_values.go => safe_values.go} (54%)

diff --git a/cmd/yukari/link_http_equiv_safe_values.go b/cmd/yukari/link_http_equiv_safe_values.go
deleted file mode 100644
index b63b1b8..0000000
--- a/cmd/yukari/link_http_equiv_safe_values.go
+++ /dev/null
@@ -1,9 +0,0 @@
-package main
-
-var LINK_HTTP_EQUIV_SAFE_VALUES [][]byte = [][]byte{
-        // X-UA-Compatible will be added automaticaly, so it can be skipped                                                                                           
-        []byte("date"),
-        []byte("last-modified"),
-        []byte("refresh"), // URL rewrite                                                                                                                             
-        []byte("content-language"),
-}
diff --git a/cmd/yukari/main.go b/cmd/yukari/main.go
index 794960b..83e2f5f 100644
--- a/cmd/yukari/main.go
+++ b/cmd/yukari/main.go
@@ -873,7 +873,7 @@ func (p *Proxy) serveExitYukariPage(ctx *fasthttp.RequestCtx, uri *url.URL) {
 	ctx.SetContentType("text/html")
 	ctx.SetStatusCode(403)
 	ctx.Write([]byte(YUKARI_HTML_PAGE_START))
-	ctx.Write([]byte("<h2>You are about to exit YukariSukima</h2>"))
+	ctx.Write([]byte("<h2>You are about to exit Yukari no Sukima</h2>"))
 	ctx.Write([]byte("<p>Following</p><p><a href=\""))
 	ctx.Write([]byte(html.EscapeString(uri.String())))
 	ctx.Write([]byte("\" rel=\"noreferrer\">"))
@@ -933,7 +933,7 @@ func main() {
 	config.Config.MaxConnsPerHost = 4
 
 	if version {
-		fmt.Println(yukari.FullVersion())
+		yukari.FullVersion()
 		return
 	}
 
diff --git a/cmd/yukari/link_rel_safe_values.go b/cmd/yukari/safe_values.go
similarity index 54%
rename from cmd/yukari/link_rel_safe_values.go
rename to cmd/yukari/safe_values.go
index 902008c..b43dbd7 100644
--- a/cmd/yukari/link_rel_safe_values.go
+++ b/cmd/yukari/safe_values.go
@@ -1,5 +1,13 @@
 package main
 
+var LINK_HTTP_EQUIV_SAFE_VALUES [][]byte = [][]byte{
+        // X-UA-Compatible will be added automaticaly, so it can be skipped                                                                                           
+        []byte("date"),
+        []byte("last-modified"),
+        []byte("refresh"), // URL rewrite                                                                                                                             
+        []byte("content-language"),
+}
+
 var LINK_REL_SAFE_VALUES [][]byte = [][]byte{
         []byte("alternate"),
         []byte("archives"),