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 --- libbb/make_directory.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'libbb/make_directory.c') diff --git a/libbb/make_directory.c b/libbb/make_directory.c index 89352ca1f..a6b7c28df 100644 --- a/libbb/make_directory.c +++ b/libbb/make_directory.c @@ -35,9 +35,20 @@ int FAST_FUNC bb_make_directory(char *path, long mode, int flags) char c; struct stat st; - /* Happens on bb_make_directory(dirname("no_slashes"),...) */ - if (LONE_CHAR(path, '.')) + /* "path" can be a result of dirname(). + * dirname("no_slashes") returns ".", possibly read-only. + * musl dirname() can return read-only "/" too. + * We need writable string. And for "/", "." (and ".."?) + * nothing needs to be created anyway. + */ + if (LONE_CHAR(path, '/')) return 0; + if (path[0] == '.') { + if (path[1] == '\0') + return 0; /* "." */ +// if (path[1] == '.' && path[2] == '\0') +// return 0; /* ".." */ + } org_mask = cur_mask = (mode_t)-1L; s = path; -- cgit v1.2.3