From fb6a139c85e78e89d72f68e3a255b93b51a201a1 Mon Sep 17 00:00:00 2001
From: Bill Zissimopoulos <billziss@navimatics.com>
Date: Fri, 10 Jun 2016 21:30:59 -0700
Subject: [PATCH] dll: fuseintf: CanDelete improvements

---
 src/dll/fuse/fuseintf.c | 24 +++++++++++++++++-------
 src/dll/fuse/library.h  |  2 +-
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/dll/fuse/fuseintf.c b/src/dll/fuse/fuseintf.c
index 8c7876fc..76904273 100644
--- a/src/dll/fuse/fuseintf.c
+++ b/src/dll/fuse/fuseintf.c
@@ -752,11 +752,11 @@ static int fsp_fuse_intf_CanDeleteAddDirInfo(void *buf, const char *name,
 {
     struct fuse_dirhandle *dh = buf;
 
-    if ('.' == name[0] && '\0' == name[1])
-        return 0;
-    else
-    if ('.' == name[0] && '.' == name[1] && '\0' == name[2])
+    if ('.' == name[0] && ('\0' == name[1] || ('.' == name[1] && '\0' == name[2])))
+    {
+        dh->DotFiles = TRUE;
         return 0;
+    }
     else
     {
         dh->HasChild = TRUE;
@@ -779,17 +779,27 @@ static NTSTATUS fsp_fuse_intf_CanDelete(FSP_FILE_SYSTEM *FileSystem,
         (PVOID)(UINT_PTR)Request->Req.SetInformation.UserContext2;
     struct fuse_file_info fi;
     struct fuse_dirhandle dh;
+    int err;
 
     if (filedesc->IsDirectory)
     {
+        /* check that directory is empty! */
+
         memset(&dh, 0, sizeof dh);
 
         if (0 != f->ops.readdir)
-            f->ops.readdir(filedesc->PosixPath, &dh, fsp_fuse_intf_CanDeleteAddDirInfo, 0, &fi);
+            err = f->ops.readdir(filedesc->PosixPath, &dh, fsp_fuse_intf_CanDeleteAddDirInfo, 0, &fi);
         else if (0 != f->ops.getdir)
-            f->ops.getdir(filedesc->PosixPath, &dh, fsp_fuse_intf_CanDeleteAddDirInfoOld);
+            err = f->ops.getdir(filedesc->PosixPath, &dh, fsp_fuse_intf_CanDeleteAddDirInfoOld);
+        else
+            err = 0;
 
-        return dh.HasChild ? STATUS_DIRECTORY_NOT_EMPTY : STATUS_SUCCESS;
+        if (dh.HasChild)
+            return STATUS_DIRECTORY_NOT_EMPTY;
+        else if (dh.DotFiles)
+            return STATUS_SUCCESS;
+        else
+            return fsp_fuse_ntstatus_from_errno(f->env, err);
     }
 
     return STATUS_SUCCESS;
diff --git a/src/dll/fuse/library.h b/src/dll/fuse/library.h
index c6aa7206..b4c131eb 100644
--- a/src/dll/fuse/library.h
+++ b/src/dll/fuse/library.h
@@ -64,7 +64,7 @@ struct fuse_dirhandle
     PVOID Buffer;
     ULONG Length;
     ULONG BytesTransferred;
-    BOOLEAN HasChild;
+    BOOLEAN DotFiles, HasChild;
 };
 
 static inline