Commit: 05942d8a1b618e1c850b67ad76374f8c59743df5 - binutils_gdb (git)

Commit MetaInfo

• Révision: 05942d8a1b618e1c850b67ad76374f8c59743df5 (tree)
• l'heure: 2014-12-31 04:14:25
• Auteur: Eli Zaretskii <eliz@gnu....>
• Commiter: Eli Zaretskii

Message de Log

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.

Change Summary

• modified: readline/ChangeLog.gdb
• modified: readline/complete.c

Modification

--- a/readline/ChangeLog.gdb
+++ b/readline/ChangeLog.gdb
@@ -1,3 +1,9 @@
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* 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  <[e-mail]>
 
 	Pushed by Joel Brobecker  <[e-mail]>

--- 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);
 }