From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Phillip Wood <phillip.wood@dunelm.org.uk>
Cc: Git Mailing List <git@vger.kernel.org>,
Carlo Arenas <carenas@gmail.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Ramsay Jones <ramsay@ramsayjones.plus.com>
Subject: Re: [PATCH v2 3/4] terminal: work around macos poll() bug
Date: Thu, 10 Mar 2022 14:35:00 +0100 [thread overview]
Message-ID: <220310.86v8wmj5c8.gmgdl@evledraar.gmail.com> (raw)
In-Reply-To: <20220309110325.36917-4-phillip.wood123@gmail.com>
On Wed, Mar 09 2022, Phillip Wood wrote:
> From: Phillip Wood <phillip.wood@dunelm.org.uk>
>
> On macos the builtin "add -p" does not handle keys that generate
> escape sequences because poll() does not work with terminals
> there. Switch to using select() on non-windows platforms to work
> around this.
>
> Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
> ---
> compat/terminal.c | 43 +++++++++++++++++++++++++++++++++++++------
> 1 file changed, 37 insertions(+), 6 deletions(-)
>
> diff --git a/compat/terminal.c b/compat/terminal.c
> index cb653419c3..4189cbb12c 100644
> --- a/compat/terminal.c
> +++ b/compat/terminal.c
> @@ -82,6 +82,32 @@ static int enable_non_canonical(enum save_term_flags flags)
> return disable_bits(flags, ICANON | ECHO);
> }
>
> +/*
> + * On macos it is not possible to use poll() with a terminal so use select
> + * instead.
> + */
> +#include <sys/select.h>
I don't think this breaks anything in practice due to the platforms we
define HAVE_DEV_TTY and NO_SYS_SELECT_H on, but it does look redundant &
confusing, and will break if the current users of HAVE_DEV_TTY and
NO_SYS_SELECT_H change.
I.e. isn't sys/select.h already pulled in by the relevant include in
git-compat-util.h? Why is it needed again here?
next prev parent reply other threads:[~2022-03-10 13:38 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-04 13:11 [PATCH 0/4] builtin add -p: hopefully final readkey fixes Phillip Wood
2022-03-04 13:11 ` [PATCH 1/4] terminal: use flags for save_term() Phillip Wood
2022-03-04 20:40 ` Ramsay Jones
2022-03-07 11:11 ` Phillip Wood
2022-03-07 20:21 ` Ramsay Jones
2022-03-08 10:41 ` Phillip Wood
2022-03-05 14:02 ` Ævar Arnfjörð Bjarmason
2022-03-07 10:45 ` Phillip Wood
2022-03-07 12:06 ` Ævar Arnfjörð Bjarmason
2022-03-04 13:11 ` [PATCH 2/4] terminal: don't assume stdin is /dev/tty Phillip Wood
2022-03-04 20:42 ` Ramsay Jones
2022-03-04 13:11 ` [PATCH 3/4] terminal: work around macos poll() bug Phillip Wood
2022-03-04 13:11 ` [PATCH 4/4] terminal: restore settings on SIGTSTP Phillip Wood
2022-03-05 13:59 ` Ævar Arnfjörð Bjarmason
2022-03-07 10:53 ` Phillip Wood
2022-03-07 11:49 ` Ævar Arnfjörð Bjarmason
2022-03-07 13:49 ` Phillip Wood
2022-03-07 14:45 ` Ævar Arnfjörð Bjarmason
2022-03-08 10:54 ` Phillip Wood
2022-03-09 12:19 ` Johannes Schindelin
2022-03-10 16:06 ` Phillip Wood
2022-03-09 11:03 ` [PATCH v2 0/4] builtin add -p: hopefully final readkey fixes Phillip Wood
2022-03-09 11:03 ` [PATCH v2 1/4] terminal: use flags for save_term() Phillip Wood
2022-03-11 16:52 ` Carlo Arenas
2022-03-14 10:49 ` Phillip Wood
2022-03-09 11:03 ` [PATCH v2 2/4] terminal: don't assume stdin is /dev/tty Phillip Wood
2022-03-09 11:03 ` [PATCH v2 3/4] terminal: work around macos poll() bug Phillip Wood
2022-03-10 13:35 ` Ævar Arnfjörð Bjarmason [this message]
2022-03-10 16:02 ` Phillip Wood
2022-03-10 18:02 ` Junio C Hamano
2022-03-09 11:03 ` [PATCH v2 4/4] terminal: restore settings on SIGTSTP Phillip Wood
2022-03-09 23:10 ` [PATCH v2 0/4] builtin add -p: hopefully final readkey fixes Junio C Hamano
2022-03-09 23:37 ` Junio C Hamano
2022-03-10 13:28 ` Phillip Wood
2022-03-10 18:18 ` Phillip Wood
2022-03-10 18:53 ` Junio C Hamano
2022-03-10 13:25 ` Johannes Schindelin
2022-03-10 16:08 ` Phillip Wood
2022-03-15 10:57 ` [PATCH v3 " Phillip Wood
2022-03-15 10:57 ` [PATCH v3 1/4] terminal: use flags for save_term() Phillip Wood
2022-03-15 10:57 ` [PATCH v3 2/4] terminal: don't assume stdin is /dev/tty Phillip Wood
2022-03-15 17:42 ` Junio C Hamano
2022-03-15 18:01 ` rsbecker
2022-03-15 19:05 ` Junio C Hamano
2022-03-15 19:38 ` rsbecker
2022-03-15 10:57 ` [PATCH v3 3/4] terminal: work around macos poll() bug Phillip Wood
2022-03-15 10:57 ` [PATCH v3 4/4] terminal: restore settings on SIGTSTP Phillip Wood
2022-03-15 17:51 ` Junio C Hamano
2022-03-16 18:54 ` [PATCH v4 0/4] builtin add -p: hopefully final readkey fixes Phillip Wood
2022-03-16 18:54 ` [PATCH v4 1/4] terminal: use flags for save_term() Phillip Wood
2022-03-16 18:54 ` [PATCH v4 2/4] terminal: don't assume stdin is /dev/tty Phillip Wood
2022-03-16 18:54 ` [PATCH v4 3/4] terminal: work around macos poll() bug Phillip Wood
2022-03-16 18:54 ` [PATCH v4 4/4] terminal: restore settings on SIGTSTP Phillip Wood
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=220310.86v8wmj5c8.gmgdl@evledraar.gmail.com \
--to=avarab@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=carenas@gmail.com \
--cc=git@vger.kernel.org \
--cc=phillip.wood@dunelm.org.uk \
--cc=ramsay@ramsayjones.plus.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).