 @@ -1,14 +1,14 @@
-/*	$NetBSD: fstat.c,v 1.113 2019/09/06 17:08:22 christos Exp $	*/
+/*	$NetBSD: fstat.c,v 1.114 2020/08/26 23:08:29 christos Exp $	*/
 /*-
  * Copyright (c) 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -29,27 +29,27 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1988, 1993\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)fstat.c	8.3 (Berkeley) 5/2/95";
 #else
-__RCSID("$NetBSD: fstat.c,v 1.113 2019/09/06 17:08:22 christos Exp $");
+__RCSID("$NetBSD: fstat.c,v 1.114 2020/08/26 23:08:29 christos Exp $");
 #endif
 #endif /* not lint */
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/proc.h>
 #include <sys/stat.h>
 #include <sys/vnode.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/domain.h>
 #include <sys/protosw.h>
 @@ -171,26 +171,27 @@ static const char *inet_addrstr(char *,
 static const char *inet6_addrstr(char *, size_t, const struct in6_addr *,
     uint16_t, bool);
 #endif
 static const char *at_addrstr(char *, size_t, const struct sockaddr_at *);
 static void	socktrans(struct file *, struct socket *, int);
 static void	misctrans(struct file *, int);
 static int	ufs_filestat(struct vnode *, struct filestat *);
 static void	usage(void) __dead;
 static const char   *vfilestat(struct vnode *, struct filestat *);
 static void	vtrans(struct file *, struct vnode *, int, int, long);
 static void	ftrans(fdfile_t *, int);
 static void	ptrans(struct file *, struct pipe *, int);
 static void	kdriver_init(void);
 static void	check_privs(void);
 int
 main(int argc, char **argv)
+{
 	struct passwd *passwd;
 	struct kinfo_proc2 *p, *plast;
 	int arg, ch, what;
 	char *memf, *nlistf;
 	char buf[_POSIX2_LINE_MAX];
 	int cnt;
 	gid_t egid = getegid();
 	(void)setegid(getgid());
 @@ -234,26 +235,28 @@ main(int argc, char **argv)
 				errx(1, "%s: unknown uid", optarg);
+			}
 			what = KERN_PROC_UID;
 			arg = passwd->pw_uid;
 			break;
 		case 'v':
 			vflg = 1;
 			break;
 		case '?':
 		default:
 			usage();
+		}
 	check_privs();
 	kdriver_init();
 	if (*(argv += optind)) {
 		for (; *argv; ++argv) {
 			if (getfname(*argv))
 				checkfile = 1;
+		}
 		if (!checkfile)	/* file(s) specified, but none accessible */
 			exit(1);
+	}
 	ALLOC_OFILES(256);	/* reserve space for file pointers */
 @@ -299,26 +302,43 @@ main(int argc, char **argv)
 	if (checkfile && fsflg == 0)
 		(void)printf(" NAME\n");
 	else
 		(void)putchar('\n');
 	for (plast = &p[cnt]; p < plast; ++p) {
 		if (p->p_stat == SZOMB)
 			continue;
 		dofiles(p);
+	}
 	return 0;
+}
 static void
 check_privs(void)
+{
 	int expaddr;
 	size_t expsize = sizeof(expaddr);
 	const char *expname = "kern.expose_address";
 	if (geteuid() == 0)
 		return;
 	if (sysctlbyname(expname, &expaddr, &expsize, NULL, 0) == -1)
 		err(EXIT_FAILURE, "Can't get sysctl `%s'", expname);
 	if (expaddr == 0)
 		errx(EXIT_FAILURE, "This program does not work without "
 		    "sysctl `%s' being set", expname);
+}
 static const	char *Uname, *Comm;
 pid_t	Pid;
 #define PREFIX(i) (void)printf("%-8.8s %-10s %5d", Uname, Comm, Pid); \
 	switch(i) { \
 	case TEXT: \
 		(void)printf(" text"); \
 		break; \
 	case CDIR: \
 		(void)printf("   wd"); \
 		break; \
 	case RDIR: \
 		(void)printf(" root"); \