Merge branch 'maint' into tj/imap-send-remove-unused

diff --git a/help.c b/help.c
index 42193550f0b6f2a2c703c20c7abf1a81fe1b51d0..cbbe966f685b276cac702bb0fd9a44bfbf5f0e79 100644 (file)
--- a/help.c
+++ b/help.c
@@ -127,7 +127,10 @@ static int is_executable(const char *name)
            !S_ISREG(st.st_mode))
                return 0;
 
-#ifdef WIN32
+#if defined(WIN32) || defined(__CYGWIN__)
+#if defined(__CYGWIN__)
+if ((st.st_mode & S_IXUSR) == 0)
+#endif
 {      /* cannot trust the executable bit, peek into the file instead */
        char buf[3] = { 0 };
        int n;