Use setgid(), not setregid().

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

diff --git a/worm/worm.c b/worm/worm.c
index 47e242c35188263877dfb6c552444a254e5bd3c2..a78f27fb9b055f46e3cf216b1a88cf4ab49cba88 100644 (file)
--- a/worm/worm.c
+++ b/worm/worm.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: worm.c,v 1.15 1999/09/09 17:28:00 jsm Exp $    */
+/*     $NetBSD: worm.c,v 1.19 2000/05/08 07:56:06 mycroft Exp $        */
 
 /*
  * Copyright (c) 1980, 1993
@@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
 #if 0
 static char sccsid[] = "@(#)worm.c     8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: worm.c,v 1.15 1999/09/09 17:28:00 jsm Exp $");
+__RCSID("$NetBSD: worm.c,v 1.19 2000/05/08 07:56:06 mycroft Exp $");
 #endif
 #endif /* not lint */
 
@@ -80,7 +80,7 @@ int running = 0;
 int slow = 0;
 int score = 0;
 int start_len = LENGTH;
-char lastch;
+int lastch;
 char outbuf[BUFSIZ];
 
 void   crash __P((void)) __attribute__((__noreturn__));
@@ -89,7 +89,7 @@ int   main __P((int, char **));
 void   leave __P((int)) __attribute__((__noreturn__));
 void   life __P((void));
 void   newpos __P((struct body *));
-void   process __P((char));
+void   process __P((int));
 void   prize __P((void));
 int    rnd __P((int));
 void   setup __P((void));
@@ -100,7 +100,9 @@ main(argc, argv)
        int argc;
        char **argv;
 {
-       char ch;
+
+       /* Revoke setgid privileges */
+       setgid(getgid());
 
        if (argc == 2)
                start_len = atoi(argv[1]);
@@ -114,6 +116,9 @@ main(argc, argv)
        initscr();
        crmode();
        noecho();
+#ifdef KEY_LEFT
+       keypad(stdscr, TRUE);
+#endif
        slow = (baudrate() <= 1200);
        clear();
        stw = newwin(1, COLS-1, 0, 0);
@@ -138,8 +143,7 @@ main(argc, argv)
                else
                {
                    fflush(stdout);
-                   if (read(0, &ch, 1) >= 0)
-                       process(ch);
+                   process(getch());
                }
        }
 }
@@ -153,7 +157,7 @@ life()
        np = NULL;
        head = newlink();
        if (head == NULL)
-               errx(1, "out of memory");
+               err(1, NULL);
        head->x = start_len+2;
        head->y = 12;
        head->next = NULL;
@@ -161,7 +165,7 @@ life()
        for (i = 0, bp = head; i < start_len; i++, bp = np) {
                np = newlink();
                if (np == NULL)
-                       errx(1, "out of memory");
+                       err(1, NULL);
                np->next = bp;
                bp->prev = np;
                np->x = bp->x - 1;
@@ -234,7 +238,7 @@ prize()
 
 void
 process(ch)
-       char ch;
+       int ch;
 {
        int x,y;
        struct body *nh;
@@ -244,17 +248,42 @@ process(ch)
        y = head->y;
        switch(ch)
        {
-               case 'h': x--; break;
-               case 'j': y++; break;
-               case 'k': y--; break;
-               case 'l': x++; break;
+#ifdef KEY_LEFT
+               case KEY_LEFT:
+#endif
+               case 'h':
+                       x--; break;
+
+#ifdef KEY_DOWN
+               case KEY_DOWN:
+#endif
+               case 'j':
+                       y++; break;
+
+#ifdef KEY_UP
+               case KEY_UP:
+#endif
+               case 'k':
+                       y--; break;
+
+#ifdef KEY_RIGHT
+               case KEY_RIGHT:
+#endif
+               case 'l':
+                       x++; break;
+
                case 'H': x--; running = RUNLEN; ch = tolower(ch); break;
                case 'J': y++; running = RUNLEN/2; ch = tolower(ch); break;
                case 'K': y--; running = RUNLEN/2; ch = tolower(ch); break;
                case 'L': x++; running = RUNLEN; ch = tolower(ch); break;
                case '\f': setup(); return;
-               case CNTRL('C'): crash(); return;
-               case CNTRL('D'): crash(); return;
+
+               case ERR:
+               case CNTRL('C'):
+               case CNTRL('D'):
+                       crash();
+                       return;
+
                default: if (! running) alarm(1);
                           return;
        }
@@ -283,7 +312,7 @@ process(ch)
        else if(ch != ' ') crash();
        nh = newlink();
        if (nh == NULL)
-               errx(1, "out of memory");
+               err(1, NULL);
        nh->next = NULL;
        nh->prev = head;
        head->next = nh;