Make spacing nicer and add explicit NULL initializers.

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

diff --git a/morse/morse.c b/morse/morse.c
index c3f2b136cc099e2173a2ca3e2793255ce6bd027e..f97de68949c2e877029a5f92a29797618462f17c 100644 (file)
--- a/morse/morse.c
+++ b/morse/morse.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: morse.c,v 1.6 1998/11/18 14:22:32 hubertf Exp $        */
+/*     $NetBSD: morse.c,v 1.10 2000/07/03 03:57:42 matt Exp $  */
 
 /*
  * Copyright (c) 1988, 1993
@@ -43,12 +43,13 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1993\n\
 #if 0
 static char sccsid[] = "@(#)morse.c    8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: morse.c,v 1.6 1998/11/18 14:22:32 hubertf Exp $");
+__RCSID("$NetBSD: morse.c,v 1.10 2000/07/03 03:57:42 matt Exp $");
 #endif
 #endif /* not lint */
 
 #include <ctype.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
@@ -56,8 +57,8 @@ __RCSID("$NetBSD: morse.c,v 1.6 1998/11/18 14:22:32 hubertf Exp $");
 #define MORSE_PERIOD   ".-.-.-"
 
 
-static char
-       *digit[] = {
+static const char
+       *const digit[] = {
        "-----",
        ".----",
        "..---",
@@ -69,7 +70,7 @@ static char
        "---..",
        "----.",
 },
-       *alph[] = {
+       *const alph[] = {
        ".-",
        "-...",
        "-.-.",
@@ -101,7 +102,7 @@ static char
 int    main __P((int, char *[]));
 void   morse __P((int));
 void   decode __P((const char *));
-void   show __P((char *));
+void   show __P((const char *));
 
 static int sflag;
 static int dflag;
@@ -114,6 +115,9 @@ main(argc, argv)
        int ch;
        char *s, *p;
 
+       /* Revoke setgid privileges */
+       setgid(getgid());
+
        while ((ch = getopt(argc, argv, "ds")) != -1)
                switch((char)ch) {
                case 'd':
@@ -188,7 +192,7 @@ decode(s)
                putchar('.');
        } else {
                int found;
-               char **a;
+               const char *const *a;
                int size;
                int i;
 
@@ -242,7 +246,7 @@ morse(c)
 
 void
 show(s)
-       char *s;
+       const char *s;
 {
        if (sflag)
                printf(" %s", s);