use symbolic constant for open(), PR#5867

[bsdgames-darwin.git] / trek / getpar.c

diff --git a/trek/getpar.c b/trek/getpar.c
index 701420133ee9590fb9ab62adbc73ca23ec38b710..c35cd90d1f0b629da91d8e165b10411937c21c9c 100644 (file)
--- a/trek/getpar.c
+++ b/trek/getpar.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: getpar.c,v 1.6 1997/10/13 22:12:01 cjs 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
@@ -31,21 +33,31 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-static char sccsid[] = "@(#)getpar.c   4.8 (Berkeley) 6/1/90";
+#if 0
+static char sccsid[] = "@(#)getpar.c   8.1 (Berkeley) 5/31/93";
+#else
+__RCSID("$NetBSD: getpar.c,v 1.6 1997/10/13 22:12:01 cjs Exp $");
+#endif
 #endif /* not lint */
 
-# include      <stdio.h>
-# include      "getpar.h"
+#include <stdio.h>
+#include <string.h>
+#include "getpar.h"
+#include "trek.h"
+
+static int testterm __P((void));
 
 /**
  **    get integer parameter
  **/
 
+int
 getintpar(s)
 char   *s;
 {
-       register int    i;
+       int     i;
        int             n;
 
        while (1)
@@ -69,7 +81,7 @@ char  *s;
 double getfltpar(s)
 char   *s;
 {
-       register int            i;
+       int             i;
        double                  d;
 
        while (1)
@@ -92,18 +104,19 @@ char       *s;
 
 struct cvntab  Yntab[] =
 {
-       "y",    "es",   (int (*)())1,   0,
-       "n",    "o",    (int (*)())0,   0,
-       0
+       { "y",  "es",   (cmdfun)1,      1 },
+       { "n",  "o",    (cmdfun)0,      0 },
+       { NULL, NULL,   NULL,           0 }
 };
 
+int
 getynpar(s)
 char   *s;
 {
        struct cvntab           *r;
 
        r = getcodpar(s, Yntab);
-       return ((int) r->value);
+       return r->value2;
 }
 
 
@@ -116,9 +129,9 @@ char                *s;
 struct cvntab  tab[];
 {
        char                            input[100];
-       register struct cvntab          *r;
+       struct cvntab           *r;
        int                             flag;
-       register char                   *p, *q;
+       char                    *p, *q;
        int                             c;
        int                             f;
 
@@ -143,7 +156,8 @@ struct cvntab       tab[];
                        c = 4;
                        for (r = tab; r->abrev; r++)
                        {
-                               concat(r->abrev, r->full, input);
+                               strcpy(input, r->abrev);
+                               strcat(input, r->full);
                                printf("%14.14s", input);
                                if (--c > 0)
                                        continue;
@@ -188,15 +202,16 @@ struct cvntab     tab[];
  **    get string parameter
  **/
 
+void
 getstrpar(s, r, l, t)
 char   *s;
 char   *r;
 int    l;
 char   *t;
 {
-       register int    i;
+       int     i;
        char            format[20];
-       register int    f;
+       int     f;
 
        if (t == 0)
                t = " \t\n;";
@@ -221,9 +236,10 @@ char       *t;
  **    test if newline is next valid character
  **/
 
+int
 testnl()
 {
-       register char           c;
+       char            c;
 
        while ((c = cgetc(0)) != '\n')
                if ((c >= '0' && c <= '9') || c == '.' || c == '!' ||
@@ -242,8 +258,9 @@ testnl()
  **    scan for newline
  **/
 
+void
 skiptonl(c)
-char   c;
+int    c;
 {
        while (c != '\n')
                if (!(c = cgetc(0)))
@@ -257,9 +274,10 @@ char       c;
  **    test for valid terminator
  **/
 
+static int
 testterm()
 {
-       register char           c;
+       char            c;
 
        if (!(c = cgetc(0)))
                return (1);
@@ -279,12 +297,13 @@ testterm()
 **     zero is returned.
 */
 
+int
 readdelim(d)
 char   d;
 {
-       register char   c;
+       char    c;
 
-       while (c = cgetc(0))
+       while ((c = cgetc(0)) != '\0')
        {
                if (c == d)
                        return (1);