mingw: changes to handling of directory permissions

The read-only attribute on a directory in Microsoft Windows is
quite different from write permission in POSIX.  Modify rmdir(2)
and chmod(2) to provide more POSIX-like behaviour:

  rmdir will remove a directory even if it's read-only
  chmod won't make a directory read-only

2 files changed, 26 insertions, 0 deletions

diff --git a/include/mingw.h b/include/mingw.h
index 137548ad8..247aae587 100644
--- a/include/mingw.h
+++ b/include/mingw.h
@@ -257,7 +257,10 @@ NOIMPL(mingw_bind,SOCKET s UNUSED_PARAM,const struct sockaddr* sa UNUSED_PARAM,i
 IMPL(fchmod,int,0,int fildes UNUSED_PARAM, mode_t mode UNUSED_PARAM);
 NOIMPL(fchown,int fd UNUSED_PARAM, uid_t uid UNUSED_PARAM, gid_t gid UNUSED_PARAM);
 int mingw_mkdir(const char *path, int mode);
+int mingw_chmod(const char *path, int mode);
+
 #define mkdir mingw_mkdir
+#define chmod mingw_chmod
 
 #if ENABLE_LFS
 # define off_t off64_t
@@ -395,12 +398,14 @@ NOIMPL(ttyname_r,int fd UNUSED_PARAM, char *buf UNUSED_PARAM, int sz UNUSED_PARA
 int mingw_unlink(const char *pathname);
 NOIMPL(vfork,void);
 int mingw_access(const char *name, int mode);
+int mingw_rmdir(const char *name);
 
 #define dup2 mingw_dup2
 #define getcwd mingw_getcwd
 #define lchown chown
 #define open mingw_open
 #define unlink mingw_unlink
+#define rmdir mingw_rmdir
 
 #undef access
 #define access mingw_access
diff --git a/win32/mingw.c b/win32/mingw.c
index fe45589c2..d76f17820 100644
--- a/win32/mingw.c
+++ b/win32/mingw.c
@@ -842,6 +842,19 @@ int mingw_mkdir(const char *path, int mode UNUSED_PARAM)
         return ret;
 }
 
+#undef chmod
+int mingw_chmod(const char *path, int mode)
+{
+        WIN32_FILE_ATTRIBUTE_DATA fdata;
+
+        if ( get_file_attr(path, &fdata) == 0 &&
+                        fdata.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ) {
+                mode |= 0222;
+        }
+
+        return chmod(path, mode);
+}
+
 int fcntl(int fd, int cmd, ...)
 {
         va_list arg;
@@ -1014,6 +1027,14 @@ int mingw_access(const char *name, int mode)
         return -1;
 }
 
+#undef rmdir
+int mingw_rmdir(const char *path)
+{
+        /* read-only directories cannot be removed */
+        chmod(path, 0666);
+        return rmdir(path);
+}
+
 /* check if path can be made into an executable by adding a suffix;
  * return an allocated string containing the path if it can;
  * return NULL if not.