53335: Remove unused dupstring_glen() function

Also make use of the dupstring_wlen() variant in more places to avoid a strlen()

ChangeLog

@@ -1,5 +1,10 @@
 2025-01-30  Oliver Kiddle  <opk@zsh.org>
 
+	* 53335: Src/hist.c, Src/string.c, Src/Zle/compcore.c,
+	Src/Zle/compctl.c, Src/Zle/compmatch.c, Src/Zle/computil.c:
+	Remove unused dupstring_glen() function and make use of the
+	dupstring_wlen() variant in more places to avoid a strlen()
+
 	* 53332, 53334: Src/builtin.c, Src/prompt.c, Src/Modules/stat.c,
 	Src/Zle/compresult.c, Src/Zle/zle_misc.c:
 	Avoid strlen calls after sprintf

Src/Zle/compcore.c

@@ -708,7 +708,7 @@ callcompfunc(char *s, char *fn)
 
 	    sav = *ss;
 	    *ss = '\0';
-	    tmp = (linwhat == IN_MATH ? dupstring(s) : multiquote(s, 0));
+	    tmp = (linwhat == IN_MATH ? dupstring_wlen(s, offs) : multiquote(s, 0));
 	    untokenize(tmp);
 	    compprefix = ztrdup(tmp);
 	    *ss = sav;
@@ -1820,7 +1820,7 @@ set_comp_sep(void)
      */
     sav = s[(i = swb - 1 - sqq + dq)];
     s[i] = '\0';
-    qp = (qttype == QT_SINGLE) ? dupstring(s) : rembslash(s);
+    qp = (qttype == QT_SINGLE) ? dupstring_wlen(s, i) : rembslash(s);
     s[i] = sav;
     if (swe < swb)
 	swe = swb;
@@ -2244,10 +2244,10 @@ addmatches(Cadata dat, char **argv)
 	if (dat->aflags & CAF_MATCH) {
 	    lipre = dupstring(compiprefix);
 	    lisuf = dupstring(compisuffix);
-	    lpre = dupstring(compprefix);
+	    llpl = strlen(compprefix);
-	    lsuf = dupstring(compsuffix);
+	    llsl = strlen(compsuffix);
-	    llpl = strlen(lpre);
+	    lpre = dupstring_wlen(compprefix, llpl);
-	    llsl = strlen(lsuf);
+	    lsuf = dupstring_wlen(compsuffix, llsl);
 
 	    /* This used to reference compqiprefix and compqisuffix, why? */
 	    if (llpl + (int)strlen(qipre) + (int)strlen(lipre) != origlpre
@@ -2300,12 +2300,8 @@ addmatches(Cadata dat, char **argv)
 		for (p = lpre + 2; *p && *p != ')'; p++);
 
 		if (*p == ')') {
-		    char sav = p[1];
-
-		    p[1] = '\0';
-		    globflag = dupstring(lpre);
 		    gfl = p - lpre + 1;
-		    p[1] = sav;
+		    globflag = dupstring_wlen(lpre, gfl);
 
 		    lpre = p + 1;
 		    llpl -= gfl;
@@ -2731,7 +2727,7 @@ add_match_data(int alt, char *str, char *orig, Cline line,
 	    sl = tsl;
 	}
 	if (qisl) {
-	    Cline qsl = bld_parts(dupstring(qisuf), qisl, qisl, NULL, NULL);
+	    Cline qsl = bld_parts(dupstring_wlen(qisuf, qisl), qisl, qisl, NULL, NULL);
 
 	    qsl->flags |= CLF_SUF;
 	    qsl->suffix = qsl->prefix;
@@ -2814,7 +2810,7 @@ add_match_data(int alt, char *str, char *orig, Cline line,
 	    line = p;
 	}
 	if (qipl) {
-	    Cline lp, p = bld_parts(dupstring(qipre), qipl, qipl, &lp, NULL);
+	    Cline lp, p = bld_parts(dupstring_wlen(qipre, qipl), qipl, qipl, &lp, NULL);
 
 	    lp->next = line;
 	    line = p;

Src/Zle/compctl.c

@@ -3201,8 +3201,8 @@ makecomplistflags(Compctl cc, char *s, int incmd, int compadd)
 	memcpy(lpre, s, lpl);
     lpre[lpl] = '\0';
     qlpre = quotename(lpre);
-    lsuf = dupstring(s + offs);
+    lsl = strlen(s + offs);
-    lsl = strlen(lsuf);
+    lsuf = dupstring_wlen(s + offs, lsl);
     qlsuf = quotename(lsuf);
 
     /* First check for ~.../... */

Src/Zle/compmatch.c

@@ -1161,8 +1161,8 @@ comp_match(char *pfx, char *sfx, char *w, Patprog cp, Cline *clp, int qu,
 
 	/* We still break it into parts here, trying to build a sensible
 	 * cline list for these matches, too. */
-	w = dupstring(w);
 	wl = strlen(w);
+	w = dupstring_wlen(w, wl);
 	*clp = bld_parts(w, wl, wl, NULL, NULL);
 	*exact = 0;
     } else {
@@ -2127,7 +2127,7 @@ cmp_anchors(Cline o, Cline n, int join)
 	(j = join_strs(o->wlen, o->word, n->wlen, n->word))) {
 	o->flags |= CLF_JOIN;
 	o->wlen = strlen(j);
-	o->word = dupstring(j);
+	o->word = dupstring_wlen(j, o->wlen);
 
 	return 2;
     }

Src/Zle/computil.c

@@ -1296,8 +1296,7 @@ parse_cadef(char *nam, char **args)
 		int l = strlen(p) - 1;
 
 		if (*p == '(' && p[l] == ')') {
-		    axor = p = dupstring(p + 1);
+		    axor = p = dupstring_wlen(p + 1, l - 1);
-		    p[l - 1] = '\0';
 		} else
 		    axor = NULL;
 		if (!*p) {
@@ -1317,8 +1316,7 @@ parse_cadef(char *nam, char **args)
 	    p = *++args;
 	    l = strlen(p) - 1;
 	    if (*p == '(' && p[l] == ')') {
-		axor = p = dupstring(p + 1);
+		axor = p = dupstring_wlen(p + 1, l - 1);
-		p[l - 1] = '\0';
 	    } else
 		axor = NULL;
 	    if (!*p) {
@@ -1339,7 +1337,7 @@ parse_cadef(char *nam, char **args)
 
 	    LinkList list = newlinklist();
 	    LinkNode node;
-	    char **xp, sav;
+	    char **xp;
 
 	    while (*p && *p != ')') {
 		for (p++; inblank(*p); p++);
@@ -1351,11 +1349,8 @@ parse_cadef(char *nam, char **args)
 		if (!*p)
 		    break;
 
-		sav = *p;
+		addlinknode(list, dupstring_wlen(q, p - q));
-		*p = '\0';
-		addlinknode(list, dupstring(q));
 		xnum++;
-		*p = sav;
 	    }
 	    /* Oops, end-of-string. */
 	    if (*p != ')') {

Src/hist.c

@@ -3553,9 +3553,8 @@ bufferwords(LinkList list, char *buf, int *index, int flags)
 	} else if (buf) {
 	    if (IS_REDIROP(tok) && tokfd >= 0) {
 		char b[20];
-
+		int l = sprintf(b, "%d%s", tokfd, tokstrings[tok]);
-		sprintf(b, "%d%s", tokfd, tokstrings[tok]);
+		addlinknode(list, dupstring_wlen(b, l));
-		addlinknode(list, dupstring(b));
 		num++;
 	    } else if (tok != NEWLIN) {
 		addlinknode(list, dupstring(tokstrings[tok]));

Src/string.c

@@ -57,21 +57,6 @@ dupstring_wlen(const char *s, unsigned len)
     return t;
 }
 
-/* Duplicate string on heap, returning length of string */
-
-/**/
-mod_export char *
-dupstring_glen(const char *s, unsigned *len_ret)
-{
-    char *t;
-
-    if (!s)
-	return NULL;
-    t = (char *) zhalloc((*len_ret = strlen((char *)s)) + 1);
-    strcpy(t, s);
-    return t;
-}
-
 /**/
 mod_export char *
 ztrdup(const char *s)