Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 14 Sep 2024 11:10:44 +0200
From:      "Herbert J. Skuhra" <herbert@gojira.at>
To:        Cy Schubert <Cy.Schubert@cschubert.com>
Cc:        Stefan =?ISO-8859-1?Q?E=DFer?= <se@FreeBSD.org>, src-committers@FreeBSD.org,	dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   Re: git: 12e0d316644a - main - vendor/bc: upgrade to version 7.0.0
Message-ID:  <87o74qa9d7.wl-herbert@gojira.at>
In-Reply-To: <20240905174416.247B0293@slippy.cwsent.com>
References:  <202408261628.47QGSD1E072637@gitrepo.freebsd.org> <20240905174416.247B0293@slippy.cwsent.com>

next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, 05 Sep 2024 19:44:16 +0200, Cy Schubert wrote:
>=20
> In message <202408261628.47QGSD1E072637@gitrepo.freebsd.org>, Stefan=20
> =3D?utf-8?Q?
> E=3DC3=3D9Fer?=3D writes:
> > The branch main has been updated by se:
> >
> > URL: https://cgit.FreeBSD.org/src/commit/?id=3D12e0d316644a4f80f5f1f78c=
f07bd93d
> > ef43b1ca
> >
> > commit 12e0d316644a4f80f5f1f78cf07bd93def43b1ca
> > Author:     Stefan E=DFer <se@FreeBSD.org>
> > AuthorDate: 2024-08-23 16:45:58 +0000
> > Commit:     Stefan E=DFer <se@FreeBSD.org>
> > CommitDate: 2024-08-26 16:27:29 +0000
> >
> >     vendor/bc: upgrade to version 7.0.0
> >    =20
> >     This is a production release to fix three bugs, none of which
> >     affects well formed scripts on FreeBSD:
> >    =20
> >     The first bug is that bc/dc will exit on macOS when the terminal
> >     is resized.
> >    =20
> >     The second bug is that an array, which should only be a function
> >     parameter, was accepted as part of larger expressions.
> >    =20
> >     The third bug is that the value stack for dc was cleared on any err=
or.
> >     However, this is not how other dc behave. To bring dc more in line
> >     with other implementations, this behavior was changed. This change =
is
> >     why this version is a new major version.
> >    =20
> >     (cherry picked from commit 54d20d67e2af28d948ce2df13feb039fa10900fc)
> >    =20
> >     MFC after:      3 days
>=20
> This commit introduced a regression. Prior to this one could exit bc usin=
g=20
> the EOF character defined by stty(1), default ^D. Now one needs to enter =

> the word quit instead of ^D.

Reverting=20

https://git.gavinhoward.com/gavin/bc/commit/56bb18255a24b60f785560ab882447d=
9c959bd93

seems to resolve the issue.

diff --git a/contrib/bc/src/history.c b/contrib/bc/src/history.c
index 6ae9785d9a79..71afe62db879 100644
--- a/contrib/bc/src/history.c
+++ b/contrib/bc/src/history.c
@@ -264,7 +264,7 @@ bc_history_line(BcHistory* h, BcVec* vec, const char* p=
rompt)
        errno =3D EINTR;
=20
        // Get the line.
-       while (line =3D=3D NULL && (len =3D=3D -1 || errno =3D=3D EINTR))
+       while (line =3D=3D NULL && len =3D=3D -1 && errno =3D=3D EINTR)
        {
                line =3D el_gets(h->el, &len);
                bc_history_use_prompt =3D false;


--
Herbert



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?87o74qa9d7.wl-herbert>