The branch main has been updated by kevans:
URL:
https://cgit.FreeBSD.org/src/commit/?id=946585179dc4a1662d9269835dc46a1844e9919b
commit 946585179dc4a1662d9269835dc46a1844e9919b
Author: Kyle Evans <kev...@freebsd.org>
AuthorDate: 2022-02-10 17:20:24 +0000
Commit: Kyle Evans <kev...@freebsd.org>
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);
