From: Takashi Iwai <tiwai@suse.de>
Date: Wed, 31 Jul 2024 09:14:08 +0000 (+0200)
Subject: seq: Avoid strlcat()
X-Git-Tag: v1.2.13~20
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=d9694398130c2217de19165a5ac641651f837857;p=alsa-lib.git

seq: Avoid strlcat()

strlcat() isn't available in every system, so better to avoid it.
Rewrite the code without strlcat().

Fixes: 6167b8ce3e80 ("seq: Add API helper functions for creating UMP Endpoint and Blocks")
Link: https://lore.kernel.org/0796c157-1ac3-47a3-9d54-ba86f59d64d5@linux.intel.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/src/seq/seqmid.c b/src/seq/seqmid.c
index 08c62d5c..b30db407 100644
--- a/src/seq/seqmid.c
+++ b/src/seq/seqmid.c
@@ -635,6 +635,7 @@ static void update_group_ports(snd_seq_t *seq, snd_ump_endpoint_info_t *ep)
 		char blknames[64];
 		char name[64];
 		unsigned int caps = 0;
+		int len;
 
 		blknames[0] = 0;
 		for (b = 0; b < ep->num_blocks; b++) {
@@ -668,14 +669,13 @@ static void update_group_ports(snd_seq_t *seq, snd_ump_endpoint_info_t *ep)
 
 			if (!*bp->name)
 				continue;
-			if (*blknames) {
-				strlcat(blknames, ", ", sizeof(blknames));
-				strlcat(blknames, (const char *)bp->name,
-					sizeof(blknames));
-			} else {
+			len = strlen(blknames);
+			if (len)
+				snprintf(blknames + len, sizeof(blknames) - len,
+					 ", %s", bp->name);
+			else
 				snd_strlcpy(blknames, (const char *)bp->name,
 					    sizeof(blknames));
-			}
 		}
 
 		if (!*blknames)