From 5338ce1197c934540aeef8e3e9966db551767a60 Mon Sep 17 00:00:00 2001
From: dev <dev@d6811dac-2434-b64a-9ddc-f563ab233461>
Date: Tue, 19 Oct 2021 06:35:08 +0000
Subject: [PATCH] Use http.Error() when appropriate

git-svn-id: file:///srv/svn/repo/marisa/trunk@22 d6811dac-2434-b64a-9ddc-f563ab233461
---
 partage.go | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/partage.go b/partage.go
index 3fd198c..f7914eb 100644
--- a/partage.go
+++ b/partage.go
@@ -41,7 +41,6 @@ var conf struct {
 	expiry   int64
 }
 
-
 func writefile(f *os.File, s io.ReadCloser, contentlength int64) error {
 	buffer := make([]byte, 4096)
 	eof := false
@@ -106,7 +105,7 @@ func writemeta(filename string, expiry int64) error {
 func servetemplate(w http.ResponseWriter, f string, d templatedata) {
 	t, err := template.ParseFiles(conf.templatedir + "/" + f)
 	if err != nil {
-		w.WriteHeader(http.StatusInternalServerError)
+		http.Error(w, err, http.StatusInternalServerError)
 		return
 	}
 
@@ -119,8 +118,7 @@ func servetemplate(w http.ResponseWriter, f string, d templatedata) {
 func uploaderPut(w http.ResponseWriter, r *http.Request) {
 	/* limit upload size */
 	if r.ContentLength > conf.maxsize {
-		w.WriteHeader(http.StatusRequestEntityTooLarge)
-		w.Write([]byte("File is too big"))
+		http.Error(w, "File is too big", http.StatusRequestEntityTooLarge)
 	}
 
 	tmp, _ := ioutil.TempFile(conf.filepath, "*"+path.Ext(r.URL.Path))
@@ -132,7 +130,7 @@ func uploaderPut(w http.ResponseWriter, r *http.Request) {
 	defer f.Close()
 
 	if err = writefile(f, r.Body, r.ContentLength); err != nil {
-		w.WriteHeader(http.StatusInternalServerError)
+		http.Error(w, err, http.StatusInternalServerError)
 		defer os.Remove(tmp.Name())
 		return
 	}
@@ -149,14 +147,13 @@ func uploaderPost(w http.ResponseWriter, r *http.Request) {
 	links := []string{}
 	for _, h := range r.MultipartForm.File["uck"] {
 		if h.Size > conf.maxsize {
-			w.WriteHeader(http.StatusRequestEntityTooLarge)
-			w.Write([]byte("File is too big"))
+			http.Error(w, "File is too big", http.StatusRequestEntityTooLarge)
 			return
 		}
 
 		post, err := h.Open()
 		if err != nil {
-			w.WriteHeader(http.StatusInternalServerError)
+			http.Error(w, err, http.StatusInternalServerError)
 			return
 		}
 		defer post.Close()
@@ -164,13 +161,13 @@ func uploaderPost(w http.ResponseWriter, r *http.Request) {
 		tmp, _ := ioutil.TempFile(conf.filepath, "*"+path.Ext(h.Filename))
 		f, err := os.Create(tmp.Name())
 		if err != nil {
-			w.WriteHeader(http.StatusInternalServerError)
+			http.Error(w, err, http.StatusInternalServerError)
 			return
 		}
 		defer f.Close()
 
 		if err = writefile(f, post, h.Size); err != nil {
-			w.WriteHeader(http.StatusInternalServerError)
+			http.Error(w, err, http.StatusInternalServerError)
 			defer os.Remove(tmp.Name())
 			return
 		}