Fix merge conflicts

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

diff --git a/monop/getinp.c b/monop/getinp.c
index 9c4f948c176bbddf5e653722c19f54a51ef59d8b..3d0dc637f04dc359343f9ca4f5fd05cd6b717d79 100644 (file)
--- a/monop/getinp.c
+++ b/monop/getinp.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: getinp.c,v 1.11 2003/08/07 09:37:27 agc Exp $  */
+/*     $NetBSD: getinp.c,v 1.19 2012/06/19 05:35:32 dholland Exp $     */
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,54 +34,48 @@
 #if 0
 static char sccsid[] = "@(#)getinp.c   8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: getinp.c,v 1.11 2003/08/07 09:37:27 agc Exp $");
+__RCSID("$NetBSD: getinp.c,v 1.19 2012/06/19 05:35:32 dholland Exp $");
 #endif
 #endif /* not lint */
 
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
-#include "monop.ext"
+
+#include "monop.h"
 
 #define        LINE    70
 
 static char    buf[257];
 
-static int comp __P((const char *));
+static int comp(const char *);
 
 int
-getinp(prompt, list)
-       const char *prompt, *const list[]; 
+getinp(const char *prompt, const char *const lst [])
 {
        int i, n_match, match = 0;
        char *sp;
-       int c;
 
        for (;;) {
-inter:
                printf("%s", prompt);
-               for (sp = buf; (c=getchar()) != '\n'; ) {
-                       *sp = c;
-                       if (c == -1)    /* check for interrupted system call */
-                               goto inter;
-                       else if (sp != buf || *sp != ' ')
-                               sp++;
+               fgets(buf, sizeof(buf), stdin);
+               if (feof(stdin)) {
+                       return 0;
                }
-               *sp = c;
                if (buf[0] == '?' && buf[1] == '\n') {
                        printf("Valid inputs are: ");
-                       for (i = 0, match = 18; list[i]; i++) {
-                               if ((match+=(n_match=strlen(list[i]))) > LINE) {
+                       for (i = 0, match = 18; lst[i]; i++) {
+                               if ((match+=(n_match=strlen(lst[i]))) > LINE) {
                                        printf("\n\t");
                                        match = n_match + 8;
                                }
-                               if (*list[i] == '\0') {
+                               if (*lst[i] == '\0') {
                                        match += 8;
                                        printf("<RETURN>");
                                }
                                else
-                                       printf("%s", list[i]);
-                               if (list[i+1])
+                                       printf("%s", lst[i]);
+                               if (lst[i+1])
                                        printf(", ");
                                else
                                        putchar('\n');
@@ -89,12 +83,12 @@ inter:
                        }
                        continue;
                }
-               *sp = '\0';
+               if ((sp = strchr(buf, '\n')) != NULL)
+                       *sp = '\0';
                for (sp = buf; *sp; sp++)
-                       if (isupper(*sp))
-                               *sp = tolower(*sp);
-               for (i = n_match = 0; list[i]; i++)
-                       if (comp(list[i])) {
+                       *sp = tolower((unsigned char)*sp);
+               for (i = n_match = 0; lst[i]; i++)
+                       if (comp(lst[i])) {
                                n_match++;
                                match = i;
                        }
@@ -107,15 +101,14 @@ inter:
 }
 
 static int
-comp(s1)
-       const char *s1;
+comp(const char *s1)
 {
        const char *sp, *tsp;
        char c;
 
        if (buf[0] != '\0')
                for (sp = buf, tsp = s1; *sp; ) {
-                       c = isupper(*tsp) ? tolower(*tsp) : *tsp;
+                       c = tolower((unsigned char)*tsp);
                        tsp++;
                        if (c != *sp++)
                                return 0;