From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Sat, 3 Dec 2016 10:49:23 +0000 (+0100)
Subject: install: fix musl problem with dirname
X-Git-Tag: 1_26_0~19
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=cf2600c3661c11491a838ef29733583afb6ad968;p=oweals%2Fbusybox.git

install: fix musl problem with dirname

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/coreutils/install.c b/coreutils/install.c
index e68589229..d0dcd0e89 100644
--- a/coreutils/install.c
+++ b/coreutils/install.c
@@ -209,9 +209,16 @@ int install_main(int argc, char **argv)
 			dest = last;
 			if (opts & OPT_MKDIR_LEADING) {
 				char *ddir = xstrdup(dest);
-				bb_make_directory(dirname(ddir), 0755, mkdir_flags);
-				/* errors are not checked. copy_file
-				 * will fail if dir is not created. */
+				char *dn = dirname(ddir);
+				/* musl can return read-only "/" or "." string.
+				 * bb_make_directory needs writable string.
+				 */
+				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)