- enlarge buffer to avoid snprintf() truncation

[bsdgames-darwin.git] / hack / hack.rip.c

diff --git a/hack/hack.rip.c b/hack/hack.rip.c
index e1eaea955990c987c7e6a4f560c2d83331ab5bb6..9c2c199a262b33d79324b84b8e0f19e395bf67ed 100644 (file)
--- a/hack/hack.rip.c
+++ b/hack/hack.rip.c
@@ -1,12 +1,69 @@
-/*     $NetBSD: hack.rip.c,v 1.6 2001/03/25 20:44:02 jsm Exp $ */
+/*     $NetBSD: hack.rip.c,v 1.12 2009/08/12 07:28:41 dholland Exp $   */
 
 /*
- * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985.
+ * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
+ * Amsterdam
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * - Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * - 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.
+ *
+ * - Neither the name of the Stichting Centrum voor Wiskunde en
+ * Informatica, nor the names of its contributors may be used to endorse or
+ * promote products derived from this software without specific prior
+ * written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * Copyright (c) 1982 Jay Fenlason <hack@gnu.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 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. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+ * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: hack.rip.c,v 1.6 2001/03/25 20:44:02 jsm Exp $");
+__RCSID("$NetBSD: hack.rip.c,v 1.12 2009/08/12 07:28:41 dholland Exp $");
 #endif                         /* not lint */
 
 #include "hack.h"
@@ -26,8 +83,10 @@ static const char    *ripbot = "\
                  *|     *  *  *      | *\n\
         _________)/\\\\_//(\\/(/\\)/\\//\\/|_)_______";
 
+static void center(int, char *);
+
 void
-outrip()
+outrip(void)
 {
        char            buf[BUFSZ];
 
@@ -37,14 +96,14 @@ outrip()
        (void) strcpy(buf, plname);
        buf[16] = 0;
        center(6, buf);
-       (void) sprintf(buf, "%ld AU", u.ugold);
+       (void) snprintf(buf, sizeof(buf), "%ld AU", u.ugold);
        center(7, buf);
-       (void) sprintf(buf, "killed by%s",
+       (void) snprintf(buf, sizeof(buf), "killed by%s",
                       !strncmp(killer, "the ", 4) ? "" :
                       !strcmp(killer, "starvation") ? "" :
                       strchr(vowels, *killer) ? " an" : " a");
        center(8, buf);
-       (void) strcpy(buf, killer);
+       (void) strlcpy(buf, killer, sizeof(buf));
        {
                int             i1;
                if ((i1 = strlen(buf)) > 16) {
@@ -61,16 +120,14 @@ outrip()
                center(9, buf);
                center(10, buf + i1);
        }
-       (void) sprintf(buf, "%4d", getyear());
+       (void) snprintf(buf, sizeof(buf), "%4d", getyear());
        center(11, buf);
        puts(ripbot);
        getret();
 }
 
-void
-center(line, text)
-       int             line __attribute__((__unused__));
-       char           *text;
+static void
+center(int line __unused, char *text)
 {
        int             n = strlen(text) / 2;
        printf(ripmid, 8 + n, text, 8 - n, "");