Fix merge conflicts

[bsdgames-darwin.git] / robots / score.c

diff --git a/robots/score.c b/robots/score.c
index f23bdc42c2065c8c4b7949094e58685cfcbed849..91a2f38a0bea08b6457eef4ca45ccac787f4e069 100644 (file)
--- a/robots/score.c
+++ b/robots/score.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: score.c,v 1.22 2009/08/03 06:04:12 dholland Exp $      */
+/*     $NetBSD: score.c,v 1.24 2021/04/13 01:50:46 mrg Exp $   */
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)score.c    8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: score.c,v 1.22 2009/08/03 06:04:12 dholland Exp $");
+__RCSID("$NetBSD: score.c,v 1.24 2021/04/13 01:50:46 mrg Exp $");
 #endif
 #endif /* not lint */
 
@@ -57,6 +57,9 @@ static SCORE Top[MAXSCORES];
 
 static uint32_t numscores, max_uid;
 
+static int cmp_sc(const void *, const void *);
+static void set_name(SCORE *);
+
 /*
  * read_score:
  *     Read the score file in MI format
@@ -189,22 +192,23 @@ score(int score_wfd)
        lseek(inf, 0, SEEK_SET);
 }
 
-void
+static void
 set_name(SCORE *scp)
 {
        struct passwd *pp;
 
        if ((pp = getpwuid(scp->s_uid)) == NULL)
-               strncpy(scp->s_name, "???", MAXNAME);
+               strncpy(scp->s_name, "???", MAXNAME - 1);
        else
-               strncpy(scp->s_name, pp->pw_name, MAXNAME);
+               strncpy(scp->s_name, pp->pw_name, MAXNAME - 1);
+       scp->s_name[MAXNAME - 1] = '\0';
 }
 
 /*
  * cmp_sc:
  *     Compare two scores.
  */
-int
+static int
 cmp_sc(const void *s1, const void *s2)
 {
        return ((const SCORE *)s2)->s_score - ((const SCORE *)s1)->s_score;