diff options
| author | Denys Vlasenko | 2018-06-22 18:59:10 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2018-06-22 18:59:10 +0200 |
| commit | 34254f9ddece34d4df541438ec4f6a1b19929926 (patch) | |
| tree | 93e353134c52d5c05c6d10277cea81e67aa6d50d | |
| parent | 148788eb0ee96026105755cf3fd1ad3d94f49cd2 (diff) | |
| download | busybox-34254f9ddece34d4df541438ec4f6a1b19929926.zip busybox-34254f9ddece34d4df541438ec4f6a1b19929926.tar.gz | |
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>
| -rw-r--r-- | coreutils/install.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/coreutils/install.c b/coreutils/install.c index 2e4dc25..8270490 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. */ |