From: Russ Cox <rsc@golang.org>
Date: Tue, 28 Oct 2014 00:45:16 +0000 (-0400)
Subject: syscall: accept pre-existing directories in nacl zip file
X-Git-Tag: go1.4beta1~34
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=1c534714e1d353d45670a3ed76f4f4a7c7bfa7c6;p=gostls13.git

syscall: accept pre-existing directories in nacl zip file

NaCl creates /tmp. This lets the zip file populate it.

LGTM=adg
R=adg
CC=golang-codereviews
https://golang.org/cl/159600043
---

diff --git a/src/syscall/fs_nacl.go b/src/syscall/fs_nacl.go
index 4abc9b81c9..6e6ce2ab7b 100644
--- a/src/syscall/fs_nacl.go
+++ b/src/syscall/fs_nacl.go
@@ -818,6 +818,12 @@ func create(name string, mode uint32, sec int64, data []byte) error {
 	fs.mu.Unlock()
 	f, err := fs.open(name, O_CREATE|O_EXCL, mode)
 	if err != nil {
+		if mode&S_IFMT == S_IFDIR {
+			ip, _, err := fs.namei(name, false)
+			if err == nil && (ip.Mode&S_IFMT) == S_IFDIR {
+				return nil // directory already exists
+			}
+		}
 		return err
 	}
 	ip := f.(*fsysFile).inode