From nobody Thu Feb 10 17:36:36 2022 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 D3F7F19CBA2E; Thu, 10 Feb 2022 17:36:36 +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 4JvkSh5cb6z3QWd; Thu, 10 Feb 2022 17:36:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644514596; 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=aSjfng71Vt0Ma29F2kypEfc5L0CTYNvmZMTc+V1xqs0=; b=mz87Pf5+FX6o7pO9Bvt0VF6+ab5MbkhPYDihNPneiMg/iB0fl8NlGUhw9e11N8zW7LqPvW oIPVW9MhjQrPkq+3G/Y1n+cRONyePBqf90FsZeTCbrHOWcyz/8XqihMDjSxGrJ+v0Lelf8 6yoy7CUxQ7Zl5BQK5U/rki5WAExuEjR6qa+TBFlg73Falrl2vKut2dkBgEXs03vpDfff4o w+mFCbhlqNL93xlMfOpaMkIqg5raI/epEBuXDreGRK129R9m+InnUqdpJGx3CQdiJjjwVz 9zZMiJk081K482v4V/x+ot2/r5ljwFZATxpJE3mBZiyYNFZWUHYrJbLCj2wKzQ== 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 A07F824272; Thu, 10 Feb 2022 17:36:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21AHaa71059990; Thu, 10 Feb 2022 17:36:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21AHaaRk059989; Thu, 10 Feb 2022 17:36:36 GMT (envelope-from git) Date: Thu, 10 Feb 2022 17:36:36 GMT Message-Id: <202202101736.21AHaaRk059989@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 946585179dc4 - main - lsvfs: restyle, no functional change 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 946585179dc4a1662d9269835dc46a1844e9919b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644514596; 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=aSjfng71Vt0Ma29F2kypEfc5L0CTYNvmZMTc+V1xqs0=; b=YJY0/19I2XbUumXkozREnz0Zqm8cD++z4V0jKZDH9rUo7zw11stSj12hF7xmkOiMb+VuqT Xb/sB2ryrf51QX8h97FtXX8leN0yIRMIQSEkg4NgvKQWqEtx4NehJM7VUo0kHzXgM8fEyp R4YHiCDiORHoI81wEu1BpR5pGMYKcHxI0hWmLWZfaQXlnlg7a+0PgLCv8LdC0Ci8zvLUsh Be/LoJqtIpwazFrwYO+dXY7KG4harVxeOAWM/c0BKwD9Ugy//2kAmSdAGKpTdHg5eJ7cJk CaR8/LPxbbp+9XGlQq1pVylRfRGhf/0pizmUJ98sJibCnakxBeqiPjUD0mebsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644514596; a=rsa-sha256; cv=none; b=nm7S7d6TK4cH6v8IBBp06E6VWy67WAdc7GthfOIP2iwT2dGb2z4uI41bSLUXPixi6DvzDN fQXS9r7LDFz69z7BHXZ7Iddnn92pzO28uY6JYnIO4G3J7k33QSkCCNx5gXABM0jKwFpBi2 5TtP2lN4EUNBZ6yHkCAuDzXjzvd7VftwXHf4Ayahv0gTTlEzTT2zhIBRl8euLvhzKvxadi iR1anG5X5nopdP3U1VIEjBc844nc6EZCJo9tpuuRaUWvF0JmxgvHwfhtWlnJP0PAULAyNl uRmhJUqncmkgl6o6JCLVTP4ph2Rcf+3elkHolX+f8/j5/li0O3ex1ftlG5ngNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=946585179dc4a1662d9269835dc46a1844e9919b commit 946585179dc4a1662d9269835dc46a1844e9919b Author: Kyle Evans AuthorDate: 2022-02-10 17:20:24 +0000 Commit: Kyle Evans CommitDate: 2022-02-10 17:34:52 +0000 lsvfs: restyle, no functional change Namely: - main was using two-space indentation - re-sort local variables - explicit braces for loop scope - make flag bit comparison explicit The first line of this commit message is unfortunately a lie, as it introduces a minor functional change on non-FreeBSD systems. Namely, the first branch is now explicitly compared against `0` and the choice was made to compare it as greater than 0 to avoid issues on other systems where `argc != 0` on entry isn't guaranteed (negative when checked there). Sponsored by: Klara, Inc. --- usr.bin/lsvfs/lsvfs.c | 73 +++++++++++++++++++++++++++------------------------ 1 file changed, 39 insertions(+), 34 deletions(-) diff --git a/usr.bin/lsvfs/lsvfs.c b/usr.bin/lsvfs/lsvfs.c index a0a6acb0b59c..cd56e5ebfbda 100644 --- a/usr.bin/lsvfs/lsvfs.c +++ b/usr.bin/lsvfs/lsvfs.c @@ -41,42 +41,44 @@ static const char *fmt_flags(int); int main(int argc, char **argv) { - int cnt, rv = 0, i; - struct xvfsconf vfc, *xvfsp; - size_t buflen; - argc--, argv++; + struct xvfsconf vfc, *xvfsp; + size_t buflen; + int cnt, i, rv = 0; - printf(HDRFMT, "Filesystem", "Num", "Refs", "Flags"); - fputs(DASHES, stdout); + argc--, argv++; - if(argc) { - for(; argc; argc--, argv++) { - if (getvfsbyname(*argv, &vfc) == 0) { - printf(FMT, vfc.vfc_name, vfc.vfc_typenum, vfc.vfc_refcount, - fmt_flags(vfc.vfc_flags)); - } else { - warnx("VFS %s unknown or not loaded", *argv); - rv++; - } - } - } else { - if (sysctlbyname("vfs.conflist", NULL, &buflen, NULL, 0) < 0) - err(1, "sysctl(vfs.conflist)"); - xvfsp = malloc(buflen); - if (xvfsp == NULL) - errx(1, "malloc failed"); - if (sysctlbyname("vfs.conflist", xvfsp, &buflen, NULL, 0) < 0) - err(1, "sysctl(vfs.conflist)"); - cnt = buflen / sizeof(struct xvfsconf); + printf(HDRFMT, "Filesystem", "Num", "Refs", "Flags"); + fputs(DASHES, stdout); - for (i = 0; i < cnt; i++) { - printf(FMT, xvfsp[i].vfc_name, xvfsp[i].vfc_typenum, - xvfsp[i].vfc_refcount, fmt_flags(xvfsp[i].vfc_flags)); - } - free(xvfsp); - } + if (argc > 0) { + for(; argc > 0; argc--, argv++) { + if (getvfsbyname(*argv, &vfc) == 0) { + printf(FMT, vfc.vfc_name, vfc.vfc_typenum, + vfc.vfc_refcount, fmt_flags(vfc.vfc_flags)); + } else { + warnx("VFS %s unknown or not loaded", *argv); + rv++; + } + } + } else { + if (sysctlbyname("vfs.conflist", NULL, &buflen, NULL, 0) < 0) + err(1, "sysctl(vfs.conflist)"); + xvfsp = malloc(buflen); + if (xvfsp == NULL) + errx(1, "malloc failed"); + if (sysctlbyname("vfs.conflist", xvfsp, &buflen, NULL, 0) < 0) + err(1, "sysctl(vfs.conflist)"); + cnt = buflen / sizeof(struct xvfsconf); + + for (i = 0; i < cnt; i++) { + printf(FMT, xvfsp[i].vfc_name, xvfsp[i].vfc_typenum, + xvfsp[i].vfc_refcount, + fmt_flags(xvfsp[i].vfc_flags)); + } + free(xvfsp); + } - return rv; + return (rv); } static const char * @@ -86,11 +88,14 @@ fmt_flags(int flags) int i; buf[0] = '\0'; - for (i = 0; i < (int)nitems(fl); i++) - if (flags & fl[i].flag) { + for (i = 0; i < (int)nitems(fl); i++) { + if ((flags & fl[i].flag) != 0) { strlcat(buf, fl[i].str, sizeof(buf)); strlcat(buf, ", ", sizeof(buf)); } + } + + /* Zap the trailing comma + space. */ if (buf[0] != '\0') buf[strlen(buf) - 2] = '\0'; return (buf);