Update package paths and README

Fix go format of generated code

Makefile

@@ -0,0 +1,2 @@
+all:
+	make -C testdata

README.md

@@ -1,3 +1,13 @@
+> **NOTICE:**
+>
+> This repository is a fork of <https://github.com/jteeuwen/go-bindata> which
+> itself was a fork of an original project that disappeared.
+>
+> I've cloned a copy for personal use at <https://git.kirsle.net/go/bindata> so
+> that I always have a version that won't disappear.
+>
+> [@kirsle](https://www.kirsle.net/)
+
 ## bindata
 
 This package converts any file into managable Go source code. Useful for
@@ -13,7 +23,7 @@ output being generated.
 
 To install the library and command line program, use the following:
 
-	go get github.com/jteeuwen/go-bindata/...
+	go get -u git.kirsle.net/go/bindata/...
 
 
 ### Usage
@@ -42,7 +52,7 @@ Multiple input directories can be specified if necessary.
 	$ go-bindata dir1/... /path/to/dir2/... dir3
 
 
-The following paragraphs detail some of the command line options which can be 
+The following paragraphs detail some of the command line options which can be
 supplied to `go-bindata`. Refer to the `testdata/out` directory for various
 output examples from the assets in `testdata/in`. Each example uses different
 command line options.
@@ -53,14 +63,14 @@ To ignore files, pass in regexes using -ignore, for example:
 
 ### Accessing an asset
 
-To access asset data, we use the `Asset(string) []byte` function which
+To access asset data, we use the `Asset(string) ([]byte, error)` function which
 is included in the generated output.
 
-	data := Asset("pub/style/foo.css")
-	if len(data) == 0 {
+	data, err := Asset("pub/style/foo.css")
+	if err != nil {
 		// Asset was not found.
 	}
-	
+
 	// use asset data
 
 
@@ -184,6 +194,5 @@ and must follow the build tags syntax specified by the go tool.
 
 ### Related projects
 
-[go-bindata-assetfs](https://github.com/elazarl/go-bindata-assetfs#readme) - 
+[go-bindata-assetfs](https://github.com/elazarl/go-bindata-assetfs#readme) -
 implements `http.FileSystem` interface. Allows you to serve assets with `net/http`.
-

asset.go

@@ -10,10 +10,3 @@ type Asset struct {
 	Name string // Key used in TOC -- name by which asset is referenced.
 	Func string // Function name for the procedure returning the asset contents.
 }
-
-// Implement sort.Interface for []Asset based on Path field
-type ByPath []Asset
-
-func (v ByPath) Len() int           { return len(v) }
-func (v ByPath) Swap(i, j int)      { v[i], v[j] = v[j], v[i] }
-func (v ByPath) Less(i, j int) bool { return v[i].Path < v[j].Path }

config.go

@@ -117,10 +117,22 @@ type Config struct {
 	// in the code. The default behaviour is Release mode.
 	Debug bool
 
-	// Recursively process all assets in the input directory and its
-	// sub directories. This defaults to false, so only files in the
-	// input directory itself are read.
-	Recursive bool
+	// Perform a dev build, which is nearly identical to the debug option. The
+	// only difference is that instead of absolute file paths in generated code,
+	// it expects a variable, `rootDir`, to be set in the generated code's
+	// package (the author needs to do this manually), which it then prepends to
+	// an asset's name to construct the file path on disk.
+	//
+	// This is mainly so you can push the generated code file to a shared
+	// repository.
+	Dev bool
+
+	// When true, size, mode and modtime are not preserved from files
+	NoMetadata bool
+	// When nonzero, use this as mode for all files.
+	Mode uint
+	// When nonzero, use this as unix timestamp for all files.
+	ModTime int64
 
 	// Ignores any filenames matching the regex pattern specified, e.g.
 	// path/to/file.ext will ignore only that file, or \\.gitignore
@@ -137,7 +149,6 @@ func NewConfig() *Config {
 	c.NoMemCopy = false
 	c.NoCompress = false
 	c.Debug = false
-	c.Recursive = false
 	c.Output = "./bindata.go"
 	c.Ignore = make([]*regexp.Regexp, 0)
 	return c

convert.go

@@ -27,17 +27,16 @@ func Translate(c *Config) error {
 		return err
 	}
 
+	var knownFuncs = make(map[string]int)
+	var visitedPaths = make(map[string]bool)
 	// Locate all the assets.
 	for _, input := range c.Input {
-		err = findFiles(input.Path, c.Prefix, input.Recursive, &toc, c.Ignore)
+		err = findFiles(input.Path, c.Prefix, input.Recursive, &toc, c.Ignore, knownFuncs, visitedPaths)
 		if err != nil {
 			return err
 		}
 	}
 
-	// Sort to make output stable between invocations
-	sort.Sort(ByPath(toc))
-
 	// Create output file.
 	fd, err := os.Create(c.Output)
 	if err != nil {
@@ -50,10 +49,32 @@ func Translate(c *Config) error {
 	bfd := bufio.NewWriter(fd)
 	defer bfd.Flush()
 
+	// Write the header. This makes e.g. Github ignore diffs in generated files.
+	if _, err = fmt.Fprint(bfd, "// Code generated by go-bindata.\n"); err != nil {
+		return err
+	}
+	if _, err = fmt.Fprint(bfd, "// sources:\n"); err != nil {
+		return err
+	}
+
+	wd, err := os.Getwd()
+	if err != nil {
+		return err
+	}
+
+	for _, asset := range toc {
+		relative, _ := filepath.Rel(wd, asset.Path)
+		if _, err = fmt.Fprintf(bfd, "// %s\n", filepath.ToSlash(relative)); err != nil {
+			return err
+		}
+	}
+	if _, err = fmt.Fprint(bfd, "// DO NOT EDIT!\n\n"); err != nil {
+		return err
+	}
+
 	// Write build tags, if applicable.
 	if len(c.Tags) > 0 {
-		_, err = fmt.Fprintf(bfd, "// +build %s\n\n", c.Tags)
-		if err != nil {
+		if _, err = fmt.Fprintf(bfd, "// +build %s\n\n", c.Tags); err != nil {
 			return err
 		}
 	}
@@ -65,8 +86,8 @@ func Translate(c *Config) error {
 	}
 
 	// Write assets.
-	if c.Debug {
-		err = writeDebug(bfd, toc)
+	if c.Debug || c.Dev {
+		err = writeDebug(bfd, c, toc)
 	} else {
 		err = writeRelease(bfd, c, toc)
 	}
@@ -80,20 +101,33 @@ func Translate(c *Config) error {
 		return err
 	}
 	// Write hierarchical tree of assets
-	return writeTOCTree(bfd, toc)
+	if err := writeTOCTree(bfd, toc); err != nil {
+		return err
+	}
+
+	// Write restore procedure
+	return writeRestore(bfd)
 }
 
+// Implement sort.Interface for []os.FileInfo based on Name()
+type ByName []os.FileInfo
+
+func (v ByName) Len() int           { return len(v) }
+func (v ByName) Swap(i, j int)      { v[i], v[j] = v[j], v[i] }
+func (v ByName) Less(i, j int) bool { return v[i].Name() < v[j].Name() }
+
 // findFiles recursively finds all the file paths in the given directory tree.
 // They are added to the given map as keys. Values will be safe function names
 // for each file, which will be used when generating the output code.
-func findFiles(dir, prefix string, recursive bool, toc *[]Asset, ignore []*regexp.Regexp) error {
+func findFiles(dir, prefix string, recursive bool, toc *[]Asset, ignore []*regexp.Regexp, knownFuncs map[string]int, visitedPaths map[string]bool) error {
+	dirpath := dir
 	if len(prefix) > 0 {
-		dir, _ = filepath.Abs(dir)
+		dirpath, _ = filepath.Abs(dirpath)
 		prefix, _ = filepath.Abs(prefix)
 		prefix = filepath.ToSlash(prefix)
 	}
 
-	fi, err := os.Stat(dir)
+	fi, err := os.Stat(dirpath)
 	if err != nil {
 		return err
 	}
@@ -101,10 +135,11 @@ func findFiles(dir, prefix string, recursive bool, toc *[]Asset, ignore []*regex
 	var list []os.FileInfo
 
 	if !fi.IsDir() {
-		dir = ""
+		dirpath = filepath.Dir(dirpath)
 		list = []os.FileInfo{fi}
 	} else {
-		fd, err := os.Open(dir)
+		visitedPaths[dirpath] = true
+		fd, err := os.Open(dirpath)
 		if err != nil {
 			return err
 		}
@@ -115,13 +150,14 @@ func findFiles(dir, prefix string, recursive bool, toc *[]Asset, ignore []*regex
 		if err != nil {
 			return err
 		}
-	}
 
-	knownFuncs := make(map[string]int)
+		// Sort to make output stable between invocations
+		sort.Sort(ByName(list))
+	}
 
 	for _, file := range list {
 		var asset Asset
-		asset.Path = filepath.Join(dir, file.Name())
+		asset.Path = filepath.Join(dirpath, file.Name())
 		asset.Name = filepath.ToSlash(asset.Path)
 
 		ignoring := false
@@ -137,13 +173,32 @@ func findFiles(dir, prefix string, recursive bool, toc *[]Asset, ignore []*regex
 
 		if file.IsDir() {
 			if recursive {
-				findFiles(asset.Path, prefix, recursive, toc, ignore)
+				recursivePath := filepath.Join(dir, file.Name())
+				visitedPaths[asset.Path] = true
+				findFiles(recursivePath, prefix, recursive, toc, ignore, knownFuncs, visitedPaths)
+			}
+			continue
+		} else if file.Mode()&os.ModeSymlink == os.ModeSymlink {
+			var linkPath string
+			if linkPath, err = os.Readlink(asset.Path); err != nil {
+				return err
+			}
+			if !filepath.IsAbs(linkPath) {
+				if linkPath, err = filepath.Abs(dirpath + "/" + linkPath); err != nil {
+					return err
+				}
+			}
+			if _, ok := visitedPaths[linkPath]; !ok {
+				visitedPaths[linkPath] = true
+				findFiles(asset.Path, prefix, recursive, toc, ignore, knownFuncs, visitedPaths)
 			}
 			continue
 		}
 
 		if strings.HasPrefix(asset.Name, prefix) {
 			asset.Name = asset.Name[len(prefix):]
+		} else {
+			asset.Name = filepath.Join(dir, file.Name())
 		}
 
 		// If we have a leading slash, get rid of it.
@@ -171,18 +226,24 @@ var regFuncName = regexp.MustCompile(`[^a-zA-Z0-9_]`)
 // also compares against a known list of functions to
 // prevent conflict based on name translation.
 func safeFunctionName(name string, knownFuncs map[string]int) string {
+	var inBytes, outBytes []byte
+	var toUpper bool
+
 	name = strings.ToLower(name)
-	name = regFuncName.ReplaceAllString(name, "_")
+	inBytes = []byte(name)
 
-	// Get rid of "__" instances for niceness.
-	for strings.Index(name, "__") > -1 {
-		name = strings.Replace(name, "__", "_", -1)
+	for i := 0; i < len(inBytes); i++ {
+		if regFuncName.Match([]byte{inBytes[i]}) {
+			toUpper = true
+		} else if toUpper {
+			outBytes = append(outBytes, []byte(strings.ToUpper(string(inBytes[i])))...)
+			toUpper = false
+		} else {
+			outBytes = append(outBytes, inBytes[i])
+		}
 	}
 
-	// Leading underscores are silly (unless they prefix a digit (see below)).
-	for len(name) > 1 && name[0] == '_' {
-		name = name[1:]
-	}
+	name = string(outBytes)
 
 	// Identifier can't start with a digit.
 	if unicode.IsDigit(rune(name[0])) {

convert_test.go

@@ -0,0 +1,90 @@
+package bindata
+
+import (
+	"regexp"
+	"strings"
+	"testing"
+)
+
+func TestSafeFunctionName(t *testing.T) {
+	var knownFuncs = make(map[string]int)
+	name1 := safeFunctionName("foo/bar", knownFuncs)
+	name2 := safeFunctionName("foo_bar", knownFuncs)
+	if name1 == name2 {
+		t.Errorf("name collision")
+	}
+}
+
+func TestFindFiles(t *testing.T) {
+	var toc []Asset
+	var knownFuncs = make(map[string]int)
+	var visitedPaths = make(map[string]bool)
+	err := findFiles("testdata/dupname", "testdata/dupname", true, &toc, []*regexp.Regexp{}, knownFuncs, visitedPaths)
+	if err != nil {
+		t.Errorf("expected to be no error: %+v", err)
+	}
+	if toc[0].Func == toc[1].Func {
+		t.Errorf("name collision")
+	}
+}
+
+func TestFindFilesWithSymlinks(t *testing.T) {
+	var tocSrc []Asset
+	var tocTarget []Asset
+
+	var knownFuncs = make(map[string]int)
+	var visitedPaths = make(map[string]bool)
+	err := findFiles("testdata/symlinkSrc", "testdata/symlinkSrc", true, &tocSrc, []*regexp.Regexp{}, knownFuncs, visitedPaths)
+	if err != nil {
+		t.Errorf("expected to be no error: %+v", err)
+	}
+
+	knownFuncs = make(map[string]int)
+	visitedPaths = make(map[string]bool)
+	err = findFiles("testdata/symlinkParent", "testdata/symlinkParent", true, &tocTarget, []*regexp.Regexp{}, knownFuncs, visitedPaths)
+	if err != nil {
+		t.Errorf("expected to be no error: %+v", err)
+	}
+
+	if len(tocSrc) != len(tocTarget) {
+		t.Errorf("Symlink source and target should have the same number of assets.  Expected %d got %d", len(tocTarget), len(tocSrc))
+	} else {
+		for i, _ := range tocSrc {
+			targetFunc := strings.TrimPrefix(tocTarget[i].Func, "symlinktarget")
+			targetFunc = strings.ToLower(targetFunc[:1]) + targetFunc[1:]
+			if tocSrc[i].Func != targetFunc {
+				t.Errorf("Symlink source and target produced different function lists.  Expected %s to be %s", targetFunc, tocSrc[i].Func)
+			}
+		}
+	}
+}
+
+func TestFindFilesWithRecursiveSymlinks(t *testing.T) {
+	var toc []Asset
+
+	var knownFuncs = make(map[string]int)
+	var visitedPaths = make(map[string]bool)
+	err := findFiles("testdata/symlinkRecursiveParent", "testdata/symlinkRecursiveParent", true, &toc, []*regexp.Regexp{}, knownFuncs, visitedPaths)
+	if err != nil {
+		t.Errorf("expected to be no error: %+v", err)
+	}
+
+	if len(toc) != 1 {
+		t.Errorf("Only one asset should have been found.  Got %d: %v", len(toc), toc)
+	}
+}
+
+func TestFindFilesWithSymlinkedFile(t *testing.T) {
+	var toc []Asset
+
+	var knownFuncs = make(map[string]int)
+	var visitedPaths = make(map[string]bool)
+	err := findFiles("testdata/symlinkFile", "testdata/symlinkFile", true, &toc, []*regexp.Regexp{}, knownFuncs, visitedPaths)
+	if err != nil {
+		t.Errorf("expected to be no error: %+v", err)
+	}
+
+	if len(toc) != 1 {
+		t.Errorf("Only one asset should have been found.  Got %d: %v", len(toc), toc)
+	}
+}

debug.go

@@ -10,14 +10,14 @@ import (
 )
 
 // writeDebug writes the debug code file.
-func writeDebug(w io.Writer, toc []Asset) error {
+func writeDebug(w io.Writer, c *Config, toc []Asset) error {
 	err := writeDebugHeader(w)
 	if err != nil {
 		return err
 	}
 
 	for i := range toc {
-		err = writeDebugAsset(w, &toc[i])
+		err = writeDebugAsset(w, c, &toc[i])
 		if err != nil {
 			return err
 		}
@@ -32,11 +32,13 @@ func writeDebugHeader(w io.Writer) error {
 	_, err := fmt.Fprintf(w, `import (
 	"fmt"
 	"io/ioutil"
+	"os"
+	"path/filepath"
 	"strings"
 )
 
-// bindata_read reads the given file from disk. It returns an error on failure.
-func bindata_read(path, name string) ([]byte, error) {
+// bindataRead reads the given file from disk. It returns an error on failure.
+func bindataRead(path, name string) ([]byte, error) {
 	buf, err := ioutil.ReadFile(path)
 	if err != nil {
 		err = fmt.Errorf("Error reading asset %%s at %%s: %%v", name, path, err)
@@ -44,6 +46,11 @@ func bindata_read(path, name string) ([]byte, error) {
 	return buf, err
 }
 
+type asset struct {
+	bytes []byte
+	info  os.FileInfo
+}
+
 `)
 	return err
 }
@@ -51,15 +58,30 @@ func bindata_read(path, name string) ([]byte, error) {
 // writeDebugAsset write a debug entry for the given asset.
 // A debug entry is simply a function which reads the asset from
 // the original file (e.g.: from disk).
-func writeDebugAsset(w io.Writer, asset *Asset) error {
+func writeDebugAsset(w io.Writer, c *Config, asset *Asset) error {
+	pathExpr := fmt.Sprintf("%q", asset.Path)
+	if c.Dev {
+		pathExpr = fmt.Sprintf("filepath.Join(rootDir, %q)", asset.Name)
+	}
+
 	_, err := fmt.Fprintf(w, `// %s reads file data from disk. It returns an error on failure.
-func %s() ([]byte, error) {
-	return bindata_read(
-		%q,
-		%q,
-	)
+func %s() (*asset, error) {
+	path := %s
+	name := %q
+	bytes, err := bindataRead(path, name)
+	if err != nil {
+		return nil, err
+	}
+
+	fi, err := os.Stat(path)
+	if err != nil {
+		err = fmt.Errorf("Error reading asset info %%s at %%s: %%v", name, path, err)
+	}
+
+	a := &asset{bytes: bytes, info: fi}
+	return a, err
 }
 
-`, asset.Func, asset.Func, asset.Path, asset.Name)
+`, asset.Func, asset.Func, pathExpr, asset.Name)
 	return err
 }

go-bindata/main.go

@@ -7,11 +7,12 @@ package main
 import (
 	"flag"
 	"fmt"
-	"github.com/jteeuwen/go-bindata"
 	"os"
 	"path/filepath"
 	"regexp"
 	"strings"
+
+	"git.kirsle.net/go/bindata"
 )
 
 func main() {
@@ -40,11 +41,15 @@ func parseArgs() *bindata.Config {
 	}
 
 	flag.BoolVar(&c.Debug, "debug", c.Debug, "Do not embed the assets, but provide the embedding API. Contents will still be loaded from disk.")
+	flag.BoolVar(&c.Dev, "dev", c.Dev, "Similar to debug, but does not emit absolute paths. Expects a rootDir variable to already exist in the generated code's package.")
 	flag.StringVar(&c.Tags, "tags", c.Tags, "Optional set of build tags to include.")
 	flag.StringVar(&c.Prefix, "prefix", c.Prefix, "Optional path prefix to strip off asset names.")
 	flag.StringVar(&c.Package, "pkg", c.Package, "Package name to use in the generated code.")
 	flag.BoolVar(&c.NoMemCopy, "nomemcopy", c.NoMemCopy, "Use a .rodata hack to get rid of unnecessary memcopies. Refer to the documentation to see what implications this carries.")
 	flag.BoolVar(&c.NoCompress, "nocompress", c.NoCompress, "Assets will *not* be GZIP compressed when this flag is specified.")
+	flag.BoolVar(&c.NoMetadata, "nometadata", c.NoMetadata, "Assets will not preserve size, mode, and modtime info.")
+	flag.UintVar(&c.Mode, "mode", c.Mode, "Optional file mode override for all files.")
+	flag.Int64Var(&c.ModTime, "modtime", c.ModTime, "Optional modification unix timestamp override for all files.")
 	flag.StringVar(&c.Output, "o", c.Output, "Optional name of the output file to be generated.")
 	flag.BoolVar(&version, "version", false, "Displays version information.")
 

release.go

@@ -5,10 +5,13 @@
 package bindata
 
 import (
+	"bytes"
 	"compress/gzip"
 	"fmt"
 	"io"
+	"io/ioutil"
 	"os"
+	"unicode/utf8"
 )
 
 // writeRelease writes the release code file.
@@ -31,19 +34,24 @@ func writeRelease(w io.Writer, c *Config, toc []Asset) error {
 // writeReleaseHeader writes output file headers.
 // This targets release builds.
 func writeReleaseHeader(w io.Writer, c *Config) error {
+	var err error
 	if c.NoCompress {
 		if c.NoMemCopy {
-			return header_uncompressed_nomemcopy(w)
+			err = header_uncompressed_nomemcopy(w)
 		} else {
-			return header_uncompressed_memcopy(w)
+			err = header_uncompressed_memcopy(w)
 		}
 	} else {
 		if c.NoMemCopy {
-			return header_compressed_nomemcopy(w)
+			err = header_compressed_nomemcopy(w)
 		} else {
-			return header_compressed_memcopy(w)
+			err = header_compressed_memcopy(w)
 		}
 	}
+	if err != nil {
+		return err
+	}
+	return header_release_common(w)
 }
 
 // writeReleaseAsset write a release entry for the given asset.
@@ -59,17 +67,34 @@ func writeReleaseAsset(w io.Writer, c *Config, asset *Asset) error {
 
 	if c.NoCompress {
 		if c.NoMemCopy {
-			return uncompressed_nomemcopy(w, asset, fd)
+			err = uncompressed_nomemcopy(w, asset, fd)
 		} else {
-			return uncompressed_memcopy(w, asset, fd)
+			err = uncompressed_memcopy(w, asset, fd)
 		}
 	} else {
 		if c.NoMemCopy {
-			return compressed_nomemcopy(w, asset, fd)
+			err = compressed_nomemcopy(w, asset, fd)
 		} else {
-			return compressed_memcopy(w, asset, fd)
+			err = compressed_memcopy(w, asset, fd)
 		}
 	}
+	if err != nil {
+		return err
+	}
+	return asset_release_common(w, c, asset)
+}
+
+// sanitize prepares a valid UTF-8 string as a raw string constant.
+// Based on https://code.google.com/p/go/source/browse/godoc/static/makestatic.go?repo=tools
+func sanitize(b []byte) []byte {
+	// Replace ` with `+"`"+`
+	b = bytes.Replace(b, []byte("`"), []byte("`+\"`\"+`"), -1)
+
+	// Replace BOM with `+"\xEF\xBB\xBF"+`
+	// (A BOM is valid UTF-8 but not permitted in Go source files.
+	// I wouldn't bother handling this, but for some insane reason
+	// jquery.js has a BOM somewhere in the middle.)
+	return bytes.Replace(b, []byte("\xEF\xBB\xBF"), []byte("`+\"\\xEF\\xBB\\xBF\"+`"), -1)
 }
 
 func header_compressed_nomemcopy(w io.Writer) error {
@@ -78,32 +103,29 @@ func header_compressed_nomemcopy(w io.Writer) error {
 	"compress/gzip"
 	"fmt"
 	"io"
-	"reflect"
+	"io/ioutil"
+	"os"
+	"path/filepath"
 	"strings"
-	"unsafe"
+	"time"
 )
 
-func bindata_read(data, name string) ([]byte, error) {
-	var empty [0]byte
-	sx := (*reflect.StringHeader)(unsafe.Pointer(&data))
-	b := empty[:]
-	bx := (*reflect.SliceHeader)(unsafe.Pointer(&b))
-	bx.Data = sx.Data
-	bx.Len = len(data)
-	bx.Cap = bx.Len
-
-	gz, err := gzip.NewReader(bytes.NewBuffer(b))
+func bindataRead(data, name string) ([]byte, error) {
+	gz, err := gzip.NewReader(strings.NewReader(data))
 	if err != nil {
 		return nil, fmt.Errorf("Read %%q: %%v", name, err)
 	}
 
 	var buf bytes.Buffer
 	_, err = io.Copy(&buf, gz)
-	gz.Close()
+	clErr := gz.Close()
 
 	if err != nil {
 		return nil, fmt.Errorf("Read %%q: %%v", name, err)
 	}
+	if clErr != nil {
+		return nil, err
+	}
 
 	return buf.Bytes(), nil
 }
@@ -118,10 +140,14 @@ func header_compressed_memcopy(w io.Writer) error {
 	"compress/gzip"
 	"fmt"
 	"io"
+	"io/ioutil"
+	"os"
+	"path/filepath"
 	"strings"
+	"time"
 )
 
-func bindata_read(data []byte, name string) ([]byte, error) {
+func bindataRead(data []byte, name string) ([]byte, error) {
 	gz, err := gzip.NewReader(bytes.NewBuffer(data))
 	if err != nil {
 		return nil, fmt.Errorf("Read %%q: %%v", name, err)
@@ -129,11 +155,14 @@ func bindata_read(data []byte, name string) ([]byte, error) {
 
 	var buf bytes.Buffer
 	_, err = io.Copy(&buf, gz)
-	gz.Close()
+	clErr := gz.Close()
 
 	if err != nil {
 		return nil, fmt.Errorf("Read %%q: %%v", name, err)
 	}
+	if clErr != nil {
+		return nil, err
+	}
 
 	return buf.Bytes(), nil
 }
@@ -145,12 +174,16 @@ func bindata_read(data []byte, name string) ([]byte, error) {
 func header_uncompressed_nomemcopy(w io.Writer) error {
 	_, err := fmt.Fprintf(w, `import (
 	"fmt"
+	"io/ioutil"
+	"os"
+	"path/filepath"
 	"reflect"
 	"strings"
+	"time"
 	"unsafe"
 )
 
-func bindata_read(data, name string) ([]byte, error) {
+func bindataRead(data, name string) ([]byte, error) {
 	var empty [0]byte
 	sx := (*reflect.StringHeader)(unsafe.Pointer(&data))
 	b := empty[:]
@@ -168,12 +201,52 @@ func bindata_read(data, name string) ([]byte, error) {
 func header_uncompressed_memcopy(w io.Writer) error {
 	_, err := fmt.Fprintf(w, `import (
 	"fmt"
+	"io/ioutil"
+	"os"
+	"path/filepath"
 	"strings"
+	"time"
 )
 `)
 	return err
 }
 
+func header_release_common(w io.Writer) error {
+	_, err := fmt.Fprintf(w, `type asset struct {
+	bytes []byte
+	info  os.FileInfo
+}
+
+type bindataFileInfo struct {
+	name    string
+	size    int64
+	mode    os.FileMode
+	modTime time.Time
+}
+
+func (fi bindataFileInfo) Name() string {
+	return fi.name
+}
+func (fi bindataFileInfo) Size() int64 {
+	return fi.size
+}
+func (fi bindataFileInfo) Mode() os.FileMode {
+	return fi.mode
+}
+func (fi bindataFileInfo) ModTime() time.Time {
+	return fi.modTime
+}
+func (fi bindataFileInfo) IsDir() bool {
+	return false
+}
+func (fi bindataFileInfo) Sys() interface{} {
+	return nil
+}
+
+`)
+	return err
+}
+
 func compressed_nomemcopy(w io.Writer, asset *Asset, r io.Reader) error {
 	_, err := fmt.Fprintf(w, `var _%s = "`, asset.Func)
 	if err != nil {
@@ -190,8 +263,8 @@ func compressed_nomemcopy(w io.Writer, asset *Asset, r io.Reader) error {
 
 	_, err = fmt.Fprintf(w, `"
 
-func %s() ([]byte, error) {
-	return bindata_read(
+func %sBytes() ([]byte, error) {
+	return bindataRead(
 		_%s,
 		%q,
 	)
@@ -202,14 +275,12 @@ func %s() ([]byte, error) {
 }
 
 func compressed_memcopy(w io.Writer, asset *Asset, r io.Reader) error {
-	_, err := fmt.Fprintf(w, `func %s() ([]byte, error) {
-	return bindata_read([]byte{`, asset.Func)
-
+	_, err := fmt.Fprintf(w, `var _%s = []byte("`, asset.Func)
 	if err != nil {
-		return nil
+		return err
 	}
 
-	gz := gzip.NewWriter(&ByteWriter{Writer: w})
+	gz := gzip.NewWriter(&StringWriter{Writer: w})
 	_, err = io.Copy(gz, r)
 	gz.Close()
 
@@ -217,13 +288,16 @@ func compressed_memcopy(w io.Writer, asset *Asset, r io.Reader) error {
 		return err
 	}
 
-	_, err = fmt.Fprintf(w, `
-	},
+	_, err = fmt.Fprintf(w, `")
+
+func %sBytes() ([]byte, error) {
+	return bindataRead(
+		_%s,
 		%q,
 	)
 }
 
-`, asset.Name)
+`, asset.Func, asset.Func, asset.Name)
 	return err
 }
 
@@ -240,8 +314,8 @@ func uncompressed_nomemcopy(w io.Writer, asset *Asset, r io.Reader) error {
 
 	_, err = fmt.Fprintf(w, `"
 
-func %s() ([]byte, error) {
-	return bindata_read(
+func %sBytes() ([]byte, error) {
+	return bindataRead(
 		_%s,
 		%q,
 	)
@@ -252,21 +326,62 @@ func %s() ([]byte, error) {
 }
 
 func uncompressed_memcopy(w io.Writer, asset *Asset, r io.Reader) error {
-	_, err := fmt.Fprintf(w, `func %s() ([]byte, error) {
-	return []byte{`, asset.Func)
+	_, err := fmt.Fprintf(w, `var _%s = []byte(`, asset.Func)
 	if err != nil {
 		return err
 	}
 
-	_, err = io.Copy(&ByteWriter{Writer: w}, r)
+	b, err := ioutil.ReadAll(r)
 	if err != nil {
 		return err
 	}
+	if utf8.Valid(b) && !bytes.Contains(b, []byte{0}) {
+		fmt.Fprintf(w, "`%s`", sanitize(b))
+	} else {
+		fmt.Fprintf(w, "%+q", b)
+	}
 
-	_, err = fmt.Fprintf(w, `
-	}, nil
+	_, err = fmt.Fprintf(w, `)
+
+func %sBytes() ([]byte, error) {
+	return _%s, nil
 }
 
-`)
+`, asset.Func, asset.Func)
+	return err
+}
+
+func asset_release_common(w io.Writer, c *Config, asset *Asset) error {
+	fi, err := os.Stat(asset.Path)
+	if err != nil {
+		return err
+	}
+
+	mode := uint(fi.Mode())
+	modTime := fi.ModTime().Unix()
+	size := fi.Size()
+	if c.NoMetadata {
+		mode = 0
+		modTime = 0
+		size = 0
+	}
+	if c.Mode > 0 {
+		mode = uint(os.ModePerm) & c.Mode
+	}
+	if c.ModTime > 0 {
+		modTime = c.ModTime
+	}
+	_, err = fmt.Fprintf(w, `func %s() (*asset, error) {
+	bytes, err := %sBytes()
+	if err != nil {
+		return nil, err
+	}
+
+	info := bindataFileInfo{name: %q, size: %d, mode: os.FileMode(%d), modTime: time.Unix(%d, 0)}
+	a := &asset{bytes: bytes, info: info}
+	return a, nil
+}
+
+`, asset.Func, asset.Func, asset.Name, size, mode, modTime)
 	return err
 }

restore.go

@@ -0,0 +1,63 @@
+// This work is subject to the CC0 1.0 Universal (CC0 1.0) Public Domain Dedication
+// license. Its contents can be found at:
+// http://creativecommons.org/publicdomain/zero/1.0/
+
+package bindata
+
+import (
+	"fmt"
+	"io"
+)
+
+func writeRestore(w io.Writer) error {
+	_, err := fmt.Fprintf(w, `
+// RestoreAsset restores an asset under the given directory
+func RestoreAsset(dir, name string) error {
+	data, err := Asset(name)
+	if err != nil {
+		return err
+	}
+	info, err := AssetInfo(name)
+	if err != nil {
+		return err
+	}
+	err = os.MkdirAll(_filePath(dir, filepath.Dir(name)), os.FileMode(0755))
+	if err != nil {
+		return err
+	}
+	err = ioutil.WriteFile(_filePath(dir, name), data, info.Mode())
+	if err != nil {
+		return err
+	}
+	err = os.Chtimes(_filePath(dir, name), info.ModTime(), info.ModTime())
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+// RestoreAssets restores an asset under the given directory recursively
+func RestoreAssets(dir, name string) error {
+	children, err := AssetDir(name)
+	// File
+	if err != nil {
+		return RestoreAsset(dir, name)
+	}
+	// Dir
+	for _, child := range children {
+		err = RestoreAssets(dir, filepath.Join(name, child))
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func _filePath(dir, name string) string {
+	cannonicalName := strings.Replace(name, "\\", "/", -1)
+	return filepath.Join(append([]string{dir}, strings.Split(cannonicalName, "/")...)...)
+}
+
+`)
+	return err
+}

testdata/Makefile

@@ -0,0 +1,37 @@
+FILES:=$(wildcard out/*.go)
+
+.PHONY: check
+check: errcheck vet golint $(FILES:.go=.checked)
+
+out/%.checked: out/%.go
+	errcheck $<
+	go tool vet --all $<
+	go tool vet --shadow $<
+	golint $<
+
+$(GOPATH)/bin/go-bindata: $(wildcard ../*.go) $(wildcard ../**/*.go)
+	go install ../...
+
+out/compress-memcopy.go: 		 $(wildcard in/**/*) $(GOPATH)/bin/go-bindata
+	$(GOPATH)/bin/go-bindata                        -o $@ in/...
+
+out/compress-nomemcopy.go: 	 $(wildcard in/**/*) $(GOPATH)/bin/go-bindata
+	$(GOPATH)/bin/go-bindata -nomemcopy             -o $@ in/...
+
+out/debug.go: 							 $(wildcard in/**/*) $(GOPATH)/bin/go-bindata
+	$(GOPATH)/bin/go-bindata -debug                 -o $@ in/...
+
+out/nocompress-memcopy.go:   $(wildcard in/**/*) $(GOPATH)/bin/go-bindata
+	$(GOPATH)/bin/go-bindata -nocompress            -o $@ in/...
+
+out/nocompress-nomemcopy.go: $(wildcard in/**/*) $(GOPATH)/bin/go-bindata
+	$(GOPATH)/bin/go-bindata -nocompress -nomemcopy -o $@ in/...
+
+errcheck:
+	go get github.com/kisielk/errcheck
+
+vet:
+	go get golang.org/x/tools/cmd/vet
+
+golint:
+	go get github.com/golang/lint/golint

testdata/dupname/foo/bar

@@ -0,0 +1 @@
+// sample file

testdata/dupname/foo_bar

@@ -0,0 +1 @@
+// sample file

testdata/out/compress-memcopy.go

@@ -1,86 +1,312 @@
+// Code generated by go-bindata.
+// sources:
+// in/a/test.asset
+// in/b/test.asset
+// in/c/test.asset
+// in/test.asset
+// DO NOT EDIT!
+
 package main
 
 import (
 	"bytes"
 	"compress/gzip"
+	"fmt"
 	"io"
-	"log"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"strings"
+	"time"
 )
 
-func bindata_read(data []byte, name string) []byte {
+func bindataRead(data []byte, name string) ([]byte, error) {
 	gz, err := gzip.NewReader(bytes.NewBuffer(data))
 	if err != nil {
-		log.Fatalf("Read %q: %v", name, err)
+		return nil, fmt.Errorf("Read %q: %v", name, err)
 	}
 
 	var buf bytes.Buffer
 	_, err = io.Copy(&buf, gz)
-	gz.Close()
+	clErr := gz.Close()
 
 	if err != nil {
-		log.Fatalf("Read %q: %v", name, err)
+		return nil, fmt.Errorf("Read %q: %v", name, err)
+	}
+	if clErr != nil {
+		return nil, err
 	}
 
-	return buf.Bytes()
+	return buf.Bytes(), nil
 }
 
-func in_b_test_asset() []byte {
-	return bindata_read([]byte{
-		0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x00, 0xff, 0xd2, 0xd7,
-		0x57, 0x28, 0x4e, 0xcc, 0x2d, 0xc8, 0x49, 0x55, 0x48, 0xcb, 0xcc, 0x49,
-		0xe5, 0x02, 0x04, 0x00, 0x00, 0xff, 0xff, 0x8a, 0x82, 0x8c, 0x85, 0x0f,
-		0x00, 0x00, 0x00,
-	},
-		"in/b/test.asset",
-	)
+type asset struct {
+	bytes []byte
+	info  os.FileInfo
 }
 
-func in_test_asset() []byte {
-	return bindata_read([]byte{
-		0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x00, 0xff, 0xd2, 0xd7,
-		0x57, 0x28, 0x4e, 0xcc, 0x2d, 0xc8, 0x49, 0x55, 0x48, 0xcb, 0xcc, 0x49,
-		0xe5, 0x02, 0x04, 0x00, 0x00, 0xff, 0xff, 0x8a, 0x82, 0x8c, 0x85, 0x0f,
-		0x00, 0x00, 0x00,
-	},
-		"in/test.asset",
-	)
+type bindataFileInfo struct {
+	name    string
+	size    int64
+	mode    os.FileMode
+	modTime time.Time
 }
 
-func in_a_test_asset() []byte {
-	return bindata_read([]byte{
-		0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x00, 0xff, 0xd2, 0xd7,
-		0x57, 0x28, 0x4e, 0xcc, 0x2d, 0xc8, 0x49, 0x55, 0x48, 0xcb, 0xcc, 0x49,
-		0xe5, 0x02, 0x04, 0x00, 0x00, 0xff, 0xff, 0x8a, 0x82, 0x8c, 0x85, 0x0f,
-		0x00, 0x00, 0x00,
-	},
+func (fi bindataFileInfo) Name() string {
+	return fi.name
+}
+func (fi bindataFileInfo) Size() int64 {
+	return fi.size
+}
+func (fi bindataFileInfo) Mode() os.FileMode {
+	return fi.mode
+}
+func (fi bindataFileInfo) ModTime() time.Time {
+	return fi.modTime
+}
+func (fi bindataFileInfo) IsDir() bool {
+	return false
+}
+func (fi bindataFileInfo) Sys() interface{} {
+	return nil
+}
+
+var _inATestAsset = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xd2\xd7\x57\x28\x4e\xcc\x2d\xc8\x49\x55\x48\xcb\xcc\x49\xe5\x02\x04\x00\x00\xff\xff\x8a\x82\x8c\x85\x0f\x00\x00\x00")
+
+func inATestAssetBytes() ([]byte, error) {
+	return bindataRead(
+		_inATestAsset,
 		"in/a/test.asset",
 	)
 }
 
-func in_c_test_asset() []byte {
-	return bindata_read([]byte{
-		0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x00, 0xff, 0xd2, 0xd7,
-		0x57, 0x28, 0x4e, 0xcc, 0x2d, 0xc8, 0x49, 0x55, 0x48, 0xcb, 0xcc, 0x49,
-		0xe5, 0x02, 0x04, 0x00, 0x00, 0xff, 0xff, 0x8a, 0x82, 0x8c, 0x85, 0x0f,
-		0x00, 0x00, 0x00,
-	},
+func inATestAsset() (*asset, error) {
+	bytes, err := inATestAssetBytes()
+	if err != nil {
+		return nil, err
+	}
+
+	info := bindataFileInfo{name: "in/a/test.asset", size: 15, mode: os.FileMode(436), modTime: time.Unix(1445582844, 0)}
+	a := &asset{bytes: bytes, info: info}
+	return a, nil
+}
+
+var _inBTestAsset = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xd2\xd7\x57\x28\x4e\xcc\x2d\xc8\x49\x55\x48\xcb\xcc\x49\xe5\x02\x04\x00\x00\xff\xff\x8a\x82\x8c\x85\x0f\x00\x00\x00")
+
+func inBTestAssetBytes() ([]byte, error) {
+	return bindataRead(
+		_inBTestAsset,
+		"in/b/test.asset",
+	)
+}
+
+func inBTestAsset() (*asset, error) {
+	bytes, err := inBTestAssetBytes()
+	if err != nil {
+		return nil, err
+	}
+
+	info := bindataFileInfo{name: "in/b/test.asset", size: 15, mode: os.FileMode(436), modTime: time.Unix(1445582844, 0)}
+	a := &asset{bytes: bytes, info: info}
+	return a, nil
+}
+
+var _inCTestAsset = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xd2\xd7\x57\x28\x4e\xcc\x2d\xc8\x49\x55\x48\xcb\xcc\x49\xe5\x02\x04\x00\x00\xff\xff\x8a\x82\x8c\x85\x0f\x00\x00\x00")
+
+func inCTestAssetBytes() ([]byte, error) {
+	return bindataRead(
+		_inCTestAsset,
 		"in/c/test.asset",
 	)
 }
 
+func inCTestAsset() (*asset, error) {
+	bytes, err := inCTestAssetBytes()
+	if err != nil {
+		return nil, err
+	}
+
+	info := bindataFileInfo{name: "in/c/test.asset", size: 15, mode: os.FileMode(436), modTime: time.Unix(1445582844, 0)}
+	a := &asset{bytes: bytes, info: info}
+	return a, nil
+}
+
+var _inTestAsset = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xd2\xd7\x57\x28\x4e\xcc\x2d\xc8\x49\x55\x48\xcb\xcc\x49\xe5\x02\x04\x00\x00\xff\xff\x8a\x82\x8c\x85\x0f\x00\x00\x00")
+
+func inTestAssetBytes() ([]byte, error) {
+	return bindataRead(
+		_inTestAsset,
+		"in/test.asset",
+	)
+}
+
+func inTestAsset() (*asset, error) {
+	bytes, err := inTestAssetBytes()
+	if err != nil {
+		return nil, err
+	}
+
+	info := bindataFileInfo{name: "in/test.asset", size: 15, mode: os.FileMode(436), modTime: time.Unix(1445582844, 0)}
+	a := &asset{bytes: bytes, info: info}
+	return a, nil
+}
+
 // Asset loads and returns the asset for the given name.
-// This returns nil of the asset could not be found.
-func Asset(name string) []byte {
-	if f, ok := _bindata[name]; ok {
-		return f()
+// It returns an error if the asset could not be found or
+// could not be loaded.
+func Asset(name string) ([]byte, error) {
+	cannonicalName := strings.Replace(name, "\\", "/", -1)
+	if f, ok := _bindata[cannonicalName]; ok {
+		a, err := f()
+		if err != nil {
+			return nil, fmt.Errorf("Asset %s can't read by error: %v", name, err)
+		}
+		return a.bytes, nil
+	}
+	return nil, fmt.Errorf("Asset %s not found", name)
+}
+
+// MustAsset is like Asset but panics when Asset would return an error.
+// It simplifies safe initialization of global variables.
+func MustAsset(name string) []byte {
+	a, err := Asset(name)
+	if err != nil {
+		panic("asset: Asset(" + name + "): " + err.Error())
+	}
+
+	return a
+}
+
+// AssetInfo loads and returns the asset info for the given name.
+// It returns an error if the asset could not be found or
+// could not be loaded.
+func AssetInfo(name string) (os.FileInfo, error) {
+	cannonicalName := strings.Replace(name, "\\", "/", -1)
+	if f, ok := _bindata[cannonicalName]; ok {
+		a, err := f()
+		if err != nil {
+			return nil, fmt.Errorf("AssetInfo %s can't read by error: %v", name, err)
+		}
+		return a.info, nil
+	}
+	return nil, fmt.Errorf("AssetInfo %s not found", name)
+}
+
+// AssetNames returns the names of the assets.
+func AssetNames() []string {
+	names := make([]string, 0, len(_bindata))
+	for name := range _bindata {
+		names = append(names, name)
+	}
+	return names
+}
+
+// _bindata is a table, holding each asset generator, mapped to its name.
+var _bindata = map[string]func() (*asset, error){
+	"in/a/test.asset": inATestAsset,
+	"in/b/test.asset": inBTestAsset,
+	"in/c/test.asset": inCTestAsset,
+	"in/test.asset": inTestAsset,
+}
+
+// AssetDir returns the file names below a certain
+// directory embedded in the file by go-bindata.
+// For example if you run go-bindata on data/... and data contains the
+// following hierarchy:
+//     data/
+//       foo.txt
+//       img/
+//         a.png
+//         b.png
+// then AssetDir("data") would return []string{"foo.txt", "img"}
+// AssetDir("data/img") would return []string{"a.png", "b.png"}
+// AssetDir("foo.txt") and AssetDir("notexist") would return an error
+// AssetDir("") will return []string{"data"}.
+func AssetDir(name string) ([]string, error) {
+	node := _bintree
+	if len(name) != 0 {
+		cannonicalName := strings.Replace(name, "\\", "/", -1)
+		pathList := strings.Split(cannonicalName, "/")
+		for _, p := range pathList {
+			node = node.Children[p]
+			if node == nil {
+				return nil, fmt.Errorf("Asset %s not found", name)
+			}
+		}
+	}
+	if node.Func != nil {
+		return nil, fmt.Errorf("Asset %s not found", name)
+	}
+	rv := make([]string, 0, len(node.Children))
+	for childName := range node.Children {
+		rv = append(rv, childName)
+	}
+	return rv, nil
+}
+
+type bintree struct {
+	Func     func() (*asset, error)
+	Children map[string]*bintree
+}
+var _bintree = &bintree{nil, map[string]*bintree{
+	"in": &bintree{nil, map[string]*bintree{
+		"a": &bintree{nil, map[string]*bintree{
+			"test.asset": &bintree{inATestAsset, map[string]*bintree{}},
+		}},
+		"b": &bintree{nil, map[string]*bintree{
+			"test.asset": &bintree{inBTestAsset, map[string]*bintree{}},
+		}},
+		"c": &bintree{nil, map[string]*bintree{
+			"test.asset": &bintree{inCTestAsset, map[string]*bintree{}},
+		}},
+		"test.asset": &bintree{inTestAsset, map[string]*bintree{}},
+	}},
+}}
+
+// RestoreAsset restores an asset under the given directory
+func RestoreAsset(dir, name string) error {
+	data, err := Asset(name)
+	if err != nil {
+		return err
+	}
+	info, err := AssetInfo(name)
+	if err != nil {
+		return err
+	}
+	err = os.MkdirAll(_filePath(dir, filepath.Dir(name)), os.FileMode(0755))
+	if err != nil {
+		return err
+	}
+	err = ioutil.WriteFile(_filePath(dir, name), data, info.Mode())
+	if err != nil {
+		return err
+	}
+	err = os.Chtimes(_filePath(dir, name), info.ModTime(), info.ModTime())
+	if err != nil {
+		return err
 	}
 	return nil
 }
 
-// _bindata is a table, holding each asset generator, mapped to its name.
-var _bindata = map[string]func() []byte{
-	"in/b/test.asset": in_b_test_asset,
-	"in/test.asset":   in_test_asset,
-	"in/a/test.asset": in_a_test_asset,
-	"in/c/test.asset": in_c_test_asset,
+// RestoreAssets restores an asset under the given directory recursively
+func RestoreAssets(dir, name string) error {
+	children, err := AssetDir(name)
+	// File
+	if err != nil {
+		return RestoreAsset(dir, name)
+	}
+	// Dir
+	for _, child := range children {
+		err = RestoreAssets(dir, filepath.Join(name, child))
+		if err != nil {
+			return err
+		}
+	}
+	return nil
 }
+
+func _filePath(dir, name string) string {
+	cannonicalName := strings.Replace(name, "\\", "/", -1)
+	return filepath.Join(append([]string{dir}, strings.Split(cannonicalName, "/")...)...)
+}
+

testdata/out/compress-nomemcopy.go

@@ -1,88 +1,312 @@
+// Code generated by go-bindata.
+// sources:
+// in/a/test.asset
+// in/b/test.asset
+// in/c/test.asset
+// in/test.asset
+// DO NOT EDIT!
+
 package main
 
 import (
 	"bytes"
 	"compress/gzip"
+	"fmt"
 	"io"
-	"log"
-	"reflect"
-	"unsafe"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"strings"
+	"time"
 )
 
-func bindata_read(data, name string) []byte {
-	var empty [0]byte
-	sx := (*reflect.StringHeader)(unsafe.Pointer(&data))
-	b := empty[:]
-	bx := (*reflect.SliceHeader)(unsafe.Pointer(&b))
-	bx.Data = sx.Data
-	bx.Len = len(data)
-	bx.Cap = bx.Len
-
-	gz, err := gzip.NewReader(bytes.NewBuffer(b))
+func bindataRead(data, name string) ([]byte, error) {
+	gz, err := gzip.NewReader(strings.NewReader(data))
 	if err != nil {
-		log.Fatalf("Read %q: %v", name, err)
+		return nil, fmt.Errorf("Read %q: %v", name, err)
 	}
 
 	var buf bytes.Buffer
 	_, err = io.Copy(&buf, gz)
-	gz.Close()
+	clErr := gz.Close()
 
 	if err != nil {
-		log.Fatalf("Read %q: %v", name, err)
+		return nil, fmt.Errorf("Read %q: %v", name, err)
+	}
+	if clErr != nil {
+		return nil, err
 	}
 
-	return buf.Bytes()
+	return buf.Bytes(), nil
 }
 
-var _in_b_test_asset = "\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xd2\xd7\x57\x28\x4e\xcc\x2d\xc8\x49\x55\x48\xcb\xcc\x49\xe5\x02\x04\x00\x00\xff\xff\x8a\x82\x8c\x85\x0f\x00\x00\x00"
-
-func in_b_test_asset() []byte {
-	return bindata_read(
-		_in_b_test_asset,
-		"in/b/test.asset",
-	)
+type asset struct {
+	bytes []byte
+	info  os.FileInfo
 }
 
-var _in_test_asset = "\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xd2\xd7\x57\x28\x4e\xcc\x2d\xc8\x49\x55\x48\xcb\xcc\x49\xe5\x02\x04\x00\x00\xff\xff\x8a\x82\x8c\x85\x0f\x00\x00\x00"
-
-func in_test_asset() []byte {
-	return bindata_read(
-		_in_test_asset,
-		"in/test.asset",
-	)
+type bindataFileInfo struct {
+	name    string
+	size    int64
+	mode    os.FileMode
+	modTime time.Time
 }
 
-var _in_a_test_asset = "\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xd2\xd7\x57\x28\x4e\xcc\x2d\xc8\x49\x55\x48\xcb\xcc\x49\xe5\x02\x04\x00\x00\xff\xff\x8a\x82\x8c\x85\x0f\x00\x00\x00"
+func (fi bindataFileInfo) Name() string {
+	return fi.name
+}
+func (fi bindataFileInfo) Size() int64 {
+	return fi.size
+}
+func (fi bindataFileInfo) Mode() os.FileMode {
+	return fi.mode
+}
+func (fi bindataFileInfo) ModTime() time.Time {
+	return fi.modTime
+}
+func (fi bindataFileInfo) IsDir() bool {
+	return false
+}
+func (fi bindataFileInfo) Sys() interface{} {
+	return nil
+}
 
-func in_a_test_asset() []byte {
-	return bindata_read(
-		_in_a_test_asset,
+var _inATestAsset = "\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xd2\xd7\x57\x28\x4e\xcc\x2d\xc8\x49\x55\x48\xcb\xcc\x49\xe5\x02\x04\x00\x00\xff\xff\x8a\x82\x8c\x85\x0f\x00\x00\x00"
+
+func inATestAssetBytes() ([]byte, error) {
+	return bindataRead(
+		_inATestAsset,
 		"in/a/test.asset",
 	)
 }
 
-var _in_c_test_asset = "\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xd2\xd7\x57\x28\x4e\xcc\x2d\xc8\x49\x55\x48\xcb\xcc\x49\xe5\x02\x04\x00\x00\xff\xff\x8a\x82\x8c\x85\x0f\x00\x00\x00"
+func inATestAsset() (*asset, error) {
+	bytes, err := inATestAssetBytes()
+	if err != nil {
+		return nil, err
+	}
 
-func in_c_test_asset() []byte {
-	return bindata_read(
-		_in_c_test_asset,
+	info := bindataFileInfo{name: "in/a/test.asset", size: 15, mode: os.FileMode(436), modTime: time.Unix(1445582844, 0)}
+	a := &asset{bytes: bytes, info: info}
+	return a, nil
+}
+
+var _inBTestAsset = "\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xd2\xd7\x57\x28\x4e\xcc\x2d\xc8\x49\x55\x48\xcb\xcc\x49\xe5\x02\x04\x00\x00\xff\xff\x8a\x82\x8c\x85\x0f\x00\x00\x00"
+
+func inBTestAssetBytes() ([]byte, error) {
+	return bindataRead(
+		_inBTestAsset,
+		"in/b/test.asset",
+	)
+}
+
+func inBTestAsset() (*asset, error) {
+	bytes, err := inBTestAssetBytes()
+	if err != nil {
+		return nil, err
+	}
+
+	info := bindataFileInfo{name: "in/b/test.asset", size: 15, mode: os.FileMode(436), modTime: time.Unix(1445582844, 0)}
+	a := &asset{bytes: bytes, info: info}
+	return a, nil
+}
+
+var _inCTestAsset = "\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xd2\xd7\x57\x28\x4e\xcc\x2d\xc8\x49\x55\x48\xcb\xcc\x49\xe5\x02\x04\x00\x00\xff\xff\x8a\x82\x8c\x85\x0f\x00\x00\x00"
+
+func inCTestAssetBytes() ([]byte, error) {
+	return bindataRead(
+		_inCTestAsset,
 		"in/c/test.asset",
 	)
 }
 
+func inCTestAsset() (*asset, error) {
+	bytes, err := inCTestAssetBytes()
+	if err != nil {
+		return nil, err
+	}
+
+	info := bindataFileInfo{name: "in/c/test.asset", size: 15, mode: os.FileMode(436), modTime: time.Unix(1445582844, 0)}
+	a := &asset{bytes: bytes, info: info}
+	return a, nil
+}
+
+var _inTestAsset = "\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xd2\xd7\x57\x28\x4e\xcc\x2d\xc8\x49\x55\x48\xcb\xcc\x49\xe5\x02\x04\x00\x00\xff\xff\x8a\x82\x8c\x85\x0f\x00\x00\x00"
+
+func inTestAssetBytes() ([]byte, error) {
+	return bindataRead(
+		_inTestAsset,
+		"in/test.asset",
+	)
+}
+
+func inTestAsset() (*asset, error) {
+	bytes, err := inTestAssetBytes()
+	if err != nil {
+		return nil, err
+	}
+
+	info := bindataFileInfo{name: "in/test.asset", size: 15, mode: os.FileMode(436), modTime: time.Unix(1445582844, 0)}
+	a := &asset{bytes: bytes, info: info}
+	return a, nil
+}
+
 // Asset loads and returns the asset for the given name.
-// This returns nil of the asset could not be found.
-func Asset(name string) []byte {
-	if f, ok := _bindata[name]; ok {
-		return f()
+// It returns an error if the asset could not be found or
+// could not be loaded.
+func Asset(name string) ([]byte, error) {
+	cannonicalName := strings.Replace(name, "\\", "/", -1)
+	if f, ok := _bindata[cannonicalName]; ok {
+		a, err := f()
+		if err != nil {
+			return nil, fmt.Errorf("Asset %s can't read by error: %v", name, err)
+		}
+		return a.bytes, nil
+	}
+	return nil, fmt.Errorf("Asset %s not found", name)
+}
+
+// MustAsset is like Asset but panics when Asset would return an error.
+// It simplifies safe initialization of global variables.
+func MustAsset(name string) []byte {
+	a, err := Asset(name)
+	if err != nil {
+		panic("asset: Asset(" + name + "): " + err.Error())
+	}
+
+	return a
+}
+
+// AssetInfo loads and returns the asset info for the given name.
+// It returns an error if the asset could not be found or
+// could not be loaded.
+func AssetInfo(name string) (os.FileInfo, error) {
+	cannonicalName := strings.Replace(name, "\\", "/", -1)
+	if f, ok := _bindata[cannonicalName]; ok {
+		a, err := f()
+		if err != nil {
+			return nil, fmt.Errorf("AssetInfo %s can't read by error: %v", name, err)
+		}
+		return a.info, nil
+	}
+	return nil, fmt.Errorf("AssetInfo %s not found", name)
+}
+
+// AssetNames returns the names of the assets.
+func AssetNames() []string {
+	names := make([]string, 0, len(_bindata))
+	for name := range _bindata {
+		names = append(names, name)
+	}
+	return names
+}
+
+// _bindata is a table, holding each asset generator, mapped to its name.
+var _bindata = map[string]func() (*asset, error){
+	"in/a/test.asset": inATestAsset,
+	"in/b/test.asset": inBTestAsset,
+	"in/c/test.asset": inCTestAsset,
+	"in/test.asset": inTestAsset,
+}
+
+// AssetDir returns the file names below a certain
+// directory embedded in the file by go-bindata.
+// For example if you run go-bindata on data/... and data contains the
+// following hierarchy:
+//     data/
+//       foo.txt
+//       img/
+//         a.png
+//         b.png
+// then AssetDir("data") would return []string{"foo.txt", "img"}
+// AssetDir("data/img") would return []string{"a.png", "b.png"}
+// AssetDir("foo.txt") and AssetDir("notexist") would return an error
+// AssetDir("") will return []string{"data"}.
+func AssetDir(name string) ([]string, error) {
+	node := _bintree
+	if len(name) != 0 {
+		cannonicalName := strings.Replace(name, "\\", "/", -1)
+		pathList := strings.Split(cannonicalName, "/")
+		for _, p := range pathList {
+			node = node.Children[p]
+			if node == nil {
+				return nil, fmt.Errorf("Asset %s not found", name)
+			}
+		}
+	}
+	if node.Func != nil {
+		return nil, fmt.Errorf("Asset %s not found", name)
+	}
+	rv := make([]string, 0, len(node.Children))
+	for childName := range node.Children {
+		rv = append(rv, childName)
+	}
+	return rv, nil
+}
+
+type bintree struct {
+	Func     func() (*asset, error)
+	Children map[string]*bintree
+}
+var _bintree = &bintree{nil, map[string]*bintree{
+	"in": &bintree{nil, map[string]*bintree{
+		"a": &bintree{nil, map[string]*bintree{
+			"test.asset": &bintree{inATestAsset, map[string]*bintree{}},
+		}},
+		"b": &bintree{nil, map[string]*bintree{
+			"test.asset": &bintree{inBTestAsset, map[string]*bintree{}},
+		}},
+		"c": &bintree{nil, map[string]*bintree{
+			"test.asset": &bintree{inCTestAsset, map[string]*bintree{}},
+		}},
+		"test.asset": &bintree{inTestAsset, map[string]*bintree{}},
+	}},
+}}
+
+// RestoreAsset restores an asset under the given directory
+func RestoreAsset(dir, name string) error {
+	data, err := Asset(name)
+	if err != nil {
+		return err
+	}
+	info, err := AssetInfo(name)
+	if err != nil {
+		return err
+	}
+	err = os.MkdirAll(_filePath(dir, filepath.Dir(name)), os.FileMode(0755))
+	if err != nil {
+		return err
+	}
+	err = ioutil.WriteFile(_filePath(dir, name), data, info.Mode())
+	if err != nil {
+		return err
+	}
+	err = os.Chtimes(_filePath(dir, name), info.ModTime(), info.ModTime())
+	if err != nil {
+		return err
 	}
 	return nil
 }
 
-// _bindata is a table, holding each asset generator, mapped to its name.
-var _bindata = map[string]func() []byte{
-	"in/b/test.asset": in_b_test_asset,
-	"in/test.asset":   in_test_asset,
-	"in/a/test.asset": in_a_test_asset,
-	"in/c/test.asset": in_c_test_asset,
+// RestoreAssets restores an asset under the given directory recursively
+func RestoreAssets(dir, name string) error {
+	children, err := AssetDir(name)
+	// File
+	if err != nil {
+		return RestoreAsset(dir, name)
+	}
+	// Dir
+	for _, child := range children {
+		err = RestoreAssets(dir, filepath.Join(name, child))
+		if err != nil {
+			return err
+		}
+	}
+	return nil
 }
+
+func _filePath(dir, name string) string {
+	cannonicalName := strings.Replace(name, "\\", "/", -1)
+	return filepath.Join(append([]string{dir}, strings.Split(cannonicalName, "/")...)...)
+}
+

testdata/out/debug.go

@@ -1,80 +1,263 @@
+// Code generated by go-bindata.
+// sources:
+// in/a/test.asset
+// in/b/test.asset
+// in/c/test.asset
+// in/test.asset
+// DO NOT EDIT!
+
 package main
 
 import (
-	"bytes"
-	"io"
-	"log"
+	"fmt"
+	"io/ioutil"
 	"os"
+	"path/filepath"
+	"strings"
 )
 
-// bindata_read reads the given file from disk.
-// It panics if anything went wrong.
-func bindata_read(path, name string) []byte {
-	fd, err := os.Open(path)
+// bindataRead reads the given file from disk. It returns an error on failure.
+func bindataRead(path, name string) ([]byte, error) {
+	buf, err := ioutil.ReadFile(path)
 	if err != nil {
-		log.Fatalf("Read %s: %v", name, err)
+		err = fmt.Errorf("Error reading asset %s at %s: %v", name, path, err)
+	}
+	return buf, err
+}
+
+type asset struct {
+	bytes []byte
+	info  os.FileInfo
+}
+
+// inATestAsset reads file data from disk. It returns an error on failure.
+func inATestAsset() (*asset, error) {
+	path := "/home/ts/code/go/src/git.kirsle.net/go/bindata/testdata/in/a/test.asset"
+	name := "in/a/test.asset"
+	bytes, err := bindataRead(path, name)
+	if err != nil {
+		return nil, err
 	}
 
-	defer fd.Close()
-
-	var buf bytes.Buffer
-	_, err = io.Copy(&buf, fd)
+	fi, err := os.Stat(path)
 	if err != nil {
-		log.Fatalf("Read %s: %v", name, err)
+		err = fmt.Errorf("Error reading asset info %s at %s: %v", name, path, err)
 	}
 
-	return buf.Bytes()
+	a := &asset{bytes: bytes, info: fi}
+	return a, err
 }
 
-// in_b_test_asset reads file data from disk.
-// It panics if something went wrong in the process.
-func in_b_test_asset() []byte {
-	return bindata_read(
-		"/a/code/go/src/github.com/jteeuwen/go-bindata/testdata/in/b/test.asset",
-		"in/b/test.asset",
-	)
+// inBTestAsset reads file data from disk. It returns an error on failure.
+func inBTestAsset() (*asset, error) {
+	path := "/home/ts/code/go/src/git.kirsle.net/go/bindata/testdata/in/b/test.asset"
+	name := "in/b/test.asset"
+	bytes, err := bindataRead(path, name)
+	if err != nil {
+		return nil, err
+	}
+
+	fi, err := os.Stat(path)
+	if err != nil {
+		err = fmt.Errorf("Error reading asset info %s at %s: %v", name, path, err)
+	}
+
+	a := &asset{bytes: bytes, info: fi}
+	return a, err
 }
 
-// in_test_asset reads file data from disk.
-// It panics if something went wrong in the process.
-func in_test_asset() []byte {
-	return bindata_read(
-		"/a/code/go/src/github.com/jteeuwen/go-bindata/testdata/in/test.asset",
-		"in/test.asset",
-	)
+// inCTestAsset reads file data from disk. It returns an error on failure.
+func inCTestAsset() (*asset, error) {
+	path := "/home/ts/code/go/src/git.kirsle.net/go/bindata/testdata/in/c/test.asset"
+	name := "in/c/test.asset"
+	bytes, err := bindataRead(path, name)
+	if err != nil {
+		return nil, err
+	}
+
+	fi, err := os.Stat(path)
+	if err != nil {
+		err = fmt.Errorf("Error reading asset info %s at %s: %v", name, path, err)
+	}
+
+	a := &asset{bytes: bytes, info: fi}
+	return a, err
 }
 
-// in_a_test_asset reads file data from disk.
-// It panics if something went wrong in the process.
-func in_a_test_asset() []byte {
-	return bindata_read(
-		"/a/code/go/src/github.com/jteeuwen/go-bindata/testdata/in/a/test.asset",
-		"in/a/test.asset",
-	)
-}
+// inTestAsset reads file data from disk. It returns an error on failure.
+func inTestAsset() (*asset, error) {
+	path := "/home/ts/code/go/src/git.kirsle.net/go/bindata/testdata/in/test.asset"
+	name := "in/test.asset"
+	bytes, err := bindataRead(path, name)
+	if err != nil {
+		return nil, err
+	}
 
-// in_c_test_asset reads file data from disk.
-// It panics if something went wrong in the process.
-func in_c_test_asset() []byte {
-	return bindata_read(
-		"/a/code/go/src/github.com/jteeuwen/go-bindata/testdata/in/c/test.asset",
-		"in/c/test.asset",
-	)
+	fi, err := os.Stat(path)
+	if err != nil {
+		err = fmt.Errorf("Error reading asset info %s at %s: %v", name, path, err)
+	}
+
+	a := &asset{bytes: bytes, info: fi}
+	return a, err
 }
 
 // Asset loads and returns the asset for the given name.
-// This returns nil of the asset could not be found.
-func Asset(name string) []byte {
-	if f, ok := _bindata[name]; ok {
-		return f()
+// It returns an error if the asset could not be found or
+// could not be loaded.
+func Asset(name string) ([]byte, error) {
+	cannonicalName := strings.Replace(name, "\\", "/", -1)
+	if f, ok := _bindata[cannonicalName]; ok {
+		a, err := f()
+		if err != nil {
+			return nil, fmt.Errorf("Asset %s can't read by error: %v", name, err)
+		}
+		return a.bytes, nil
+	}
+	return nil, fmt.Errorf("Asset %s not found", name)
+}
+
+// MustAsset is like Asset but panics when Asset would return an error.
+// It simplifies safe initialization of global variables.
+func MustAsset(name string) []byte {
+	a, err := Asset(name)
+	if err != nil {
+		panic("asset: Asset(" + name + "): " + err.Error())
+	}
+
+	return a
+}
+
+// AssetInfo loads and returns the asset info for the given name.
+// It returns an error if the asset could not be found or
+// could not be loaded.
+func AssetInfo(name string) (os.FileInfo, error) {
+	cannonicalName := strings.Replace(name, "\\", "/", -1)
+	if f, ok := _bindata[cannonicalName]; ok {
+		a, err := f()
+		if err != nil {
+			return nil, fmt.Errorf("AssetInfo %s can't read by error: %v", name, err)
+		}
+		return a.info, nil
+	}
+	return nil, fmt.Errorf("AssetInfo %s not found", name)
+}
+
+// AssetNames returns the names of the assets.
+func AssetNames() []string {
+	names := make([]string, 0, len(_bindata))
+	for name := range _bindata {
+		names = append(names, name)
+	}
+	return names
+}
+
+// _bindata is a table, holding each asset generator, mapped to its name.
+var _bindata = map[string]func() (*asset, error){
+	"in/a/test.asset": inATestAsset,
+	"in/b/test.asset": inBTestAsset,
+	"in/c/test.asset": inCTestAsset,
+	"in/test.asset": inTestAsset,
+}
+
+// AssetDir returns the file names below a certain
+// directory embedded in the file by go-bindata.
+// For example if you run go-bindata on data/... and data contains the
+// following hierarchy:
+//     data/
+//       foo.txt
+//       img/
+//         a.png
+//         b.png
+// then AssetDir("data") would return []string{"foo.txt", "img"}
+// AssetDir("data/img") would return []string{"a.png", "b.png"}
+// AssetDir("foo.txt") and AssetDir("notexist") would return an error
+// AssetDir("") will return []string{"data"}.
+func AssetDir(name string) ([]string, error) {
+	node := _bintree
+	if len(name) != 0 {
+		cannonicalName := strings.Replace(name, "\\", "/", -1)
+		pathList := strings.Split(cannonicalName, "/")
+		for _, p := range pathList {
+			node = node.Children[p]
+			if node == nil {
+				return nil, fmt.Errorf("Asset %s not found", name)
+			}
+		}
+	}
+	if node.Func != nil {
+		return nil, fmt.Errorf("Asset %s not found", name)
+	}
+	rv := make([]string, 0, len(node.Children))
+	for childName := range node.Children {
+		rv = append(rv, childName)
+	}
+	return rv, nil
+}
+
+type bintree struct {
+	Func     func() (*asset, error)
+	Children map[string]*bintree
+}
+var _bintree = &bintree{nil, map[string]*bintree{
+	"in": &bintree{nil, map[string]*bintree{
+		"a": &bintree{nil, map[string]*bintree{
+			"test.asset": &bintree{inATestAsset, map[string]*bintree{}},
+		}},
+		"b": &bintree{nil, map[string]*bintree{
+			"test.asset": &bintree{inBTestAsset, map[string]*bintree{}},
+		}},
+		"c": &bintree{nil, map[string]*bintree{
+			"test.asset": &bintree{inCTestAsset, map[string]*bintree{}},
+		}},
+		"test.asset": &bintree{inTestAsset, map[string]*bintree{}},
+	}},
+}}
+
+// RestoreAsset restores an asset under the given directory
+func RestoreAsset(dir, name string) error {
+	data, err := Asset(name)
+	if err != nil {
+		return err
+	}
+	info, err := AssetInfo(name)
+	if err != nil {
+		return err
+	}
+	err = os.MkdirAll(_filePath(dir, filepath.Dir(name)), os.FileMode(0755))
+	if err != nil {
+		return err
+	}
+	err = ioutil.WriteFile(_filePath(dir, name), data, info.Mode())
+	if err != nil {
+		return err
+	}
+	err = os.Chtimes(_filePath(dir, name), info.ModTime(), info.ModTime())
+	if err != nil {
+		return err
 	}
 	return nil
 }
 
-// _bindata is a table, holding each asset generator, mapped to its name.
-var _bindata = map[string]func() []byte{
-	"in/b/test.asset": in_b_test_asset,
-	"in/test.asset":   in_test_asset,
-	"in/a/test.asset": in_a_test_asset,
-	"in/c/test.asset": in_c_test_asset,
+// RestoreAssets restores an asset under the given directory recursively
+func RestoreAssets(dir, name string) error {
+	children, err := AssetDir(name)
+	// File
+	if err != nil {
+		return RestoreAsset(dir, name)
+	}
+	// Dir
+	for _, child := range children {
+		err = RestoreAssets(dir, filepath.Join(name, child))
+		if err != nil {
+			return err
+		}
+	}
+	return nil
 }
+
+func _filePath(dir, name string) string {
+	cannonicalName := strings.Replace(name, "\\", "/", -1)
+	return filepath.Join(append([]string{dir}, strings.Split(cannonicalName, "/")...)...)
+}
+

testdata/out/debug.go-bindata

@@ -0,0 +1,259 @@
+package main
+
+import (
+	"fmt"
+	"io/ioutil"
+	"strings"
+	"os"
+	"path"
+	"path/filepath"
+)
+
+// bindata_read reads the given file from disk. It returns an error on failure.
+func bindata_read(path, name string) ([]byte, error) {
+	buf, err := ioutil.ReadFile(path)
+	if err != nil {
+		err = fmt.Errorf("Error reading asset %s at %s: %v", name, path, err)
+	}
+	return buf, err
+}
+
+type asset struct {
+	bytes []byte
+	info  os.FileInfo
+}
+
+// in_a_test_asset reads file data from disk. It returns an error on failure.
+func in_a_test_asset() (*asset, error) {
+	path := "/Users/tamird/src/go/src/git.kirsle.net/go/bindata/testdata/in/a/test.asset"
+	name := "in/a/test.asset"
+	bytes, err := bindata_read(path, name)
+	if err != nil {
+		return nil, err
+	}
+
+	fi, err := os.Stat(path)
+	if err != nil {
+		err = fmt.Errorf("Error reading asset info %s at %s: %v", name, path, err)
+	}
+
+	a := &asset{bytes: bytes, info: fi}
+	return a, err
+}
+
+// in_b_test_asset reads file data from disk. It returns an error on failure.
+func in_b_test_asset() (*asset, error) {
+	path := "/Users/tamird/src/go/src/git.kirsle.net/go/bindata/testdata/in/b/test.asset"
+	name := "in/b/test.asset"
+	bytes, err := bindata_read(path, name)
+	if err != nil {
+		return nil, err
+	}
+
+	fi, err := os.Stat(path)
+	if err != nil {
+		err = fmt.Errorf("Error reading asset info %s at %s: %v", name, path, err)
+	}
+
+	a := &asset{bytes: bytes, info: fi}
+	return a, err
+}
+
+// in_c_test_asset reads file data from disk. It returns an error on failure.
+func in_c_test_asset() (*asset, error) {
+	path := "/Users/tamird/src/go/src/git.kirsle.net/go/bindata/testdata/in/c/test.asset"
+	name := "in/c/test.asset"
+	bytes, err := bindata_read(path, name)
+	if err != nil {
+		return nil, err
+	}
+
+	fi, err := os.Stat(path)
+	if err != nil {
+		err = fmt.Errorf("Error reading asset info %s at %s: %v", name, path, err)
+	}
+
+	a := &asset{bytes: bytes, info: fi}
+	return a, err
+}
+
+// in_test_asset reads file data from disk. It returns an error on failure.
+func in_test_asset() (*asset, error) {
+	path := "/Users/tamird/src/go/src/git.kirsle.net/go/bindata/testdata/in/test.asset"
+	name := "in/test.asset"
+	bytes, err := bindata_read(path, name)
+	if err != nil {
+		return nil, err
+	}
+
+	fi, err := os.Stat(path)
+	if err != nil {
+		err = fmt.Errorf("Error reading asset info %s at %s: %v", name, path, err)
+	}
+
+	a := &asset{bytes: bytes, info: fi}
+	return a, err
+}
+
+// Asset loads and returns the asset for the given name.
+// It returns an error if the asset could not be found or
+// could not be loaded.
+func Asset(name string) ([]byte, error) {
+	cannonicalName := strings.Replace(name, "\\", "/", -1)
+	if f, ok := _bindata[cannonicalName]; ok {
+		a, err := f()
+		if err != nil {
+			return nil, fmt.Errorf("Asset %s can't read by error: %v", name, err)
+		}
+		return a.bytes, nil
+	}
+	return nil, fmt.Errorf("Asset %s not found", name)
+}
+
+// MustAsset is like Asset but panics when Asset would return an error.
+// It simplifies safe initialization of global variables.
+func MustAsset(name string) []byte {
+	a, err := Asset(name)
+	if (err != nil) {
+		panic("asset: Asset(" + name + "): " + err.Error())
+	}
+
+	return a
+}
+
+// AssetInfo loads and returns the asset info for the given name.
+// It returns an error if the asset could not be found or
+// could not be loaded.
+func AssetInfo(name string) (os.FileInfo, error) {
+	cannonicalName := strings.Replace(name, "\\", "/", -1)
+	if f, ok := _bindata[cannonicalName]; ok {
+		a, err := f()
+		if err != nil {
+			return nil, fmt.Errorf("AssetInfo %s can't read by error: %v", name, err)
+		}
+		return a.info, nil
+	}
+	return nil, fmt.Errorf("AssetInfo %s not found", name)
+}
+
+// AssetNames returns the names of the assets.
+func AssetNames() []string {
+	names := make([]string, 0, len(_bindata))
+	for name := range _bindata {
+		names = append(names, name)
+	}
+	return names
+}
+
+// _bindata is a table, holding each asset generator, mapped to its name.
+var _bindata = map[string]func() (*asset, error){
+	"in/a/test.asset": in_a_test_asset,
+	"in/b/test.asset": in_b_test_asset,
+	"in/c/test.asset": in_c_test_asset,
+	"in/test.asset": in_test_asset,
+}
+
+// AssetDir returns the file names below a certain
+// directory embedded in the file by go-bindata.
+// For example if you run go-bindata on data/... and data contains the
+// following hierarchy:
+//     data/
+//       foo.txt
+//       img/
+//         a.png
+//         b.png
+// then AssetDir("data") would return []string{"foo.txt", "img"}
+// AssetDir("data/img") would return []string{"a.png", "b.png"}
+// AssetDir("foo.txt") and AssetDir("notexist") would return an error
+// AssetDir("") will return []string{"data"}.
+func AssetDir(name string) ([]string, error) {
+	node := _bintree
+	if len(name) != 0 {
+		cannonicalName := strings.Replace(name, "\\", "/", -1)
+		pathList := strings.Split(cannonicalName, "/")
+		for _, p := range pathList {
+			node = node.Children[p]
+			if node == nil {
+				return nil, fmt.Errorf("Asset %s not found", name)
+			}
+		}
+	}
+	if node.Func != nil {
+		return nil, fmt.Errorf("Asset %s not found", name)
+	}
+	rv := make([]string, 0, len(node.Children))
+	for name := range node.Children {
+		rv = append(rv, name)
+	}
+	return rv, nil
+}
+
+type _bintree_t struct {
+	Func func() (*asset, error)
+	Children map[string]*_bintree_t
+}
+var _bintree = &_bintree_t{nil, map[string]*_bintree_t{
+	"in": &_bintree_t{nil, map[string]*_bintree_t{
+		"a": &_bintree_t{nil, map[string]*_bintree_t{
+			"test.asset": &_bintree_t{in_a_test_asset, map[string]*_bintree_t{
+			}},
+		}},
+		"b": &_bintree_t{nil, map[string]*_bintree_t{
+			"test.asset": &_bintree_t{in_b_test_asset, map[string]*_bintree_t{
+			}},
+		}},
+		"c": &_bintree_t{nil, map[string]*_bintree_t{
+			"test.asset": &_bintree_t{in_c_test_asset, map[string]*_bintree_t{
+			}},
+		}},
+		"test.asset": &_bintree_t{in_test_asset, map[string]*_bintree_t{
+		}},
+	}},
+}}
+
+// Restore an asset under the given directory
+func RestoreAsset(dir, name string) error {
+        data, err := Asset(name)
+        if err != nil {
+                return err
+        }
+        info, err := AssetInfo(name)
+        if err != nil {
+                return err
+        }
+        err = os.MkdirAll(_filePath(dir, path.Dir(name)), os.FileMode(0755))
+        if err != nil {
+                return err
+        }
+        err = ioutil.WriteFile(_filePath(dir, name), data, info.Mode())
+        if err != nil {
+                return err
+        }
+        err = os.Chtimes(_filePath(dir, name), info.ModTime(), info.ModTime())
+        if err != nil {
+                return err
+        }
+        return nil
+}
+
+// Restore assets under the given directory recursively
+func RestoreAssets(dir, name string) error {
+        children, err := AssetDir(name)
+        if err != nil { // File
+                return RestoreAsset(dir, name)
+        } else { // Dir
+                for _, child := range children {
+                        err = RestoreAssets(dir, path.Join(name, child))
+                        if err != nil {
+                                return err
+                        }
+                }
+        }
+        return nil
+}
+
+func _filePath(dir, name string) string {
+        cannonicalName := strings.Replace(name, "\\", "/", -1)
+        return filepath.Join(append([]string{dir}, strings.Split(cannonicalName, "/")...)...)
+}
+

testdata/out/nocompress-memcopy.go

@@ -1,46 +1,280 @@
+// Code generated by go-bindata.
+// sources:
+// in/a/test.asset
+// in/b/test.asset
+// in/c/test.asset
+// in/test.asset
+// DO NOT EDIT!
+
 package main
 
-func in_b_test_asset() []byte {
-	return []byte{
-		0x2f, 0x2f, 0x20, 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x20, 0x66, 0x69,
-		0x6c, 0x65, 0x0a,
-	}
+import (
+	"fmt"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"strings"
+	"time"
+)
+type asset struct {
+	bytes []byte
+	info  os.FileInfo
 }
 
-func in_test_asset() []byte {
-	return []byte{
-		0x2f, 0x2f, 0x20, 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x20, 0x66, 0x69,
-		0x6c, 0x65, 0x0a,
-	}
+type bindataFileInfo struct {
+	name    string
+	size    int64
+	mode    os.FileMode
+	modTime time.Time
 }
 
-func in_a_test_asset() []byte {
-	return []byte{
-		0x2f, 0x2f, 0x20, 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x20, 0x66, 0x69,
-		0x6c, 0x65, 0x0a,
-	}
+func (fi bindataFileInfo) Name() string {
+	return fi.name
+}
+func (fi bindataFileInfo) Size() int64 {
+	return fi.size
+}
+func (fi bindataFileInfo) Mode() os.FileMode {
+	return fi.mode
+}
+func (fi bindataFileInfo) ModTime() time.Time {
+	return fi.modTime
+}
+func (fi bindataFileInfo) IsDir() bool {
+	return false
+}
+func (fi bindataFileInfo) Sys() interface{} {
+	return nil
 }
 
-func in_c_test_asset() []byte {
-	return []byte{
-		0x2f, 0x2f, 0x20, 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x20, 0x66, 0x69,
-		0x6c, 0x65, 0x0a,
+var _inATestAsset = []byte(`// sample file
+`)
+
+func inATestAssetBytes() ([]byte, error) {
+	return _inATestAsset, nil
+}
+
+func inATestAsset() (*asset, error) {
+	bytes, err := inATestAssetBytes()
+	if err != nil {
+		return nil, err
 	}
+
+	info := bindataFileInfo{name: "in/a/test.asset", size: 15, mode: os.FileMode(436), modTime: time.Unix(1445582844, 0)}
+	a := &asset{bytes: bytes, info: info}
+	return a, nil
+}
+
+var _inBTestAsset = []byte(`// sample file
+`)
+
+func inBTestAssetBytes() ([]byte, error) {
+	return _inBTestAsset, nil
+}
+
+func inBTestAsset() (*asset, error) {
+	bytes, err := inBTestAssetBytes()
+	if err != nil {
+		return nil, err
+	}
+
+	info := bindataFileInfo{name: "in/b/test.asset", size: 15, mode: os.FileMode(436), modTime: time.Unix(1445582844, 0)}
+	a := &asset{bytes: bytes, info: info}
+	return a, nil
+}
+
+var _inCTestAsset = []byte(`// sample file
+`)
+
+func inCTestAssetBytes() ([]byte, error) {
+	return _inCTestAsset, nil
+}
+
+func inCTestAsset() (*asset, error) {
+	bytes, err := inCTestAssetBytes()
+	if err != nil {
+		return nil, err
+	}
+
+	info := bindataFileInfo{name: "in/c/test.asset", size: 15, mode: os.FileMode(436), modTime: time.Unix(1445582844, 0)}
+	a := &asset{bytes: bytes, info: info}
+	return a, nil
+}
+
+var _inTestAsset = []byte(`// sample file
+`)
+
+func inTestAssetBytes() ([]byte, error) {
+	return _inTestAsset, nil
+}
+
+func inTestAsset() (*asset, error) {
+	bytes, err := inTestAssetBytes()
+	if err != nil {
+		return nil, err
+	}
+
+	info := bindataFileInfo{name: "in/test.asset", size: 15, mode: os.FileMode(436), modTime: time.Unix(1445582844, 0)}
+	a := &asset{bytes: bytes, info: info}
+	return a, nil
 }
 
 // Asset loads and returns the asset for the given name.
-// This returns nil of the asset could not be found.
-func Asset(name string) []byte {
-	if f, ok := _bindata[name]; ok {
-		return f()
+// It returns an error if the asset could not be found or
+// could not be loaded.
+func Asset(name string) ([]byte, error) {
+	cannonicalName := strings.Replace(name, "\\", "/", -1)
+	if f, ok := _bindata[cannonicalName]; ok {
+		a, err := f()
+		if err != nil {
+			return nil, fmt.Errorf("Asset %s can't read by error: %v", name, err)
+		}
+		return a.bytes, nil
+	}
+	return nil, fmt.Errorf("Asset %s not found", name)
+}
+
+// MustAsset is like Asset but panics when Asset would return an error.
+// It simplifies safe initialization of global variables.
+func MustAsset(name string) []byte {
+	a, err := Asset(name)
+	if err != nil {
+		panic("asset: Asset(" + name + "): " + err.Error())
+	}
+
+	return a
+}
+
+// AssetInfo loads and returns the asset info for the given name.
+// It returns an error if the asset could not be found or
+// could not be loaded.
+func AssetInfo(name string) (os.FileInfo, error) {
+	cannonicalName := strings.Replace(name, "\\", "/", -1)
+	if f, ok := _bindata[cannonicalName]; ok {
+		a, err := f()
+		if err != nil {
+			return nil, fmt.Errorf("AssetInfo %s can't read by error: %v", name, err)
+		}
+		return a.info, nil
+	}
+	return nil, fmt.Errorf("AssetInfo %s not found", name)
+}
+
+// AssetNames returns the names of the assets.
+func AssetNames() []string {
+	names := make([]string, 0, len(_bindata))
+	for name := range _bindata {
+		names = append(names, name)
+	}
+	return names
+}
+
+// _bindata is a table, holding each asset generator, mapped to its name.
+var _bindata = map[string]func() (*asset, error){
+	"in/a/test.asset": inATestAsset,
+	"in/b/test.asset": inBTestAsset,
+	"in/c/test.asset": inCTestAsset,
+	"in/test.asset": inTestAsset,
+}
+
+// AssetDir returns the file names below a certain
+// directory embedded in the file by go-bindata.
+// For example if you run go-bindata on data/... and data contains the
+// following hierarchy:
+//     data/
+//       foo.txt
+//       img/
+//         a.png
+//         b.png
+// then AssetDir("data") would return []string{"foo.txt", "img"}
+// AssetDir("data/img") would return []string{"a.png", "b.png"}
+// AssetDir("foo.txt") and AssetDir("notexist") would return an error
+// AssetDir("") will return []string{"data"}.
+func AssetDir(name string) ([]string, error) {
+	node := _bintree
+	if len(name) != 0 {
+		cannonicalName := strings.Replace(name, "\\", "/", -1)
+		pathList := strings.Split(cannonicalName, "/")
+		for _, p := range pathList {
+			node = node.Children[p]
+			if node == nil {
+				return nil, fmt.Errorf("Asset %s not found", name)
+			}
+		}
+	}
+	if node.Func != nil {
+		return nil, fmt.Errorf("Asset %s not found", name)
+	}
+	rv := make([]string, 0, len(node.Children))
+	for childName := range node.Children {
+		rv = append(rv, childName)
+	}
+	return rv, nil
+}
+
+type bintree struct {
+	Func     func() (*asset, error)
+	Children map[string]*bintree
+}
+var _bintree = &bintree{nil, map[string]*bintree{
+	"in": &bintree{nil, map[string]*bintree{
+		"a": &bintree{nil, map[string]*bintree{
+			"test.asset": &bintree{inATestAsset, map[string]*bintree{}},
+		}},
+		"b": &bintree{nil, map[string]*bintree{
+			"test.asset": &bintree{inBTestAsset, map[string]*bintree{}},
+		}},
+		"c": &bintree{nil, map[string]*bintree{
+			"test.asset": &bintree{inCTestAsset, map[string]*bintree{}},
+		}},
+		"test.asset": &bintree{inTestAsset, map[string]*bintree{}},
+	}},
+}}
+
+// RestoreAsset restores an asset under the given directory
+func RestoreAsset(dir, name string) error {
+	data, err := Asset(name)
+	if err != nil {
+		return err
+	}
+	info, err := AssetInfo(name)
+	if err != nil {
+		return err
+	}
+	err = os.MkdirAll(_filePath(dir, filepath.Dir(name)), os.FileMode(0755))
+	if err != nil {
+		return err
+	}
+	err = ioutil.WriteFile(_filePath(dir, name), data, info.Mode())
+	if err != nil {
+		return err
+	}
+	err = os.Chtimes(_filePath(dir, name), info.ModTime(), info.ModTime())
+	if err != nil {
+		return err
 	}
 	return nil
 }
 
-// _bindata is a table, holding each asset generator, mapped to its name.
-var _bindata = map[string]func() []byte{
-	"in/b/test.asset": in_b_test_asset,
-	"in/test.asset":   in_test_asset,
-	"in/a/test.asset": in_a_test_asset,
-	"in/c/test.asset": in_c_test_asset,
+// RestoreAssets restores an asset under the given directory recursively
+func RestoreAssets(dir, name string) error {
+	children, err := AssetDir(name)
+	// File
+	if err != nil {
+		return RestoreAsset(dir, name)
+	}
+	// Dir
+	for _, child := range children {
+		err = RestoreAssets(dir, filepath.Join(name, child))
+		if err != nil {
+			return err
+		}
+	}
+	return nil
 }
+
+func _filePath(dir, name string) string {
+	cannonicalName := strings.Replace(name, "\\", "/", -1)
+	return filepath.Join(append([]string{dir}, strings.Split(cannonicalName, "/")...)...)
+}
+

testdata/out/nocompress-nomemcopy.go

@@ -1,11 +1,25 @@
+// Code generated by go-bindata.
+// sources:
+// in/a/test.asset
+// in/b/test.asset
+// in/c/test.asset
+// in/test.asset
+// DO NOT EDIT!
+
 package main
 
 import (
+	"fmt"
+	"io/ioutil"
+	"os"
+	"path/filepath"
 	"reflect"
+	"strings"
+	"time"
 	"unsafe"
 )
 
-func bindata_read(data, name string) []byte {
+func bindataRead(data, name string) ([]byte, error) {
 	var empty [0]byte
 	sx := (*reflect.StringHeader)(unsafe.Pointer(&data))
 	b := empty[:]
@@ -13,58 +27,276 @@ func bindata_read(data, name string) []byte {
 	bx.Data = sx.Data
 	bx.Len = len(data)
 	bx.Cap = bx.Len
-	return b
+	return b, nil
 }
 
-var _in_b_test_asset = "\x2f\x2f\x20\x73\x61\x6d\x70\x6c\x65\x20\x66\x69\x6c\x65\x0a"
-
-func in_b_test_asset() []byte {
-	return bindata_read(
-		_in_b_test_asset,
-		"in/b/test.asset",
-	)
+type asset struct {
+	bytes []byte
+	info  os.FileInfo
 }
 
-var _in_test_asset = "\x2f\x2f\x20\x73\x61\x6d\x70\x6c\x65\x20\x66\x69\x6c\x65\x0a"
-
-func in_test_asset() []byte {
-	return bindata_read(
-		_in_test_asset,
-		"in/test.asset",
-	)
+type bindataFileInfo struct {
+	name    string
+	size    int64
+	mode    os.FileMode
+	modTime time.Time
 }
 
-var _in_a_test_asset = "\x2f\x2f\x20\x73\x61\x6d\x70\x6c\x65\x20\x66\x69\x6c\x65\x0a"
+func (fi bindataFileInfo) Name() string {
+	return fi.name
+}
+func (fi bindataFileInfo) Size() int64 {
+	return fi.size
+}
+func (fi bindataFileInfo) Mode() os.FileMode {
+	return fi.mode
+}
+func (fi bindataFileInfo) ModTime() time.Time {
+	return fi.modTime
+}
+func (fi bindataFileInfo) IsDir() bool {
+	return false
+}
+func (fi bindataFileInfo) Sys() interface{} {
+	return nil
+}
 
-func in_a_test_asset() []byte {
-	return bindata_read(
-		_in_a_test_asset,
+var _inATestAsset = "\x2f\x2f\x20\x73\x61\x6d\x70\x6c\x65\x20\x66\x69\x6c\x65\x0a"
+
+func inATestAssetBytes() ([]byte, error) {
+	return bindataRead(
+		_inATestAsset,
 		"in/a/test.asset",
 	)
 }
 
-var _in_c_test_asset = "\x2f\x2f\x20\x73\x61\x6d\x70\x6c\x65\x20\x66\x69\x6c\x65\x0a"
+func inATestAsset() (*asset, error) {
+	bytes, err := inATestAssetBytes()
+	if err != nil {
+		return nil, err
+	}
 
-func in_c_test_asset() []byte {
-	return bindata_read(
-		_in_c_test_asset,
+	info := bindataFileInfo{name: "in/a/test.asset", size: 15, mode: os.FileMode(436), modTime: time.Unix(1445582844, 0)}
+	a := &asset{bytes: bytes, info: info}
+	return a, nil
+}
+
+var _inBTestAsset = "\x2f\x2f\x20\x73\x61\x6d\x70\x6c\x65\x20\x66\x69\x6c\x65\x0a"
+
+func inBTestAssetBytes() ([]byte, error) {
+	return bindataRead(
+		_inBTestAsset,
+		"in/b/test.asset",
+	)
+}
+
+func inBTestAsset() (*asset, error) {
+	bytes, err := inBTestAssetBytes()
+	if err != nil {
+		return nil, err
+	}
+
+	info := bindataFileInfo{name: "in/b/test.asset", size: 15, mode: os.FileMode(436), modTime: time.Unix(1445582844, 0)}
+	a := &asset{bytes: bytes, info: info}
+	return a, nil
+}
+
+var _inCTestAsset = "\x2f\x2f\x20\x73\x61\x6d\x70\x6c\x65\x20\x66\x69\x6c\x65\x0a"
+
+func inCTestAssetBytes() ([]byte, error) {
+	return bindataRead(
+		_inCTestAsset,
 		"in/c/test.asset",
 	)
 }
 
+func inCTestAsset() (*asset, error) {
+	bytes, err := inCTestAssetBytes()
+	if err != nil {
+		return nil, err
+	}
+
+	info := bindataFileInfo{name: "in/c/test.asset", size: 15, mode: os.FileMode(436), modTime: time.Unix(1445582844, 0)}
+	a := &asset{bytes: bytes, info: info}
+	return a, nil
+}
+
+var _inTestAsset = "\x2f\x2f\x20\x73\x61\x6d\x70\x6c\x65\x20\x66\x69\x6c\x65\x0a"
+
+func inTestAssetBytes() ([]byte, error) {
+	return bindataRead(
+		_inTestAsset,
+		"in/test.asset",
+	)
+}
+
+func inTestAsset() (*asset, error) {
+	bytes, err := inTestAssetBytes()
+	if err != nil {
+		return nil, err
+	}
+
+	info := bindataFileInfo{name: "in/test.asset", size: 15, mode: os.FileMode(436), modTime: time.Unix(1445582844, 0)}
+	a := &asset{bytes: bytes, info: info}
+	return a, nil
+}
+
 // Asset loads and returns the asset for the given name.
-// This returns nil of the asset could not be found.
-func Asset(name string) []byte {
-	if f, ok := _bindata[name]; ok {
-		return f()
+// It returns an error if the asset could not be found or
+// could not be loaded.
+func Asset(name string) ([]byte, error) {
+	cannonicalName := strings.Replace(name, "\\", "/", -1)
+	if f, ok := _bindata[cannonicalName]; ok {
+		a, err := f()
+		if err != nil {
+			return nil, fmt.Errorf("Asset %s can't read by error: %v", name, err)
+		}
+		return a.bytes, nil
+	}
+	return nil, fmt.Errorf("Asset %s not found", name)
+}
+
+// MustAsset is like Asset but panics when Asset would return an error.
+// It simplifies safe initialization of global variables.
+func MustAsset(name string) []byte {
+	a, err := Asset(name)
+	if err != nil {
+		panic("asset: Asset(" + name + "): " + err.Error())
+	}
+
+	return a
+}
+
+// AssetInfo loads and returns the asset info for the given name.
+// It returns an error if the asset could not be found or
+// could not be loaded.
+func AssetInfo(name string) (os.FileInfo, error) {
+	cannonicalName := strings.Replace(name, "\\", "/", -1)
+	if f, ok := _bindata[cannonicalName]; ok {
+		a, err := f()
+		if err != nil {
+			return nil, fmt.Errorf("AssetInfo %s can't read by error: %v", name, err)
+		}
+		return a.info, nil
+	}
+	return nil, fmt.Errorf("AssetInfo %s not found", name)
+}
+
+// AssetNames returns the names of the assets.
+func AssetNames() []string {
+	names := make([]string, 0, len(_bindata))
+	for name := range _bindata {
+		names = append(names, name)
+	}
+	return names
+}
+
+// _bindata is a table, holding each asset generator, mapped to its name.
+var _bindata = map[string]func() (*asset, error){
+	"in/a/test.asset": inATestAsset,
+	"in/b/test.asset": inBTestAsset,
+	"in/c/test.asset": inCTestAsset,
+	"in/test.asset": inTestAsset,
+}
+
+// AssetDir returns the file names below a certain
+// directory embedded in the file by go-bindata.
+// For example if you run go-bindata on data/... and data contains the
+// following hierarchy:
+//     data/
+//       foo.txt
+//       img/
+//         a.png
+//         b.png
+// then AssetDir("data") would return []string{"foo.txt", "img"}
+// AssetDir("data/img") would return []string{"a.png", "b.png"}
+// AssetDir("foo.txt") and AssetDir("notexist") would return an error
+// AssetDir("") will return []string{"data"}.
+func AssetDir(name string) ([]string, error) {
+	node := _bintree
+	if len(name) != 0 {
+		cannonicalName := strings.Replace(name, "\\", "/", -1)
+		pathList := strings.Split(cannonicalName, "/")
+		for _, p := range pathList {
+			node = node.Children[p]
+			if node == nil {
+				return nil, fmt.Errorf("Asset %s not found", name)
+			}
+		}
+	}
+	if node.Func != nil {
+		return nil, fmt.Errorf("Asset %s not found", name)
+	}
+	rv := make([]string, 0, len(node.Children))
+	for childName := range node.Children {
+		rv = append(rv, childName)
+	}
+	return rv, nil
+}
+
+type bintree struct {
+	Func     func() (*asset, error)
+	Children map[string]*bintree
+}
+var _bintree = &bintree{nil, map[string]*bintree{
+	"in": &bintree{nil, map[string]*bintree{
+		"a": &bintree{nil, map[string]*bintree{
+			"test.asset": &bintree{inATestAsset, map[string]*bintree{}},
+		}},
+		"b": &bintree{nil, map[string]*bintree{
+			"test.asset": &bintree{inBTestAsset, map[string]*bintree{}},
+		}},
+		"c": &bintree{nil, map[string]*bintree{
+			"test.asset": &bintree{inCTestAsset, map[string]*bintree{}},
+		}},
+		"test.asset": &bintree{inTestAsset, map[string]*bintree{}},
+	}},
+}}
+
+// RestoreAsset restores an asset under the given directory
+func RestoreAsset(dir, name string) error {
+	data, err := Asset(name)
+	if err != nil {
+		return err
+	}
+	info, err := AssetInfo(name)
+	if err != nil {
+		return err
+	}
+	err = os.MkdirAll(_filePath(dir, filepath.Dir(name)), os.FileMode(0755))
+	if err != nil {
+		return err
+	}
+	err = ioutil.WriteFile(_filePath(dir, name), data, info.Mode())
+	if err != nil {
+		return err
+	}
+	err = os.Chtimes(_filePath(dir, name), info.ModTime(), info.ModTime())
+	if err != nil {
+		return err
 	}
 	return nil
 }
 
-// _bindata is a table, holding each asset generator, mapped to its name.
-var _bindata = map[string]func() []byte{
-	"in/b/test.asset": in_b_test_asset,
-	"in/test.asset":   in_test_asset,
-	"in/a/test.asset": in_a_test_asset,
-	"in/c/test.asset": in_c_test_asset,
+// RestoreAssets restores an asset under the given directory recursively
+func RestoreAssets(dir, name string) error {
+	children, err := AssetDir(name)
+	// File
+	if err != nil {
+		return RestoreAsset(dir, name)
+	}
+	// Dir
+	for _, child := range children {
+		err = RestoreAssets(dir, filepath.Join(name, child))
+		if err != nil {
+			return err
+		}
+	}
+	return nil
 }
+
+func _filePath(dir, name string) string {
+	cannonicalName := strings.Replace(name, "\\", "/", -1)
+	return filepath.Join(append([]string{dir}, strings.Split(cannonicalName, "/")...)...)
+}
+

testdata/symlinkFile/file1

@@ -0,0 +1 @@
+../symlinkSrc/file1

testdata/symlinkParent/symlinkTarget

@@ -0,0 +1 @@
+../symlinkSrc/

testdata/symlinkRecursiveParent/file1

@@ -0,0 +1 @@
+// test file 1

testdata/symlinkRecursiveParent/symlinkTarget

@@ -0,0 +1 @@
+../symlinkRecursiveParent/

testdata/symlinkSrc/file1

@@ -0,0 +1 @@
+// symlink file 1

testdata/symlinkSrc/file2

@@ -0,0 +1 @@
+// symlink file 2

testdata/symlinkSrc/file3

@@ -0,0 +1 @@
+// symlink file 3

testdata/symlinkSrc/file4

@@ -0,0 +1 @@
+// symlink file 4

toc.go

@@ -7,7 +7,6 @@ package bindata
 import (
 	"fmt"
 	"io"
-	"os"
 	"sort"
 	"strings"
 )
@@ -54,23 +53,28 @@ func (root *assetTree) funcOrNil() string {
 }
 
 func (root *assetTree) writeGoMap(w io.Writer, nident int) {
-	fmt.Fprintf(w, "&_bintree_t{%s, map[string]*_bintree_t{\n", root.funcOrNil())
+	fmt.Fprintf(w, "&bintree{%s, map[string]*bintree{", root.funcOrNil())
 
-	// Sort to make output stable between invocations
-	filenames := make([]string, len(root.Children))
-	i := 0
-	for filename, _ := range root.Children {
-		filenames[i] = filename
-		i++
-	}
-	sort.Strings(filenames)
+	if len(root.Children) > 0 {
+		io.WriteString(w, "\n")
 
-	for _, p := range filenames {
-		ident(w, nident+1)
-		fmt.Fprintf(w, `"%s": `, p)
-		root.Children[p].writeGoMap(w, nident+1)
+		// Sort to make output stable between invocations
+		filenames := make([]string, len(root.Children))
+		i := 0
+		for filename, _ := range root.Children {
+			filenames[i] = filename
+			i++
+		}
+		sort.Strings(filenames)
+
+		for _, p := range filenames {
+			ident(w, nident+1)
+			fmt.Fprintf(w, `"%s": `, p)
+			root.Children[p].writeGoMap(w, nident+1)
+		}
+		ident(w, nident)
 	}
-	ident(w, nident)
+
 	io.WriteString(w, "}}")
 	if nident > 0 {
 		io.WriteString(w, ",")
@@ -79,9 +83,9 @@ func (root *assetTree) writeGoMap(w io.Writer, nident int) {
 }
 
 func (root *assetTree) WriteAsGoMap(w io.Writer) error {
-	_, err := fmt.Fprint(w, `type _bintree_t struct {
-	Func func() ([]byte, error)
-	Children map[string]*_bintree_t
+	_, err := fmt.Fprint(w, `type bintree struct {
+	Func     func() (*asset, error)
+	Children map[string]*bintree
 }
 var _bintree = `)
 	root.writeGoMap(w, 0)
@@ -118,8 +122,8 @@ func AssetDir(name string) ([]string, error) {
 		return nil, fmt.Errorf("Asset %%s not found", name)
 	}
 	rv := make([]string, 0, len(node.Children))
-	for name := range node.Children {
-		rv = append(rv, name)
+	for childName := range node.Children {
+		rv = append(rv, childName)
 	}
 	return rv, nil
 }
@@ -130,7 +134,7 @@ func AssetDir(name string) ([]string, error) {
 	}
 	tree := newAssetTree()
 	for i := range toc {
-		pathList := strings.Split(toc[i].Name, string(os.PathSeparator))
+		pathList := strings.Split(toc[i].Name, "/")
 		tree.Add(pathList, toc[i])
 	}
 	return tree.WriteAsGoMap(w)
@@ -161,11 +165,41 @@ func writeTOCHeader(w io.Writer) error {
 func Asset(name string) ([]byte, error) {
 	cannonicalName := strings.Replace(name, "\\", "/", -1)
 	if f, ok := _bindata[cannonicalName]; ok {
-		return f()
+		a, err := f()
+		if err != nil {
+			return nil, fmt.Errorf("Asset %%s can't read by error: %%v", name, err)
+		}
+		return a.bytes, nil
 	}
 	return nil, fmt.Errorf("Asset %%s not found", name)
 }
 
+// MustAsset is like Asset but panics when Asset would return an error.
+// It simplifies safe initialization of global variables.
+func MustAsset(name string) []byte {
+	a, err := Asset(name)
+	if err != nil {
+		panic("asset: Asset(" + name + "): " + err.Error())
+	}
+
+	return a
+}
+
+// AssetInfo loads and returns the asset info for the given name.
+// It returns an error if the asset could not be found or
+// could not be loaded.
+func AssetInfo(name string) (os.FileInfo, error) {
+	cannonicalName := strings.Replace(name, "\\", "/", -1)
+	if f, ok := _bindata[cannonicalName]; ok {
+		a, err := f()
+		if err != nil {
+			return nil, fmt.Errorf("AssetInfo %%s can't read by error: %%v", name, err)
+		}
+		return a.info, nil
+	}
+	return nil, fmt.Errorf("AssetInfo %%s not found", name)
+}
+
 // AssetNames returns the names of the assets.
 func AssetNames() []string {
 	names := make([]string, 0, len(_bindata))
@@ -176,7 +210,7 @@ func AssetNames() []string {
 }
 
 // _bindata is a table, holding each asset generator, mapped to its name.
-var _bindata = map[string]func() ([]byte, error){
+var _bindata = map[string]func() (*asset, error){
 `)
 	return err
 }
@@ -190,6 +224,7 @@ func writeTOCAsset(w io.Writer, asset *Asset) error {
 // writeTOCFooter writes the table of contents file footer.
 func writeTOCFooter(w io.Writer) error {
 	_, err := fmt.Fprintf(w, `}
+
 `)
 	return err
 }