diff options
| author | Peiyuan Song <squallatf@gmail.com> | 2021-01-20 13:33:52 +0900 |
|---|---|---|
| committer | Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp> | 2021-01-20 13:33:52 +0900 |
| commit | bf8ca5f019fa9fd585a7480a3d4198719369df92 (patch) | |
| tree | 12fc5dba7c859ff280c8df7b617fea19d72f5696 | |
| parent | ce0660b7ba283e3208db28a8763796816a587259 (diff) | |
| download | zsh-bf8ca5f019fa9fd585a7480a3d4198719369df92.tar.gz zsh-bf8ca5f019fa9fd585a7480a3d4198719369df92.tar.xz zsh-bf8ca5f019fa9fd585a7480a3d4198719369df92.zip | |
47840: make zpty module work on Cygwin
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/Modules/zpty.c | 11 | ||||
| -rw-r--r-- | configure.ac | 2 |
3 files changed, 17 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 88c205103..eb99fcd5b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2021-01-20 Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp> + + * Peiyuan Song: 47840: Src/Modules/zpty.c, configure.ac: make + zpty module work on Cygwin + 2020-12-12 dana <dana@dana.is> * unposted: NEWS: Catch up on new features diff --git a/Src/Modules/zpty.c b/Src/Modules/zpty.c index 45fd15ee0..dfd2a2a7a 100644 --- a/Src/Modules/zpty.c +++ b/Src/Modules/zpty.c @@ -30,6 +30,13 @@ #include "zpty.mdh" #include "zpty.pro" +#ifdef __CYGWIN__ +#include <cygwin/version.h> +#if defined(CYGWIN_VERSION_DLL_MAJOR) && CYGWIN_VERSION_DLL_MAJOR<3002 +#define USE_CYGWIN_FIX 1 +#endif +#endif + /* The number of bytes we normally read when given no pattern and the * upper bound on the number of bytes we read (even if we are give a * pattern). */ @@ -428,6 +435,7 @@ newptycmd(char *nam, char *pname, char **args, int echo, int nblock) mypid = 0; /* trick to ensure we _exit() */ zexit(lastval, ZEXIT_NORMAL); } +#ifndef USE_CYGWIN_FIX master = movefd(master); if (master == -1) { zerrnam(nam, "cannot duplicate fd %d: %e", master, errno); @@ -435,6 +443,9 @@ newptycmd(char *nam, char *pname, char **args, int echo, int nblock) ineval = oineval; return 1; } +#else + addmodulefd(master, FDT_INTERNAL); +#endif p = (Ptycmd) zalloc(sizeof(*p)); diff --git a/configure.ac b/configure.ac index 549cae3d6..16dafac05 100644 --- a/configure.ac +++ b/configure.ac @@ -2460,7 +2460,7 @@ if test x$ac_cv_have_dev_ptmx = xyes -o x$ac_cv_func_posix_openpt = xyes && \ test x$ac_cv_func_ptsname = xyes; then AC_CACHE_CHECK([if /dev/ptmx is usable], ac_cv_use_dev_ptmx, - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#ifdef __linux + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if defined(__linux) || defined(__CYGWIN__) #define _GNU_SOURCE 1 #endif #include <stdlib.h> |