cgram: in hinting mode, show all correct characters in bold face

[bsdgames-darwin.git] / hack / makedefs.c

diff --git a/hack/makedefs.c b/hack/makedefs.c
index 3aa621c698913b99ac792f488b296d190e0657ed..3eadc8b19772edea6f8038db4f935cf342206734 100644 (file)
--- a/hack/makedefs.c
+++ b/hack/makedefs.c
@@ -1,15 +1,73 @@
-/* $NetBSD: makedefs.c,v 1.6 2000/07/31 11:35:03 simonb Exp $ */
+/* $NetBSD: makedefs.c,v 1.8 2003/04/02 18:36:42 jsm Exp $ */
 
 /*
- * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985.
+ * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
+ * Amsterdam
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * - Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * - 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.
+ *
+ * - Neither the name of the Stichting Centrum voor Wiskunde en
+ * Informatica, nor the names of its contributors may be used to endorse or
+ * promote products derived from this software without specific prior
+ * written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * Copyright (c) 1982 Jay Fenlason <hack@gnu.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 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. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+ * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef lint
-static char rcsid[] =
-    "$NetBSD: makedefs.c,v 1.6 2000/07/31 11:35:03 simonb Exp $";
+static const char rcsid[] =
+    "$NetBSD: makedefs.c,v 1.8 2003/04/02 18:36:42 jsm Exp $";
 #endif                         /* not lint */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <fcntl.h>
 #include <unistd.h>
@@ -23,7 +81,7 @@ char            string[STRSZ];
 
 static void readline(void);
 static char nextchar(void);
-static int skipuntil(char *);
+static int skipuntil(const char *);
 static int getentry(void);
 static void capitalize(char *);
 static int letter(int);
@@ -43,7 +101,7 @@ main(argc, argv)
                (void) fprintf(stderr, "usage: makedefs file\n");
                exit(1);
        }
-       if ((fd = open(argv[1], 0)) < 0) {
+       if ((fd = open(argv[1], O_RDONLY)) < 0) {
                perror(argv[1]);
                exit(1);
        }
@@ -74,6 +132,11 @@ main(argc, argv)
        printf("#define LAST_GEM        (JADE+1)\n");
        printf("#define LAST_RING       %d\n", propct);
        printf("#define NROFOBJECTS     %d\n", i - 1);
+       fflush(stdout);
+       if (ferror(stdout)) {
+               perror("standard output");
+               exit(1);
+       }
        exit(0);
 }
 
@@ -105,9 +168,10 @@ nextchar()
 
 static int
 skipuntil(s)
-       char           *s;
+       const char           *s;
 {
-       char           *sp0, *sp1;
+       const char *sp0;
+       char *sp1;
 loop:
        while (*s != nextchar())
                if (eof) {