33 lines
1.6 KiB
Diff
33 lines
1.6 KiB
Diff
diff -Naur a/Modules/getpath.c b/Modules/getpath.c
|
|
--- a/Modules/getpath.c 2014-05-31 22:58:40.000000000 +0400
|
|
+++ b/Modules/getpath.c 2014-06-04 10:16:52.777000000 +0400
|
|
@@ -451,6 +451,28 @@
|
|
if (isxfile(progpath))
|
|
break;
|
|
|
|
+#ifdef __CYGWIN__
|
|
+ /*
|
|
+ * Cygwin automatically removes the ".exe" extension from argv[0]
|
|
+ * to make programs feel like they are in a more Unix-like
|
|
+ * environment. Unfortunately, this can make it problemmatic for
|
|
+ * Cygwin to distinguish between a directory and an executable with
|
|
+ * the same name excluding the ".exe" extension. For example, the
|
|
+ * Cygwin Python build directory has a "Python" directory and a
|
|
+ * "python.exe" executable. This causes isxfile() to erroneously
|
|
+ * return false. If isdir() returns true and there is enough space
|
|
+ * to append the ".exe" extension, then we try again with the
|
|
+ * extension appended.
|
|
+ */
|
|
+#define EXE ".exe"
|
|
+ if (isdir(progpath) && strlen(progpath) + strlen(EXE) <= MAXPATHLEN)
|
|
+ {
|
|
+ strcat(progpath, EXE);
|
|
+ if (isxfile(progpath))
|
|
+ break;
|
|
+ }
|
|
+#endif /* __CYGWIN__ */
|
|
+
|
|
if (!delim) {
|
|
progpath[0] = '\0';
|
|
break;
|