sprinkle static

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

diff --git a/monop/getinp.c b/monop/getinp.c
index cd0253c9a4165f1e72e33bdc0b39ec3fb5166825..48730f77791a294ad119ec85e31fad5ed5a47368 100644 (file)
--- a/monop/getinp.c
+++ b/monop/getinp.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: getinp.c,v 1.14 2006/01/20 21:40:08 elad Exp $ */
+/*     $NetBSD: getinp.c,v 1.18 2008/02/24 01:57:34 dholland Exp $     */
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,14 +34,15 @@
 #if 0
 static char sccsid[] = "@(#)getinp.c   8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: getinp.c,v 1.14 2006/01/20 21:40:08 elad Exp $");
+__RCSID("$NetBSD: getinp.c,v 1.18 2008/02/24 01:57:34 dholland Exp $");
 #endif
 #endif /* not lint */
 
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
-#include "monop.ext"
+
+#include "monop.h"
 
 #define        LINE    70
 
@@ -50,37 +51,32 @@ static char buf[257];
 static int comp(const char *);
 
 int
-getinp(prompt, list)
-       const char *prompt, *const list[]; 
+getinp(prompt, lst)
+       const char *prompt, *const lst[];
 {
        int i, n_match, match = 0;
        char *sp;
-       int c;
 
        for (;;) {
                printf("%s", prompt);
-               for (sp = buf; (c=getchar()) != '\n'; ) {
-                       if (c == -1)
-                               return 0;
-                       *sp = c;
-                       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');
@@ -88,11 +84,12 @@ getinp(prompt, list)
                        }
                        continue;
                }
-               *sp = '\0';
+               if ((sp = strchr(buf, '\n')) != NULL)
+                       *sp = '\0';
                for (sp = buf; *sp; sp++)
                        *sp = tolower((unsigned char)*sp);
-               for (i = n_match = 0; list[i]; i++)
-                       if (comp(list[i])) {
+               for (i = n_match = 0; lst[i]; i++)
+                       if (comp(lst[i])) {
                                n_match++;
                                match = i;
                        }