From: Joshua Kwan <joshk@triplehelix.org>
Date: Sat, 3 Jan 2004 03:51:29 +0000 (+0000)
Subject: fix some errors pointed out by jilles and paxed
X-Git-Tag: v1.6.1-roc-dev~648
X-Git-Url: https://skyeroc.xyz/gitweb/?a=commitdiff_plain;h=d9c2a09b9f695202edccc321b487bed3a0da7b0b;p=dgamelaunch

fix some errors pointed out by jilles and paxed


git-svn-id: svn://katsu.triplehelix.org/dgamelaunch/trunk@50 db0b04b0-f4d1-0310-9a6d-de3e77497b0e
---

diff --git a/README b/README
index c1f4934..58ba5ae 100644
--- a/README
+++ b/README
@@ -81,7 +81,7 @@ service telnet
   bind      = 64.71.163.206
 }
 
-An classic inetd line would look like this
+A classic inetd line would look like this:
 
 telnet stream tcp nowait root.root /usr/sbin/tcpd /usr/sbin/in.telnetd -h -L /usr/sbin/dgamelaunch
 
diff --git a/dgamelaunch.c b/dgamelaunch.c
index f27e0d3..2f3938a 100644
--- a/dgamelaunch.c
+++ b/dgamelaunch.c
@@ -109,11 +109,11 @@ ttyrec_getmaster ()
   (void) tcgetattr (0, &tt);
   (void) ioctl (0, TIOCGWINSZ, (char *) &win);
 #ifdef USE_OPENPTY
-  if (openpty(&master, &slave, NULL, &tt, &win) == -1)
+  if (openpty (&master, &slave, NULL, &tt, &win) == -1)
 #else
   if ((master = open ("/dev/ptmx", O_RDWR)) < 0)
 #endif
-      exit (62);
+    exit (62);
 }
 
 /* ************************************************************* */
@@ -183,7 +183,7 @@ loadbanner (struct dg_banner *ban)
                 " - network console game launcher");
       ban->lines[1] =
         strdup
-        ("### NOTE: administrator has not installed a /dgl-banner file");
+        ("### NOTE: administrator has not installed a " LOC_BANNER " file");
       return;
     }
 
@@ -212,7 +212,7 @@ loadbanner (struct dg_banner *ban)
                 {
                   strncat (bufnew, VERSION, 80 - i);
                   b += 8;       /* skip the whole $VERSION string */
-                  i += ARRAY_SIZE(VERSION);
+                  i += ARRAY_SIZE (VERSION);
                 }
 
               if (strlen (b) == 0)
@@ -367,14 +367,14 @@ inprogressmenu ()
 
       switch ((menuchoice = tolower (getch ())))
         {
-        case 'd':
+        case '>':
           if ((offset + 14) >= len)
             break;
           else
             offset += 14;
           break;
 
-        case 'u':
+        case '<':
           if ((offset - 14) < 0)
             break;
           else
@@ -419,7 +419,7 @@ changepw ()
   char buf[21];
   int error = 2;
 
-  /* A precondiction is that struct `me' exists because we can be not-yet-logged-in. */
+  /* A precondition is that struct `me' exists because we can be not-yet-logged-in. */
   if (!me)
     exit (122);                 /* Die. */
 
@@ -489,7 +489,7 @@ domailuser (char *username)
 
   assert (loggedin);
 
-  len = ARRAY_SIZE(LOC_SPOOLDIR) +  strlen (username) + 1;
+  len = ARRAY_SIZE (LOC_SPOOLDIR) + strlen (username) + 1;
   spool_fn = malloc (len + 1);
   time (&now);
   snprintf (spool_fn, len, "%s/%s", LOC_SPOOLDIR, username);
@@ -1094,23 +1094,23 @@ main (void)
     }
 
   /* shed privs. this is done immediately after chroot. */
-  if (setgroups(1, &newgid) == -1)
-  {
-    perror("setgroups");
-    exit(1);
-  }
+  if (setgroups (1, &newgid) == -1)
+    {
+      perror ("setgroups");
+      exit (1);
+    }
 
   if (setgid (newgid) == -1)
-  {
-    perror("setgid");
-    exit(1);
-  }
+    {
+      perror ("setgid");
+      exit (1);
+    }
 
   if (setuid (newuid) == -1)
-  {
-    perror("setuid");
-    exit(1);
-  }
+    {
+      perror ("setuid");
+      exit (1);
+    }
 
   /* simple login routine, uses ncurses */
   if (readfile (0))
@@ -1156,7 +1156,7 @@ main (void)
   /* environment */
   snprintf (atrcfilename, 81, "@%s", rcfilename);
 
-  len = ARRAY_SIZE(LOC_SPOOLDIR) + strlen (me->username) + 1;
+  len = ARRAY_SIZE (LOC_SPOOLDIR) + strlen (me->username) + 1;
   spool = malloc (len + 1);
   snprintf (spool, len, "%s/%s", LOC_SPOOLDIR, me->username);