From nobody Mon Apr 29 05:29:39 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 4VSX2X32rLz5JJ0Z; Mon, 29 Apr 2024 05:29:40 +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 4VSX2X0k9Kz4Fg8; Mon, 29 Apr 2024 05:29:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714368580; 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=H04ydHQWV+BG5lNmXoG+RaLKQeDRmbmU7uNpwh9QV3I=; b=puJFI9PtqqNWFMGyT1kTtZKRBmhucGuz2Aqu7oEuHanseb0qk/H756bR8jipqUJt/vooPP 4hO0EPxm7ENEEXdccpUdaUm/zp4tmfTVokhPHa3RhrHQlaF19i2dxTgqc9iVVO0AxX56M6 yaKRR56t+d3J9btbsZEFy+JxYc0dDU1dDveL74F7l/dQyveuvSdfAN8+LT3o60U21A+GQZ 4mDyYi1R12UXyg3BOM33FLTnE2403jEPW8xZy+/uwhvfWrpgN7J9LIGsw+QAq0UAutiZyj nMfBcxuL3CIJXCLkDXnVkV6rwhLSpbZLOmvqnmIRnkCtn5KCeIueX/UG/MxeEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714368580; a=rsa-sha256; cv=none; b=q9snYGm2s9VRUUpc+3puERxwk4Lql4ZJgxB6DUdc8rzLDclIXdHPJcZLmDW539QgnxG/dl Edrvn8uT3jdtWm88VjBfTQNM3Vt5J1IgiFXSdxsp0OrkT4ZZG5BysCpc2StEN3xcTV45H2 QJ3bMDkRpiwRlGwXhC7hwcgMFSWHLgzdeSuS8jwv7mcVqHH8wzLWAA5eT1LndXgr8Xjdu1 57TgVB9BBi8H67bZgbBUEKP0T6WI0yEp3Nwy/dVfLviK+ChPx4ou9XR6WbeXvuzhaGiCAR v2iIqtfnYf3Hh0PEgy6m/XPSz9nyeN+skGNJSxXT/W4E5jzFcoojmZI8rdJUyg== 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=1714368580; 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=H04ydHQWV+BG5lNmXoG+RaLKQeDRmbmU7uNpwh9QV3I=; b=xwCAi8Yy62vj1o9GBxrKeyKT06d9w5VNmdjdR9tDxXXZD0+2C+XZiywYSKcfayQQflvmns u8hRLeEMaf3gX+5HkbC99qe5jnVjxc3fGZSVurXmc4XfQK1AhkZz9R737inWUJBIeEZTRB ADp+i4UpBZyKykk3YMMxTdOgD4xtZxlZO4I/ePRarqkk1tkwPpOJR5QprBuORgzxGhFw/F G2rq6D/CFvPg5JqYNynnFim8DsZuarZpBAMSbx9lyp4BL/WeKfenLTLyGqncvQa1mFg052 RT/x6CEYvvt1dAypECJytTeZC9kOQoCvLAH7ALGVYV7fUnF0r8Bf6uosEb2aWA== 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 4VSX2W6XZBzw8n; Mon, 29 Apr 2024 05:29:39 +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 43T5TdtE047352; Mon, 29 Apr 2024 05:29:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43T5Td91047349; Mon, 29 Apr 2024 05:29:39 GMT (envelope-from git) Date: Mon, 29 Apr 2024 05:29:39 GMT Message-Id: <202404290529.43T5Td91047349@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: 2a2cc22f517b - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 2a2cc22f517b837ee6dbf1f44b99ee3fdca93b12 Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=2a2cc22f517b837ee6dbf1f44b99ee3fdca93b12 commit 2a2cc22f517b837ee6dbf1f44b99ee3fdca93b12 Author: Xavier Beaudouin AuthorDate: 2024-04-26 16:10:15 +0000 Commit: Kyle Evans CommitDate: 2024-04-29 05:28:45 +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)