From b9c0a09435392913c0054382500c805cd7cb596b Mon Sep 17 00:00:00 2001
From: Máximo Cuadros <mcuadros@gmail.com>
Date: Sun, 25 Sep 2016 23:58:59 +0200
Subject: formats: objfile idomatic reader/writer

---
 utils/fs/os.go | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

(limited to 'utils/fs')

diff --git a/utils/fs/os.go b/utils/fs/os.go
index 51af921..a0d197d 100644
--- a/utils/fs/os.go
+++ b/utils/fs/os.go
@@ -23,11 +23,8 @@ func NewOS(rootDir string) *OS {
 func (fs *OS) Create(filename string) (File, error) {
 	fullpath := path.Join(fs.RootDir, filename)
 
-	dir := filepath.Dir(fullpath)
-	if dir != "." {
-		if err := os.MkdirAll(dir, 0755); err != nil {
-			return nil, err
-		}
+	if err := fs.createDir(fullpath); err != nil {
+		return nil, err
 	}
 
 	f, err := os.Create(fullpath)
@@ -41,6 +38,17 @@ func (fs *OS) Create(filename string) (File, error) {
 	}, nil
 }
 
+func (fs *OS) createDir(fullpath string) error {
+	dir := filepath.Dir(fullpath)
+	if dir != "." {
+		if err := os.MkdirAll(dir, 0755); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
 // ReadDir returns the filesystem info for all the archives under the specified
 // path.
 func (fs *OS) ReadDir(path string) ([]FileInfo, error) {
@@ -62,6 +70,11 @@ func (fs *OS) ReadDir(path string) ([]FileInfo, error) {
 func (fs *OS) Rename(from, to string) error {
 	from = fs.Join(fs.RootDir, from)
 	to = fs.Join(fs.RootDir, to)
+
+	if err := fs.createDir(to); err != nil {
+		return err
+	}
+
 	return os.Rename(from, to)
 }
 
-- 
cgit