From 7e13458c3a06a2ba58052e645ba91f38a4db0d8c Mon Sep 17 00:00:00 2001 From: "Liam J. Foy" Date: Sat, 13 Nov 2004 16:14:33 +0000 Subject: [PATCH] - Remove main proto - Don't bother using *logfile, just use _PATH_LASTLOG - WARN 6 and remove CFLAGS Ok'ed: Joerg --- usr.sbin/lastlogin/Makefile | 4 ++-- usr.sbin/lastlogin/lastlogin.c | 10 +++------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/usr.sbin/lastlogin/Makefile b/usr.sbin/lastlogin/Makefile index 097b65124a..4954ca08f7 100644 --- a/usr.sbin/lastlogin/Makefile +++ b/usr.sbin/lastlogin/Makefile @@ -1,8 +1,8 @@ # $FreeBSD: src/usr.sbin/lastlogin/Makefile,v 1.1.2.2 2001/04/25 12:09:52 ru Exp $ -# $DragonFly: src/usr.sbin/lastlogin/Makefile,v 1.2 2003/06/17 04:29:55 dillon Exp $ +# $DragonFly: src/usr.sbin/lastlogin/Makefile,v 1.3 2004/11/13 16:14:33 liamfoy Exp $ PROG= lastlogin MAN= lastlogin.8 -CFLAGS+=-Wall +WARNS?= 6 .include diff --git a/usr.sbin/lastlogin/lastlogin.c b/usr.sbin/lastlogin/lastlogin.c index 96fb60cd57..505a0e4781 100644 --- a/usr.sbin/lastlogin/lastlogin.c +++ b/usr.sbin/lastlogin/lastlogin.c @@ -31,7 +31,7 @@ * * $NetBSD: lastlogin.c,v 1.4 1998/02/03 04:45:35 perry Exp $ * $FreeBSD: src/usr.sbin/lastlogin/lastlogin.c,v 1.2.2.2 2001/07/19 05:02:46 kris Exp $ - * $DragonFly: src/usr.sbin/lastlogin/lastlogin.c,v 1.4 2003/11/16 15:17:36 eirikn Exp $ + * $DragonFly: src/usr.sbin/lastlogin/lastlogin.c,v 1.5 2004/11/13 16:14:33 liamfoy Exp $ */ #include @@ -44,9 +44,6 @@ #include #include -static const char *logfile = _PATH_LASTLOG; - - int main(int, char **); static void output(struct passwd *, struct lastlog *); static void usage(void); @@ -62,9 +59,8 @@ main(int argc, char **argv) usage(); } - fp = fopen(logfile, "r"); - if (fp == NULL) - err(1, "%s", logfile); + if ((fp = fopen(_PATH_LASTLOG, "r")) == NULL) + err(1, "%s", _PATH_LASTLOG); setpassent(1); /* Keep passwd file pointers open */ -- 2.41.0