Date: Tue, 1 Sep 2020 18:22:33 +0200 From: Baptiste Daroussin <bapt@FreeBSD.org> To: Warner Losh <imp@FreeBSD.org> 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> In-Reply-To: <202009011611.081GBN9M025984@repo.freebsd.org> References: <202009011611.081GBN9M025984@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] 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 > > Log: > Have script accept and ignore -e for Linux compat > > 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. > > Modified: > head/usr.bin/script/script.1 > head/usr.bin/script/script.c > > Modified: head/usr.bin/script/script.1 > ============================================================================== > --- 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 session. > +.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 > > Modified: head/usr.bin/script/script.c > ============================================================================== > --- 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 = 0; > > - while ((ch = getopt(argc, argv, "adFfkpqrt:")) != -1) > + while ((ch = getopt(argc, argv, "adeFfkpqrt:")) != -1) > switch(ch) { > case 'a': > aflg = 1; > break; > case 'd': > usesleep = 0; > + break; > + case 'e': /* Default behaior, accepted for linux compat */ ^^^^^^^ You have a typo here, Best regards, Bapt [-- Attachment #2 --] -----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-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20200901162233.efcoqkrpb6setch5>