From 9eb592fa19024f586e5505eb3fd3dfee9a19e4cf Mon Sep 17 00:00:00 2001
From: John Beisley <johnbeisleyuk@gmail.com>
Date: Sun, 11 Jul 2021 14:44:55 +0100
Subject: [PATCH] Minor fixes to goupnpdcpgen.

Most importantly fix to run on Windows.
---
 cmd/goupnpdcpgen/fileutil.go     | 31 +++++++++++++++++++------------
 cmd/goupnpdcpgen/goupnpdcpgen.go |  2 +-
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/cmd/goupnpdcpgen/fileutil.go b/cmd/goupnpdcpgen/fileutil.go
index 095bd8b..e6a4413 100644
--- a/cmd/goupnpdcpgen/fileutil.go
+++ b/cmd/goupnpdcpgen/fileutil.go
@@ -21,30 +21,37 @@ func acquireFile(specFilename string, xmlSpecURL string) error {
 		return nil
 	}
 
-	resp, err := http.Get(xmlSpecURL)
+	tmpFilename := specFilename + ".download"
+	if err := downloadFile(tmpFilename, xmlSpecURL); err != nil {
+		return err
+	}
+
+	return os.Rename(tmpFilename, specFilename)
+}
+
+func downloadFile(filename, url string) error {
+	resp, err := http.Get(url)
 	if err != nil {
 		return err
 	}
 	defer resp.Body.Close()
 
 	if resp.StatusCode != http.StatusOK {
-		return fmt.Errorf("could not download spec %q from %q: %s",
-			specFilename, xmlSpecURL, resp.Status)
+		return fmt.Errorf("could not download %q from %q: %s",
+			filename, url, resp.Status)
 	}
 
-	tmpFilename := specFilename + ".download"
-	w, err := os.Create(tmpFilename)
-	if err != nil {
-		return err
-	}
-	defer w.Close()
-
-	_, err = io.Copy(w, resp.Body)
+	w, err := os.Create(filename)
 	if err != nil {
 		return err
 	}
 
-	return os.Rename(tmpFilename, specFilename)
+	if _, err := io.Copy(w, resp.Body); err != nil {
+		w.Close()
+		return err
+	}
+
+	return w.Close()
 }
 
 func globFiles(pattern string, archive *zip.ReadCloser) []*zip.File {
diff --git a/cmd/goupnpdcpgen/goupnpdcpgen.go b/cmd/goupnpdcpgen/goupnpdcpgen.go
index 33b6117..51fa22b 100644
--- a/cmd/goupnpdcpgen/goupnpdcpgen.go
+++ b/cmd/goupnpdcpgen/goupnpdcpgen.go
@@ -32,7 +32,7 @@ func main() {
 
 func run(dcpName, specsDir string, useGofmt bool) error {
 	if err := os.MkdirAll(specsDir, os.ModePerm); err != nil {
-		return fmt.Errorf("could not create specs-dir %q: %v\n", specsDir, err)
+		return fmt.Errorf("could not create specs-dir %q: %v", specsDir, err)
 	}
 
 	for _, d := range dcpMetadata {