From 4bd0c2ab38a53d5ecc89eacc61b3291d4fe01d51 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Sun, 4 Dec 2016 10:42:07 +0100 Subject: fix musl problem with dirname, now for all users of bb_make_directory() function old new delta bb_make_directory 412 419 +7 install_main 793 769 -24 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 1/1 up/down: 7/-24) Total: -17 bytes Signed-off-by: Denys Vlasenko --- coreutils/install.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'coreutils') diff --git a/coreutils/install.c b/coreutils/install.c index d0dcd0e89..831f9b802 100644 --- a/coreutils/install.c +++ b/coreutils/install.c @@ -209,16 +209,10 @@ int install_main(int argc, char **argv) dest = last; if (opts & OPT_MKDIR_LEADING) { char *ddir = xstrdup(dest); - char *dn = dirname(ddir); - /* musl can return read-only "/" or "." string. - * bb_make_directory needs writable string. + bb_make_directory(dirname(ddir), 0755, mkdir_flags); + /* errors are not checked. copy_file + * will fail if dir is not created. */ - if ((dn[0] != '/' && dn[0] != '.') || dn[1] != '\0') { - bb_make_directory(dn, 0755, mkdir_flags); - /* errors are not checked. copy_file - * will fail if dir is not created. - */ - } free(ddir); } if (isdir) -- cgit v1.2.3