I'm guessing that there should be no space between the hyphen and

[bsdgames-darwin.git] / fortune / strfile / strfile.c

diff --git a/fortune/strfile/strfile.c b/fortune/strfile/strfile.c
index 93adf45f9683b97371a7dee174f30659c0fe8e68..15509370e2aebb92b19235862f6db7cd09743d28 100644 (file)
--- a/fortune/strfile/strfile.c
+++ b/fortune/strfile/strfile.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: strfile.c,v 1.16 1999/12/30 01:32:33 simonb Exp $      */
+/*     $NetBSD: strfile.c,v 1.25 2007/12/18 08:45:03 dogcow Exp $      */
 
 /*-
  * Copyright (c) 1989, 1993
@@ -15,11 +15,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.
  *
@@ -47,11 +43,13 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
 #if 0
 static char sccsid[] = "@(#)strfile.c  8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: strfile.c,v 1.16 1999/12/30 01:32:33 simonb Exp $");
+__RCSID("$NetBSD: strfile.c,v 1.25 2007/12/18 08:45:03 dogcow Exp $");
 #endif
 #endif /* not lint */
 #endif /* __NetBSD__ */
 
+/* n.b.: this file is used at build-time - i.e. during build.sh. */
+
 # include      <sys/types.h>
 # include      <sys/param.h>
 # include      <ctype.h>
@@ -70,8 +68,23 @@ __RCSID("$NetBSD: strfile.c,v 1.16 1999/12/30 01:32:33 simonb Exp $");
 # define       MAXPATHLEN      1024
 # endif        /* MAXPATHLEN */
 
+u_int32_t
+h2nl(u_int32_t h)
+{
+        unsigned char c[4];
+        u_int32_t rv;
+
+        c[0] = (h >> 24) & 0xff;
+        c[1] = (h >> 16) & 0xff;
+        c[2] = (h >>  8) & 0xff;
+        c[3] = (h >>  0) & 0xff;
+        memcpy(&rv, c, sizeof rv);
+
+        return (rv);
+}
+
 /*
- *     This program takes a file composed of strings seperated by
+ *     This program takes a file composed of strings separated by
  * lines starting with two consecutive delimiting character (default
  * character is '%') and creates another file which consists of a table
  * describing the file (structure from "strfile.h"), a table of seek
@@ -101,17 +114,13 @@ __RCSID("$NetBSD: strfile.c,v 1.16 1999/12/30 01:32:33 simonb Exp $");
 
 # define       ALLOC(ptr,sz)   do { \
                        if (ptr == NULL) \
-                               ptr = malloc((unsigned int) (CHUNKSIZE * sizeof *ptr)); \
+                               ptr = malloc(CHUNKSIZE * sizeof *ptr); \
                        else if (((sz) + 1) % CHUNKSIZE == 0) \
-                               ptr = realloc((void *) ptr, ((unsigned int) ((sz) + CHUNKSIZE) * sizeof *ptr)); \
+                               ptr = realloc(ptr, ((sz) + CHUNKSIZE) * sizeof *ptr); \
                        if (ptr == NULL) \
                                die("out of space"); \
                } while (0)
 
-#ifdef NO_VOID
-# define       void    char
-#endif
-
 typedef struct {
        char    first;
        off_t   pos;
@@ -136,12 +145,16 @@ STRFILE   Tbl;                            /* statistics table */
 
 STR    *Firstch;                       /* first chars of each string */
 
-#ifdef __GCC__
-#define NORETURN       __attribute__((__noreturn__))
+#ifdef __GNUC__
+#define NORETURN       __dead
 #else
 #define NORETURN
 #endif
 
+#ifndef __dead /* not NetBSD, presumably */
+#define __dead ;
+#endif
+
 void   add_offset(FILE *, off_t);
 int    cmp_str(const void *, const void *);
 void   die(const char *) NORETURN;
@@ -217,12 +230,12 @@ main(ac, av)
                        first = Oflag;
                }
                else if (first) {
-                       for (nsp = sp; !isalnum(*nsp); nsp++)
+                       for (nsp = sp; !isalnum((unsigned char)*nsp); nsp++)
                                continue;
                        ALLOC(Firstch, Num_pts);
                        fp = &Firstch[Num_pts - 1];
-                       if (Iflag && isupper(*nsp))
-                               fp->first = tolower(*nsp);
+                       if (Iflag && isupper((unsigned char)*nsp))
+                               fp->first = tolower((unsigned char)*nsp);
                        else
                                fp->first = *nsp;
                        fp->pos = Seekpts[Num_pts - 1];
@@ -250,18 +263,18 @@ main(ac, av)
                        puts("There was 1 string");
                else
                        printf("There were %d strings\n", (int)(Num_pts - 1));
-               printf("Longest string: %lu byte%s\n", Tbl.str_longlen,
+               printf("Longest string: %lu byte%s\n", (unsigned long)Tbl.str_longlen,
                       Tbl.str_longlen == 1 ? "" : "s");
-               printf("Shortest string: %lu byte%s\n", Tbl.str_shortlen,
+               printf("Shortest string: %lu byte%s\n", (unsigned long)Tbl.str_shortlen,
                       Tbl.str_shortlen == 1 ? "" : "s");
        }
 
        (void) fseek(outf, (off_t) 0, SEEK_SET);
-       Tbl.str_version = htonl(Tbl.str_version);
-       Tbl.str_numstr = htonl(Num_pts - 1);
-       Tbl.str_longlen = htonl(Tbl.str_longlen);
-       Tbl.str_shortlen = htonl(Tbl.str_shortlen);
-       Tbl.str_flags = htonl(Tbl.str_flags);
+       Tbl.str_version = h2nl(Tbl.str_version);
+       Tbl.str_numstr = h2nl(Num_pts - 1);
+       Tbl.str_longlen = h2nl(Tbl.str_longlen);
+       Tbl.str_shortlen = h2nl(Tbl.str_shortlen);
+       Tbl.str_flags = h2nl(Tbl.str_flags);
        (void) fwrite((char *) &Tbl, sizeof Tbl, 1, outf);
        if (STORING_PTRS) {
                for (p = Seekpts, cnt = Num_pts; cnt--; ++p)