From owner-svn-src-head@freebsd.org Tue Sep 1 16:11:24 2020 Return-Path: Delivered-To: svn-src-head@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 20F3F3CD5C3; Tue, 1 Sep 2020 16:11:24 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgsWc05tSz3WR7; Tue, 1 Sep 2020 16:11:24 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DAD981C124; Tue, 1 Sep 2020 16:11:23 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081GBN9d025987; Tue, 1 Sep 2020 16:11:23 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081GBN9M025984; Tue, 1 Sep 2020 16:11:23 GMT (envelope-from imp@FreeBSD.org) Message-Id: <202009011611.081GBN9M025984@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Tue, 1 Sep 2020 16:11:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365052 - head/usr.bin/script X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/usr.bin/script X-SVN-Commit-Revision: 365052 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 16:11:24 -0000 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 */ break; case 'F': Fflg = 1;