Fix executable indicator in file name completion on Windows.

	* complete.c (stat_char) [_WIN32]: Don't use 'access' and X_OK on
	Windows, they don't work.  Instead, look at the file-name
	extension to determine whether the file is executable.

diff --git a/readline/ChangeLog.gdb b/readline/ChangeLog.gdb
index bd082e0fe68c3fda139251a9527f357f3e91655f..43abd19e11ca9b9e194cb255265dfdf5282f5238 100644 (file)
--- a/readline/ChangeLog.gdb
+++ b/readline/ChangeLog.gdb
@@ -1,3 +1,9 @@
+2014-12-30  Eli Zaretskii  <eliz@gnu.org>
+
+       * complete.c (stat_char) [_WIN32]: Don't use 'access' and X_OK on
+       Windows, they don't work.  Instead, look at the file-name
+       extension to determine whether the file is executable.
+
 2014-09-22  Chen Gang  <gang.chen.5i5j@gmail.com>
 
        Pushed by Joel Brobecker  <brobecker@adacore.com>

diff --git a/readline/complete.c b/readline/complete.c
index a9c46dfc15ee9e9c7ffe5468d270eb2a6c3ba79d..a5ce8039e5010ca9ce5193941f2ab386a87f39c2 100644 (file)
--- a/readline/complete.c
+++ b/readline/complete.c
@@ -598,8 +598,21 @@ stat_char (filename)
 #endif
   else if (S_ISREG (finfo.st_mode))
     {
+#if defined (_WIN32) && !defined (__CYGWIN__)
+      /* Windows 'access' doesn't support X_OK and on latest Windows
+        versions even invokes an invalid parameter exception.  */
+      char *ext = strrchr (filename, '.');
+
+      if (ext
+         && (_rl_stricmp (ext, ".exe") == 0
+             || _rl_stricmp (ext, ".cmd") == 0
+             || _rl_stricmp (ext, ".bat") == 0
+             || _rl_stricmp (ext, ".com") == 0))
+       character = '*';
+#else
       if (access (filename, X_OK) == 0)
        character = '*';
+#endif
     }
   return (character);
 }