From 5cddb46379a0c85fc9e6aa7cc681daee46d1732c Mon Sep 17 00:00:00 2001
From: Sergey Matveev <stargrave@stargrave.org>
Date: Tue, 6 Aug 2024 14:49:43 +0300
Subject: [PATCH] Fix various lint warnings and suggestions

---
 cfg.go                |  9 +++++----
 cmd/godlighty/main.go | 11 ++++++-----
 dirlist.go            |  8 ++++----
 handler.go            |  6 ++++--
 rc/mime.go            |  6 ++----
 tls.go                |  2 +-
 6 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/cfg.go b/cfg.go
index 41e8505..110e0e3 100644
--- a/cfg.go
+++ b/cfg.go
@@ -36,18 +36,19 @@ type AuthCfg struct {
 type Hook func(http.ResponseWriter, *http.Request) bool
 
 type HostCfg struct {
+	MIMEs    map[string]string
 	Root     string
 	ECDSATLS *TLSCfg
 	EdDSATLS *TLSCfg
 	GOSTTLS  *TLSCfg
-	DirList  bool
-	WebDAV   bool
-	Hooks    []Hook
 	Auth     *AuthCfg
 
+	Hooks   []Hook
 	Indices []string
 	Readmes []string
-	MIMEs   map[string]string
+
+	DirList bool
+	WebDAV  bool
 }
 
 var Hosts = make(map[string]*HostCfg)
diff --git a/cmd/godlighty/main.go b/cmd/godlighty/main.go
index 912684f..9f09407 100644
--- a/cmd/godlighty/main.go
+++ b/cmd/godlighty/main.go
@@ -64,31 +64,32 @@ func main() {
 	}
 
 	if *doSetGID != 0 {
-		if err := syscall.Setregid(*doSetGID, *doSetGID); err != nil {
+		if err = syscall.Setregid(*doSetGID, *doSetGID); err != nil {
 			log.Fatal(err)
 		}
 	}
 	if *doSetGIDs == "" {
 		if *doSetGID != 0 {
-			if err := syscall.Setgroups([]int{*doSetGID}); err != nil {
+			if err = syscall.Setgroups([]int{*doSetGID}); err != nil {
 				log.Fatal(err)
 			}
 		}
 	} else {
 		gids := []int{}
 		for _, g := range strings.Split(*doSetGIDs, ",") {
-			gid, err := strconv.Atoi(g)
+			var gid int
+			gid, err = strconv.Atoi(g)
 			if err != nil {
 				log.Fatalln(err)
 			}
 			gids = append(gids, gid)
 		}
-		if err := syscall.Setgroups(gids); err != nil {
+		if err = syscall.Setgroups(gids); err != nil {
 			log.Fatal(err)
 		}
 	}
 	if *doSetUID != 0 {
-		if err := syscall.Setreuid(*doSetUID, *doSetUID); err != nil {
+		if err = syscall.Setreuid(*doSetUID, *doSetUID); err != nil {
 			log.Fatal(err)
 		}
 	}
diff --git a/dirlist.go b/dirlist.go
index 0670692..d0bfc7b 100644
--- a/dirlist.go
+++ b/dirlist.go
@@ -50,13 +50,13 @@ func (a ByName) Less(i, j int) bool {
 }
 
 type DirListFile struct {
-	Idx     int
 	Name    string
 	Size    string
-	IsDir   bool
 	Type    string
 	ModTime string
 	Symlink string
+	Idx     int
+	IsDir   bool
 }
 
 func dirList(
@@ -101,13 +101,13 @@ func dirList(
 	err = DirListTmpl.Execute(fd, struct {
 		Root   string
 		Dir    string
-		Files  []DirListFile
 		Readme string
+		Files  []DirListFile
 	}{
 		Root:   root,
 		Dir:    dir,
-		Files:  files,
 		Readme: readme,
+		Files:  files,
 	})
 	if err != nil {
 		fd.Close()
diff --git a/handler.go b/handler.go
index 10b0d2f..3060f97 100644
--- a/handler.go
+++ b/handler.go
@@ -22,6 +22,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"io/fs"
 	"log"
 	"net"
 	"net/http"
@@ -182,7 +183,8 @@ func (h Handler) Handle(
 IndexLookuped:
 	if fi.IsDir() {
 		if cfg.DirList {
-			entries, err := os.ReadDir(pth)
+			var entries []fs.DirEntry
+			entries, err = os.ReadDir(pth)
 			if err != nil {
 				printErr(http.StatusInternalServerError, err)
 				http.Error(w, "internal error", http.StatusInternalServerError)
@@ -218,7 +220,7 @@ IndexLookuped:
 		} else {
 			for _, index := range append(cfg.Indices, Index) {
 				p := path.Join(pth, index)
-				if _, err := os.Stat(p); err == nil {
+				if _, err = os.Stat(p); err == nil {
 					pth = p
 					fi, err = os.Stat(pth)
 					if err != nil {
diff --git a/rc/mime.go b/rc/mime.go
index 63ff312..75f3cf7 100644
--- a/rc/mime.go
+++ b/rc/mime.go
@@ -10,10 +10,8 @@ import (
 
 const MIMEDir = "mime"
 
-var (
-	//go:embed mime
-	mimes embed.FS
-)
+//go:embed mime
+var mimes embed.FS
 
 type MIMEEntry struct {
 	ext          string
diff --git a/tls.go b/tls.go
index 28f54fb..b79edd7 100644
--- a/tls.go
+++ b/tls.go
@@ -70,7 +70,7 @@ func GetCertificate(chi *tls.ClientHelloInfo) (*tls.Certificate, error) {
 		cert = HostToEdDSACertificate[chi.ServerName]
 	} else {
 		if CHIHasEdDSA(chi) {
-			if cert := HostToEdDSACertificate[chi.ServerName]; cert != nil {
+			if cert = HostToEdDSACertificate[chi.ServerName]; cert != nil {
 				return cert, nil
 			}
 		}
-- 
2.48.1