Clarify how one is supposed to use the pointers returned by getutentries()

[bsdgames-darwin.git] / dm / dm.c

diff --git a/dm/dm.c b/dm/dm.c
index fa2d0a18ddab2b7937bc462fbbb865c3098992a7..24833da5a54493f7eba022c47d6ba55049e3ef28 100644 (file)
--- a/dm/dm.c
+++ b/dm/dm.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: dm.c,v 1.18 2003/08/07 09:37:11 agc Exp $      */
+/*     $NetBSD: dm.c,v 1.25 2008/07/13 20:07:48 dholland Exp $ */
 
 /*
  * Copyright (c) 1987, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 1993\n\
 #if 0
 static char sccsid[] = "@(#)dm.c       8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: dm.c,v 1.18 2003/08/07 09:37:11 agc Exp $");
+__RCSID("$NetBSD: dm.c,v 1.25 2008/07/13 20:07:48 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -66,21 +66,18 @@ static int  priority = 0;           /* priority game runs at */
 static char    *game,                  /* requested game */
                *gametty;               /* from tty? */
 
-void   c_day __P((const char *, const char *, const char *));
-void   c_game __P((const char *, const char  *, const char *, const char *));
-void   c_tty __P((const char *));
-const char *hour __P((int));
-double load __P((void));
-int    main __P((int, char *[]));
-void   nogamefile __P((void));
-void   play __P((char **)) __attribute__((__noreturn__));
-void   read_config __P((void));
-int    users __P((void));
+void   c_day(const char *, const char *, const char *);
+void   c_game(const char *, const char  *, const char *, const char *);
+void   c_tty(const char *);
+const char *hour(int);
+double load(void);
+void   nogamefile(void);
+void   play(char **) __dead;
+void   read_config(void);
+int    users(void);
 
 int
-main(argc, argv)
-       int argc;
-       char *argv[];
+main(int argc __unused, char *argv[])
 {
        char *cp;
 
@@ -107,8 +104,7 @@ main(argc, argv)
  *     play the game
  */
 void
-play(args)
-       char **args;
+play(char **args)
 {
        char pbuf[MAXPATHLEN];
 
@@ -124,7 +120,7 @@ play(args)
  *     read through config file, looking for key words.
  */
 void
-read_config()
+read_config(void)
 {
        FILE *cfp;
        char lbuf[BUFSIZ], f1[40], f2[40], f3[40], f4[40], f5[40];
@@ -134,19 +130,19 @@ read_config()
        while (fgets(lbuf, sizeof(lbuf), cfp))
                switch (*lbuf) {
                case 'b':               /* badtty */
-                       if (sscanf(lbuf, "%s%s", f1, f2) != 2 ||
+                       if (sscanf(lbuf, "%39s%39s", f1, f2) != 2 ||
                            strcasecmp(f1, "badtty"))
                                break;
                        c_tty(f2);
                        break;
                case 'g':               /* game */
-                       if (sscanf(lbuf, "%s%s%s%s%s",
+                       if (sscanf(lbuf, "%39s%39s%39s%39s%39s",
                            f1, f2, f3, f4, f5) != 5 || strcasecmp(f1, "game"))
                                break;
                        c_game(f2, f3, f4, f5);
                        break;
                case 't':               /* time */
-                       if (sscanf(lbuf, "%s%s%s%s", f1, f2, f3, f4) != 4 ||
+                       if (sscanf(lbuf, "%39s%39s%39s%39s", f1, f2, f3, f4) != 4 ||
                            strcasecmp(f1, "time"))
                                break;
                        c_day(f2, f3, f4);
@@ -159,8 +155,7 @@ read_config()
  *     if day is today, see if okay to play
  */
 void
-c_day(s_day, s_start, s_stop)
-       const char *s_day, *s_start, *s_stop;
+c_day(const char *s_day, const char *s_start, const char *s_stop)
 {
        static const char *const days[] = {
                "sunday", "monday", "tuesday", "wednesday",
@@ -173,7 +168,8 @@ c_day(s_day, s_start, s_stop)
                ct = localtime(&now);
        if (strcasecmp(s_day, days[ct->tm_wday]))
                return;
-       if (!isdigit(*s_start) || !isdigit(*s_stop))
+       if (!isdigit((unsigned char)*s_start) || 
+           !isdigit((unsigned char)*s_stop))
                return;
        start = atoi(s_start);
        stop = atoi(s_stop);
@@ -191,8 +187,7 @@ c_day(s_day, s_start, s_stop)
  *     decide if this tty can be used for games.
  */
 void
-c_tty(tty)
-       const char *tty;
+c_tty(const char *tty)
 {
        static int first = 1;
        static char *p_tty;
@@ -211,8 +206,8 @@ c_tty(tty)
  *     see if game can be played now.
  */
 void
-c_game(s_game, s_load, s_users, s_priority)
-       const char *s_game, *s_load, *s_users, *s_priority;
+c_game(const char *s_game, const char *s_load, const char *s_users, 
+       const char *s_priority)
 {
        static int found;
 
@@ -221,11 +216,11 @@ c_game(s_game, s_load, s_users, s_priority)
        if (strcmp(game, s_game) && strcasecmp("default", s_game))
                return;
        ++found;
-       if (isdigit(*s_load) && atoi(s_load) < load())
+       if (isdigit((unsigned char)*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())
+       if (isdigit((unsigned char)*s_users) && atoi(s_users) <= users())
                errx(0, "Sorry, there are too many users logged on right now.");
-       if (isdigit(*s_priority))
+       if (isdigit((unsigned char)*s_priority))
                priority = atoi(s_priority);
 }
 
@@ -234,7 +229,7 @@ c_game(s_game, s_load, s_users, s_priority)
  *     return 15 minute load average
  */
 double
-load()
+load(void)
 {
        double avenrun[3];
 
@@ -250,22 +245,17 @@ load()
  *     count them.
  */
 int
-users()
+users(void)
 {
-       static struct utmpentry *ohead = NULL;  
        struct utmpentry *ep;
        int nusers;
 
        nusers = getutentries(NULL, &ep);
-       if (ep != ohead) {
-               freeutentries(ep);
-               ohead = ep;
-       }
        return nusers;
 }
 
 void
-nogamefile()
+nogamefile(void)
 {
        int fd, n;
        char buf[BUFSIZ];
@@ -284,8 +274,7 @@ nogamefile()
  *     print out the hour in human form
  */
 const char *
-hour(h)
-       int h;
+hour(int h)
 {
        static const char *const hours[] = {
            "midnight", "1am", "2am", "3am", "4am", "5am",
@@ -304,7 +293,7 @@ hour(h)
  * logfile --
  *     log play of game
  */
-logfile()
+logfile(void)
 {
        struct passwd *pw;
        FILE *lp;