Revert arc4random usage for now

[bsdgames-darwin.git] / cribbage / io.c

diff --git a/cribbage/io.c b/cribbage/io.c
index 0d79516865b233a3f74625376312e589709a6b4e..cc1243df04c3bc22f15b9ee80d1b3f33c2befd44 100644 (file)
--- a/cribbage/io.c
+++ b/cribbage/io.c
@@ -1,6 +1,8 @@
-/*
- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.
+/*     $NetBSD: io.c,v 1.27 2012/10/13 20:36:06 dholland Exp $ */
+
+/*-
+ * Copyright (c) 1980, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions


@@ -10,11 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.

- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors

  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *


@@ -31,96 +29,99 @@
  * SUCH DAMAGE.
  */
 
  * SUCH DAMAGE.
  */
 

+#include <sys/cdefs.h>

 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)io.c       5.8 (Berkeley) 2/28/91";
+#if 0
+static char sccsid[] = "@(#)io.c       8.1 (Berkeley) 5/31/93";
+#else
+__RCSID("$NetBSD: io.c,v 1.27 2012/10/13 20:36:06 dholland Exp $");
+#endif

 #endif /* not lint */
 
 #endif /* not lint */
 

-# include      <curses.h>
-# include      <ctype.h>
-# include      <signal.h>
-# include      <stdarg.h>
-# include      "deck.h"
-# include      "cribbage.h"
-# include      "cribcur.h"
-
-# define       LINESIZE                128
+#include <ctype.h>
+#include <curses.h>
+#include <signal.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+#include <termios.h>
+#include <unistd.h>

 
 

-# ifdef CTRL
-# undef CTRL
-# endif
-# define       CTRL(X)                 ('X' - 'A' + 1)
+#include "deck.h"
+#include "cribbage.h"
+#include "cribcur.h"

 
 

-# ifdef        notdef                          /* defined in curses.h */
-#      define  erasechar()     _tty.sg_erase
-#      define  killchar()      _tty.sg_kill
-# endif
+#define        LINESIZE                128

 
 

-char           linebuf[ LINESIZE ];
+#ifdef CTRL
+#undef CTRL
+#endif
+#define        CTRL(X)                 (X - 'A' + 1)

 
 

-char           *rankname[ RANKS ]      = { "ACE", "TWO", "THREE", "FOUR",
-                                           "FIVE", "SIX", "SEVEN", "EIGHT",
-                                           "NINE", "TEN", "JACK", "QUEEN",
-                                           "KING" };
+static int msgcrd(CARD, BOOLEAN, const char *, BOOLEAN);
+static void printcard(WINDOW *, unsigned, CARD, BOOLEAN);
+static int incard(CARD *);
+static void wait_for(int);
+static int readchar(void);

 
 

-char            *rankchar[ RANKS ]      = { "A", "2", "3", "4", "5", "6", "7",
-                                           "8", "9", "T", "J", "Q", "K" };
+static char linebuf[LINESIZE];

 
 

-char            *suitname[ SUITS ]      = { "SPADES", "HEARTS", "DIAMONDS",
-                                           "CLUBS" };
+static const char *const rankname[RANKS] = {
+       "ACE", "TWO", "THREE", "FOUR", "FIVE", "SIX", "SEVEN",
+       "EIGHT", "NINE", "TEN", "JACK", "QUEEN", "KING"
+};

 
 

-char            *suitchar[ SUITS ]      = { "S", "H", "D", "C" };
+static const char *const rankchar[RANKS] = {
+       "A", "2", "3", "4", "5", "6", "7", "8", "9", "T", "J", "Q", "K"
+};

 
 

+static const char *const suitname[SUITS] = {
+       "SPADES", "HEARTS", "DIAMONDS", "CLUBS"
+};

 
 

+static const char *const suitchar[SUITS] = {"S", "H", "D", "C"};

 
 /*
  * msgcard:
  *     Call msgcrd in one of two forms
  */
 
 /*
  * msgcard:
  *     Call msgcrd in one of two forms
  */

-msgcard(c, brief)
-CARD           c;
-BOOLEAN                brief;
+int
+msgcard(CARD c, BOOLEAN brief)

 {
        if (brief)
 {
        if (brief)

-               return msgcrd(c, TRUE, (char *) NULL, TRUE);
+               return (msgcrd(c, TRUE, NULL, TRUE));

        else
        else

-               return msgcrd(c, FALSE, " of ", FALSE);
+               return (msgcrd(c, FALSE, " of ", FALSE));

 }
 
 }
 

-
-

 /*
  * msgcrd:
  *     Print the value of a card in ascii
  */
 /*
  * msgcrd:
  *     Print the value of a card in ascii
  */

-msgcrd(c, brfrank, mid, brfsuit)
-CARD           c;
-char           *mid;
-BOOLEAN                brfrank,  brfsuit;
+static int
+msgcrd(CARD c, BOOLEAN brfrank, const char *mid, BOOLEAN brfsuit)

 {
        if (c.rank == EMPTY || c.suit == EMPTY)
 {
        if (c.rank == EMPTY || c.suit == EMPTY)

-           return FALSE;
+               return (FALSE);

        if (brfrank)
        if (brfrank)

-           addmsg("%1.1s", rankchar[c.rank]);
+               addmsg("%1.1s", rankchar[c.rank]);

        else
        else

-           addmsg(rankname[c.rank]);
+               addmsg("%s", rankname[c.rank]);

        if (mid != NULL)
        if (mid != NULL)

-           addmsg(mid);
+               addmsg("%s", mid);

        if (brfsuit)
        if (brfsuit)

-           addmsg("%1.1s", suitchar[c.suit]);
+               addmsg("%1.1s", suitchar[c.suit]);

        else
        else

-           addmsg(suitname[c.suit]);
-       return TRUE;
+               addmsg("%s", suitname[c.suit]);
+       return (TRUE);

 }
 
 /*
  * printcard:
  *     Print out a card.
  */
 }
 
 /*
  * printcard:
  *     Print out a card.
  */

-printcard(win, cardno, c, blank)
-WINDOW         *win;
-int            cardno;
-CARD           c;
-BOOLEAN                blank;
+static void
+printcard(WINDOW *win, unsigned cardno, CARD c, BOOLEAN blank)

 {
        prcard(win, cardno * 2, cardno, c, blank);
 }
 {
        prcard(win, cardno * 2, cardno, c, blank);
 }


@@ -129,14 +130,12 @@ BOOLEAN           blank;
  * prcard:
  *     Print out a card on the window at the specified location
  */
  * prcard:
  *     Print out a card on the window at the specified location
  */

-prcard(win, y, x, c, blank)
-WINDOW         *win;
-int            y, x;
-CARD           c;
-BOOLEAN                blank;
+void
+prcard(WINDOW *win, int y, int x, CARD c, BOOLEAN blank)

 {
        if (c.rank == EMPTY)
 {
        if (c.rank == EMPTY)

-           return;
+               return;
+

        mvwaddstr(win, y + 0, x, "+-----+");
        mvwaddstr(win, y + 1, x, "|     |");
        mvwaddstr(win, y + 2, x, "|     |");
        mvwaddstr(win, y + 0, x, "+-----+");
        mvwaddstr(win, y + 1, x, "|     |");
        mvwaddstr(win, y + 2, x, "|     |");


@@ -154,171 +153,169 @@ BOOLEAN         blank;
  * prhand:
  *     Print a hand of n cards
  */
  * prhand:
  *     Print a hand of n cards
  */

-prhand(h, n, win, blank)
-CARD           h[];
-int            n;
-WINDOW         *win;
-BOOLEAN                blank;
+void
+prhand(const CARD h[], unsigned n, WINDOW *win, BOOLEAN blank)

 {
 {

-       register int    i;
+       unsigned i;

 
        werase(win);
        for (i = 0; i < n; i++)
 
        werase(win);
        for (i = 0; i < n; i++)

-           printcard(win, i, *h++, blank);
+               printcard(win, i, *h++, blank);

        wrefresh(win);
 }
 
        wrefresh(win);
 }
 

-
-

 /*
  * infrom:
  *     reads a card, supposedly in hand, accepting unambigous brief
  *     input, returns the index of the card found...
  */
 /*
  * infrom:
  *     reads a card, supposedly in hand, accepting unambigous brief
  *     input, returns the index of the card found...
  */

-infrom(hand, n, prompt)
-CARD           hand[];
-int            n;
-char           *prompt;
+int
+infrom(const CARD hand[], int n, const char *prompt)

 {
 {

-       register int           i, j;
-       CARD                    crd;
+       int i, j;
+       CARD crd;

 
        if (n < 1) {
 
        if (n < 1) {

-           printf("\nINFROM: %d = n < 1!!\n", n);
-           exit(74);
+               printf("\nINFROM: %d = n < 1!!\n", n);
+               exit(74);

        }
        for (;;) {
        }
        for (;;) {

-           msg(prompt);
-           if (incard(&crd)) {                 /* if card is full card */
-               if (!isone(crd, hand, n))
-                   msg("That's not in your hand");
-               else {
-                   for (i = 0; i < n; i++)
-                       if (hand[i].rank == crd.rank &&
-                           hand[i].suit == crd.suit)
-                               break;
-                   if (i >= n) {
-                       printf("\nINFROM: isone or something messed up\n");
-                       exit(77);
-                   }
-                   return i;
-               }
-           }
-           else                                /* if not full card... */
-               if (crd.rank != EMPTY) {
-                   for (i = 0; i < n; i++)
-                       if (hand[i].rank == crd.rank)
-                               break;
-                   if (i >= n)
-                       msg("No such rank in your hand");
-                   else {
-                       for (j = i + 1; j < n; j++)
-                           if (hand[j].rank == crd.rank)
-                               break;
-                       if (j < n)
-                           msg("Ambiguous rank");
-                       else
-                           return i;
-                   }
-               }
-               else
-                   msg("Sorry, I missed that");
+               msg("%s", prompt);
+               if (incard(&crd)) {     /* if card is full card */
+                       if (!is_one(crd, hand, n))
+                               msg("That's not in your hand");
+                       else {
+                               for (i = 0; i < n; i++)
+                                       if (hand[i].rank == crd.rank &&
+                                           hand[i].suit == crd.suit)
+                                               break;
+                               if (i >= n) {
+                       printf("\nINFROM: is_one or something messed up\n");
+                                       exit(77);
+                               }
+                               return (i);
+                       }
+               } else                  /* if not full card... */
+                       if (crd.rank != EMPTY) {
+                               for (i = 0; i < n; i++)
+                                       if (hand[i].rank == crd.rank)
+                                               break;
+                               if (i >= n)
+                                       msg("No such rank in your hand");
+                               else {
+                                       for (j = i + 1; j < n; j++)
+                                               if (hand[j].rank == crd.rank)
+                                                       break;
+                                       if (j < n)
+                                               msg("Ambiguous rank");
+                                       else
+                                               return (i);
+                               }
+                       } else
+                               msg("Sorry, I missed that");

        }
        /* NOTREACHED */
 }
 
        }
        /* NOTREACHED */
 }
 

-
-

 /*
  * incard:
  *     Inputs a card in any format.  It reads a line ending with a CR
  *     and then parses it.
  */
 /*
  * incard:
  *     Inputs a card in any format.  It reads a line ending with a CR
  *     and then parses it.
  */

-incard(crd)
-CARD           *crd;
+static int
+incard(CARD *crd)

 {
 {

-       char            *getline();
-       register int    i;
-       int             rnk, sut;
-       char            *line, *p, *p1;
-       BOOLEAN         retval;
+       int i;
+       int rnk, sut;
+       char *line, *p, *p1;
+       BOOLEAN retval;

 
        retval = FALSE;
        rnk = sut = EMPTY;
 
        retval = FALSE;
        rnk = sut = EMPTY;

-       if (!(line = getline()))
+       if (!(line = get_line()))

                goto gotit;
        p = p1 = line;
                goto gotit;
        p = p1 = line;

-       while(  *p1 != ' '  &&  *p1 != NULL  )  ++p1;
-       *p1++ = NULL;
-       if(  *p == NULL  )  goto  gotit;
-                       /* IMPORTANT: no real card has 2 char first name */
-       if(  strlen(p) == 2  )  {               /* check for short form */
-           rnk = EMPTY;
-           for( i = 0; i < RANKS; i++ )  {
-               if(  *p == *rankchar[i]  )  {
-                   rnk = i;
-                   break;
+       while (*p1 != ' ' && *p1 != '\0')
+               ++p1;
+       *p1++ = '\0';
+       if (*p == '\0')
+               goto gotit;
+
+       /* IMPORTANT: no real card has 2 char first name */
+       if (strlen(p) == 2) {   /* check for short form */
+               rnk = EMPTY;
+               for (i = 0; i < RANKS; i++) {
+                       if (*p == *rankchar[i]) {
+                               rnk = i;
+                               break;
+                       }

                }
                }

-           }
-           if(  rnk == EMPTY  )  goto  gotit;     /* it's nothing... */
-           ++p;                                /* advance to next char */
-           sut = EMPTY;
-           for( i = 0; i < SUITS; i++ )  {
-               if(  *p == *suitchar[i]  )  {
-                   sut = i;
-                   break;
+               if (rnk == EMPTY)
+                       goto gotit;     /* it's nothing... */
+               ++p;            /* advance to next char */
+               sut = EMPTY;
+               for (i = 0; i < SUITS; i++) {
+                       if (*p == *suitchar[i]) {
+                               sut = i;
+                               break;
+                       }

                }
                }

-           }
-           if(  sut != EMPTY  )  retval = TRUE;
-           goto  gotit;
+               if (sut != EMPTY)
+                       retval = TRUE;
+               goto gotit;

        }
        rnk = EMPTY;
        }
        rnk = EMPTY;

-       for( i = 0; i < RANKS; i++ )  {
-           if(  !strcmp( p, rankname[i] )  ||  !strcmp( p, rankchar[i] )  )  {
-               rnk = i;
-               break;
-           }
+       for (i = 0; i < RANKS; i++) {
+               if (!strcmp(p, rankname[i]) || !strcmp(p, rankchar[i])) {
+                       rnk = i;
+                       break;
+               }

        }
        }

-       if(  rnk == EMPTY  )  goto  gotit;
+       if (rnk == EMPTY)
+               goto gotit;

        p = p1;
        p = p1;

-       while(  *p1 != ' '  &&  *p1 != NULL  )  ++p1;
-       *p1++ = NULL;
-       if(  *p == NULL  )  goto  gotit;
-       if(  !strcmp( "OF", p )  )  {
-           p = p1;
-           while(  *p1 != ' '  &&  *p1 != NULL  )  ++p1;
-           *p1++ = NULL;
-           if(  *p == NULL  )  goto  gotit;
+       while (*p1 != ' ' && *p1 != '\0')
+               ++p1;
+       *p1++ = '\0';
+       if (*p == '\0')
+               goto gotit;
+       if (!strcmp("OF", p)) {
+               p = p1;
+               while (*p1 != ' ' && *p1 != '\0')
+                       ++p1;
+               *p1++ = '\0';
+               if (*p == '\0')
+                       goto gotit;

        }
        sut = EMPTY;
        }
        sut = EMPTY;

-       for( i = 0; i < SUITS; i++ )  {
-           if(  !strcmp( p, suitname[i] )  ||  !strcmp( p, suitchar[i] )  )  {
-               sut = i;
-               break;
-           }
+       for (i = 0; i < SUITS; i++) {
+               if (!strcmp(p, suitname[i]) || !strcmp(p, suitchar[i])) {
+                       sut = i;
+                       break;
+               }

        }
        }

-       if(  sut != EMPTY  )  retval = TRUE;
+       if (sut != EMPTY)
+               retval = TRUE;

 gotit:
        (*crd).rank = rnk;
        (*crd).suit = sut;
 gotit:
        (*crd).rank = rnk;
        (*crd).suit = sut;

-       return( retval );
+       return (retval);

 }
 
 }
 

-
-

 /*
  * getuchar:
  *     Reads and converts to upper case
  */
 /*
  * getuchar:
  *     Reads and converts to upper case
  */

-getuchar()
+int
+getuchar(void)

 {
 {

-       register int            c;
+       int c;

 
        c = readchar();
        if (islower(c))
 
        c = readchar();
        if (islower(c))

-           c = toupper(c);
+               c = toupper(c);

        waddch(Msgwin, c);
        waddch(Msgwin, c);

-       return c;
+       return (c);

 }
 
 /*
 }
 
 /*


@@ -326,59 +323,59 @@ getuchar()
  *     Reads in a decimal number and makes sure it is between "lo" and
  *     "hi" inclusive.
  */
  *     Reads in a decimal number and makes sure it is between "lo" and
  *     "hi" inclusive.
  */

-number(lo, hi, prompt)
-int            lo, hi;
-char           *prompt;
+int
+number(int lo, int hi, const char *prompt)

 {
 {

-       char                    *getline();
-       register char           *p;
-       register int            sum;
-
-       sum = 0;
-       for (;;) {
-           msg(prompt);
-           if(!(p = getline()) || *p == NULL) {
-               msg(quiet ? "Not a number" : "That doesn't look like a number");
-               continue;
-           }
-           sum = 0;
-
-           if (!isdigit(*p))
-               sum = lo - 1;
-           else
-               while (isdigit(*p)) {
-                   sum = 10 * sum + (*p - '0');
-                   ++p;
+       char *p;
+       int sum;
+
+       for (sum = 0;;) {
+               msg("%s", prompt);
+               if (!(p = get_line()) || *p == '\0') {
+                       msg(quiet ? "Not a number" :
+                           "That doesn't look like a number");
+                       continue;

                }
                }

+               sum = 0;

 
 

-           if (*p != ' ' && *p != '\t' && *p != NULL)
-               sum = lo - 1;
-           if (sum >= lo && sum <= hi)
-               return sum;
-           if (sum == lo - 1)
-               msg("that doesn't look like a number, try again --> ");
-           else
+               if (!isdigit((unsigned char)*p))
+                       sum = lo - 1;
+               else
+                       while (isdigit((unsigned char)*p)) {
+                               sum = 10 * sum + (*p - '0');
+                               ++p;
+                       }
+
+               if (*p != ' ' && *p != '\t' && *p != '\0')
+                       sum = lo - 1;
+               if (sum >= lo && sum <= hi)
+                       break;
+               if (sum == lo - 1)
+                       msg("that doesn't look like a number, try again --> ");
+               else

                msg("%d is not between %d and %d inclusive, try again --> ",
                msg("%d is not between %d and %d inclusive, try again --> ",

-                                                               sum, lo, hi);
+                           sum, lo, hi);

        }
        }

+       return (sum);

 }
 
 /*
  * msg:
  *     Display a message at the top of the screen.
  */
 }
 
 /*
  * msg:
  *     Display a message at the top of the screen.
  */

-char           Msgbuf[BUFSIZ] = { '\0' };
-
-int            Mpos = 0;
+static char Msgbuf[BUFSIZ] = {'\0'};
+static int Mpos = 0;
+static int Newpos = 0;

 
 

-static int     Newpos = 0;
-
-/* VARARGS1 */
-msg(fmt,ap)
-       char *fmt;
-       _VA_LIST_ ap;
+void
+msg(const char *fmt, ...)

 {
 {

-       (void)vsprintf(&Msgbuf[Newpos], fmt, ap);
+       va_list ap;
+
+       va_start(ap, fmt);
+       (void)vsnprintf(&Msgbuf[Newpos], sizeof(Msgbuf)-Newpos, fmt, ap);
+       Newpos = strlen(Msgbuf);
+       va_end(ap);

        endmsg();
 }
 
        endmsg();
 }
 


@@ -386,210 +383,187 @@ msg(fmt,ap)
  * addmsg:
  *     Add things to the current message
  */
  * addmsg:
  *     Add things to the current message
  */

-/* VARARGS1 */
-addmsg(fmt,ap)
-       char *fmt;
-       _VA_LIST_ ap;
+void
+addmsg(const char *fmt, ...)

 {
 {

-       (void)vsprintf(&Msgbuf[Newpos], fmt, ap);
+       va_list ap;
+
+       va_start(ap, fmt);
+       (void)vsnprintf(&Msgbuf[Newpos], sizeof(Msgbuf)-Newpos, fmt, ap);
+       Newpos = strlen(Msgbuf);
+       va_end(ap);

 }
 
 /*
  * endmsg:
  *     Display a new msg.
  */
 }
 
 /*
  * endmsg:
  *     Display a new msg.
  */

+static int Lineno = 0;

 
 

-int    Lineno = 0;
-
-endmsg()
+void
+endmsg(void)

 {
 {

-    register int       len;
-    register char      *mp, *omp;
-    static int         lastline = 0;
-
-    /*
-     * All messages should start with uppercase
-     */
-    mvaddch(lastline + Y_MSG_START, SCORE_X, ' ');
-    if (islower(Msgbuf[0]) && Msgbuf[1] != ')')
-       Msgbuf[0] = toupper(Msgbuf[0]);
-    mp = Msgbuf;
-    len = strlen(mp);
-    if (len / MSG_X + Lineno >= MSG_Y) {
-       while (Lineno < MSG_Y) {
-           wmove(Msgwin, Lineno++, 0);
-           wclrtoeol(Msgwin);
-       }
-       Lineno = 0;
-    }
-    mvaddch(Lineno + Y_MSG_START, SCORE_X, '*');
-    lastline = Lineno;
-    do {
-       mvwaddstr(Msgwin, Lineno, 0, mp);
-       if ((len = strlen(mp)) > MSG_X) {
-           omp = mp;
-           for (mp = &mp[MSG_X-1]; *mp != ' '; mp--)
-               continue;
-           while (*mp == ' ')
-               mp--;
-           mp++;
-           wmove(Msgwin, Lineno, mp - omp);
-           wclrtoeol(Msgwin);
+       static int lastline = 0;
+       int len;
+       char *mp, *omp;
+
+       /* All messages should start with uppercase */
+       mvaddch(lastline + Y_MSG_START, SCORE_X, ' ');
+       if (islower((unsigned char)Msgbuf[0]) && Msgbuf[1] != ')')
+               Msgbuf[0] = toupper((unsigned char)Msgbuf[0]);
+       mp = Msgbuf;
+       len = strlen(mp);
+       if (len / MSG_X + Lineno >= MSG_Y) {
+               while (Lineno < MSG_Y) {
+                       wmove(Msgwin, Lineno++, 0);
+                       wclrtoeol(Msgwin);
+               }
+               Lineno = 0;

        }
        }

-       if (++Lineno >= MSG_Y)
-           Lineno = 0;
-    } while (len > MSG_X);
-    wclrtoeol(Msgwin);
-    Mpos = len;
-    Newpos = 0;
-    wrefresh(Msgwin);
-    refresh();
-    wrefresh(Msgwin);
-}
-
-#ifdef notdef
-/*
- * doadd:
- *     Perform an add onto the message buffer
- */
-doadd(fmt, args)
-char   *fmt;
-int    *args;
-{
-    static FILE        junk;
-
-    /*
-     * Do the printf into Msgbuf
-     */
-    junk._flag = _IOWRT + _IOSTRG;
-    junk._ptr = &Msgbuf[Newpos];
-    junk._cnt = 32767;
-    _doprnt(fmt, args, &junk);
-    putc('\0', &junk);
-    Newpos = strlen(Msgbuf);
+       mvaddch(Lineno + Y_MSG_START, SCORE_X, '*');
+       lastline = Lineno;
+       do {
+               mvwaddstr(Msgwin, Lineno, 0, mp);
+               if ((len = strlen(mp)) > MSG_X) {
+                       omp = mp;
+                       for (mp = &mp[MSG_X - 1]; *mp != ' '; mp--)
+                               continue;
+                       while (*mp == ' ')
+                               mp--;
+                       mp++;
+                       wmove(Msgwin, Lineno, mp - omp);
+                       wclrtoeol(Msgwin);
+               }
+               if (++Lineno >= MSG_Y)
+                       Lineno = 0;
+       } while (len > MSG_X);
+       wclrtoeol(Msgwin);
+       Mpos = len;
+       Newpos = 0;
+       wrefresh(Msgwin);
+       refresh();
+       wrefresh(Msgwin);

 }
 }

-#endif

 
 /*
  * do_wait:
  *     Wait for the user to type ' ' before doing anything else
  */
 
 /*
  * do_wait:
  *     Wait for the user to type ' ' before doing anything else
  */

-do_wait()
+void
+do_wait(void)

 {
 {

-    register int line;
-    static char prompt[] = { '-', '-', 'M', 'o', 'r', 'e', '-', '-', '\0' };
+       static const char prompt[] = {'-', '-', 'M', 'o', 'r', 'e', '-', '-', '\0'};

 
 

-    if (Mpos + sizeof prompt < MSG_X)
-       wmove(Msgwin, Lineno > 0 ? Lineno - 1 : MSG_Y - 1, Mpos);
-    else {
-       mvwaddch(Msgwin, Lineno, 0, ' ');
-       wclrtoeol(Msgwin);
-       if (++Lineno >= MSG_Y)
-           Lineno = 0;
-    }
-    waddstr(Msgwin, prompt);
-    wrefresh(Msgwin);
-    wait_for(' ');
+       if ((int)(Mpos + sizeof prompt) < MSG_X)
+               wmove(Msgwin, Lineno > 0 ? Lineno - 1 : MSG_Y - 1, Mpos);
+       else {
+               mvwaddch(Msgwin, Lineno, 0, ' ');
+               wclrtoeol(Msgwin);
+               if (++Lineno >= MSG_Y)
+                       Lineno = 0;
+       }
+       waddstr(Msgwin, prompt);
+       wrefresh(Msgwin);
+       wait_for(' ');

 }
 
 /*
  * wait_for
  *     Sit around until the guy types the right key
  */
 }
 
 /*
  * wait_for
  *     Sit around until the guy types the right key
  */

-wait_for(ch)
-register char  ch;
+static void
+wait_for(int ch)

 {
 {

-    register char      c;
-
-    if (ch == '\n')
-       while ((c = readchar()) != '\n')
-           continue;
-    else
-       while (readchar() != ch)
-           continue;
+       int c;
+
+       if (ch == '\n')
+               while ((c = readchar()) != '\n')
+                       continue;
+       else
+               while (readchar() != ch)
+                       continue;

 }
 
 /*
  * readchar:
  *     Reads and returns a character, checking for gross input errors
  */
 }
 
 /*
  * readchar:
  *     Reads and returns a character, checking for gross input errors
  */

-readchar()
+static int
+readchar(void)

 {
 {

-    register int       cnt, y, x;
-    auto char          c;
+       int cnt;
+       unsigned char c;

 
 over:
 
 over:

-    cnt = 0;
-    while (read(0, &c, 1) <= 0)
-       if (cnt++ > 100) {      /* if we are getting infinite EOFs */
-               bye();          /* quit the game */
-               exit(1);
+       cnt = 0;
+       while (read(STDIN_FILENO, &c, sizeof(unsigned char)) <= 0)
+               if (cnt++ > 100) {      /* if we are getting infinite EOFs */
+                       bye();          /* quit the game */
+                       exit(1);
+               }
+       if (c == CTRL('L')) {
+               wrefresh(curscr);
+               goto over;

        }
        }

-    if (c == CTRL(L)) {
-       wrefresh(curscr);
-       goto over;
-    }
-    if (c == '\r')
-       return '\n';
-    else
-       return c;
+       if (c == '\r')
+               return ('\n');
+       else
+               return (c);

 }
 
 /*
 }
 
 /*

- * getline:
+ * get_line:

  *      Reads the next line up to '\n' or EOF.  Multiple spaces are
  *     compressed to one space; a space is inserted before a ','
  */
 char *
  *      Reads the next line up to '\n' or EOF.  Multiple spaces are
  *     compressed to one space; a space is inserted before a ','
  */
 char *

-getline()
+get_line(void)

 {
 {

-    register char      *sp;
-    register int       c, oy, ox;
-    register WINDOW    *oscr;
-
-    oscr = stdscr;
-    stdscr = Msgwin;
-    getyx(stdscr, oy, ox);
-    refresh();
-    /*
-     * loop reading in the string, and put it in a temporary buffer
-     */
-    for (sp = linebuf; (c = readchar()) != '\n'; clrtoeol(), refresh()) {
-       if (c == -1)
-           continue;
-       else if (c == erasechar()) {    /* process erase character */
-           if (sp > linebuf) {
-               register int i;
-
-               sp--;
-               for (i = strlen(unctrl(*sp)); i; i--)
-                   addch('\b');
-           }
-           continue;
-       }
-       else if (c == killchar()) {     /* process kill character */
-           sp = linebuf;
-           move(oy, ox);
-           continue;
-       }
-       else if (sp == linebuf && c == ' ')
-           continue;
-       if (sp >= &linebuf[LINESIZE-1] || !(isprint(c) || c == ' '))
-           putchar(CTRL(G));
-       else {
-           if (islower(c))
-               c = toupper(c);
-           *sp++ = c;
-           addstr(unctrl(c));
-           Mpos++;
+       size_t pos;
+       int c, oy, ox;
+       WINDOW *oscr;
+
+       oscr = stdscr;
+       stdscr = Msgwin;
+       getyx(stdscr, oy, ox);
+       refresh();
+       /* loop reading in the string, and put it in a temporary buffer */
+       for (pos = 0; (c = readchar()) != '\n'; clrtoeol(), refresh()) {
+                       if (c == erasechar()) { /* process erase character */
+                               if (pos > 0) {
+                                       int i;
+
+                                       pos--;
+                                       for (i = strlen(unctrl(linebuf[pos])); i; i--)
+                                               addch('\b');
+                               }
+                               continue;
+                       } else
+                               if (c == killchar()) {  /* process kill
+                                                        * character */
+                                       pos = 0;
+                                       move(oy, ox);
+                                       continue;
+                               } else
+                                       if (pos == 0 && c == ' ')
+                                               continue;
+               if (pos >= LINESIZE - 1 || !(isprint(c) || c == ' '))
+                       putchar(CTRL('G'));
+               else {
+                       if (islower(c))
+                               c = toupper(c);
+                       linebuf[pos++] = c;
+                       addstr(unctrl(c));
+                       Mpos++;
+               }

        }
        }

-    }
-    *sp = '\0';
-    stdscr = oscr;
-    return linebuf;
+       linebuf[pos] = '\0';
+       stdscr = oscr;
+       return (linebuf);

 }
 
 }
 

-rint()
+void
+receive_intr(int signo __unused)

 {
        bye();
        exit(1);
 {
        bye();
        exit(1);


@@ -599,7 +573,8 @@ rint()
  * bye:
  *     Leave the program, cleaning things up as we go.
  */
  * bye:
  *     Leave the program, cleaning things up as we go.
  */

-bye()
+void
+bye(void)

 {
        signal(SIGINT, SIG_IGN);
        mvcur(0, COLS - 1, LINES - 1, 0);
 {
        signal(SIGINT, SIG_IGN);
        mvcur(0, COLS - 1, LINES - 1, 0);