From 8967299b33c1fae4a3ab14396db323bb7b7fcc50 Mon Sep 17 00:00:00 2001
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Mon, 19 Sep 2016 18:42:58 +0000
Subject: [PATCH] mount(1): Simplify by using asprintf(3)

Instead of strlen() + malloc() + snprintf, just use asprintf().
No functional change.

Obtained from:	OpenBSD (CVS Rev. 1.67)
---
 sbin/mount/mount.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c
index debe3547a8ff..b33d9a3f71ef 100644
--- a/sbin/mount/mount.c
+++ b/sbin/mount/mount.c
@@ -705,17 +705,14 @@ getmntpt(const char *name)
 char *
 catopt(char *s0, const char *s1)
 {
-	size_t i;
 	char *cp;
 
 	if (s1 == NULL || *s1 == '\0')
 		return (s0);
 
 	if (s0 && *s0) {
-		i = strlen(s0) + strlen(s1) + 1 + 1;
-		if ((cp = malloc(i)) == NULL)
-			errx(1, "malloc failed");
-		(void)snprintf(cp, i, "%s,%s", s0, s1);
+		if (asprintf(&cp, "%s,%s", s0, s1) == -1)
+			errx(1, "asprintf failed");
 	} else
 		cp = strdup(s1);