tetris: Use arc4random_uniform instead of modulo for better randomness

[bsdgames-darwin.git] / pig / pig.c

diff --git a/pig/pig.c b/pig/pig.c
index 3fbd514bfef5b25e17d8975cfd11dd15458227e5..a127ac74c2f478b1304b60ad617f595a2d87cf88 100644 (file)
--- a/pig/pig.c
+++ b/pig/pig.c
@@ -1,3 +1,5 @@
+/*     $NetBSD: pig.c,v 1.15 2012/06/19 05:46:09 dholland Exp $        */
+

 /*-
  * Copyright (c) 1992, 1993
  *     The Regents of the University of California.  All rights reserved.
 /*-
  * Copyright (c) 1992, 1993
  *     The Regents of the University of California.  All rights reserved.


@@ -10,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.
  * 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.
  *
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *


@@ -31,36 +29,41 @@
  * SUCH DAMAGE.
  */
 
  * SUCH DAMAGE.
  */
 

+#include <sys/cdefs.h>

 #ifndef lint
 #ifndef lint

-static char copyright[] =
-"@(#) Copyright (c) 1992, 1993\n\
-       The Regents of the University of California.  All rights reserved.\n";
+__COPYRIGHT("@(#) Copyright (c) 1992, 1993\
+ The Regents of the University of California.  All rights reserved.");

 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)pig.c      8.1 (Berkeley) 5/31/93";
+#if 0
+static char sccsid[] = "@(#)pig.c      8.2 (Berkeley) 5/4/95";
+#else
+__RCSID("$NetBSD: pig.c,v 1.15 2012/06/19 05:46:09 dholland Exp $");
+#endif

 #endif /* not lint */
 
 #include <sys/types.h>
 
 #include <ctype.h>
 #endif /* not lint */
 
 #include <sys/types.h>
 
 #include <ctype.h>

+#include <err.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

+#include <unistd.h>

 
 

-void pigout __P((char *, int));
-void usage __P((void));
+int main(int, char *[]);
+static void pigout(char *, int);
+static void usage(void) __dead;

 
 int
 
 int

-main(argc, argv)
-       int argc;
-       char *argv[];
+main(int argc, char *argv[])

 {
 {

-       register int len;
+       int len;

        int ch;
        char buf[1024];
 
        int ch;
        char buf[1024];
 

-       while ((ch = getopt(argc, argv, "")) != EOF)
+       while ((ch = getopt(argc, argv, "")) != -1)

                switch(ch) {
                case '?':
                default:
                switch(ch) {
                case '?':
                default:


@@ -71,10 +74,8 @@ main(argc, argv)
 
        for (len = 0; (ch = getchar()) != EOF;) {
                if (isalpha(ch)) {
 
        for (len = 0; (ch = getchar()) != EOF;) {
                if (isalpha(ch)) {

-                       if (len >= sizeof(buf)) {
-                               (void)fprintf(stderr, "pig: ate too much!\n");
-                               exit(1);
-                       }
+                       if ((size_t)len >= sizeof(buf))
+                               errx(1, "ate too much!");

                        buf[len++] = ch;
                        continue;
                }
                        buf[len++] = ch;
                        continue;
                }


@@ -87,20 +88,24 @@ main(argc, argv)
        exit(0);
 }
 
        exit(0);
 }
 

-void
-pigout(buf, len)
-       char *buf;
-       int len;
+static void
+pigout(char *buf, int len)

 {
 {

-       register int ch, start;
-       int olen;
+       int ch, start, i;
+       int olen, allupper, firstupper;
+
+       /* See if the word is all upper case */
+       allupper = firstupper = isupper((unsigned char)buf[0]);
+       for (i = 1; i < len && allupper; i++)
+               allupper = allupper && isupper((unsigned char)buf[i]);

 
        /*
         * If the word starts with a vowel, append "way".  Don't treat 'y'
         * as a vowel if it appears first.
         */
 
        /*
         * If the word starts with a vowel, append "way".  Don't treat 'y'
         * as a vowel if it appears first.
         */

-       if (index("aeiouAEIOU", buf[0]) != NULL) {
-               (void)printf("%.*sway", len, buf);
+       if (strchr("aeiouAEIOU", buf[0]) != NULL) {
+               (void)printf("%.*s%s", len, buf,
+                   allupper ? "WAY" : "way");

                return;
        }
 
                return;
        }
 


@@ -108,18 +113,22 @@ pigout(buf, len)
         * Copy leading consonants to the end of the word.  The unit "qu"
         * isn't treated as a vowel.
         */
         * Copy leading consonants to the end of the word.  The unit "qu"
         * isn't treated as a vowel.
         */

+       if (!allupper)
+               buf[0] = tolower((unsigned char)buf[0]);

        for (start = 0, olen = len;
        for (start = 0, olen = len;

-           !index("aeiouyAEIOUY", buf[start]) && start < olen;) {
+           !strchr("aeiouyAEIOUY", buf[start]) && start < olen;) {

                ch = buf[len++] = buf[start++];
                if ((ch == 'q' || ch == 'Q') && start < olen &&
                    (buf[start] == 'u' || buf[start] == 'U'))
                        buf[len++] = buf[start++];
        }
                ch = buf[len++] = buf[start++];
                if ((ch == 'q' || ch == 'Q') && start < olen &&
                    (buf[start] == 'u' || buf[start] == 'U'))
                        buf[len++] = buf[start++];
        }

-       (void)printf("%.*say", olen, buf + start);
+       if (firstupper)
+               buf[start] = toupper((unsigned char)buf[start]);
+       (void)printf("%.*s%s", olen, buf + start, allupper ? "AY" : "ay");

 }
 
 }
 

-void
-usage()
+static void
+usage(void)

 {
        (void)fprintf(stderr, "usage: pig\n");
        exit(1);
 {
        (void)fprintf(stderr, "usage: pig\n");
        exit(1);