Fix merge conflicts

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

diff --git a/monop/misc.c b/monop/misc.c
index 3f8810725153c3281656f357a74b9e9d8dda87db..aaa9eb3d5b84d6fbc42f79210ea3470e41d443ab 100644 (file)
--- a/monop/misc.c
+++ b/monop/misc.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: misc.c,v 1.21 2009/08/12 08:10:49 dholland Exp $       */
+/*     $NetBSD: misc.c,v 1.23 2012/06/19 05:35:32 dholland Exp $       */
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)misc.c     8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: misc.c,v 1.21 2009/08/12 08:10:49 dholland Exp $");
+__RCSID("$NetBSD: misc.c,v 1.23 2012/06/19 05:35:32 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -52,8 +52,7 @@ static void is_monop(MON *, int);
  * "yes or "no" answer is gotten.
  */
 int
-getyn(prompt)
-       const char *prompt;
+getyn(const char *prompt)
 {
        int com;
 
@@ -68,7 +67,7 @@ getyn(prompt)
  *     This routine tells the player if he's out of money.
  */
 void
-notify()
+notify(void)
 {
        if (cur_p->money < 0)
                printf("That leaves you $%d in debt\n", -cur_p->money);
@@ -84,7 +83,7 @@ notify()
  *     This routine switches to the next player
  */
 void
-next_play()
+next_play(void)
 {
        player = (player + 1) % num_play;
        cur_p = &play[player];
@@ -96,8 +95,7 @@ next_play()
  * given prompt.
  */
 int
-get_int(prompt)
-       const char *prompt;
+get_int(const char *prompt)
 {
        long num;
        char *sp;
@@ -106,8 +104,9 @@ get_int(prompt)
        for (;;) {
                printf("%s", prompt);
                fgets(buf, sizeof(buf), stdin);
+               /* if stdin is closed we cant really play anymore */
                if (feof(stdin))
-                       return 0;
+                       quit();
                sp = strchr(buf, '\n');
                if (sp)
                        *sp = '\0';
@@ -125,8 +124,7 @@ get_int(prompt)
  *     This routine sets the monopoly flag from the list given.
  */
 void
-set_ownlist(pl)
-       int pl;
+set_ownlist(int pl)
 {
        int num;                /* general counter              */
        MON *orig;              /* remember starting monop ptr  */
@@ -237,9 +235,7 @@ set_ownlist(pl)
  *     This routine sets things up as if it is a new monopoly
  */
 static void
-is_monop(mp, pl)
-       MON *mp;
-       int pl;
+is_monop(MON *mp, int pl)
 {
        int i;
 
@@ -254,8 +250,7 @@ is_monop(mp, pl)
  *     This routine sets things up as if it is no longer a monopoly
  */
 void
-is_not_monop(mp)
-       MON *mp;
+is_not_monop(MON *mp)
 {
        int i;
 
@@ -269,7 +264,7 @@ is_not_monop(mp)
  *     This routine gives a list of the current player's routine
  */
 void
-list()
+list(void)
 {
        printhold(player);
 }
@@ -278,7 +273,7 @@ list()
  *     This routine gives a list of a given players holdings
  */
 void
-list_all()
+list_all(void)
 {
        int pl;
 
@@ -291,9 +286,14 @@ list_all()
  *     This routine gives the players a chance before it exits.
  */
 void
-quit()
+quit(void)
 {
        putchar('\n');
+
+       /* We dont even have a chance to input y/n if stdin is closed */
+       if (feof(stdin))
+               exit(0);
+
        if (getyn("Do you all really want to quit? ") == 0)
                exit(0);
 }