sprinkle static

[bsdgames-darwin.git] / sail / lo_main.c

diff --git a/sail/lo_main.c b/sail/lo_main.c
index 3b91644db18c6844e1e2e9aeef5748a029b7ba0b..b490299069f6d3b40182ba85cf918b90d90710bb 100644 (file)
--- a/sail/lo_main.c
+++ b/sail/lo_main.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: lo_main.c,v 1.9 2001/01/04 03:21:17 jwise Exp $        */
+/*     $NetBSD: lo_main.c,v 1.16 2009/03/14 20:14:56 dholland Exp $    */

 
 /*
  * Copyright (c) 1983, 1993
 
 /*
  * Copyright (c) 1983, 1993


@@ -12,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.
  *


@@ -38,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)lo_main.c  8.2 (Berkeley) 4/28/95";
 #else
 #if 0
 static char sccsid[] = "@(#)lo_main.c  8.2 (Berkeley) 4/28/95";
 #else

-__RCSID("$NetBSD: lo_main.c,v 1.9 2001/01/04 03:21:17 jwise Exp $");
+__RCSID("$NetBSD: lo_main.c,v 1.16 2009/03/14 20:14:56 dholland Exp $");

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


@@ -48,13 +44,13 @@ __RCSID("$NetBSD: lo_main.c,v 1.9 2001/01/04 03:21:17 jwise Exp $");
  * -l force a long listing (print out real usernames)
  */
 
  * -l force a long listing (print out real usernames)
  */
 

+#include <err.h>

 #include <stdio.h>
 #include <stdio.h>

+#include <stdlib.h>

 #include <pwd.h>
 #include "extern.h"
 #include "pathnames.h"
 
 #include <pwd.h>
 #include "extern.h"
 #include "pathnames.h"
 

-int    lo_main(void);
-

 const char *const title[] = {
        "Admiral", "Commodore", "Captain", "Captain",
        "Captain", "Captain", "Captain", "Commander",
 const char *const title[] = {
        "Admiral", "Commodore", "Captain", "Captain",
        "Captain", "Captain", "Captain", "Commander",


@@ -66,36 +62,36 @@ lo_main(void)
 {
        FILE *fp;
        char sbuf[32];
 {
        FILE *fp;
        char sbuf[32];

-       int n = 0, people;
+       int n = 0, npeople;

        struct passwd *pass;
        struct logs log;
        struct ship *ship;
 
        if ((fp = fopen(_PATH_LOGFILE, "r")) == 0) {
        struct passwd *pass;
        struct logs log;
        struct ship *ship;
 
        if ((fp = fopen(_PATH_LOGFILE, "r")) == 0) {

-               perror(_PATH_LOGFILE);
-               exit(1);
+               err(1, "%s", _PATH_LOGFILE);

        }
        }

-       switch (fread((char *)&people, sizeof people, 1, fp)) {
+       switch (fread(&npeople, sizeof npeople, 1, fp)) {

        case 0:
                printf("Nobody has sailed yet.\n");
                exit(0);
        case 1:
                break;
        default:
        case 0:
                printf("Nobody has sailed yet.\n");
                exit(0);
        case 1:
                break;
        default:

-               perror(_PATH_LOGFILE);
-               exit(1);
+               err(1, "%s", _PATH_LOGFILE);

        }
        }

-       while (fread((char *)&log, sizeof log, 1, fp) == 1 &&
+       while (fread(&log, sizeof log, 1, fp) == 1 &&

               log.l_name[0] != '\0') {
                if (longfmt && (pass = getpwuid(log.l_uid)) != NULL)
               log.l_name[0] != '\0') {
                if (longfmt && (pass = getpwuid(log.l_uid)) != NULL)

-                       sprintf(sbuf, "%10.10s (%s)", log.l_name, pass->pw_name);
+                       snprintf(sbuf, sizeof(sbuf),
+                               "%10.10s (%s)", log.l_name, pass->pw_name);

                else
                else

-                       sprintf(sbuf, "%20.20s", log.l_name);
+                       snprintf(sbuf, sizeof(sbuf),
+                               "%20.20s", log.l_name);

                ship = &scene[log.l_gamenum].ship[log.l_shipnum];
                printf("%-10s %21s of the %15s %3d points, %5.2f equiv\n",
                        title[n++], sbuf, ship->shipname, log.l_netpoints,
                        (float) log.l_netpoints / ship->specs->pts);
        }
                ship = &scene[log.l_gamenum].ship[log.l_shipnum];
                printf("%-10s %21s of the %15s %3d points, %5.2f equiv\n",
                        title[n++], sbuf, ship->shipname, log.l_netpoints,
                        (float) log.l_netpoints / ship->specs->pts);
        }

-       printf("\n%d people have played.\n", people);
+       printf("\n%d people have played.\n", npeople);

        return 0;
 }
        return 0;
 }