6 files changed, 25 insertions, 50 deletions

diff --git a/usr.bin/finger/finger.1 b/usr.bin/finger/finger.1
index cf382203ea89..22d7fc956446 100644
--- a/usr.bin/finger/finger.1
+++ b/usr.bin/finger/finger.1
@@ -69,7 +69,7 @@ if a ``:'' is present, or days if a ``d'' is present.
 If it is an
 .Dq * ,
 the login time indicates the time of last login.
-Login time is displayed as the dayname if less than 6 days, else month, day;
+Login time is displayed as the day name if less than 6 days, else month, day;
 hours and minutes, unless more than six months ago, in which case the year
 is displayed rather than the hours and minutes.
 .Pp
diff --git a/usr.bin/finger/finger.c b/usr.bin/finger/finger.c
index 53ea14496163..0e356b30069a 100644
--- a/usr.bin/finger/finger.c
+++ b/usr.bin/finger/finger.c
@@ -53,10 +53,9 @@ static const char copyright[] =
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)finger.c	8.5 (Berkeley) 5/4/95";
-#else
+#endif
 static const char rcsid[] =
   "$FreeBSD$";
-#endif
 #endif /* not lint */
 
 /*
@@ -73,12 +72,8 @@ static const char rcsid[] =
  * well as home directory, shell, mail info, and .plan/.project files.
  */
 
-#include <sys/param.h>
-
 #include <db.h>
 #include <err.h>
-#include <errno.h>
-#include <fcntl.h>
 #include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -86,9 +81,7 @@ static const char rcsid[] =
 #include <time.h>
 #include <unistd.h>
 #include <utmp.h>
-#include <db.h>
 #include <locale.h>
-#include <sys/syslimits.h>
 
 #include "finger.h"
 #include "pathnames.h"
diff --git a/usr.bin/finger/lprint.c b/usr.bin/finger/lprint.c
index 6bf605060574..f990be29f920 100644
--- a/usr.bin/finger/lprint.c
+++ b/usr.bin/finger/lprint.c
@@ -37,27 +37,22 @@
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)lprint.c	8.3 (Berkeley) 4/28/95";
-#else
+#endif
 static const char rcsid[] =
   "$FreeBSD$";
-#endif
 #endif /* not lint */
 
-#include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/time.h>
-#include <fcntl.h>
-#include <time.h>
+#include <ctype.h>
 #include <db.h>
 #include <err.h>
+#include <fcntl.h>
+#include <paths.h>
 #include <pwd.h>
-#include <utmp.h>
-#include <errno.h>
-#include <unistd.h>
 #include <stdio.h>
-#include <ctype.h>
 #include <string.h>
-#include <paths.h>
+#include <unistd.h>
+#include <utmp.h>
 #include "finger.h"
 #include "pathnames.h"
 #include "extern.h"
diff --git a/usr.bin/finger/net.c b/usr.bin/finger/net.c
index 388ea332b984..3f93a8a55d53 100644
--- a/usr.bin/finger/net.c
+++ b/usr.bin/finger/net.c
@@ -37,29 +37,23 @@
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)net.c	8.4 (Berkeley) 4/28/95";
-#else
+#endif
 static const char rcsid[] =
   "$FreeBSD$";
-#endif
 #endif /* not lint */
 
-#include <sys/types.h>
 #include <sys/param.h>
 #include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
+#include <sys/uio.h>
+#include <ctype.h>
 #include <db.h>
 #include <err.h>
-#include <unistd.h>
+#include <netdb.h>
 #include <pwd.h>
-#include <utmp.h>
 #include <stdio.h>
-#include <ctype.h>
 #include <string.h>
-#include <sys/uio.h>
-#include <signal.h>
-#include <limits.h>
+#include <unistd.h>
+#include <utmp.h>
 #include "finger.h"
 
 extern int lflag;		/* XXX finger.h? */
diff --git a/usr.bin/finger/sprint.c b/usr.bin/finger/sprint.c
index 40b7d8273d8c..e373edbebe24 100644
--- a/usr.bin/finger/sprint.c
+++ b/usr.bin/finger/sprint.c
@@ -37,23 +37,18 @@
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)sprint.c	8.3 (Berkeley) 4/28/95";
-#else
+#endif
 static const char rcsid[] =
   "$FreeBSD$";
-#endif
 #endif /* not lint */
 
-#include <sys/types.h>
-#include <sys/time.h>
-#include <time.h>
 #include <db.h>
 #include <err.h>
 #include <pwd.h>
-#include <errno.h>
-#include <utmp.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
+#include <time.h>
+#include <utmp.h>
 #include "finger.h"
 
 static void	  stimeprint __P((WHERE *));
diff --git a/usr.bin/finger/util.c b/usr.bin/finger/util.c
index eb9120629975..19e2f96d9d9d 100644
--- a/usr.bin/finger/util.c
+++ b/usr.bin/finger/util.c
@@ -37,27 +37,25 @@
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)util.c	8.3 (Berkeley) 4/28/95";
-#else
+#endif
 static const char rcsid[] =
   "$FreeBSD$";
-#endif
 #endif /* not lint */
 
 #include <sys/param.h>
 #include <sys/stat.h>
-#include <fcntl.h>
+#include <ctype.h>
 #include <db.h>
 #include <err.h>
-#include <pwd.h>
-#include <utmp.h>
 #include <errno.h>
-#include <unistd.h>
+#include <fcntl.h>
+#include <paths.h>
+#include <pwd.h>
 #include <stdio.h>
-#include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
-#include <paths.h>
-#include <errno.h>
+#include <unistd.h>
+#include <utmp.h>
 #include "finger.h"
 
 static void	 find_idle_and_ttywrite __P((WHERE *));
@@ -138,7 +136,7 @@ enter_lastlog(pn)
 		/*
 		 * and if it's not any of the current logins
 		 * can't use time comparison because there may be a small
-		 * discrepency since login calls time() twice
+		 * discrepancy since login calls time() twice
 		 */
 		for (w = pn->whead; doit && w != NULL; w = w->next)
 			if (w->info == LOGGEDIN &&