hardcoresushi/libgocryptfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Rename isDirEmpty -> isEmptyDir

Browse Source 
The function actually answers the question:
"is this an empty dir"?
This commit is contained in:
Jakob Unterwurzacher 2019-08-04 14:13:00 +02:00
parent 13055278f5
commit b1d09b0f17
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
init_dir.go
View File

@ -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)

2
mount.go
View File

@ -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",