PR/55693: Andreas Gustafsson: factor(6) lists factors in wrong order

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

diff --git a/hack/hack.topl.c b/hack/hack.topl.c
index 8096290252c733894df6b6c7eac347e2e7b63556..d99b76f881ad76043fdbe0668651c8a3874767ee 100644 (file)
--- a/hack/hack.topl.c
+++ b/hack/hack.topl.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: hack.topl.c,v 1.10 2009/06/07 20:13:18 dholland 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,22 +63,25 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: hack.topl.c,v 1.10 2009/06/07 20:13:18 dholland 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(void)
 {
@@ -93,7 +96,7 @@ doredotopl(void)
        return (0);
 }
 
-void
+static void
 redotoplin(void)
 {
        home();
@@ -120,8 +123,7 @@ remember_topl(void)
            !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,7 +133,7 @@ remember_topl(void)
                tl = tl->next_topl;
        }
        if (tl && tl->next_topl) {
-               free((char *) tl->next_topl);
+               free(tl->next_topl);
                tl->next_topl = 0;
        }
 }
@@ -149,7 +151,7 @@ addtopl(const char *s)
 }
 
 /* s = allowed chars besides space/return */
-void
+static void
 xmore(const char *s)
 {
        if (flags.toplin) {
@@ -212,7 +214,7 @@ 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;
@@ -240,8 +242,9 @@ vpline(const char *line, va_list 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;
@@ -255,7 +258,14 @@ vpline(const char *line, va_list 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;
 
@@ -265,7 +275,7 @@ vpline(const char *line, va_list ap)
 
                n0 = strlen(bp);
                if (n0 && tl[0])
-                       (void) strcat(tl, "\n");
+                       (void) strlcat(toplines, "\n", sizeof(toplines));
        }
        redotoplin();
 }