Remove SHORTLEN and LONGLEN defines; use sizeof() properly instead.

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

diff --git a/hack/hack.topl.c b/hack/hack.topl.c
index b2e29b6260ce7d8d39d6675bfad5c1f9ece96fe5..d99b76f881ad76043fdbe0668651c8a3874767ee 100644 (file)
--- a/hack/hack.topl.c
+++ b/hack/hack.topl.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: hack.topl.c,v 1.7 2003/04/02 18:36:41 jsm Exp $        */
+/*     $NetBSD: hack.topl.c,v 1.14 2011/08/06 20:29:37 dholland Exp $  */
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,24 +63,27 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: hack.topl.c,v 1.7 2003/04/02 18:36:41 jsm Exp $");
+__RCSID("$NetBSD: hack.topl.c,v 1.14 2011/08/06 20:29:37 dholland Exp $");
 #endif                         /* not lint */
 
 #include <stdlib.h>
 #include "hack.h"
 #include "extern.h"
 
-char            toplines[BUFSZ];
-xchar           tlx, tly;      /* set by pline; used by addtopl */
+static char toplines[BUFSZ];
+static xchar tlx, tly;         /* set by pline; used by addtopl */
 
-struct topl {
+static struct topl {
        struct topl    *next_topl;
        char           *topl_text;
 }              *old_toplines, *last_redone_topl;
 #define        OTLMAX  20              /* max nr of old toplines remembered */
 
+static void redotoplin(void);
+static void xmore(const char *);
+
 int
-doredotopl()
+doredotopl(void)
 {
        if (last_redone_topl)
                last_redone_topl = last_redone_topl->next_topl;
@@ -93,8 +96,8 @@ doredotopl()
        return (0);
 }
 
-void
-redotoplin()
+static void
+redotoplin(void)
 {
        home();
        if (strchr(toplines, '\n'))
@@ -109,7 +112,7 @@ redotoplin()
 }
 
 void
-remember_topl()
+remember_topl(void)
 {
        struct topl    *tl;
        int             cnt = OTLMAX;
@@ -120,8 +123,7 @@ remember_topl()
            !strcmp(toplines, old_toplines->topl_text))
                return;
        last_redone_topl = 0;
-       tl = (struct topl *)
-               alloc((unsigned) (strlen(toplines) + sizeof(struct topl) + 1));
+       tl = alloc(strlen(toplines) + sizeof(*tl) + 1);
        tl->next_topl = old_toplines;
        tl->topl_text = (char *) (tl + 1);
        (void) strcpy(tl->topl_text, toplines);
@@ -131,17 +133,16 @@ remember_topl()
                tl = tl->next_topl;
        }
        if (tl && tl->next_topl) {
-               free((char *) tl->next_topl);
+               free(tl->next_topl);
                tl->next_topl = 0;
        }
 }
 
 void
-addtopl(s)
-       const char           *s;
+addtopl(const char *s)
 {
        curs(tlx, tly);
-       if (tlx + strlen(s) > CO)
+       if (tlx + (int)strlen(s) > CO)
                putsym('\n');
        putstr(s);
        tlx = curx;
@@ -149,9 +150,9 @@ addtopl(s)
        flags.toplin = 1;
 }
 
-void
-xmore(s)
-       const char *s;  /* allowed chars besides space/return */
+/* s = allowed chars besides space/return */
+static void
+xmore(const char *s)
 {
        if (flags.toplin) {
                curs(tlx, tly);
@@ -174,20 +175,19 @@ xmore(s)
 }
 
 void
-more()
+more(void)
 {
        xmore("");
 }
 
 void
-cmore(s)
-       const char           *s;
+cmore(const char *s)
 {
        xmore(s);
 }
 
 void
-clrlin()
+clrlin(void)
 {
        if (flags.toplin) {
                home();
@@ -210,20 +210,18 @@ pline(const char *fmt, ...)
 }
 
 void
-vpline(line, ap)
-       const char *line;
-       va_list ap;
+vpline(const char *line, va_list ap)
 {
        char            pbuf[BUFSZ];
        char           *bp = pbuf, *tl;
-       int             n, n0;
+       int             n, n0, tlpos, dead;
 
        if (!line || !*line)
                return;
        if (!strchr(line, '%'))
-               (void) strcpy(pbuf, line);
+               (void) strlcpy(pbuf, line, sizeof(pbuf));
        else
-               (void) vsprintf(pbuf, line, ap);
+               (void) vsnprintf(pbuf, sizeof(pbuf), line, ap);
        if (flags.toplin == 1 && !strcmp(pbuf, toplines))
                return;
        nscr();                 /* %% */
@@ -232,7 +230,7 @@ vpline(line, ap)
        /* But messages like "You die..." deserve their own line */
        n0 = strlen(bp);
        if (flags.toplin == 1 && tly == 1 &&
-           n0 + strlen(toplines) + 3 < CO - 8 &&       /* leave room for
+           n0 + (int)strlen(toplines) + 3 < CO - 8 &&  /* leave room for
                                                         * --More-- */
            strncmp(bp, "You ", 4)) {
                (void) strcat(toplines, "  ");
@@ -244,8 +242,9 @@ vpline(line, ap)
        if (flags.toplin == 1)
                more();
        remember_topl();
+       dead = 0;
        toplines[0] = 0;
-       while (n0) {
+       while (n0 && !dead) {
                if (n0 >= CO) {
                        /* look for appropriate cut point */
                        n0 = 0;
@@ -259,7 +258,14 @@ vpline(line, ap)
                        if (!n0)
                                n0 = CO - 2;
                }
-               (void) strncpy((tl = eos(toplines)), bp, n0);
+               tlpos = strlen(toplines);
+               tl = toplines + tlpos;
+               /* avoid overflow */
+               if (tlpos + n0 > (int)sizeof(toplines) - 1) {
+                       n0 = sizeof(toplines) - 1 - tlpos;
+                       dead = 1;
+               }
+               (void) memcpy(tl, bp, n0);
                tl[n0] = 0;
                bp += n0;
 
@@ -269,15 +275,16 @@ vpline(line, ap)
 
                n0 = strlen(bp);
                if (n0 && tl[0])
-                       (void) strcat(tl, "\n");
+                       (void) strlcat(toplines, "\n", sizeof(toplines));
        }
        redotoplin();
 }
 
 void
-putsym(c)
-       char            c;
+putsym(int c1)
 {
+       char c = c1; /* XXX this hack prevents .o diffs -- remove later */
+
        switch (c) {
        case '\b':
                backsp();
@@ -298,8 +305,7 @@ putsym(c)
 }
 
 void
-putstr(s)
-       const char           *s;
+putstr(const char *s)
 {
        while (*s)
                putsym(*s++);