[src/trunk]: src/usr.bin/who make this compile with either utmp or utmpx there.

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/62729ed57b6d
branches:  trunk
changeset: 534689:62729ed57b6d
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Aug 01 23:51:42 2002 +0000

description:
make this compile with either utmp or utmpx there.

diffstat:

 usr.bin/who/utmpentry.c |  23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 deletions(-)

diffs (93 lines):

diff -r d6902df50da6 -r 62729ed57b6d usr.bin/who/utmpentry.c
--- a/usr.bin/who/utmpentry.c   Thu Aug 01 23:51:20 2002 +0000
+++ b/usr.bin/who/utmpentry.c   Thu Aug 01 23:51:42 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: utmpentry.c,v 1.2 2002/08/01 23:36:30 christos Exp $   */
+/*     $NetBSD: utmpentry.c,v 1.3 2002/08/01 23:51:42 christos Exp $   */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: utmpentry.c,v 1.2 2002/08/01 23:36:30 christos Exp $");
+__RCSID("$NetBSD: utmpentry.c,v 1.3 2002/08/01 23:51:42 christos Exp $");
 #endif
 
 #include <sys/stat.h>
@@ -66,7 +66,7 @@
 static void getentryx(struct utmpentry *, struct utmpx *);
 static time_t utmpxtime = 0;
 #endif
-#if defined(SUPPORT_UTMPX) && defined(SUPPORT_UTMP)
+#if defined(SUPPORT_UTMPX) || defined(SUPPORT_UTMP)
 static int setup(const char *);
 static void adjust_size(struct utmpentry *e);
 #endif
@@ -75,7 +75,7 @@
 static int numutmp = 0;
 static struct utmpentry *ehead;
 
-#if defined(SUPPORT_UTMPX) && defined(SUPPORT_UTMP)
+#if defined(SUPPORT_UTMPX) || defined(SUPPORT_UTMP)
 static void
 adjust_size(struct utmpentry *e)
 {
@@ -97,10 +97,10 @@
 
        if (fname == NULL) {
 #ifdef SUPPORT_UTMPX
-               setutent();
+               setutxent();
 #endif
 #ifdef SUPPORT_UTMP
-               setutxent();
+               setutent();
 #endif
        } else {
                size_t len = strlen(fname);
@@ -115,7 +115,7 @@
                        errx(1, "utmpx support not compiled in");
 #endif
                } else {
-#ifdef SUPPORT_UTMPX
+#ifdef SUPPORT_UTMP
                        if (utmpname(fname) == 0)
                                err(1, "Cannot open `%s'", fname);
 #else
@@ -169,11 +169,10 @@
 #ifdef SUPPORT_UTMP
        struct utmp *ut;
 #endif
+#if defined(SUPPORT_UTMP) || defined(SUPPORT_UTMPX)
        struct utmpentry *ep;
-#if defined(SUPPORT_UTMP) && defined(SUPPORT_UTMPX)
        int what = setup(fname);
        struct utmpentry **nextp = &ehead;
-#endif
        if (what == 0) {
                *epp = ehead;
                return numutmp;
@@ -181,6 +180,7 @@
                ehead = NULL;
                numutmp = 0;
        }
+#endif
 
 #ifdef SUPPORT_UTMPX
        while ((what & 1) && (utx = getutxent()) != NULL) {
@@ -232,9 +232,12 @@
                        numutmp++;
                }
        }
-#endif
        *epp = ehead;
        return numutmp;
+#else
+       *epp = NULL;
+       return 0;
+#endif
 }
 
 #ifdef SUPPORT_UTMP