 @@ -1,14 +1,14 @@
-/*	$NetBSD: utmpentry.c,v 1.18 2015/11/21 15:01:43 christos Exp $	*/
+/*	$NetBSD: utmpentry.c,v 1.18.18.1 2024/04/18 16:09:09 martin Exp $	*/
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Christos Zoulas.
+ *
  * 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.
 @@ -21,27 +21,27 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: utmpentry.c,v 1.18 2015/11/21 15:01:43 christos Exp $");
+__RCSID("$NetBSD: utmpentry.c,v 1.18.18.1 2024/04/18 16:09:09 martin Exp $");
 #endif
 #include <sys/stat.h>
 #include <time.h>
 #include <string.h>
 #include <err.h>
 #include <stdlib.h>
 #ifdef SUPPORT_UTMP
 #include <utmp.h>
 #endif
 #ifdef SUPPORT_UTMPX
 @@ -85,34 +85,27 @@ adjust_size(struct utmpentry *e)
 	if ((max = strlen(e->line)) > maxline)
 		maxline = max;
 	if ((max = strlen(e->host)) > maxhost)
 		maxhost = max;
+}
 static int
 setup(const char *fname)
+{
 	int what = 3;
 	struct stat st;
 	const char *sfname;
-	if (fname == NULL) {
+	if (fname != NULL) {
 #ifdef SUPPORT_UTMPX
 		setutxent();
 #endif
 #ifdef SUPPORT_UTMP
 		setutent();
 #endif
 	} else {
 		size_t len = strlen(fname);
 		if (len == 0)
 			errx(1, "Filename cannot be 0 length.");
 		what = fname[len - 1] == 'x' ? 1 : 2;
 		if (what == 1) {
 #ifdef SUPPORT_UTMPX
 			if (utmpxname(fname) == 0)
 				warnx("Cannot set utmpx file to `%s'",
 				    fname);
 #else
 			warnx("utmpx support not compiled in");
 #endif
 		} else {
 @@ -123,29 +116,29 @@ setup(const char *fname)
 #else
 			warnx("utmp support not compiled in");
 #endif
+		}
+	}
 #ifdef SUPPORT_UTMPX
 	if (what & 1) {
 		sfname = fname ? fname : _PATH_UTMPX;
 		if (stat(sfname, &st) == -1) {
 			warn("Cannot stat `%s'", sfname);
 			what &= ~1;
 		} else {
 			if (timespeccmp(&st.st_mtimespec, &utmpxtime, >))
-			    utmpxtime = st.st_mtimespec;
+				utmpxtime = st.st_mtimespec;
 			else
-			    what &= ~1;
+				what &= ~1;
+		}
+	}
 #endif
 #ifdef SUPPORT_UTMP
 	if (what & 2) {
 		sfname = fname ? fname : _PATH_UTMP;
 		if (stat(sfname, &st) == -1) {
 			warn("Cannot stat `%s'", sfname);
 			what &= ~2;
 		} else {
 			if (timespeccmp(&st.st_mtimespec, &utmptime, >))
 				utmptime = st.st_mtimespec;
 			else
 @@ -194,40 +187,42 @@ getutentries(const char *fname, struct u
 	switch (what) {
 	case 0:
 		/* No updates */
 		*epp = ehead;
 		return numutmp;
 	default:
 		/* Need to re-scan */
 		ehead = NULL;
 		numutmp = 0;
+	}
 #endif
 #ifdef SUPPORT_UTMPX
 	setutxent();
 	while ((what & 1) && (utx = getutxent()) != NULL) {
 		if (fname == NULL && ((1 << utx->ut_type) & etype) == 0)
 			continue;
-		if ((ep = calloc(1, sizeof(struct utmpentry))) == NULL) {
+		if ((ep = calloc(1, sizeof(*ep))) == NULL) {
 			warn(NULL);
 			return 0;
+		}
 		getentryx(ep, utx);
 		*nextp = ep;
 		nextp = &(ep->next);
+	}
 #endif
 #ifdef SUPPORT_UTMP
 	setutent();
 	if ((etype & (1 << USER_PROCESS)) != 0) {
 		while ((what & 2) && (ut = getutent()) != NULL) {
 			if (fname == NULL && (*ut->ut_name == '\0' ||
 			    *ut->ut_line == '\0'))
 				continue;
 			/* Don't process entries that we have utmpx for */
 			for (ep = ehead; ep != NULL; ep = ep->next) {
 				if (strncmp(ep->line, ut->ut_line,
 				    sizeof(ut->ut_line)) == 0)
 					break;
+			}
 			if (ep != NULL)
 				continue;