diff options
Diffstat (limited to 'patches/mtd-utils-1.5.2/0005-mkfs.ubifs-simplify-make_path-with-xasprintf.patch')
| -rw-r--r-- | patches/mtd-utils-1.5.2/0005-mkfs.ubifs-simplify-make_path-with-xasprintf.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/patches/mtd-utils-1.5.2/0005-mkfs.ubifs-simplify-make_path-with-xasprintf.patch b/patches/mtd-utils-1.5.2/0005-mkfs.ubifs-simplify-make_path-with-xasprintf.patch deleted file mode 100644 index c47a7e023..000000000 --- a/patches/mtd-utils-1.5.2/0005-mkfs.ubifs-simplify-make_path-with-xasprintf.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: Sascha Hauer <s.hauer@pengutronix.de> -Date: Fri, 28 Nov 2014 11:15:18 +0100 -Subject: [PATCH] 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> ---- - mkfs.ubifs/mkfs.ubifs.c | 10 +++------- - 1 file changed, 3 insertions(+), 7 deletions(-) - -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; - } - |