From 494fcd1799d4d2d236d3183de12b0c99ceb83b1c Mon Sep 17 00:00:00 2001
From: dana <dana@dana.is>
Date: Sun, 13 Apr 2025 17:15:53 -0500
Subject: 53482: zparseopts -G: always add options with optional args to array
 with =

---
 Src/Modules/zutil.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'Src/Modules')

diff --git a/Src/Modules/zutil.c b/Src/Modules/zutil.c
index 9b2721a09..ef99303d2 100644
--- a/Src/Modules/zutil.c
+++ b/Src/Modules/zutil.c
@@ -1662,15 +1662,15 @@ add_opt_val(Zoptdesc d, char *arg)
 	v->str = NULL;
 	if (d->arr)
 	    d->arr->num += (arg ? 2 : 1);
-    } else if (arg) {
+    } else if (arg || d->flags & ZOF_GNUL) {
 	/* 3 here is '-' + '=' + NUL */
-	char *s = (char *) zhalloc(strlen(d->name) + strlen(arg) + 3);
+	char *s = (char *) zhalloc(strlen(d->name) + strlen(arg ? arg : "") + 3);
 
 	*s = '-';
 	strcpy(s + 1, d->name);
 	if (d->flags & ZOF_GNUL)
 	    strcat(s, "=");
-	strcat(s, arg);
+	strcat(s, arg ? arg : "");
 	v->str = s;
 	if (d->arr)
 	    d->arr->num += 1;
-- 
cgit v1.2.3