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

fix musl problem with dirname, now for all users of bb_make_directory()

Browse Source 
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 <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2016-12-04 10:42:07 +01:00
parent fdb4421e00
commit 4bd0c2ab38
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
coreutils/install.c
View File

@ -209,16 +209,10 @@ int install_main(int argc, char **argv)
dest = last; dest = last;
if (opts & OPT_MKDIR_LEADING) { if (opts & OPT_MKDIR_LEADING) {
char *ddir = xstrdup(dest); char *ddir = xstrdup(dest);
char *dn = dirname(ddir); bb_make_directory(dirname(ddir), 0755, mkdir_flags);
/* musl can return read-only "/" or "." string. /* errors are not checked. copy_file
* bb_make_directory needs writable string. * will fail if dir is not created.
*/ */
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); free(ddir);
} }
if (isdir) if (isdir)

15
libbb/make_directory.c
View File

@ -35,9 +35,20 @@ int FAST_FUNC bb_make_directory(char *path, long mode, int flags)
char c; char c;
struct stat st; struct stat st;
/* Happens on bb_make_directory(dirname("no_slashes"),...) */ /* "path" can be a result of dirname().
if (LONE_CHAR(path, '.')) * 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; 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; org_mask = cur_mask = (mode_t)-1L;
s = path; s = path;