WARNSify

1 files changed, 57 insertions, 56 deletions

diff --git a/dm/dm.c b/dm/dm.c
index c994618a..ebe43652 100644
--- a/dm/dm.c
+++ b/dm/dm.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dm.c,v 1.6 1997/04/21 11:11:47 mrg Exp $	*/
+/*	$NetBSD: dm.c,v 1.7 1997/10/10 12:49:49 lukem Exp $	*/
 
 /*
  * Copyright (c) 1987, 1993
@@ -33,17 +33,17 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1987, 1993\n\
-	The Regents of the University of California.  All rights reserved.\n";
+__COPYRIGHT("@(#) Copyright (c) 1987, 1993\n\
+	The Regents of the University of California.  All rights reserved.\n");
 #endif /* not lint */
 
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)dm.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$NetBSD: dm.c,v 1.6 1997/04/21 11:11:47 mrg Exp $";
+__RCSID("$NetBSD: dm.c,v 1.7 1997/10/10 12:49:49 lukem Exp $");
 #endif
 #endif /* not lint */
 
@@ -52,15 +52,17 @@ static char rcsid[] = "$NetBSD: dm.c,v 1.6 1997/04/21 11:11:47 mrg Exp $";
 #include <sys/time.h>
 #include <sys/resource.h>
 
+#include <err.h>
 #include <ctype.h>
+#include <errno.h>
 #include <nlist.h>
 #include <pwd.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
 #include <utmp.h>
-#include <errno.h>
 
 #include "pathnames.h"
 
@@ -69,6 +71,17 @@ static int	priority = 0;		/* priority game runs at */
 static char	*game,			/* requested game */
 		*gametty;		/* from tty? */
 
+void	c_day __P((char *, char *, char *));
+void	c_game __P((char *, char  *, char *, char *));
+void	c_tty __P((char *));
+const char *hour __P((int));
+double	load __P((void));
+int	main __P((int, char *[]));
+void	nogamefile __P((void));
+void	play __P((char **));
+void	read_config __P((void));
+int	users __P((void));
+
 int
 main(argc, argv)
 	int argc;
@@ -77,7 +90,7 @@ main(argc, argv)
 	char *cp;
 
 	nogamefile();
-	game = (cp = rindex(*argv, '/')) ? ++cp : *argv;
+	game = (cp = strrchr(*argv, '/')) ? ++cp : *argv;
 
 	if (!strcmp(game, "dm"))
 		exit(0);
@@ -90,12 +103,14 @@ main(argc, argv)
 #endif
 	play(argv);
 	/*NOTREACHED*/
+	return(0);
 }
 
 /*
  * play --
  *	play the game
  */
+void
 play(args)
 	char **args;
 {
@@ -109,14 +124,14 @@ play(args)
 		(void)setpriority(PRIO_PROCESS, 0, priority);
 	setgid(getgid());	/* we run setgid kmem; lose it */
 	execv(pbuf, args);
-	(void)fprintf(stderr, "dm: %s: %s\n", pbuf, strerror(errno));
-	exit(1);
+	err(1, "%s", pbuf);
 }
 
 /*
  * read_config --
  *	read through config file, looking for key words.
  */
+void
 read_config()
 {
 	FILE *cfp;
@@ -151,6 +166,7 @@ read_config()
  * c_day --
  *	if day is today, see if okay to play
  */
+void
 c_day(s_day, s_start, s_stop)
 	char *s_day, *s_start, *s_stop;
 {
@@ -169,20 +185,16 @@ c_day(s_day, s_start, s_stop)
 		return;
 	start = atoi(s_start);
 	stop = atoi(s_stop);
-	if (ct->tm_hour >= start && ct->tm_hour < stop) {
-		fputs("dm: Sorry, games are not available from ", stderr);
-		hour(start);
-		fputs(" to ", stderr);
-		hour(stop);
-		fputs(" today.\n", stderr);
-		exit(0);
-	}
+	if (ct->tm_hour >= start && ct->tm_hour < stop)
+		errx(0, "Sorry, games are not available from %s to %s today.",
+		    hour(start), hour(stop));
 }
 
 /*
  * c_tty --
  *	decide if this tty can be used for games.
  */
+void
 c_tty(tty)
 	char *tty;
 {
@@ -190,39 +202,33 @@ c_tty(tty)
 	static char *p_tty;
 
 	if (first) {
-		p_tty = rindex(gametty, '/');
+		p_tty = strrchr(gametty, '/');
 		first = 0;
 	}
 
-	if (!strcmp(gametty, tty) || p_tty && !strcmp(p_tty, tty)) {
-		fprintf(stderr, "dm: Sorry, you may not play games on %s.\n", gametty);
-		exit(0);
-	}
+	if (!strcmp(gametty, tty) || (p_tty && !strcmp(p_tty, tty)))
+		errx(1, "Sorry, you may not play games on %s.", gametty);
 }
 
 /*
  * c_game --
  *	see if game can be played now.
  */
+void
 c_game(s_game, s_load, s_users, s_priority)
 	char *s_game, *s_load, *s_users, *s_priority;
 {
 	static int found;
-	double load();
 
 	if (found)
 		return;
 	if (strcmp(game, s_game) && strcasecmp("default", s_game))
 		return;
 	++found;
-	if (isdigit(*s_load) && atoi(s_load) < load()) {
-		fputs("dm: Sorry, the load average is too high right now.\n", stderr);
-		exit(0);
-	}
-	if (isdigit(*s_users) && atoi(s_users) <= users()) {
-		fputs("dm: Sorry, there are too many users logged on right now.\n", stderr);
-		exit(0);
-	}
+	if (isdigit(*s_load) && atoi(s_load) < load())
+		errx(0, "Sorry, the load average is too high right now.");
+	if (isdigit(*s_users) && atoi(s_users) <= users())
+		errx(0, "Sorry, there are too many users logged on right now.");
 	if (isdigit(*s_priority))
 		priority = atoi(s_priority);
 }
@@ -236,10 +242,8 @@ load()
 {
 	double avenrun[3];
 
-	if (getloadavg(avenrun, sizeof(avenrun)/sizeof(avenrun[0])) < 0) {
-		fputs("dm: getloadavg() failed.\n", stderr);
-		exit(1);
-	}
+	if (getloadavg(avenrun, sizeof(avenrun)/sizeof(avenrun[0])) < 0)
+		err(1, "getloadavg() failed.");
 	return(avenrun[2]);
 }
 
@@ -249,26 +253,25 @@ load()
  *	todo: check idle time; if idle more than X minutes, don't
  *	count them.
  */
+int
 users()
 {
 	
-	register int nusers, utmp;
+	int nusers, utmp;
 	struct utmp buf;
 
-	if ((utmp = open(_PATH_UTMP, O_RDONLY, 0)) < 0) {
-		(void)fprintf(stderr, "dm: %s: %s\n",
-		    _PATH_UTMP, strerror(errno));
-		exit(1);
-	}
+	if ((utmp = open(_PATH_UTMP, O_RDONLY, 0)) < 0)
+		err(1, "%s", _PATH_UTMP);
 	for (nusers = 0; read(utmp, (char *)&buf, sizeof(struct utmp)) > 0;)
 		if (buf.ut_name[0] != '\0')
 			++nusers;
 	return(nusers);
 }
 
+void
 nogamefile()
 {
-	register int fd, n;
+	int fd, n;
 	char buf[BUFSIZ];
 
 	if ((fd = open(_PATH_NOGAMES, O_RDONLY, 0)) >= 0) {
@@ -284,22 +287,20 @@ nogamefile()
  * hour --
  *	print out the hour in human form
  */
+const char *
 hour(h)
 	int h;
 {
-	switch(h) {
-	case 0:
-		fputs("midnight", stderr);
-		break;
-	case 12:
-		fputs("noon", stderr);
-		break;
-	default:
-		if (h > 12)
-			fprintf(stderr, "%dpm", h - 12);
-		else
-			fprintf(stderr, "%dam", h);
-	}
+	static char *hours[] = {
+	    "midnight", "1am", "2am", "3am", "4am", "5am",
+	    "6am", "7am", "8am", "9am", "10am", "11am",
+	    "noon", "1pm", "2pm", "3pm", "4pm", "5pm",
+	    "6pm", "7pm", "8pm", "9pm", "10pm", "11pm" };
+
+	if (h < 0 || h > 23)
+		return "BAD TIME";
+	else
+		return hours[h];
 }
 
 #ifdef LOG
@@ -319,7 +320,7 @@ logfile()
 			if (!flock(fileno(lp), LOCK_EX))
 				break;
 			if (lock_cnt == 4) {
-				perror("dm: log lock");
+				warnx("log lock");
 				(void)fclose(lp);
 				return;
 			}