From nobody Tue Aug 12 17:21:18 2025 X-Original-To: dev-commits-src-main@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 4c1dZk6v3kz658FB; Tue, 12 Aug 2025 17:21:18 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c1dZk4dS3z3wCb; Tue, 12 Aug 2025 17:21:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755019278; 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=AxpA2eNvIAfQhiq50MKt/4qApbhe/s80eoSFJALWKLc=; b=FuP0RlVM/oVAK0k4a9UbvLvle88TPT9fPxMhwiOyNGdjNrTl6fRHhQdp5mFO9WyOiIXTjY 6hgs1vXz82UjZLskNUR3G6UeNmRpJlQ+5bCcs55ETrF80+wQ6zRoUXtTGL8N2sgp8VA+j8 jPi0umYUQKeOsB//x0z+FeSiV2tBrUmSjBRnr/Pw1eIpMBJrRQ1n7bCB0KT8YjlAgzpSpL UOyv0l54nT9r96+cGolgsfn8ADm/GPoWkgHUCqpHud3d9MPzVpTMLk8eEif1x/pgRrCttu fuDJKkiPIBTkZY+k+1nQguIadhlp6Nz6/r85Yf+KaM/y9WkyyZkKLBB3iuWCPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755019278; 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=AxpA2eNvIAfQhiq50MKt/4qApbhe/s80eoSFJALWKLc=; b=NQ69tPN6UY8nFa+LNGGSKSq9wET8I4DhQ3xpfOV85b4akYinGQXyAGjCpgMBhL7cOtPTs+ TuCv88gYprYN6y2Vz3oyGugGw97Y6dJ7B6Aa/d05mBkM/Bo0Ua7Kq8uypf+IctDFeYNF8M 9ThSobPvEpFY6gMeyjxNNvHUZU3HfbYeLQJcxi1ztsnzW43qPWNPyR3jN+MOGuFRRbXclu I8vYS9lGk24ouLPnGHGpoR4UISKvckii85lOYvepAMrPIgX8NyIIPbuj40jFrdiVOVcEEu EYHjznYHkV+xvDKA1nTH8bXrdXfiLnfiMlMf7vLtFUlx5Zr2cjaiccaBWxhENQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755019278; a=rsa-sha256; cv=none; b=DW4iqwGQ8orSObWKaHyDWwYOxPXjwEo7ixyX6Wlp7jmrFp72dUpY9gllsXmK9xyWWFLzj5 do8ImCBe3FumQgVU3KcZN0aJeJMYborQazh8C/RO737+eKjxmta5aTm5eDLgbwX2jVbhxI UybR/MPMzIUSXbvzsCnb2IVQ766W3hj7zOzroQzrO4kk2Wg/lVV4MbAtSHBYvNDVNAHDE+ 7G1XYm8Xca6CdNI8L+TrBSvyOCRVZReWCbmRrhXCjA3mftLs9mZmQ8e1zPKDUbBHw8W7VF UCgwqF//QavVFPcjSqQVgvsqVGSLRgQk7UgQ7HHifj5Tn+BMPaIi2pLkbJfr/w== 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 4c1dZk455cznHq; Tue, 12 Aug 2025 17:21:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57CHLI5m088592; Tue, 12 Aug 2025 17:21:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57CHLIJG088589; Tue, 12 Aug 2025 17:21:18 GMT (envelope-from git) Date: Tue, 12 Aug 2025 17:21:18 GMT Message-Id: <202508121721.57CHLIJG088589@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 40c2b622d825 - main - last: Mild style cleanup List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 40c2b622d825c7dea5002c9ea64fd8f3e833e8d9 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=40c2b622d825c7dea5002c9ea64fd8f3e833e8d9 commit 40c2b622d825c7dea5002c9ea64fd8f3e833e8d9 Author: Dag-Erling Smørgrav AuthorDate: 2025-08-12 17:20:55 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-08-12 17:21:12 +0000 last: Mild style cleanup * Prefer explicit NULL comparisons to using pointers as booleans * Prefer explicit 0 comparisons to using strcmp() as a predicate * Avoid use of strcpy() Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D51876 --- usr.bin/last/last.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/usr.bin/last/last.c b/usr.bin/last/last.c index 69848f359d79..2e6754abab8e 100644 --- a/usr.bin/last/last.c +++ b/usr.bin/last/last.c @@ -433,15 +433,15 @@ want(struct utmpx *bp) return (YES); break; case HOST_TYPE: - if (!strcasecmp(step->name, bp->ut_host)) + if (strcasecmp(step->name, bp->ut_host) == 0) return (YES); break; case TTY_TYPE: - if (!strcmp(step->name, bp->ut_line)) + if (strcmp(step->name, bp->ut_line) == 0) return (YES); break; case USER_TYPE: - if (!strcmp(step->name, bp->ut_user)) + if (strcmp(step->name, bp->ut_user) == 0) return (YES); break; } @@ -478,7 +478,7 @@ hostconv(char *arg) static char *hostdot, name[MAXHOSTNAMELEN]; char *argdot; - if (!(argdot = strchr(arg, '.'))) + if ((argdot = strchr(arg, '.')) == NULL) return; if (first) { first = 0; @@ -486,7 +486,7 @@ hostconv(char *arg) xo_err(1, "gethostname"); hostdot = strchr(name, '.'); } - if (hostdot && !strcasecmp(hostdot, argdot)) + if (hostdot != NULL && strcasecmp(hostdot, argdot) == 0) *argdot = '\0'; } @@ -504,19 +504,16 @@ ttyconv(char *arg) * a two character suffix. */ if (strlen(arg) == 2) { - /* either 6 for "ttyxx" or 8 for "console" */ - if ((mval = malloc(8)) == NULL) + if (strcmp(arg, "co") == 0) + mval = strdup("console"); + else + asprintf(&mval, "tty%s", arg); + if (mval == NULL) xo_errx(1, "malloc failure"); - if (!strcmp(arg, "co")) - (void)strcpy(mval, "console"); - else { - (void)strcpy(mval, "tty"); - (void)strcpy(mval + 3, arg); - } return (mval); } - if (!strncmp(arg, _PATH_DEV, sizeof(_PATH_DEV) - 1)) - return (arg + 5); + if (strncmp(arg, _PATH_DEV, strlen(_PATH_DEV)) == 0) + return (arg + strlen(_PATH_DEV)); return (arg); }