mkfs.ubifs: simplify make_path with xasprintf

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Reviewed-by: Daniel Walter <dwalter@sigma-star.at>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Richard Weinberger <richard@nod.at>

diff --git a/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c
index 049219b52cc58304ccb536036f08b5b7fa1844de..a99c6138230482765c7ea3c436bbd17df646278c 100644 (file)
--- a/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c
+++ b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c
@@ -227,13 +227,9 @@ static char *make_path(const char *dir, const char *name)
 {
        char *s;
 
-       s = malloc(strlen(dir) + strlen(name) + 2);
-       if (!s)
-               return NULL;
-       strcpy(s, dir);
-       if (dir[strlen(dir) - 1] != '/')
-               strcat(s, "/");
-       strcat(s, name);
+       xasprintf(&s, "%s%s%s",
+                 dir, dir[strlen(dir) - 1] == '/' ? "" : "/", name);
+
        return s;
 }