From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Fri, 22 Jun 2018 16:59:10 +0000 (+0200)
Subject: install: fix "-D -t DIR1/DIR2/DIR3" creating only DIR1/DIR2, closes 11106
X-Git-Tag: 1_29_0~27
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=34254f9ddece34d4df541438ec4f6a1b19929926;p=oweals%2Fbusybox.git

install: fix "-D -t DIR1/DIR2/DIR3" creating only DIR1/DIR2, closes 11106

function                                             old     new   delta
install_main                                         758     767      +9

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

diff --git a/coreutils/install.c b/coreutils/install.c
index 2e4dc257f..8270490bd 100644
--- a/coreutils/install.c
+++ b/coreutils/install.c
@@ -214,7 +214,11 @@ 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);
+				/*
+				 * -D -t DIR1/DIR2/F3 FILE: create DIR1/DIR2/F3, copy FILE there
+				 * -D FILE DIR1/DIR2/F3: create DIR1/DIR2, copy FILE there as F3
+				 */
+				bb_make_directory((opts & OPT_TARGET) ? ddir : dirname(ddir), 0755, mkdir_flags);
 				/* errors are not checked. copy_file
 				 * will fail if dir is not created.
 				 */