summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--init_dir.go6
-rw-r--r--mount.go2
2 files changed, 4 insertions, 4 deletions
diff --git a/init_dir.go b/init_dir.go
index a9c66e3..aea8b30 100644
--- a/init_dir.go
+++ b/init_dir.go
@@ -17,9 +17,9 @@ import (
"github.com/rfjakob/gocryptfs/internal/tlog"
)
-// isDirEmpty checks if "dir" exists and is an empty directory.
+// isEmptyDir checks if "dir" exists and is an empty directory.
// Returns an *os.PathError if Stat() on the path fails.
-func isDirEmpty(dir string) error {
+func isEmptyDir(dir string) error {
err := isDir(dir)
if err != nil {
return err
@@ -61,7 +61,7 @@ func initDir(args *argContainer) {
os.Exit(exitcodes.Init)
}
} else {
- err = isDirEmpty(args.cipherdir)
+ err = isEmptyDir(args.cipherdir)
if err != nil {
tlog.Fatal.Printf("Invalid cipherdir: %v", err)
os.Exit(exitcodes.Init)
diff --git a/mount.go b/mount.go
index 8163df0..657878e 100644
--- a/mount.go
+++ b/mount.go
@@ -64,7 +64,7 @@ func doMount(args *argContainer) {
if args.nonempty {
err = isDir(args.mountpoint)
} else {
- err = isDirEmpty(args.mountpoint)
+ err = isEmptyDir(args.mountpoint)
// OSXFuse will create the mountpoint for us ( https://github.com/rfjakob/gocryptfs/issues/194 )
if runtime.GOOS == "darwin" && os.IsNotExist(err) {
tlog.Info.Printf("Mountpoint %q does not exist, but should be created by OSXFuse",