From 3574e9aa49d8048619fccd233d603f497975efb2 Mon Sep 17 00:00:00 2001
From: Aaron Jacobs <jacobsa@google.com>
Date: Tue, 11 Aug 2015 10:55:43 +1000
Subject: [PATCH] Make sure the mount point exists up front.

---
 mount.go | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/mount.go b/mount.go
index 2d8a940..7f9c553 100644
--- a/mount.go
+++ b/mount.go
@@ -16,6 +16,7 @@ package fuse
 
 import (
 	"fmt"
+	"os"
 
 	"golang.org/x/net/context"
 )
@@ -35,6 +36,22 @@ func Mount(
 	dir string,
 	server Server,
 	config *MountConfig) (mfs *MountedFileSystem, err error) {
+	// Sanity check: make sure the mount point exists and is a directory. This
+	// saves us from some confusing errors later on OS X.
+	fi, err := os.Stat(dir)
+	switch {
+	case os.IsNotExist(err):
+		return
+
+	case err != nil:
+		err = fmt.Errorf("Statting mount point: %v", err)
+		return
+
+	case !fi.IsDir():
+		err = fmt.Errorf("Mount point %s is not a directory", dir)
+		return
+	}
+
 	// Initialize the struct.
 	mfs = &MountedFileSystem{
 		dir:                 dir,