emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

install: fix musl problem with dirname

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2016-12-03 11:49:23 +01:00
parent 7d877fc931
commit cf2600c366
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
coreutils/install.c
View File

@ -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);
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. */
* will fail if dir is not created.
*/
}
free(ddir);
}
if (isdir)