diff --git a/go/unixsocket/sockname.go b/go/unixsocket/sockname.go deleted file mode 100644 index e82bcd9c..00000000 --- a/go/unixsocket/sockname.go +++ /dev/null @@ -1,16 +0,0 @@ -package unixsocket - -import "os" - -var sockName string - -func init() { - sockName = os.Getenv("ZEUSSOCK") - if sockName == "" { - sockName = ".zeus.sock" - } -} - -func ZeusSockName() string { - return sockName -} diff --git a/go/unixsocket/unixsocket.go b/go/unixsocket/unixsocket.go index 9f8f4117..7d32ea38 100644 --- a/go/unixsocket/unixsocket.go +++ b/go/unixsocket/unixsocket.go @@ -18,10 +18,6 @@ import ( "syscall" ) -// http://code.google.com/p/rsc/source/browse/fuse/mount_linux.go -// https://github.com/hanwen/go-fuse/blob/master/fuse/mount.go -// http://code.google.com/p/go/source/browse/src/pkg/syscall/syscall_bsd.go?spec=svn982df2b2cb4b6001e8b60f9e8a000751e9a42198&name=982df2b2cb4b&r=982df2b2cb4b6001e8b60f9e8a000751e9a42198 - func Socketpair(typ int) (a, b *os.File, err error) { fd, err := syscall.Socketpair(syscall.AF_UNIX, typ, 0) if err != nil { @@ -33,3 +29,16 @@ func Socketpair(typ int) (a, b *os.File, err error) { b = os.NewFile(uintptr(fd[1]), "socketpair-b") return } + +var sockName string + +func init() { + sockName = os.Getenv("ZEUSSOCK") + if sockName == "" { + sockName = ".zeus.sock" + } +} + +func ZeusSockName() string { + return sockName +}