Message ID | 1445008519-19928-4-git-send-email-mkl@pengutronix.de |
---|---|
State | Superseded |
Headers | show |
diff --git a/mkfs.ubifs/mkfs.ubifs.c b/mkfs.ubifs/mkfs.ubifs.c index 049219b52cc5..a99c61382304 100644 --- a/mkfs.ubifs/mkfs.ubifs.c +++ b/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; }