Sat Oct 12 17:26:26 2019 UTC ()

enlarge buffer sizes


(christos)

diff -r1.37 -r1.38 src/usr.sbin/catman/catman.c

--- src/usr.sbin/catman/catman.c 2016/05/29 22:33:39	1.37
+++ src/usr.sbin/catman/catman.c 2019/10/12 17:26:26	1.38

 @@ -1,14 +1,14 @@
-/*      $NetBSD: catman.c,v 1.37 2016/05/29 22:33:39 dholland Exp $       */
+/*      $NetBSD: catman.c,v 1.38 2019/10/12 17:26:26 christos Exp $       */
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Author: Baldassare Dante Profeta <dante@mclink.it>
+ *
  * 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
 @@ -20,27 +20,27 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION 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.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: catman.c,v 1.37 2016/05/29 22:33:39 dholland Exp $");
+__RCSID("$NetBSD: catman.c,v 1.38 2019/10/12 17:26:26 christos Exp $");
 #endif /* not lint */
 #include <sys/types.h>
 #include <sys/queue.h>
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <sys/utsname.h>
 #include <ctype.h>
 #include <dirent.h>
 #include <err.h>
 #include <errno.h>
 #include <fnmatch.h>
 @@ -330,34 +330,34 @@ catman(void)
 		strlcpy(catdir, mandir, sizeof(catdir));
 		if (!(cp = strstr(catdir, "man/man")))
 			continue;
 		cp += 4; *cp++ = 'c'; *cp++ = 'a'; *cp = 't';
 		scanmandir(catdir, mandir);
+	}
+}
 static void
 scanmandir(const char *catdir, const char *mandir)
+{
 	TAG *buildp, *crunchp;
 	ENTRY *e_build, *e_crunch;
-	char manpage[PATH_MAX];
+	char manpage[2 * PATH_MAX];
-	char catpage[PATH_MAX];
+	char catpage[2 * PATH_MAX];
 	char linkname[PATH_MAX];
 	char buffer[PATH_MAX], *bp;
-	char tmp[PATH_MAX];
+	char tmp[2 * PATH_MAX];
 	char buildsuff[256], buildcmd[256];
 	char crunchsuff[256], crunchcmd[256];
-	char match[256];
+	char match[2 * 256];
 	struct stat manstat;
 	struct stat catstat;
 	struct stat lnkstat;
 	struct dirent *dp;
 	DIR *dirp;
 	int len, error;
 	if ((dirp = opendir(mandir)) == 0) {
 		warn("can't open %s", mandir);
 		return;
+	}
 	if (stat(catdir, &catstat) < 0) {
 @@ -560,27 +560,27 @@ setcatsuffix(char *catpage, const char *
 				    TAILQ_FIRST(&tp->entrylist)->s, crunchsuff);
 			} else {
 				sprintf(p, ".0%s", crunchsuff);
+			}
 			break;
+		}
+}
 static void
 makecat(const char *manpage, const char *catpage, const char *buildcmd,
     const char *crunchcmd)
+{
 	char crunchbuf[1024];
-	char sysbuf[2048];
+	char sysbuf[2048 + 128];
 	size_t len;
 	len = snprintf(sysbuf, sizeof(sysbuf), buildcmd, manpage);
 	if (len > sizeof(sysbuf))
 		errx(1, "snprintf");
 	if (*crunchcmd != '\0') {
 		snprintf(crunchbuf, sizeof(crunchbuf), crunchcmd, catpage);
 		snprintf(sysbuf + len, sizeof(sysbuf) - len, " | %s",
 		    crunchbuf);
 	} else {
 		snprintf(sysbuf + len, sizeof(sysbuf) - len, " > %s", catpage);
+	}