Greatly simplify these by using <bsd.hostprog.mk>. Should do the same

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

diff --git a/monop/misc.c b/monop/misc.c
index 836437a48f265017c9b6bd1907e5aaf68d560e4b..635604c68834cc1e6554f2b055e9f05a4926c4bf 100644 (file)
--- a/monop/misc.c
+++ b/monop/misc.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: misc.c,v 1.9 1999/09/30 18:01:32 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
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions


@@ -31,43 +33,28 @@
  * SUCH DAMAGE.
  */
 
  * SUCH DAMAGE.
  */
 

+#include <sys/cdefs.h>

 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)misc.c     5.5 (Berkeley) 2/28/91";
+#if 0
+static char sccsid[] = "@(#)misc.c     8.1 (Berkeley) 5/31/93";
+#else
+__RCSID("$NetBSD: misc.c,v 1.9 1999/09/30 18:01:32 jsm Exp $");
+#endif

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

-# include      "monop.ext"
-# include      <ctype.h>
-# include      <signal.h>
-
-# define       execsh(sh)      execl(sh, shell_name[roll(1, num_names)-1], 0)
-
-static char    *shell_def      = "/bin/csh",
-               *shell_name[]   = {
-                       ".Hi Mom!",
-                       ".Kick Me",
-                       ".I'm really the next process down",
-                       ".Hi Kids!",
-                       ".This space for rent",
-                       ".Singin' in the rain....",
-                       ".I am but a Cog in the Wheel of Life",
-                       ".Look out!!! Behind you!!!!!",
-                       ".Looking for a good time, sailor?",
-                       ".I don't get NO respect...",
-                       ".Augghh!  You peeked!"
-               };
-
-static int     num_names       = sizeof shell_name / sizeof (char *);;
-
-char   *shell_in();
+#include "monop.ext"
+#include <ctype.h>
+#include <signal.h>

 
 /*
  *     This routine executes a truncated set of commands until a
  * "yes or "no" answer is gotten.
  */
 
 /*
  *     This routine executes a truncated set of commands until a
  * "yes or "no" answer is gotten.
  */

+int

 getyn(prompt)
 getyn(prompt)

-reg char       *prompt; {
-
-       reg int com;
+       const char *prompt;
+{
+       int com;

 
        for (;;)
                if ((com=getinp(prompt, yn)) < 2)
 
        for (;;)
                if ((com=getinp(prompt, yn)) < 2)


@@ -75,11 +62,13 @@ reg char    *prompt; {
                else
                        (*func[com-2])();
 }
                else
                        (*func[com-2])();
 }

+

 /*
  *     This routine tells the player if he's out of money.
  */
 /*
  *     This routine tells the player if he's out of money.
  */

-notify() {
-
+void
+notify()
+{

        if (cur_p->money < 0)
                printf("That leaves you $%d in debt\n", -cur_p->money);
        else if (cur_p->money == 0)
        if (cur_p->money < 0)
                printf("That leaves you $%d in debt\n", -cur_p->money);
        else if (cur_p->money == 0)


@@ -89,33 +78,39 @@ notify() {
                told_em = TRUE;
        }
 }
                told_em = TRUE;
        }
 }

+

 /*
  *     This routine switches to the next player
  */
 /*
  *     This routine switches to the next player
  */

-next_play() {
-
+void
+next_play()
+{

        player = ++player % num_play;
        cur_p = &play[player];
        num_doub = 0;
 }
        player = ++player % num_play;
        cur_p = &play[player];
        num_doub = 0;
 }

+

 /*
  *     This routine gets an integer from the keyboard after the
  * given prompt.
  */
 /*
  *     This routine gets an integer from the keyboard after the
  * given prompt.
  */

+int

 get_int(prompt)
 get_int(prompt)

-reg char       *prompt; {
-
-       reg int         num;
-       reg char        *sp;
-       char            buf[257];
+       const char *prompt;
+{
+       int num;
+       char *sp;
+       int c;
+       char buf[257];

 
        for (;;) {
 inter:
                printf(prompt);
                num = 0;
 
        for (;;) {
 inter:
                printf(prompt);
                num = 0;

-               for (sp = buf; (*sp=getchar()) != '\n'; sp++)
-                       if (*sp == -1)  /* check for interrupted system call */
+               for (sp = buf; (c=getchar()) != '\n'; *sp++ = c)
+                       if (c == -1)    /* check for interrupted system call */

                                goto inter;
                                goto inter;

+               *sp = c;

                if (sp == buf)
                        continue;
                for (sp = buf; isspace(*sp); sp++)
                if (sp == buf)
                        continue;
                for (sp = buf; isspace(*sp); sp++)


@@ -128,16 +123,18 @@ inter:
                        printf("I can't understand that\n");
        }
 }
                        printf("I can't understand that\n");
        }
 }

+

 /*
  *     This routine sets the monopoly flag from the list given.
  */
 /*
  *     This routine sets the monopoly flag from the list given.
  */

+void

 set_ownlist(pl)
 set_ownlist(pl)

-int    pl; {
-
-       reg int num;            /* general counter              */
-       reg MON *orig;          /* remember starting monop ptr  */
-       reg OWN *op;            /* current owned prop           */
-       OWN     *orig_op;               /* origianl prop before loop    */
+       int pl;
+{
+       int num;                /* general counter              */
+       MON *orig;              /* remember starting monop ptr  */
+       OWN *op;                /* current owned prop           */
+       OWN *orig_op;           /* origianl prop before loop    */

 
        op = play[pl].own_list;
 #ifdef DEBUG
 
        op = play[pl].own_list;
 #ifdef DEBUG


@@ -152,7 +149,8 @@ int pl; {
 #ifdef DEBUG
                        printf("  case UTIL:\n");
 #endif
 #ifdef DEBUG
                        printf("  case UTIL:\n");
 #endif

-                       for (num = 0; op && op->sqr->type == UTIL; op = op->next)
+                       for (num = 0; op && op->sqr->type == UTIL;
+                           op = op->next)

                                num++;
                        play[pl].num_util = num;
 #ifdef DEBUG
                                num++;
                        play[pl].num_util = num;
 #ifdef DEBUG


@@ -163,10 +161,13 @@ int       pl; {
 #ifdef DEBUG
                        printf("  case RR:\n");
 #endif
 #ifdef DEBUG
                        printf("  case RR:\n");
 #endif

-                       for (num = 0; op && op->sqr->type == RR; op = op->next) {
+                       for (num = 0; op && op->sqr->type == RR;
+                           op = op->next) {

 #ifdef DEBUG
                                printf("iter: %d\n", num);
 #ifdef DEBUG
                                printf("iter: %d\n", num);

-                               printf("op = %d, op->sqr = %d, op->sqr->type = %d\n", op, op->sqr, op->sqr->type);
+                               printf("op = %d, op->sqr = %d, "
+                                   "op->sqr->type = %d\n", op, op->sqr,
+                                   op->sqr->type);

 #endif
                                num++;
                        }
 #endif
                                num++;
                        }


@@ -199,17 +200,21 @@ int       pl; {
                        printf("num = %d\n");
 #endif
                        if (orig == 0) {
                        printf("num = %d\n");
 #endif
                        if (orig == 0) {

-                               printf("panic:  bad monopoly descriptor: orig = %d\n", orig);
+                               printf("panic:  bad monopoly descriptor: "
+                                   "orig = %p\n", orig);

                                printf("player # %d\n", pl+1);
                                printhold(pl);
                                printf("player # %d\n", pl+1);
                                printhold(pl);

-                               printf("orig_op = %d\n", orig_op);
-                               printf("orig_op->sqr->type = %d (PRPTY)\n", op->sqr->type);
-                               printf("orig_op->next = %d\n", op->next);
-                               printf("orig_op->sqr->desc = %d\n", op->sqr->desc);
-                               printf("op = %d\n", op);
-                               printf("op->sqr->type = %d (PRPTY)\n", op->sqr->type);
-                               printf("op->next = %d\n", op->next);
-                               printf("op->sqr->desc = %d\n", op->sqr->desc);
+                               printf("orig_op = %p\n", orig_op);
+                               printf("orig_op->sqr->type = %d (PRPTY)\n",
+                                   op->sqr->type);
+                               printf("orig_op->next = %p\n", op->next);
+                               printf("orig_op->sqr->desc = %p\n",
+                                   op->sqr->desc);
+                               printf("op = %p\n", op);
+                               printf("op->sqr->type = %d (PRPTY)\n",
+                                   op->sqr->type);
+                               printf("op->next = %p\n", op->next);
+                               printf("op->sqr->desc = %p\n", op->sqr->desc);

                                printf("num = %d\n", num);
                        }
 #ifdef DEBUG
                                printf("num = %d\n", num);
                        }
 #ifdef DEBUG


@@ -218,20 +223,21 @@ int       pl; {
                        if (num == orig->num_in)
                                is_monop(orig, pl);
                        else
                        if (num == orig->num_in)
                                is_monop(orig, pl);
                        else

-                               isnot_monop(orig);
+                               is_not_monop(orig);

                        break;
                }
        }
 }
                        break;
                }
        }
 }

+

 /*
  *     This routine sets things up as if it is a new monopoly
  */
 /*
  *     This routine sets things up as if it is a new monopoly
  */

+void

 is_monop(mp, pl)
 is_monop(mp, pl)

-reg MON        *mp;
-int    pl; {
-
-       reg char        *sp;
-       reg int         i;
+       MON *mp;
+       int pl;
+{
+       int i;

 
        mp->owner = pl;
        mp->num_own = mp->num_in;
 
        mp->owner = pl;
        mp->num_own = mp->num_in;


@@ -239,121 +245,51 @@ int      pl; {
                mp->sq[i]->desc->monop = TRUE;
        mp->name = mp->mon_n;
 }
                mp->sq[i]->desc->monop = TRUE;
        mp->name = mp->mon_n;
 }

+

 /*
  *     This routine sets things up as if it is no longer a monopoly
  */
 /*
  *     This routine sets things up as if it is no longer a monopoly
  */

-isnot_monop(mp)
-reg MON        *mp; {
-
-       reg char        *sp;
-       reg int         i;
+void
+is_not_monop(mp)
+       MON *mp;
+{
+       int i;

 
        mp->owner = -1;
        for (i = 0; i < mp->num_in; i++)
                mp->sq[i]->desc->monop = FALSE;
        mp->name = mp->not_m;
 }
 
        mp->owner = -1;
        for (i = 0; i < mp->num_in; i++)
                mp->sq[i]->desc->monop = FALSE;
        mp->name = mp->not_m;
 }

+

 /*
  *     This routine gives a list of the current player's routine
  */
 /*
  *     This routine gives a list of the current player's routine
  */

-list() {
-
+void
+list()
+{

        printhold(player);
 }
        printhold(player);
 }

+

 /*
  *     This routine gives a list of a given players holdings
  */
 /*
  *     This routine gives a list of a given players holdings
  */

-list_all() {
-
-       reg int pl;
+void
+list_all()
+{
+       int pl;

 
 

-       while ((pl=getinp("Whose holdings do you want to see? ", name_list)) < num_play)
+       while ((pl = getinp("Whose holdings do you want to see? ", name_list))
+           < num_play)

                printhold(pl);
 }
                printhold(pl);
 }

+

 /*
  *     This routine gives the players a chance before it exits.
  */
 void
 /*
  *     This routine gives the players a chance before it exits.
  */
 void

-quit() {
-
+quit()
+{

        putchar('\n');
        putchar('\n');

-       if (getyn("Do you all really want to quit? ", yn) == 0)
+       if (getyn("Do you all really want to quit? ") == 0)

                exit(0);
                exit(0);

-       signal(SIGINT, quit);
-}
-/*
- *     This routine copies one structure to another
- */
-cpy_st(s1, s2, size)
-reg int        *s1, *s2, size; {
-
-       size /= 2;
-       while (size--)
-               *s1++ = *s2++;
-}
-/*
- *     This routine forks off a shell.  It uses the users login shell
- */
-shell_out() {
-
-       static char     *shell = NULL;
-
-       printline();
-       if (shell == NULL)
-               shell = shell_in();
-       fflush(stdout);
-       if (!fork()) {
-               signal(SIGINT, SIG_DFL);
-               execsh(shell);
-       }
-       ignoresigs();
-       wait();
-       resetsigs();
-       putchar('\n');
-       printline();
-}
-/*
- *     This routine looks up the users login shell
- */
-# include      <sys/types.h>
-# include      <pwd.h>
-
-char           *getenv();
-
-char *
-shell_in() {
-
-       reg struct passwd       *pp;
-       reg char                *sp;
-
-       if ((sp = getenv("SHELL")) == NULL) {
-               pp = getpwuid(getuid());
-               if (pp->pw_shell[0] != '\0')
-                       return pp->pw_shell;
-               else
-                       return shell_def;
-               /*return (*(pp->pw_shell) != '\0' ? pp->pw_shell : shell_def);*/
-       }
-       return sp;
-}
-/*
- *     This routine sets things up to ignore all the signals.
- */
-ignoresigs() {
-
-       reg int i;
-
-       for (i = 0; i < NSIG; i++)
-               signal(i, SIG_IGN);
-}
-/*
- *     This routine sets up things as they were before.
- */
-resetsigs() {
-
-       reg int i;
-
-       for (i = 0; i < NSIG; i++)
-               signal(i, SIG_DFL);
-       signal(SIGINT, quit);

 }
 }