diff options
author | Lars Wendler <polynomial-c@gentoo.org> | 2022-04-13 10:06:51 +0200 |
---|---|---|
committer | Lars Wendler <polynomial-c@gentoo.org> | 2022-04-13 10:08:48 +0200 |
commit | 35dd4906505f729d68ead73d64c42f764ba858dc (patch) | |
tree | 2b0e711be3268021fa82ba7ead8c67a85a3b2ed4 /app-shells | |
parent | www-client/opera-developer: remove old (diff) | |
download | gentoo-35dd4906505f729d68ead73d64c42f764ba858dc.tar.gz gentoo-35dd4906505f729d68ead73d64c42f764ba858dc.tar.bz2 gentoo-35dd4906505f729d68ead73d64c42f764ba858dc.zip |
app-shells/zsh: Revbump to fix non-interactive shell regression
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'app-shells')
-rw-r--r-- | app-shells/zsh/files/zsh-5.8.1-non_interactive_shell_regression_fix.patch | 76 | ||||
-rw-r--r-- | app-shells/zsh/zsh-5.8.1-r1.ebuild (renamed from app-shells/zsh/zsh-5.8.1.ebuild) | 4 |
2 files changed, 80 insertions, 0 deletions
diff --git a/app-shells/zsh/files/zsh-5.8.1-non_interactive_shell_regression_fix.patch b/app-shells/zsh/files/zsh-5.8.1-non_interactive_shell_regression_fix.patch new file mode 100644 index 000000000000..6e202fa2fb24 --- /dev/null +++ b/app-shells/zsh/files/zsh-5.8.1-non_interactive_shell_regression_fix.patch @@ -0,0 +1,76 @@ +From da8be06c2062ea02795bcba25172369ec68848cf Mon Sep 17 00:00:00 2001 +From: Peter Stephenson <p.w.stephenson@ntlworld.com> +Date: Thu, 3 Mar 2022 19:19:35 +0000 +Subject: [PATCH] 49792: Non-interative shell input is line buffered. + +--- + ChangeLog | 5 +++++ + Src/input.c | 21 ++++++++++++++------- + Test/A01grammar.ztst | 9 +++++++++ + 3 files changed, 28 insertions(+), 7 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index 8a5ad4941..cae2fc4e3 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,8 @@ ++2022-03-03 Peter Stephenson <p.w.stephenson@ntlworld.com> ++ ++ * 49792: Src/input.c, Test/A01grammar.ztst: Use line buffering ++ for non-interactive input. ++ + 2022-02-12 dana <dana@dana.is> + + * unposted: Config/version.mk, Etc/FAQ.yo, README: Update +diff --git a/Src/input.c b/Src/input.c +index 18228b37d..caa8e23b0 100644 +--- a/Src/input.c ++++ b/Src/input.c +@@ -223,13 +223,20 @@ shingetchar(void) + return STOUC(*shinbufptr++); + + shinbufreset(); +- do { +- errno = 0; +- nread = read(SHIN, shinbuffer, SHINBUFSIZE); +- } while (nread < 0 && errno == EINTR); +- if (nread <= 0) +- return -1; +- shinbufendptr = shinbuffer + nread; ++ for (;;) { ++ errno = 0; ++ nread = read(SHIN, shinbufendptr, 1); ++ if (nread > 0) { ++ /* Use line buffering (POSIX requirement) */ ++ if (*shinbufendptr++ == '\n') ++ break; ++ if (shinbufendptr == shinbuffer + SHINBUFSIZE) ++ break; ++ } else if (nread == 0 || errno != EINTR) ++ break; ++ } ++ if (shinbufendptr == shinbuffer) ++ return -1; + return STOUC(*shinbufptr++); + } + +diff --git a/Test/A01grammar.ztst b/Test/A01grammar.ztst +index 1e0e9a04e..adbf5f1d9 100644 +--- a/Test/A01grammar.ztst ++++ b/Test/A01grammar.ztst +@@ -932,3 +932,12 @@ F:Note that the behaviour of 'exit' inside try-list inside a function is unspeci + $ZTST_testdir/../Src/zsh -fc '{ ( ) } always { echo foo }' + -f:exec last command optimization inhibited for try/always + >foo ++ ++ ( ++ export VALUE=first ++ print -l 'echo Value is $VALUE' 'VALUE=second sh' 'echo Value is $VALUE' | ++ $ZTST_testdir/../Src/zsh -f ++ ) ++0:Non-interactive shell command input is line buffered ++>Value is first ++>Value is second +-- +2.36.0.rc2 + diff --git a/app-shells/zsh/zsh-5.8.1.ebuild b/app-shells/zsh/zsh-5.8.1-r1.ebuild index e44079087473..6cbf8622fe20 100644 --- a/app-shells/zsh/zsh-5.8.1.ebuild +++ b/app-shells/zsh/zsh-5.8.1-r1.ebuild @@ -51,6 +51,10 @@ if [[ ${PV} == *9999 ]] ; then )" fi +PATCHES=( + "${FILESDIR}/${P}-non_interactive_shell_regression_fix.patch" +) + src_prepare() { if [[ ${PV} != *9999 ]]; then # fix zshall problem with soelim |