cgram: allow navigation with KEY_PPAGE and KEY_NPAGE

[bsdgames-darwin.git] / battlestar / getcom.c

diff --git a/battlestar/getcom.c b/battlestar/getcom.c
index 5d68738c3a57a787dec2febbc02a20799116a9d5..7e13b5f92799fd442877fad8adccfb5d909fcec3 100644 (file)
--- a/battlestar/getcom.c
+++ b/battlestar/getcom.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: getcom.c,v 1.9 2000/09/21 17:44:34 jsm Exp $   */
+/*     $NetBSD: getcom.c,v 1.14 2012/01/16 17:38:16 christos Exp $     */
 
 /*
  * Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -38,33 +34,36 @@
 #if 0
 static char sccsid[] = "@(#)getcom.c   8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: getcom.c,v 1.9 2000/09/21 17:44:34 jsm Exp $");
+__RCSID("$NetBSD: getcom.c,v 1.14 2012/01/16 17:38:16 christos Exp $");
 #endif
 #endif                         /* not lint */
 
 #include "extern.h"
 
-char   *
-getcom(buf, size, prompt, error)
-       char   *buf;
-       int     size;
-       const char   *prompt, *error;
+char *
+getcom(char *buf, int size, const char *prompt, const char *error)
 {
        for (;;) {
                fputs(prompt, stdout);
-               if (fgets(buf, size, stdin) == 0) {
+               if (fgets(buf, size, stdin) == NULL) {
                        if (feof(stdin))
                                die();
                        clearerr(stdin);
                        continue;
                }
-               while (isspace(*buf))
+               while (isspace((unsigned char)*buf))
                        buf++;
                if (*buf)
                        break;
                if (error)
                        puts(error);
        }
+       /* If we didn't get to the end of line, don't read it in next time. */
+       if (buf[strlen(buf) - 1] != '\n') {
+               int i;
+               while ((i = getchar()) != '\n' && i != EOF)
+                       continue;
+       }
        return (buf);
 }
 
@@ -74,32 +73,33 @@ getcom(buf, size, prompt, error)
  * and leaves it unchanged if flag = 0
  */
 char   *
-getword(buf1, buf2, flag)
-       char   *buf1, *buf2;
-       int     flag;
+getword(char *buf1, char *buf2, int flag)
 {
        int cnt;
 
        cnt = 1;
-       while (isspace(*buf1))
+       while (isspace((unsigned char)*buf1))
                buf1++;
        if (*buf1 != ',') {
                if (!*buf1) {
                        *buf2 = 0;
                        return (0);
                }
-               while (cnt < WORDLEN && *buf1 && !isspace(*buf1) && *buf1 != ',')
+               while (cnt < WORDLEN && *buf1 && 
+                   !isspace((unsigned char)*buf1) && *buf1 != ',')
                        if (flag < 0) {
-                               if (isupper(*buf1)) {
-                                       *buf2++ = tolower(*buf1++);
+                               if (isupper((unsigned char)*buf1)) {
+                                       *buf2++ = 
+                                           tolower((unsigned char)*buf1++);
                                        cnt++;
                                } else {
                                        *buf2++ = *buf1++;
                                        cnt++;
                                }
                        } else if (flag > 0) {
-                               if (islower(*buf1)) {
-                                       *buf2++ = toupper(*buf1++);
+                               if (islower((unsigned char)*buf1)) {
+                                       *buf2++ = 
+                                           toupper((unsigned char)*buf1++);
                                        cnt++;
                                } else {
                                        *buf2++ = *buf1++;
@@ -110,12 +110,12 @@ getword(buf1, buf2, flag)
                                cnt++;
                        }
                if (cnt == WORDLEN)
-                       while (*buf1 && !isspace(*buf1))
+                       while (*buf1 && !isspace((unsigned char)*buf1))
                                buf1++;
        } else
                *buf2++ = *buf1++;
        *buf2 = '\0';
-       while (isspace(*buf1))
+       while (isspace((unsigned char)*buf1))
                buf1++;
        return (*buf1 ? buf1 : NULL);
 }