From owner-svn-src-all@freebsd.org Tue Sep 1 16:22:35 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B21163CDF30; Tue, 1 Sep 2020 16:22:35 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgsmW4LHwz3Y2w; Tue, 1 Sep 2020 16:22:35 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from ivaldir.etoilebsd.net (etoilebsd.net [178.32.217.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 65F211A975; Tue, 1 Sep 2020 16:22:35 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: by ivaldir.etoilebsd.net (Postfix, from userid 1001) id 1F384E35E1; Tue, 1 Sep 2020 18:22:33 +0200 (CEST) Date: Tue, 1 Sep 2020 18:22:33 +0200 From: Baptiste Daroussin To: Warner Losh Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r365052 - head/usr.bin/script Message-ID: <20200901162233.efcoqkrpb6setch5@ivaldir.net> References: <202009011611.081GBN9M025984@repo.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="drp5iphc2q3ph7kk" Content-Disposition: inline In-Reply-To: <202009011611.081GBN9M025984@repo.freebsd.org> X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 16:22:35 -0000 --drp5iphc2q3ph7kk Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Sep 01, 2020 at 04:11:23PM +0000, Warner Losh wrote: > Author: imp > Date: Tue Sep 1 16:11:23 2020 > New Revision: 365052 > URL: https://svnweb.freebsd.org/changeset/base/365052 >=20 > Log: > Have script accept and ignore -e for Linux compat > =20 > In the util-linux version of script, it will always exit with succes. > Except when run with -e, in which case it will have the exit value of > the child. BSD Script already uses the child's exit value for its exit > value. Some config and other helper scripts depend on being able to > specify -e. Accept it for compatibility since we'll already to the > right thing, but otherwise we ignore it. >=20 > Modified: > head/usr.bin/script/script.1 > head/usr.bin/script/script.c >=20 > Modified: head/usr.bin/script/script.1 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/usr.bin/script/script.1 Tue Sep 1 15:52:18 2020 (r365051) > +++ head/usr.bin/script/script.1 Tue Sep 1 16:11:23 2020 (r365052) > @@ -36,7 +36,7 @@ > .Nd make typescript of terminal session > .Sh SYNOPSIS > .Nm > -.Op Fl adfkpqr > +.Op Fl adefkpqr > .Op Fl F Ar pipe > .Op Fl t Ar time > .Op Ar file Op Ar command ... > @@ -77,6 +77,12 @@ retaining the prior contents. > When playing back a session with the > .Fl p > flag, do not sleep between records when playing back a timestamped sessi= on. > +.It Fl e > +Accepted for compatibility with > +.Em util-linux > +.Nm . > +The child command exit status is always the exit status of > +.Nm . > .It Fl F Ar pipe > Immediately flush output after each write. > This will allow a user to create a named pipe using >=20 > Modified: head/usr.bin/script/script.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/usr.bin/script/script.c Tue Sep 1 15:52:18 2020 (r365051) > +++ head/usr.bin/script/script.c Tue Sep 1 16:11:23 2020 (r365052) > @@ -111,13 +111,15 @@ main(int argc, char *argv[]) > warning. (not needed w/clang) */ > showexit =3D 0; > =20 > - while ((ch =3D getopt(argc, argv, "adFfkpqrt:")) !=3D -1) > + while ((ch =3D getopt(argc, argv, "adeFfkpqrt:")) !=3D -1) > switch(ch) { > case 'a': > aflg =3D 1; > break; > case 'd': > usesleep =3D 0; > + break; > + case 'e': /* Default behaior, accepted for linux compat */ ^^^^^^^ You have a typo here, Best regards, Bapt --drp5iphc2q3ph7kk Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEgOTj3suS2urGXVU3Y4mL3PG3PloFAl9OdUYACgkQY4mL3PG3 PlrAhQ/8DEJWYzlgZfI+l0m4vtuu6oKbE2Ne8W1XWxm+2DY5Q4MrQyVNvSSU59AG Ni89kAcWaMl4DBWVP4C0OHJrKFC4ZppSUFJVwUih/x5e8UGJ9J9NmrzMjQ8UjQLc V7uzgvlHLiqGPqjY+fvZ7iq/EgCjuDyE15zyhacquBPLUhS3WFJ7zP4tcPD3/0jI RUcMGyeduwvkcVkK4Hb/4Uf0OvwFO9NDKcfmFN8YSQzh2LNCn4/ovUwtV1JCjr54 y/v1I3TDfSnEuJPTdDGc+0vjWHAuIZj9fhFo8pPLsNPRxTFC6Htjl1PIU8g6dF95 yOjWI4XaH4sCmvIigtp8KAqlTdDZXnTGGj6pNL9Y2hUdefAdyC5F2kgv9Iitcley m4LYZHYkyFpEFXckEYbY2gv2Gxju8kPjGPmiNOx0jTrG5J1aRzhqlD39ElR6h46n ZIQIwFMLIldKKeu0lTunxwP5SzzqBCHEMUbv3IuFPQotZPeIITXFBfw9FHZlO0hD rVv0JHKi+us4JulmbmkDzQtwzf9Y8SfKrQkcVmbgLEQc+8AaS8rnesnq8RriKyyz O6GgAhq7bSJzUq2Vp6/uxhbmxpmh5vew60lAotkOtwu4VZwmPJVIj9I7Qtxoknwy IJI4jolYHinESCwMBCA02G9LxpyeA4HLCoCLAg20nlvYoah/k80= =3JWW -----END PGP SIGNATURE----- --drp5iphc2q3ph7kk--