* environ.cc (struct parse_thing): Add transparent_exe option.

	* fhandler_disk_file.cc (fhandler_disk_file::link): Accomodate
	transparent_exe option.  Add .exe suffix for links to executable files,
	if transparent_exe is set.
	* fhandler_process.cc (fhandler_process::fill_filebuf): Remove .exe
	suffix if transparent_exe option is set.
	* path.cc (symlink_worker): Accomodate transparent_exe option.
	(realpath): Don't tack on .exe suffix if transparent_exe is set.
	* syscalls.cc (transparent_exe): New global variable.
	(unlink): Accomodate transparent_exe option.
	(open): Ditto.
	(link): Ditto.
	(rename): Ditto. Maybe add .exe suffix when renaming executable files.
	(pathconf): Accomodate transparent_exe option.
	* winsup.h: Declare transparent_exe.

1 files changed, 39 insertions, 13 deletions

diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc
index 62ebf639f..66c5e38c4 100644
--- a/winsup/cygwin/syscalls.cc
+++ b/winsup/cygwin/syscalls.cc
@@ -84,6 +84,8 @@ suffix_info stat_suffixes[] =
   suffix_info (NULL)
 };
 
+bool transparent_exe = false;
+
 SYSTEM_INFO system_info;
 
 static int __stdcall mknod_worker (const char *, mode_t, mode_t, _major_t,
@@ -139,7 +141,8 @@ unlink (const char *ourname)
   int res = -1;
   DWORD devn;
 
-  path_conv win32_name (ourname, PC_SYM_NOFOLLOW);
+  path_conv win32_name (ourname, PC_SYM_NOFOLLOW,
+  			transparent_exe ? stat_suffixes : NULL);
 
   if (win32_name.error)
     {
@@ -598,7 +601,8 @@ open (const char *unix_path, int flags, ...)
       if (fd >= 0)
 	{
 	  if (!(fh = build_fh_name (unix_path, NULL, (flags & O_NOFOLLOW) ?
-				    PC_SYM_NOFOLLOW : PC_SYM_FOLLOW)))
+				    PC_SYM_NOFOLLOW : PC_SYM_FOLLOW,
+				    transparent_exe ? stat_suffixes : NULL)))
 	    res = -1;		// errno already set
 	  else if ((flags & O_NOFOLLOW) && fh->issymlink ())
 	    {
@@ -722,7 +726,8 @@ link (const char *oldpath, const char *newpath)
   int res = -1;
   fhandler_base *fh;
 
-  if (!(fh = build_fh_name (oldpath, NULL, PC_SYM_NOFOLLOW)))
+  if (!(fh = build_fh_name (oldpath, NULL, PC_SYM_NOFOLLOW,
+			    transparent_exe ? stat_suffixes : NULL)))
     goto error;
 
   if (fh->error ())
@@ -1171,7 +1176,8 @@ rename (const char *oldpath, const char *newpath)
   int res = 0;
   char *lnk_suffix = NULL;
 
-  path_conv real_old (oldpath, PC_SYM_NOFOLLOW);
+  path_conv real_old (oldpath, PC_SYM_NOFOLLOW,
+		      transparent_exe ? stat_suffixes : NULL);
 
   if (real_old.error)
     {
@@ -1180,16 +1186,35 @@ rename (const char *oldpath, const char *newpath)
       return -1;
     }
 
-  path_conv real_new (newpath, PC_SYM_NOFOLLOW);
+  path_conv real_new (newpath, PC_SYM_NOFOLLOW,
+		      transparent_exe ? stat_suffixes : NULL);
 
-  /* Shortcut hack. */
-  char new_lnk_buf[CYG_MAX_PATH + 5];
-  if (real_old.is_lnk_special () && !real_new.error && !real_new.case_clash)
+  char new_buf[CYG_MAX_PATH + 5];
+  if (!real_new.error && !real_new.case_clash)
     {
-      strcpy (new_lnk_buf, newpath);
-      strcat (new_lnk_buf, ".lnk");
-      newpath = new_lnk_buf;
-      real_new.check (newpath, PC_SYM_NOFOLLOW);
+      DWORD bintype;
+      int len;
+
+      if (real_old.is_lnk_special ())
+	{
+	  /* Shortcut hack. */
+	  strcpy (new_buf, newpath);
+	  strcat (new_buf, ".lnk");
+	  newpath = new_buf;
+	  real_new.check (newpath, PC_SYM_NOFOLLOW);
+	}
+      else if (transparent_exe
+	       && !real_old.isdir ()
+	       && GetBinaryType (real_old, &bintype)
+	       && (len = strlen (real_new)) > 4
+	       && !strcasematch ((const char *) real_new + len - 4, ".exe"))
+        {
+	  /* Executable hack. */
+	  strcpy (new_buf, newpath);
+	  strcat (new_buf, ".exe");
+	  newpath = new_buf;
+	  real_new.check (newpath, PC_SYM_NOFOLLOW);
+	}
     }
 
   if (real_new.error || real_new.case_clash)
@@ -1510,7 +1535,8 @@ pathconf (const char *file, int v)
     case _PC_POSIX_PERMISSIONS:
     case _PC_POSIX_SECURITY:
       {
-	path_conv full_path (file, PC_SYM_FOLLOW);
+	path_conv full_path (file, PC_SYM_FOLLOW,
+			     transparent_exe ? stat_suffixes : NULL);
 	if (full_path.error)
 	  {
 	    set_errno (full_path.error);