 @@ -1,14 +1,14 @@
-/* $NetBSD: dir.c,v 1.35 2020/08/09 00:34:21 dholland Exp $ */
+/* $NetBSD: dir.c,v 1.36 2024/04/24 15:49:03 nia Exp $ */
 /*-
  * Copyright (c) 1980, 1991, 1993
  *	The Regents of the University of California.  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.
 @@ -24,27 +24,27 @@
  * 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
 #if 0
 static char sccsid[] = "@(#)dir.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: dir.c,v 1.35 2020/08/09 00:34:21 dholland Exp $");
+__RCSID("$NetBSD: dir.c,v 1.36 2024/04/24 15:49:03 nia Exp $");
 #endif
 #endif /* not lint */
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <errno.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include "csh.h"
 @@ -269,28 +269,28 @@ dtilde(void)
 Char *
 dnormalize(Char *cp)
+{
 #define UC (unsigned char)
 #define ISDOT(c) (UC(c)[0] == '.' && ((UC(c)[1] == '\0') || (UC(c)[1] == '/')))
 #define ISDOTDOT(c) (UC(c)[0] == '.' && ISDOT(&((c)[1])))
     if ((unsigned char) cp[0] == '/')
 	return (Strsave(cp));
     if (adrof(STRignore_symlinks)) {
 	size_t  dotdot = 0;
 	Char   *dp, *cwd;
-	cwd = xmalloc((size_t)((Strlen(dcwd->di_name) + 3) *
+	cwd = xreallocarray(NULL, (size_t)(Strlen(dcwd->di_name) + 3),
-	    sizeof(Char)));
+	    sizeof(Char));
 	(void)Strcpy(cwd, dcwd->di_name);
 	/*
 	 * Ignore . and count ..'s
 	 */
 	while (*cp) {
 	    if (ISDOT(cp)) {
 		if (*++cp)
 		    cp++;
+	    }
 	    else if (ISDOTDOT(cp)) {
 		dotdot++;
 		cp += 2;
 @@ -379,27 +379,28 @@ dgoto(Char *cp)
+{
     Char *dp;
     if (*cp != '/') {
 	Char *p, *q;
 	size_t cwdlen;
 	for (p = dcwd->di_name; *p++;)
 	    continue;
 	if ((cwdlen = (size_t)(p - dcwd->di_name - 1)) == 1)	/* root */
 	    cwdlen = 0;
 	for (p = cp; *p++;)
 	    continue;
-	dp = xmalloc((size_t)(cwdlen + (size_t)(p - cp) + 1) * sizeof(Char));
+	dp = xreallocarray(NULL,
 	    (size_t)(cwdlen + (size_t)(p - cp) + 1), sizeof(Char));
 	for (p = dp, q = dcwd->di_name; (*p++ = *q++) != '\0';)
 	    continue;
 	if (cwdlen)
 	    p[-1] = '/';
 	else
 	    p--;		/* don't add a / after root */
 	for (q = cp; (*p++ = *q++) != '\0';)
 	    continue;
 	free(cp);
 	cp = dp;
 	dp += cwdlen;
+    }
     else
 @@ -695,48 +696,48 @@ dcanon(Char *cp, Char *p)
 		    continue;
 		if (*slink != '/') {
 		    /*
 		     * Relative path, expand it between the "yyy/" and the
 		     * "/..". First, back sp up to the character past "yyy/".
 		     */
 		    while (*--sp != '/')
 			continue;
 		    sp++;
 		    *sp = 0;
 		    /*
 		     * New length is "yyy/" + slink + "/.." and rest
 		     */
-		    p1 = newcp = xmalloc(
+		    p1 = newcp = xreallocarray(NULL,
-		        (size_t)((sp - cp) + cc + (p1 - p)) * sizeof(Char));
+		        (size_t)((sp - cp) + cc + (p1 - p)), sizeof(Char));
 		    /*
 		     * Copy new path into newcp
 		     */
 		    for (p2 = cp; (*p1++ = *p2++) != '\0';)
 			continue;
 		    for (p1--, p2 = slink; (*p1++ = *p2++) != '\0';)
 			continue;
 		    for (p1--, p2 = p; (*p1++ = *p2++) != '\0';)
 			continue;
 		    /*
 		     * Restart canonicalization at expanded "/xxx".
 		     */
 		    p = sp - cp - 1 + newcp;
+		}
 		else {
 		    /*
 		     * New length is slink + "/.." and rest
 		     */
-		    p1 = newcp = xmalloc(
+		    p1 = newcp = xreallocarray(NULL,
-		        (size_t)(cc + (p1 - p)) * sizeof(Char));
+		        (size_t)(cc + (p1 - p)), sizeof(Char));
 		    /*
 		     * Copy new path into newcp
 		     */
 		    for (p2 = slink; (*p1++ = *p2++) != '\0';)
 			continue;
 		    for (p1--, p2 = p; (*p1++ = *p2++) != '\0';)
 			continue;
 		    /*
 		     * Restart canonicalization at beginning
 		     */
 		    p = newcp;
+		}
 		free(cp);
 @@ -784,48 +785,48 @@ dcanon(Char *cp, Char *p)
 		if (*slink != '/') {
 		    /*
 		     * Relative path, expand it between the "yyy/" and the
 		     * remainder. First, back sp up to the character past
 		     * "yyy/".
 		     */
 		    while (*--sp != '/')
 			continue;
 		    sp++;
 		    *sp = 0;
 		    /*
 		     * New length is "yyy/" + slink + "/.." and rest
 		     */
-		    p1 = newcp = xmalloc(
+		    p1 = newcp = xreallocarray(NULL,
-		        (size_t)((sp - cp) + cc + (p1 - p)) * sizeof(Char));
+		        (size_t)((sp - cp) + cc + (p1 - p)), sizeof(Char));
 		    /*
 		     * Copy new path into newcp
 		     */
 		    for (p2 = cp; (*p1++ = *p2++) != '\0';)
 			continue;
 		    for (p1--, p2 = slink; (*p1++ = *p2++) != '\0';)
 			continue;
 		    for (p1--, p2 = p; (*p1++ = *p2++) != '\0';)
 			continue;
 		    /*
 		     * Restart canonicalization at expanded "/xxx".
 		     */
 		    p = sp - cp - 1 + newcp;
+		}
 		else {
 		    /*
 		     * New length is slink + the rest
 		     */
-		    p1 = newcp = xmalloc(
+		    p1 = newcp = xreallocarray(NULL,
-		        (size_t)(cc + (p1 - p)) * sizeof(Char));
+		        (size_t)(cc + (p1 - p)), sizeof(Char));
 		    /*
 		     * Copy new path into newcp
 		     */
 		    for (p2 = slink; (*p1++ = *p2++) != '\0';)
 			continue;
 		    for (p1--, p2 = p; (*p1++ = *p2++) != '\0';)
 			continue;
 		    /*
 		     * Restart canonicalization at beginning
 		     */
 		    p = newcp;
+		}
 		free(cp);

 @@ -1,14 +1,14 @@
-/* $NetBSD: file.c,v 1.33 2020/09/29 02:58:51 msaitoh Exp $ */
+/* $NetBSD: file.c,v 1.34 2024/04/24 15:49:03 nia Exp $ */
 /*-
  * Copyright (c) 1980, 1991, 1993
  *	The Regents of the University of California.  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.
 @@ -24,27 +24,27 @@
  * 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
 #if 0
 static char sccsid[] = "@(#)file.c	8.2 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: file.c,v 1.33 2020/09/29 02:58:51 msaitoh Exp $");
+__RCSID("$NetBSD: file.c,v 1.34 2024/04/24 15:49:03 nia Exp $");
 #endif
 #endif /* not lint */
 #ifdef FILEC
 #include <sys/ioctl.h>
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/tty.h>
 #include <dirent.h>
 #include <pwd.h>
 #include <termios.h>
 @@ -509,33 +509,30 @@ tsearch(Char *word, COMMAND command, siz
 again:				/* search for matches */
     name_length = Strlen(name);
     for (numitems = 0; (entry = getentry(dir_fd, looking_for_lognames)) != NULL;) {
 	if (!is_prefix(name, entry))
 	    continue;
 	/* Don't match . files on null prefix match */
 	if (name_length == 0 && entry[0] == '.' &&
 	    !looking_for_lognames)
 	    continue;
 	if (command == LIST) {
 	    if ((size_t)numitems >= maxitems) {
 		maxitems += 1024;
-		if (items == NULL)
+		items = xreallocarray(items, sizeof(*items), maxitems);
 			items = xmalloc(sizeof(*items) * maxitems);
 		else
 			items = xrealloc(items, sizeof(*items) * maxitems);
+ 	    }
-	    items[numitems] = xmalloc((size_t) (Strlen(entry) + 1) *
+	    items[numitems] = xreallocarray(NULL,
-	        sizeof(Char));
+		(size_t) (Strlen(entry) + 1), sizeof(Char));
 	    copyn(items[numitems], entry, MAXNAMLEN);
 	    numitems++;
+	}
 	else {			/* RECOGNIZE command */
 	    if (ignoring && ignored(entry))
 		nignored++;
 	    else if (recognize(extended_name,
 	        entry, name_length, ++numitems))
 		break;
+	}
+    }
     if (ignoring && numitems == 0 && nignored > 0) {
 	ignoring = FALSE;

 @@ -1,14 +1,14 @@
-/* $NetBSD: func.c,v 1.44 2020/08/09 00:22:53 dholland Exp $ */
+/* $NetBSD: func.c,v 1.45 2024/04/24 15:49:03 nia Exp $ */
 /*-
  * Copyright (c) 1980, 1991, 1993
  *	The Regents of the University of California.  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.
 @@ -24,27 +24,27 @@
  * 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
 #if 0
 static char sccsid[] = "@(#)func.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: func.c,v 1.44 2020/08/09 00:22:53 dholland Exp $");
+__RCSID("$NetBSD: func.c,v 1.45 2024/04/24 15:49:03 nia Exp $");
 #endif
 #endif /* not lint */
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <locale.h>
 #include <inttypes.h>
 #include <signal.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 @@ -968,27 +968,27 @@ dounsetenv(Char **v, struct command *t)
     if (name)
 	free(name);
     /*
      * Find the longest environment variable
      */
     for (maxi = 0, ep = STR_environ; *ep; ep++) {
 	for (i = 0, p = *ep; *p && *p != '='; p++, i++)
 	    continue;
 	if (i > maxi)
 	    maxi = i;
+    }
-    name = xmalloc((size_t)(maxi + 1) * sizeof(Char));
+    name = xreallocarray(NULL, (size_t)(maxi + 1), sizeof(Char));
     while (++v && *v)
 	for (maxi = 1; maxi;)
 	    for (maxi = 0, ep = STR_environ; *ep; ep++) {
 		for (n = name, p = *ep; *p && *p != '='; *n++ = *p++)
 		    continue;
 		*n = '\0';
 		if (!Gmatch(name, *v))
 		    continue;
 		maxi = 1;
 		if (eq(name, STRLANG) || eq(name, STRLC_CTYPE)) {
 #ifdef NLS
 		    int     k;

 @@ -1,14 +1,14 @@
-/* $NetBSD: glob.c,v 1.31 2019/01/05 16:56:25 christos Exp $ */
+/* $NetBSD: glob.c,v 1.32 2024/04/24 15:49:03 nia Exp $ */
 /*-
  * Copyright (c) 1980, 1991, 1993
  *	The Regents of the University of California.  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.
 @@ -24,27 +24,27 @@
  * 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
 #if 0
 static char sccsid[] = "@(#)glob.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: glob.c,v 1.31 2019/01/05 16:56:25 christos Exp $");
+__RCSID("$NetBSD: glob.c,v 1.32 2024/04/24 15:49:03 nia Exp $");
 #endif
 #endif /* not lint */
 #include <sys/param.h>
 #include <errno.h>
 #include <glob.h>
 #include <stdarg.h>
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 @@ -121,27 +121,27 @@ globtilde(Char **nv, Char *s)
     --u;
     free(u);
     return (Strsave(gstart));
+}
 static int
 globbrace(Char *s, Char *p, Char ***bl)
+{
     Char gbuf[MAXPATHLEN];
     Char *lm, *pe, *pl, *pm, **nv, **vl;
     int i, len, size;
     size = GLOBSPACE;
-    nv = vl = xmalloc(sizeof(Char *) * (size_t)size);
+    nv = vl = xreallocarray(NULL, sizeof(Char *), (size_t)size);
     *vl = NULL;
     len = 0;
     /* copy part up to the brace */
     for (lm = gbuf, p = s; *p != LBRC; *lm++ = *p++)
 	continue;
     /* check for balanced braces */
     for (i = 0, pe = ++p; *pe; pe++)
 	if (*pe == LBRK) {
 	    /* Ignore everything between [] */
 	    for (++pe; *pe != RBRK && *pe != EOS; pe++)
 		continue;
 	    if (*pe == EOS) {
 @@ -187,27 +187,27 @@ globbrace(Char *s, Char *p, Char ***bl)
 		break;
 	    else {
 		Char    savec = *pm;
 		*pm = EOS;
 		(void)Strcpy(lm, pl);
 		(void)Strcat(gbuf, pe + 1);
 		*pm = savec;
 		*vl++ = Strsave(gbuf);
 		len++;
 		pl = pm + 1;
 		if (vl == &nv[size]) {
 		    size += GLOBSPACE;
-		    nv = xrealloc(nv, (size_t)size * sizeof(Char *));
+		    nv = xreallocarray(nv, (size_t)size, sizeof(Char *));
 		    vl = &nv[size - GLOBSPACE];
+		}
+	    }
 	    break;
 	default:
 	    break;
+	}
     *vl = NULL;
     *bl = nv;
     return (len);
+}
 static void
 @@ -240,27 +240,27 @@ expbrace(Char ***nvp, Char ***elp, size_
 	    if (len == 1) {
 		*vl-- = *bl;
 		free(bl);
 		continue;
+	    }
 	    len = blklen(bl);
 	    if (&ex[len] >= &nv[size]) {
 		ptrdiff_t l, e;
 		l = &ex[len] - &nv[size];
 		size += (size_t)(GLOBSPACE > l ? GLOBSPACE : l);
 		l = vl - nv;
 		e = ex - nv;
-		nv = xrealloc(nv, (size_t)size * sizeof(Char *));
+		nv = xreallocarray(nv, size, sizeof(Char *));
 		vl = nv + l;
 		ex = nv + e;
+	    }
 	    vp = vl--;
 	    *vp = *bl;
 	    len--;
 	    for (bp = ex; bp != vp; bp--)
 		bp[len] = *bp;
 	    ex += len;
 	    vp++;
 	    for (bp = bl + 1; *bp; *vp++ = *bp++)
 		continue;
 	    free(bl);
 @@ -269,53 +269,53 @@ expbrace(Char ***nvp, Char ***elp, size_
+    }
     if (elp != NULL)
 	*elp = ex;
     *nvp = nv;
+}
 static Char **
 globexpand(Char **v)
+{
     Char **ex, **nv, *s, **vl;
     size_t size;
     size = GLOBSPACE;
-    nv = vl = xmalloc(sizeof(Char *) * size);
+    nv = vl = xreallocarray(NULL, sizeof(Char *), size);
     *vl = NULL;
     /*
      * Step 1: expand backquotes.
      */
     while ((s = *v++) != NULL) {
 	if (Strchr(s, '`')) {
 	    int i;
 	    (void) dobackp(s, 0);
 	    for (i = 0; i < pargc; i++) {
 		*vl++ = pargv[i];
 		if (vl == &nv[size]) {
 		    size += GLOBSPACE;
-		    nv = xrealloc(nv, (size_t)size * sizeof(Char *));
+		    nv = xreallocarray(nv, size, sizeof(Char *));
 		    vl = &nv[size - GLOBSPACE];
+		}
+	    }
 	    free(pargv);
 	    pargv = NULL;
+	}
 	else {
 	    *vl++ = Strsave(s);
 	    if (vl == &nv[size]) {
 		size += GLOBSPACE;
-		nv = xrealloc(nv, size * sizeof(Char *));
+		nv = xreallocarray(nv, size, sizeof(Char *));
 		vl = &nv[size - GLOBSPACE];
+	    }
+	}
+    }
     *vl = NULL;
     if (noglob)
 	return (nv);
     /*
      * Step 2: expand braces
      */
     ex = vl;
 @@ -502,27 +502,27 @@ globall(Char **v)
 	    blkfree(vo);
+    }
     else
 	trim(vl);
     gargc = vl ? blklen(vl) : 0;
     return (gargv = vl);
+}
 void
 ginit(void)
+{
     gargsiz = GLOBSPACE;
-    gargv = xmalloc(sizeof(Char *) * (size_t)gargsiz);
+    gargv = xreallocarray(NULL, sizeof(Char *), (size_t)gargsiz);
     gargv[0] = 0;
     gargc = 0;
+}
 void
 rscan(Char **t, void (*f)(int))
+{
     Char *p;
     while ((p = *t++) != NULL)
 	while (*p)
 	    (*f) (*p++);
+}
 @@ -581,27 +581,27 @@ tglob(Char **t)
  */
 Char **
 dobackp(Char *cp, int literal)
+{
     Char word[MAXPATHLEN], *ep, *lp, *rp;
     if (pargv) {
 #ifdef notdef
 	abort();
 #endif
 	blkfree(pargv);
+    }
     pargsiz = GLOBSPACE;
-    pargv = xmalloc(sizeof(Char *) * (size_t)pargsiz);
+    pargv = xreallocarray(NULL, sizeof(Char *), (size_t)pargsiz);
     pargv[0] = NULL;
     pargcp = pargs = word;
     pargc = 0;
     pnleft = MAXPATHLEN - 4;
     for (;;) {
 	for (lp = cp; *lp != '`'; lp++) {
 	    if (*lp == 0) {
 		if (pargcp != pargs)
 		    pword();
 		return (pargv);
+	    }
 	    psave(*lp);
+	}
 @@ -767,49 +767,49 @@ static void
 psave(int c)
+{
     if (--pnleft <= 0)
 	stderror(ERR_WTOOLONG);
     *pargcp++ = (Char)c;
+}
 static void
 pword(void)
+{
     psave(0);
     if (pargc == pargsiz - 1) {
 	pargsiz += GLOBSPACE;
-	pargv = xrealloc(pargv, (size_t)pargsiz * sizeof(Char *));
+	pargv = xreallocarray(pargv, (size_t)pargsiz, sizeof(Char *));
+    }
     pargv[pargc++] = Strsave(pargs);
     pargv[pargc] = NULL;
     pargcp = pargs;
     pnleft = MAXPATHLEN - 4;
+}
 int
 Gmatch(Char *string, Char *pattern)
+{
     Char **blk, **p;
     int gpol, gres;
     gpol = 1;
     gres = 0;
     if (*pattern == '^') {
 	gpol = 0;
 	pattern++;
+    }
-    blk = xmalloc(GLOBSPACE * sizeof(Char *));
+    blk = xreallocarray(NULL, GLOBSPACE, sizeof(Char *));
     blk[0] = Strsave(pattern);
     blk[1] = NULL;
     expbrace(&blk, NULL, GLOBSPACE);
     for (p = blk; *p; p++)
 	gres |= pmatch(string, *p);
     blkfree(blk);
     return(gres == gpol);
+}
 static int
 @@ -887,30 +887,30 @@ pmatch(const Char *name, const Char *pat
 void
 Gcat(Char *s1, Char *s2)
+{
     Char *p, *q;
     ptrdiff_t n;
     for (p = s1; *p++;)
 	continue;
     for (q = s2; *q++;)
 	continue;
     n = (p - s1) + (q - s2) - 1;
     if (++gargc >= gargsiz) {
 	gargsiz += GLOBSPACE;
-	gargv = xrealloc(gargv, (size_t)gargsiz * sizeof(Char *));
+	gargv = xreallocarray(gargv, (size_t)gargsiz, sizeof(Char *));
+    }
     gargv[gargc] = 0;
-    p = gargv[gargc - 1] = xmalloc((size_t)n * sizeof(Char));
+    p = gargv[gargc - 1] = xreallocarray(NULL, (size_t)n, sizeof(Char));
     for (q = s1; (*p++ = *q++) != '\0';)
 	continue;
     for (p--, q = s2; (*p++ = *q++) != '\0';)
 	continue;
+}
 #ifdef FILEC
 int
 sortscmp(const void *va, const void *vb)
+{
 #if defined(NLS) && !defined(NOSTRCOLL)
     char buf[2048];
 #endif

 @@ -1,14 +1,14 @@
-/* $NetBSD: misc.c,v 1.22 2019/01/05 16:54:00 christos Exp $ */
+/* $NetBSD: misc.c,v 1.23 2024/04/24 15:49:03 nia Exp $ */
 /*-
  * Copyright (c) 1980, 1991, 1993
  *	The Regents of the University of California.  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.
 @@ -24,27 +24,27 @@
  * 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
 #if 0
 static char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: misc.c,v 1.22 2019/01/05 16:54:00 christos Exp $");
+__RCSID("$NetBSD: misc.c,v 1.23 2024/04/24 15:49:03 nia Exp $");
 #endif
 #endif /* not lint */
 #include <sys/param.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include "csh.h"
 #include "extern.h"
 @@ -62,27 +62,27 @@ any(const char *s, int c)
     return (0);
+}
 char *
 strsave(const char *s)
+{
     const char *n;
     char *p, *r;
     if (s == NULL)
 	s = "";
     for (n = s; *n++;)
 	continue;
-    r = p = xmalloc((size_t)(n - s) * sizeof(*p));
+    r = p = xreallocarray(NULL, (size_t)(n - s), sizeof(*p));
     while ((*p++ = *s++) != '\0')
 	continue;
     return (r);
+}
 Char **
 blkend(Char **up)
+{
     while (*up)
 	up++;
     return (up);
+}
 @@ -179,27 +179,27 @@ strstr(char *s, char *t)
 char *
 strspl(char *cp, char *dp)
+{
     char *ep, *p, *q;
     if (!cp)
 	cp = "";
     if (!dp)
 	dp = "";
     for (p = cp; *p++;)
 	continue;
     for (q = dp; *q++;)
 	continue;
-    ep = xmalloc((size_t)(((p - cp) + (q - dp) - 1) * sizeof(*ep)));
+    ep = xreallocarray(NULL, (size_t)(((p - cp) + (q - dp) - 1), sizeof(*ep)));
     for (p = ep, q = cp; *p++ = *q++;)
 	continue;
     for (p--, q = dp; *p++ = *q++;)
 	continue;
     return (ep);
+}
 #endif
 Char **
 blkspl(Char **up, Char **vp)
+{
     Char **wp;

 @@ -1,14 +1,14 @@
-/* $NetBSD: str.c,v 1.16 2019/01/05 16:54:00 christos Exp $ */
+/* $NetBSD: str.c,v 1.17 2024/04/24 15:49:03 nia Exp $ */
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  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.
 @@ -24,27 +24,27 @@
  * 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
 #if 0
 static char sccsid[] = "@(#)str.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: str.c,v 1.16 2019/01/05 16:54:00 christos Exp $");
+__RCSID("$NetBSD: str.c,v 1.17 2024/04/24 15:49:03 nia Exp $");
 #endif
 #endif /* not lint */
 #define MALLOC_INCR 128
 /*
  * tc.str.c: Short string package
  *	     This has been a lesson of how to write buggy code!
  */
 #include <sys/types.h>
 #include <stdarg.h>
 @@ -56,104 +56,104 @@ __RCSID("$NetBSD: str.c,v 1.16 2019/01/0
 #ifdef SHORT_STRINGS
 Char **
 blk2short(char **src)
+{
     Char **dst, **sdst;
     size_t n;
     /*
      * Count
      */
     for (n = 0; src[n] != NULL; n++)
 	continue;
-    sdst = dst = xmalloc((size_t)((n + 1) * sizeof(*dst)));
+    sdst = dst = xreallocarray(NULL, n + 1, sizeof(*dst));
     for (; *src != NULL; src++)
 	*dst++ = SAVE(*src);
     *dst = NULL;
     return (sdst);
+}
 char **
 short2blk(Char *const *src)
+{
     char **dst, **sdst;
     size_t n;
     /*
      * Count
      */
     for (n = 0; src[n] != NULL; n++)
 	continue;
-    sdst = dst = xmalloc((size_t)((n + 1) * sizeof(*dst)));
+    sdst = dst = xreallocarray(NULL, n + 1, sizeof(*dst));
     for (; *src != NULL; src++)
 	*dst++ = strsave(short2str(*src));
     *dst = NULL;
     return (sdst);
+}
 Char *
 str2short(const char *src)
+{
     static Char *sdst;
     Char *dst, *edst;
     static size_t dstsize = 0;
     if (src == NULL)
 	return (NULL);
     if (sdst == (NULL)) {
 	dstsize = MALLOC_INCR;
-	sdst = xmalloc((size_t)dstsize * sizeof(*sdst));
+	sdst = xreallocarray(NULL, (size_t)dstsize, sizeof(*sdst));
+    }
     dst = sdst;
     edst = &dst[dstsize];
     while (*src) {
 	*dst++ = (Char) ((unsigned char) *src++);
 	if (dst == edst) {
 	    dstsize += MALLOC_INCR;
-	    sdst = xrealloc(sdst, (size_t)dstsize * sizeof(*sdst));
+	    sdst = xreallocarray(sdst, (size_t)dstsize, sizeof(*sdst));
 	    edst = &sdst[dstsize];
 	    dst = &edst[-MALLOC_INCR];
+	}
+    }
     *dst = 0;
     return (sdst);
+}
 char *
 short2str(const Char *src)
+{
     static char *sdst = NULL;
     static size_t dstsize = 0;
     char *dst, *edst;
     if (src == NULL)
 	return (NULL);
     if (sdst == NULL) {
 	dstsize = MALLOC_INCR;
-	sdst = xmalloc((size_t)dstsize * sizeof(*sdst));
+	sdst = xreallocarray(NULL, dstsize, sizeof(*sdst));
+    }
     dst = sdst;
     edst = &dst[dstsize];
     while (*src) {
 	*dst++ = (char) *src++;
 	if (dst == edst) {
 	    dstsize += MALLOC_INCR;
-	    sdst = xrealloc(sdst, (size_t)dstsize * sizeof(*sdst));
+	    sdst = xreallocarray(sdst, dstsize, sizeof(*sdst));
 	    edst = &sdst[dstsize];
 	    dst = &edst[-MALLOC_INCR];
+	}
+    }
     *dst = 0;
     return (sdst);
+}
 Char *
 s_strcpy(Char *dst, const Char *src)
+{
     Char *sdst;
 @@ -302,47 +302,47 @@ s_strncmp(const Char *str1, const Char *
     return(0);
+}
 Char *
 s_strsave(const Char *s)
+{
     const Char *p;
     Char *n;
     if (s == 0)
 	s = STRNULL;
     for (p = s; *p++;)
 	continue;
-    p = n = xmalloc((size_t)(p - s) * sizeof(*n));
+    p = n = xreallocarray(NULL, (size_t)(p - s), sizeof(*n));
     while ((*n++ = *s++) != '\0')
 	continue;
     return __UNCONST(p);
+}
 Char *
 s_strspl(const Char *cp, const Char *dp)
+{
     Char *ep, *d;
     const Char *p, *q;
     if (!cp)
 	cp = STRNULL;
     if (!dp)
 	dp = STRNULL;
     for (p = cp; *p++;)
 	continue;
     for (q = dp; *q++;)
 	continue;
-    ep = xmalloc((size_t)((p - cp) + (q - dp) - 1) * sizeof(*ep));
+    ep = xreallocarray(NULL, (size_t)((p - cp) + (q - dp) - 1), sizeof(*ep));
     for (d = ep, q = cp; (*d++ = *q++) != '\0';)
 	continue;
     for (d--, q = dp; (*d++ = *q++) != '\0';)
 	continue;
     return (ep);
+}
 Char *
 s_strend(const Char *cp)
+{
     if (!cp)
 	return __UNCONST(cp);
     while (*cp)
 @@ -368,45 +368,45 @@ s_strstr(const Char *s, const Char *t)
 char *
 short2qstr(const Char *src)
+{
     static char *sdst = NULL;
     static size_t dstsize = 0;
     char *dst, *edst;
     if (src == NULL)
 	return (NULL);
     if (sdst == NULL) {
 	dstsize = MALLOC_INCR;
-	sdst = xmalloc((size_t)dstsize * sizeof(*sdst));
+	sdst = xreallocarray(NULL, dstsize, sizeof(*sdst));
+    }
     dst = sdst;
     edst = &dst[dstsize];
     while (*src) {
 	if (*src & QUOTE) {
 	    *dst++ = '\\';
 	    if (dst == edst) {
 		dstsize += MALLOC_INCR;
-		sdst = xrealloc(sdst, (size_t)dstsize * sizeof(*sdst));
+		sdst = xreallocarray(sdst, (size_t)dstsize, sizeof(*sdst));
 		edst = &sdst[dstsize];
 		dst = &edst[-MALLOC_INCR];
+	    }
+	}
 	*dst++ = (char) *src++;
 	if (dst == edst) {
 	    dstsize += MALLOC_INCR;
-	    sdst = xrealloc(sdst, (size_t)dstsize * sizeof(*sdst));
+	    sdst = xreallocarray(sdst, (size_t)dstsize, sizeof(*sdst));
 	    edst = &sdst[dstsize];
 	    dst = &edst[-MALLOC_INCR];
+	}
+    }
     *dst = 0;
     return (sdst);
+}
 /*
  * XXX: Should we worry about QUOTE'd chars?
  */
 char *
 vis_str(const Char *cp)
 @@ -414,24 +414,24 @@ vis_str(const Char *cp)
     static char *sdst = NULL;
     static size_t dstsize = 0;
     const Char *dp;
     size_t n;
     if (cp == NULL)
 	return (NULL);
     for (dp = cp; *dp++;)
 	continue;
     n = ((size_t)(dp - cp) << 2) + 1; /* 4 times + NULL */
     if (dstsize < n) {
 	sdst = (dstsize ?
-	    xrealloc(sdst, (size_t)n * sizeof(*sdst)) :
+	    xreallocarray(sdst, (size_t)n, sizeof(*sdst)) :
-	    xmalloc((size_t)n * sizeof(*sdst)));
+	    xreallocarray(NULL, (size_t)n, sizeof(*sdst)));
 	dstsize = n;
+    }
     /*
      * XXX: When we are in AsciiOnly we want all characters >= 0200 to
      * be encoded, but currently there is no way in vis to do that.
      */
     (void)strvis(sdst, short2str(cp), VIS_NOSLASH);
     return (sdst);
+}