From nobody Mon Apr 29 05:29:27 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VSX2J3Hswz5JJ0Y; Mon, 29 Apr 2024 05:29:28 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VSX2H5p0Nz4FF9; Mon, 29 Apr 2024 05:29:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714368567; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cRsTH4GzwMheFMCHUNjy5JW+1Shqjxa7d3RZaDsJ0hg=; b=fDNLY79iKrTXCzlqpFa1jkQYv1wiubjVNuQYhD4KmCEijuS2JDaivVE23emtAbEp2gIBGH w/SJl/5fDBB5Q4pBOpUxpDDkqb+rVGKG0Zng59cCx8+7Esom3e2oFwtknFyMyB7Bjix9/n JLaOKvuVJ7qEz5r/qMqUj3sx+JmJGj92AOGZ3PvrdxJn6adYZI4h4P6N1rpjfSu9dtXEXd dLgMpKGPe6z+vdct3IjyibwA1fgv57CQplJHSu8ImH3eOU2aUw6ePBUssfG60RKtnWsDe/ GdDXrinQIg5zDars797VgDXneuWi+F709eHAVuVYt6UWKoB8uAA/+TTub0XnGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714368567; a=rsa-sha256; cv=none; b=LUiNsLSeWmXtseHfuQjMtq9xxaz2eDPcViJcAxIC5omVcvr+M0ZNanhp0I6ryG8K7FS5RX S00deQLMhpc/XeEFLwm9NlkhL2kM1b3UpaxNfhXMAFRUuA7zMXAF99x/z7GksKlzve1L5w yBoErTajWj0jmXEH+SsIBMLqUzcTxq+MTcILK/nSAy7+3pXH1fTf7oGBMkx0v98SWG/KHF KjyB4XbhKHxYR+N4psD0wkUOlxM2JRu0ZybkcZTwK/CV7gThyq+ftB36zcEGUY6LUSLgBF vZQUYKCT22SV6q1y4V3fsKHRLr3+bLH8L8DEzaAN0YMGfPRiNlssRwN0pTAyrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714368567; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cRsTH4GzwMheFMCHUNjy5JW+1Shqjxa7d3RZaDsJ0hg=; b=D89WBvl3MHYu0BYfY9qa3k3HgLBbI1a4wyEvn1G4WahMYiM43HFO0F2axgfB7INyZ2fvP/ w9fTr0oNRqn5nTMUKRsZJyq6bvLbP1NUPbmetnOU4P+8v+PDPmjgVHLNpfVz7PhPHo7MDu IGSRo8HePFtwfw47t6Swhr1PwEWUwEXmTuzkQk6hrOmAqXGiUzXJxmnUUnoYoHXsJF/FEp ydvyI0ztFISW2qnr88gSINRNFRAfbyRpFjYmv5RC5KzohLe+Y0jeDX+Hie7Om1i4sd97Jt DC8B6w7021TzaP5iStz2juD1X8owGaAkVnDG2pPaD7dkMd91LWSCiXSz1vZW3g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VSX2H4V2YzwWP; Mon, 29 Apr 2024 05:29:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43T5TREa047138; Mon, 29 Apr 2024 05:29:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43T5TRXi047135; Mon, 29 Apr 2024 05:29:27 GMT (envelope-from git) Date: Mon, 29 Apr 2024 05:29:27 GMT Message-Id: <202404290529.43T5TRXi047135@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: fb4c7bf8ac2d - stable/14 - script: minor style improvements List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fb4c7bf8ac2d72c3f886ef3f8317a8400c2a96d8 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=fb4c7bf8ac2d72c3f886ef3f8317a8400c2a96d8 commit fb4c7bf8ac2d72c3f886ef3f8317a8400c2a96d8 Author: Xavier Beaudouin AuthorDate: 2024-04-26 16:10:15 +0000 Commit: Kyle Evans CommitDate: 2024-04-29 05:29:02 +0000 script: minor style improvements Fix some nits pointed out by checkstyle9.pl in advance of functional changes to script(1). Reviewed by: des Sponsored by: Modirum MDPay Sponsored by: Klara, Inc. (cherry picked from commit 4459abe334eb4dbd416fa8094a64afc065ccd1cc) --- usr.bin/script/script.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/usr.bin/script/script.c b/usr.bin/script/script.c index b3a1869fcb42..3d82bad9ae2b 100644 --- a/usr.bin/script/script.c +++ b/usr.bin/script/script.c @@ -49,6 +49,7 @@ static const char sccsid[] = "@(#)script.c 8.1 (Berkeley) 6/6/93"; #include #include +#include #include #include #include @@ -123,19 +124,19 @@ main(int argc, char *argv[]) usesleep = 1; rawout = 0; flushtime = 30; - fm_fd = -1; /* Shut up stupid "may be used uninitialized" GCC - warning. (not needed w/clang) */ + fm_fd = -1; showexit = 0; while ((ch = getopt(argc, argv, "adeFfkpqrT:t:")) != -1) - switch(ch) { + switch (ch) { case 'a': aflg = 1; break; case 'd': usesleep = 0; break; - case 'e': /* Default behavior, accepted for linux compat */ + case 'e': + /* Default behavior, accepted for linux compat. */ break; case 'F': Fflg = 1; @@ -248,6 +249,8 @@ main(int argc, char *argv[]) (void)tcsetattr(STDIN_FILENO, TCSAFLUSH, &rtt); } + assert(fflg ? fm_fd >= 0 : fm_fd < 0); + child = fork(); if (child < 0) { warn("fork"); @@ -340,7 +343,7 @@ main(int argc, char *argv[]) } } if (n > 0 && FD_ISSET(master, &rfd)) { - cc = read(master, obuf, sizeof (obuf)); + cc = read(master, obuf, sizeof(obuf)); if (cc <= 0) break; (void)write(STDOUT_FILENO, obuf, cc); @@ -426,7 +429,7 @@ done(int eno) if (showexit) (void)fprintf(fscript, "\nCommand exit status:" " %d", eno); - (void)fprintf(fscript,"\nScript done on %s", + (void)fprintf(fscript, "\nScript done on %s", ctime(&tvec)); } (void)printf("\nScript done, output file is %s\n", fname); @@ -468,8 +471,7 @@ consume(FILE *fp, off_t len, char *buf, int reg) if (reg) { if (fseeko(fp, len, SEEK_CUR) == -1) err(1, NULL); - } - else { + } else { while (len > 0) { l = MIN(DEF_BUF, len); if (fread(buf, sizeof(char), l, fp) != l)