Fix uses of namespaces reserved by ISO C or POSIX.1.

[bsdgames-darwin.git] / monop / execute.c

diff --git a/monop/execute.c b/monop/execute.c
index 9b8889e47316676fc9f5ca83cd99c2d0f7755a6d..42f23797b81855ee4d460b901150912c91838866 100644 (file)
--- a/monop/execute.c
+++ b/monop/execute.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: execute.c,v 1.7 1999/09/08 21:17:51 jsm Exp $  */
+
 /*
- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.
+ * 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
@@ -31,34 +33,41 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-static char sccsid[] = "@(#)execute.c  5.5 (Berkeley) 2/28/91";
+#if 0
+static char sccsid[] = "@(#)execute.c  8.1 (Berkeley) 5/31/93";
+#else
+__RCSID("$NetBSD: execute.c,v 1.7 1999/09/08 21:17:51 jsm Exp $");
+#endif
 #endif /* not lint */
 
-# include      "monop.ext"
-# include      <sys/types.h>
-# include      <sys/stat.h>
-# include      <sys/time.h>
+#include "monop.ext"
+#include <fcntl.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/time.h>
 
-# define       SEGSIZE 8192
+#define        SEGSIZE 8192
 
 typedef        struct stat     STAT;
 typedef        struct tm       TIME;
 
-extern char    etext[],        /* end of text space                    */
-               rub();
-
-static char    buf[257],
-               *yn_only[]      = { "yes", "no"};
+static char    buf[257];
 
 static bool    new_play;       /* set if move on to new player         */
 
+static void show_move __P((void));
+
 /*
  *     This routine executes the given command by index number
  */
+void
 execute(com_num)
-reg int        com_num; {
-
+       int com_num; 
+{
        new_play = FALSE;       /* new_play is true if fixing   */
        (*func[com_num])();
        notify();
@@ -68,13 +77,15 @@ reg int     com_num; {
        else if (num_doub)
                printf("%s rolled doubles.  Goes again\n", cur_p->name);
 }
+
 /*
  *     This routine moves a piece around.
  */
-do_move() {
-
-       reg int         r1, r2;
-       reg bool        was_jail;
+void
+do_move() 
+{
+       int r1, r2;
+       bool was_jail;
 
        new_play = was_jail = FALSE;
        printf("roll is %d, %d\n", r1=roll(1, 6), r2=roll(1, 6));
@@ -99,13 +110,15 @@ do_move() {
 ret:
        return;
 }
+
 /*
  *     This routine moves a normal move
  */
+void
 move(rl)
-reg int        rl; {
-
-       reg int old_loc;
+       int rl; 
+{
+       int old_loc;
 
        old_loc = cur_p->loc;
        cur_p->loc = (cur_p->loc + rl) % N_SQRS;
@@ -115,12 +128,14 @@ reg int   rl; {
        }
        show_move();
 }
+
 /*
  *     This routine shows the results of a move
  */
-show_move() {
-
-       reg SQUARE      *sqp;
+static void
+show_move() 
+{
+       SQUARE *sqp;
 
        sqp = &board[cur_p->loc];
        printf("That puts you on %s\n", sqp->name);
@@ -148,7 +163,7 @@ show_move() {
                                cur_p->money -= sqp->cost;
                        }
                        else if (num_play > 2)
-                               bid(sqp);
+                               bid();
                }
                else if (sqp->owner == player)
                        printf("You own it.\n");
@@ -156,17 +171,18 @@ show_move() {
                        rent(sqp);
        }
 }
+
 /*
  *     This routine saves the current game for use at a later date
  */
-save() {
-
-       reg char        *sp;
-       reg int         outf, num;
-       time_t          t;
-       int             *dat_end;
-       struct stat     sb;
-       unsgn           start, end;
+void
+save() 
+{
+       char *sp;
+       int outf, num;
+       time_t t;
+       struct stat sb;
+       char *start, *end;
 
        printf("Which file do you wish to save it in? ");
        sp = buf;
@@ -179,7 +195,7 @@ save() {
         */
 
        if (stat(buf, &sb) > -1
-           && getyn("File exists.  Do you wish to overwrite? ", yn_only) > 0)
+           && getyn("File exists.  Do you wish to overwrite? ") > 0)
                return;
 
        if ((outf=creat(buf, 0644)) < 0) {
@@ -192,11 +208,7 @@ save() {
        for (sp = buf; *sp != '\n'; sp++)
                continue;
        *sp = '\0';
-# if 0
-       start = (((int) etext + (SEGSIZE-1)) / SEGSIZE ) * SEGSIZE;
-# else
        start = 0;
-# endif
        end = sbrk(0);
        while (start < end) {           /* write out entire data space */
                num = start + 16 * 1024 > end ? end - start : 16 * 1024;
@@ -206,12 +218,14 @@ save() {
        close(outf);
        printf("[%s]\n", buf);
 }
+
 /*
  *     This routine restores an old game from a file
  */
-restore() {
-
-       reg char        *sp;
+void
+restore() 
+{
+       char *sp;
 
        printf("Which file do you wish to restore from? ");
        for (sp = buf; (*sp=getchar()) != '\n'; sp++)
@@ -219,20 +233,22 @@ restore() {
        *sp = '\0';
        rest_f(buf);
 }
+
 /*
  *     This does the actual restoring.  It returns TRUE if the
  * backup was successful, else false.
  */
+int
 rest_f(file)
-reg char       *file; {
-
-       reg char        *sp;
-       reg int         inf, num;
-       char            buf[80];
-       unsgn           start, end;
-       STAT            sbuf;
+       const char *file; 
+{
+       char *sp;
+       int inf, num;
+       char buf[80];
+       char *start, *end;
+       STAT sbuf;
 
-       if ((inf=open(file, 0)) < 0) {
+       if ((inf=open(file, O_RDONLY)) < 0) {
                perror(file);
                return FALSE;
        }
@@ -241,11 +257,7 @@ reg char   *file; {
                perror(file);
                exit(1);
        }
-# if 0
-       start = (((int) etext + (SEGSIZE-1)) / SEGSIZE ) * SEGSIZE;
-# else
        start = 0;
-# endif
        brk(end = start + sbuf.st_size);
        while (start < end) {           /* write out entire data space */
                num = start + 16 * 1024 > end ? end - start : 16 * 1024;