DISTRHO
/
PawPaw
mirror of https://github.com/DISTRHO/PawPaw
1
0
Fork 0
Code Issues 0 Releases 2 Wiki Activity
Cross-Platform build scripts for audio plugins
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
294 Commits
3 Branches
5.1MB
Tree: 82b5cf0ee4
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from '82b5cf0ee4'
${ noResults }
PawPaw/patches/Python/win32/1700-cygpty-isatty.patch

418 lines
13KB
Raw Blame History 

  1. diff -Naur Python-3.8.0-orig/Include/iscygpty.h Python-3.8.0/Include/iscygpty.h

  2. --- Python-3.8.0-orig/Include/iscygpty.h	1970-01-01 03:00:00.000000000 +0300

  3. +++ Python-3.8.0/Include/iscygpty.h	2019-10-22 10:04:39.461927600 +0300

  4. @@ -0,0 +1,41 @@

  5. +/*

  6. + * iscygpty.h -- part of ptycheck

  7. + * https://github.com/k-takata/ptycheck

  8. + *

  9. + * Copyright (c) 2015-2017 K.Takata

  10. + *

  11. + * You can redistribute it and/or modify it under the terms of either

  12. + * the MIT license (as described below) or the Vim license.

  13. + *

  14. + * Permission is hereby granted, free of charge, to any person obtaining

  15. + * a copy of this software and associated documentation files (the

  16. + * "Software"), to deal in the Software without restriction, including

  17. + * without limitation the rights to use, copy, modify, merge, publish,

  18. + * distribute, sublicense, and/or sell copies of the Software, and to

  19. + * permit persons to whom the Software is furnished to do so, subject to

  20. + * the following conditions:

  21. + *

  22. + * The above copyright notice and this permission notice shall be

  23. + * included in all copies or substantial portions of the Software.

  24. + *

  25. + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

  26. + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

  27. + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

  28. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY

  29. + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,

  30. + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE

  31. + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

  32. + */

  33. +

  34. +#ifndef _ISCYGPTY_H

  35. +#define _ISCYGPTY_H

  36. +

  37. +#ifdef _WIN32

  38. +int is_cygpty(int fd);

  39. +int is_cygpty_used(void);

  40. +#else

  41. +#define is_cygpty(fd)		0

  42. +#define is_cygpty_used()	0

  43. +#endif

  44. +

  45. +#endif /* _ISCYGPTY_H */

  46. diff -Naur Python-3.8.0-orig/Makefile.pre.in Python-3.8.0/Makefile.pre.in

  47. --- Python-3.8.0-orig/Makefile.pre.in	2019-10-22 10:04:25.063102300 +0300

  48. +++ Python-3.8.0/Makefile.pre.in	2019-10-22 10:04:39.867528300 +0300

  49. @@ -346,6 +346,7 @@

  50.  		Python/import.o \

  51.  		Python/importdl.o \

  52.  		Python/initconfig.o \

  53. +		Python/iscygpty.o \

  54.  		Python/marshal.o \

  55.  		Python/modsupport.o \

  56.  		Python/mysnprintf.o \

  57. @@ -1011,6 +1012,7 @@

  58.  		$(srcdir)/Include/import.h \

  59.  		$(srcdir)/Include/interpreteridobject.h \

  60.  		$(srcdir)/Include/intrcheck.h \

  61. +		$(srcdir)/Include/iscygpty.h \

  62.  		$(srcdir)/Include/iterobject.h \

  63.  		$(srcdir)/Include/listobject.h \

  64.  		$(srcdir)/Include/longintrepr.h \

  65. diff -Naur Python-3.8.0-orig/Modules/_io/fileio.c Python-3.8.0/Modules/_io/fileio.c

  66. --- Python-3.8.0-orig/Modules/_io/fileio.c	2019-10-14 16:34:47.000000000 +0300

  67. +++ Python-3.8.0/Modules/_io/fileio.c	2019-10-22 10:04:40.273129000 +0300

  68. @@ -18,6 +18,7 @@

  69.  #endif

  70.  #include <stddef.h> /* For offsetof */

  71.  #include "_iomodule.h"

  72. +#include "iscygpty.h"

  73.  

  74.  /*

  75.   * Known likely problems:

  76. @@ -1119,7 +1120,7 @@

  77.          return err_closed();

  78.      Py_BEGIN_ALLOW_THREADS

  79.      _Py_BEGIN_SUPPRESS_IPH

  80. -    res = isatty(self->fd);

  81. +    res = isatty(self->fd) || is_cygpty(self->fd);

  82.      _Py_END_SUPPRESS_IPH

  83.      Py_END_ALLOW_THREADS

  84.      return PyBool_FromLong(res);

  85. diff -Naur Python-3.8.0-orig/Modules/main.c Python-3.8.0/Modules/main.c

  86. --- Python-3.8.0-orig/Modules/main.c	2019-10-14 16:34:47.000000000 +0300

  87. +++ Python-3.8.0/Modules/main.c	2019-10-22 10:04:41.068730400 +0300

  88. @@ -5,6 +5,7 @@

  89.  #include "pycore_pylifecycle.h"

  90.  #include "pycore_pymem.h"

  91.  #include "pycore_pystate.h"

  92. +#include "iscygpty.h"

  93.  

  94.  #ifdef __FreeBSD__

  95.  #  include <fenv.h>     /* fedisableexcept() */

  96. @@ -103,7 +104,7 @@

  97.  static int

  98.  stdin_is_interactive(const PyConfig *config)

  99.  {

  100. -    return (isatty(fileno(stdin)) || config->interactive);

  101. +    return (isatty(fileno(stdin)) || config->interactive || is_cygpty(fileno(stdin)));

  102.  }

  103.  

  104.  

  105. diff -Naur Python-3.8.0-orig/Modules/posixmodule.c Python-3.8.0/Modules/posixmodule.c

  106. --- Python-3.8.0-orig/Modules/posixmodule.c	2019-10-22 10:02:48.171332100 +0300

  107. +++ Python-3.8.0/Modules/posixmodule.c	2019-10-22 10:04:41.489931200 +0300

  108. @@ -34,6 +34,7 @@

  109.        FSCTL_GET_REPARSE_POINT is not exported with WIN32_LEAN_AND_MEAN. */

  110.  #  include <windows.h>

  111.  #endif

  112. +#include "iscygpty.h"

  113.  

  114.  #include "pycore_ceval.h"     /* _PyEval_ReInitThreads() */

  115.  #include "pycore_pystate.h"   /* _PyRuntime */

  116. @@ -9258,7 +9259,7 @@

  117.  {

  118.      int return_value;

  119.      _Py_BEGIN_SUPPRESS_IPH

  120. -    return_value = isatty(fd);

  121. +    return_value = isatty(fd) || is_cygpty(fd);

  122.      _Py_END_SUPPRESS_IPH

  123.      return return_value;

  124.  }

  125. diff -Naur Python-3.8.0-orig/Python/frozenmain.c Python-3.8.0/Python/frozenmain.c

  126. --- Python-3.8.0-orig/Python/frozenmain.c	2019-10-14 16:34:47.000000000 +0300

  127. +++ Python-3.8.0/Python/frozenmain.c	2019-10-22 10:04:41.895531900 +0300

  128. @@ -4,6 +4,7 @@

  129.  #include "Python.h"

  130.  #include "pycore_pystate.h"

  131.  #include <locale.h>

  132. +#include "iscygpty.h"

  133.  

  134.  #ifdef MS_WINDOWS

  135.  extern void PyWinFreeze_ExeInit(void);

  136. @@ -107,7 +108,7 @@

  137.      else

  138.          sts = 0;

  139.  

  140. -    if (inspect && isatty((int)fileno(stdin)))

  141. +    if (inspect && (isatty((int)fileno(stdin)) || is_cygpty((int)fileno(stdin))))

  142.          sts = PyRun_AnyFile(stdin, "<stdin>") != 0;

  143.  

  144.  #ifdef MS_WINDOWS

  145. diff -Naur Python-3.8.0-orig/Python/iscygpty.c Python-3.8.0/Python/iscygpty.c

  146. --- Python-3.8.0-orig/Python/iscygpty.c	1970-01-01 03:00:00.000000000 +0300

  147. +++ Python-3.8.0/Python/iscygpty.c	2019-10-22 10:04:42.301132600 +0300

  148. @@ -0,0 +1,185 @@

  149. +/*

  150. + * iscygpty.c -- part of ptycheck

  151. + * https://github.com/k-takata/ptycheck

  152. + *

  153. + * Copyright (c) 2015-2017 K.Takata

  154. + *

  155. + * You can redistribute it and/or modify it under the terms of either

  156. + * the MIT license (as described below) or the Vim license.

  157. + *

  158. + * Permission is hereby granted, free of charge, to any person obtaining

  159. + * a copy of this software and associated documentation files (the

  160. + * "Software"), to deal in the Software without restriction, including

  161. + * without limitation the rights to use, copy, modify, merge, publish,

  162. + * distribute, sublicense, and/or sell copies of the Software, and to

  163. + * permit persons to whom the Software is furnished to do so, subject to

  164. + * the following conditions:

  165. + *

  166. + * The above copyright notice and this permission notice shall be

  167. + * included in all copies or substantial portions of the Software.

  168. + *

  169. + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

  170. + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

  171. + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

  172. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY

  173. + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,

  174. + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE

  175. + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

  176. + */

  177. +

  178. +#ifdef _WIN32

  179. +

  180. +#include <ctype.h>

  181. +#include <io.h>

  182. +#include <wchar.h>

  183. +#include <windows.h>

  184. +

  185. +#ifdef USE_FILEEXTD

  186. +/* VC 7.1 or earlier doesn't support SAL. */

  187. +# if !defined(_MSC_VER) || (_MSC_VER < 1400)

  188. +#  define __out

  189. +#  define __in

  190. +#  define __in_opt

  191. +# endif

  192. +/* Win32 FileID API Library:

  193. + * http://www.microsoft.com/en-us/download/details.aspx?id=22599

  194. + * Needed for WinXP. */

  195. +# include <fileextd.h>

  196. +#else /* USE_FILEEXTD */

  197. +/* VC 8 or earlier. */

  198. +# if defined(_MSC_VER) && (_MSC_VER < 1500)

  199. +#  ifdef ENABLE_STUB_IMPL

  200. +#   define STUB_IMPL

  201. +#  else

  202. +#   error "Win32 FileID API Library is required for VC2005 or earlier."

  203. +#  endif

  204. +# endif

  205. +#endif /* USE_FILEEXTD */

  206. +

  207. +

  208. +#include "iscygpty.h"

  209. +

  210. +//#define USE_DYNFILEID

  211. +#ifdef USE_DYNFILEID

  212. +typedef BOOL (WINAPI *pfnGetFileInformationByHandleEx)(

  213. +		HANDLE                    hFile,

  214. +		FILE_INFO_BY_HANDLE_CLASS FileInformationClass,

  215. +		LPVOID                    lpFileInformation,

  216. +		DWORD                     dwBufferSize

  217. +);

  218. +static pfnGetFileInformationByHandleEx pGetFileInformationByHandleEx = NULL;

  219. +

  220. +# ifndef USE_FILEEXTD

  221. +static BOOL WINAPI stub_GetFileInformationByHandleEx(

  222. +		HANDLE                    hFile,

  223. +		FILE_INFO_BY_HANDLE_CLASS FileInformationClass,

  224. +		LPVOID                    lpFileInformation,

  225. +		DWORD                     dwBufferSize

  226. +		)

  227. +{

  228. +	return FALSE;

  229. +}

  230. +# endif

  231. +

  232. +static void setup_fileid_api(void)

  233. +{

  234. +	if (pGetFileInformationByHandleEx != NULL) {

  235. +		return;

  236. +	}

  237. +	pGetFileInformationByHandleEx = (pfnGetFileInformationByHandleEx)

  238. +		GetProcAddress(GetModuleHandle(TEXT("kernel32.dll")),

  239. +				"GetFileInformationByHandleEx");

  240. +	if (pGetFileInformationByHandleEx == NULL) {

  241. +# ifdef USE_FILEEXTD

  242. +		pGetFileInformationByHandleEx = GetFileInformationByHandleEx;

  243. +# else

  244. +		pGetFileInformationByHandleEx = stub_GetFileInformationByHandleEx;

  245. +# endif

  246. +	}

  247. +}

  248. +#else

  249. +# define pGetFileInformationByHandleEx	GetFileInformationByHandleEx

  250. +# define setup_fileid_api()

  251. +#endif

  252. +

  253. +

  254. +#define is_wprefix(s, prefix) \

  255. +	(wcsncmp((s), (prefix), sizeof(prefix) / sizeof(WCHAR) - 1) == 0)

  256. +

  257. +/* Check if the fd is a cygwin/msys's pty. */

  258. +int is_cygpty(int fd)

  259. +{

  260. +#ifdef STUB_IMPL

  261. +	return 0;

  262. +#else

  263. +	HANDLE h;

  264. +	int size = sizeof(FILE_NAME_INFO) + sizeof(WCHAR) * (MAX_PATH - 1);

  265. +	FILE_NAME_INFO *nameinfo;

  266. +	WCHAR *p = NULL;

  267. +

  268. +	setup_fileid_api();

  269. +

  270. +	h = (HANDLE) _get_osfhandle(fd);

  271. +	if (h == INVALID_HANDLE_VALUE) {

  272. +		return 0;

  273. +	}

  274. +	/* Cygwin/msys's pty is a pipe. */

  275. +	if (GetFileType(h) != FILE_TYPE_PIPE) {

  276. +		return 0;

  277. +	}

  278. +	nameinfo = malloc(size + sizeof(WCHAR));

  279. +	if (nameinfo == NULL) {

  280. +		return 0;

  281. +	}

  282. +	/* Check the name of the pipe:

  283. +	 * '\{cygwin,msys}-XXXXXXXXXXXXXXXX-ptyN-{from,to}-master' */

  284. +	if (pGetFileInformationByHandleEx(h, FileNameInfo, nameinfo, size)) {

  285. +		nameinfo->FileName[nameinfo->FileNameLength / sizeof(WCHAR)] = L'\0';

  286. +		p = nameinfo->FileName;

  287. +		if (is_wprefix(p, L"\\cygwin-")) {		/* Cygwin */

  288. +			p += 8;

  289. +		} else if (is_wprefix(p, L"\\msys-")) {	/* MSYS and MSYS2 */

  290. +			p += 6;

  291. +		} else {

  292. +			p = NULL;

  293. +		}

  294. +		if (p != NULL) {

  295. +			while (*p && isxdigit(*p))	/* Skip 16-digit hexadecimal. */

  296. +				++p;

  297. +			if (is_wprefix(p, L"-pty")) {

  298. +				p += 4;

  299. +			} else {

  300. +				p = NULL;

  301. +			}

  302. +		}

  303. +		if (p != NULL) {

  304. +			while (*p && isdigit(*p))	/* Skip pty number. */

  305. +				++p;

  306. +			if (is_wprefix(p, L"-from-master")) {

  307. +				//p += 12;

  308. +			} else if (is_wprefix(p, L"-to-master")) {

  309. +				//p += 10;

  310. +			} else {

  311. +				p = NULL;

  312. +			}

  313. +		}

  314. +	}

  315. +	free(nameinfo);

  316. +	return (p != NULL);

  317. +#endif /* STUB_IMPL */

  318. +}

  319. +

  320. +/* Check if at least one cygwin/msys pty is used. */

  321. +int is_cygpty_used(void)

  322. +{

  323. +	int fd, ret = 0;

  324. +

  325. +	for (fd = 0; fd < 3; fd++) {

  326. +		ret |= is_cygpty(fd);

  327. +	}

  328. +	return ret;

  329. +}

  330. +

  331. +#endif /* _WIN32 */

  332. +

  333. +/* vim: set ts=4 sw=4: */

  334. diff -Naur Python-3.8.0-orig/Python/pylifecycle.c Python-3.8.0/Python/pylifecycle.c

  335. --- Python-3.8.0-orig/Python/pylifecycle.c	2019-10-14 16:34:47.000000000 +0300

  336. +++ Python-3.8.0/Python/pylifecycle.c	2019-10-22 10:04:42.691133300 +0300

  337. @@ -24,6 +24,7 @@

  338.  #include "ast.h"

  339.  #include "marshal.h"

  340.  #include "osdefs.h"

  341. +#include "iscygpty.h"

  342.  #include <locale.h>

  343.  

  344.  #ifdef HAVE_SIGNAL_H

  345. @@ -2349,7 +2350,7 @@

  346.  int

  347.  Py_FdIsInteractive(FILE *fp, const char *filename)

  348.  {

  349. -    if (isatty((int)fileno(fp)))

  350. +    if (isatty((int)fileno(fp)) || is_cygpty((int)fileno(fp)))

  351.          return 1;

  352.      if (!Py_InteractiveFlag)

  353.          return 0;

  354. --- Python-3.8.7/Python/bltinmodule.c.orig	2020-12-21 17:25:24.000000000 +0100

  355. +++ Python-3.8.7/Python/bltinmodule.c	2021-01-06 16:50:48.899457200 +0100

  356. @@ -1,6 +1,7 @@

  357.  /* Built-in functions */

  358.  

  359.  #include "Python.h"

  360. +#include "iscygpty.h"

  361.  #include <ctype.h>

  362.  #include "ast.h"

  363.  #undef Yield   /* undefine macro conflicting with <winbase.h> */

  364. @@ -1980,7 +1981,7 @@

  365.          Py_DECREF(tmp);

  366.          if (fd < 0 && PyErr_Occurred())

  367.              return NULL;

  368. -        tty = fd == fileno(stdin) && isatty(fd);

  369. +        tty = fd == fileno(stdin) && (isatty(fd) || is_cygpty(fd));

  370.      }

  371.      if (tty) {

  372.          tmp = _PyObject_CallMethodId(fout, &PyId_fileno, NULL);

  373. @@ -1993,7 +1994,7 @@

  374.              Py_DECREF(tmp);

  375.              if (fd < 0 && PyErr_Occurred())

  376.                  return NULL;

  377. -            tty = fd == fileno(stdout) && isatty(fd);

  378. +            tty = fd == fileno(stdout) && (isatty(fd) || is_cygpty(fd));

  379.          }

  380.      }

  381.  

  382. --- Python-3.8.7/Objects/fileobject.c.orig	2020-12-21 17:25:24.000000000 +0100

  383. +++ Python-3.8.7/Objects/fileobject.c	2021-01-06 16:51:19.605061600 +0100

  384. @@ -2,6 +2,7 @@

  385.  

  386.  #define PY_SSIZE_T_CLEAN

  387.  #include "Python.h"

  388. +#include "iscygpty.h"

  389.  #include "pycore_pystate.h"

  390.  

  391.  #if defined(HAVE_GETC_UNLOCKED) && !defined(_Py_MEMORY_SANITIZER)

  392. @@ -434,7 +435,7 @@

  393.      }

  394.  

  395.      Py_BEGIN_ALLOW_THREADS

  396. -    res = isatty(self->fd);

  397. +    res = isatty(self->fd) || is_cygpty(self->fd);

  398.      Py_END_ALLOW_THREADS

  399.  

  400.      return PyBool_FromLong(res);

  401. --- Python-3.8.7/Python/fileutils.c.orig	2020-12-21 17:25:24.000000000 +0100

  402. +++ Python-3.8.7/Python/fileutils.c	2021-01-06 16:50:56.153853200 +0100

  403. @@ -1,4 +1,5 @@

  404.  #include "Python.h"

  405. +#include "iscygpty.h"

  406.  #include "pycore_fileutils.h"

  407.  #include "osdefs.h"

  408.  #include <locale.h>

  409. @@ -59,7 +60,7 @@

  410.  #endif

  411.      int valid;

  412.      _Py_BEGIN_SUPPRESS_IPH

  413. -    valid = isatty(fd);

  414. +    valid = isatty(fd) || is_cygpty(fd);

  415.      _Py_END_SUPPRESS_IPH

  416.      if (!valid)

  417.          Py_RETURN_NONE;