Make certain clients of bb_make_directory default to honoring

the user's umask

diff --git a/archival/libunarchive/data_extract_all.c b/archival/libunarchive/data_extract_all.c
index 52edaa1828e5ba8460f89c8591f29d3f3f8bf1ef..d10d665f6dd5798291334ff733feac927c9f1980 100644 (file)
--- a/archival/libunarchive/data_extract_all.c
+++ b/archival/libunarchive/data_extract_all.c
@@ -35,7 +35,7 @@ extern void data_extract_all(archive_handle_t *archive_handle)
 
        if (archive_handle->flags & ARCHIVE_CREATE_LEADING_DIRS) {
                char *name = bb_xstrdup(file_header->name);
-               bb_make_directory (dirname(name), 0777, FILEUTILS_RECUR);
+               bb_make_directory (dirname(name), -1, FILEUTILS_RECUR);
                free(name);
        }
 

diff --git a/libbb/make_directory.c b/libbb/make_directory.c
index d07ccb93c0f524cac8d5373d4b21bcd06557c4f3..d96acf0d9c045cbe912486bb12a6f0346a988a3d 100644 (file)
--- a/libbb/make_directory.c
+++ b/libbb/make_directory.c
@@ -49,7 +49,14 @@ int bb_make_directory (char *path, long mode, int flags)
        struct stat st;
 
        mask = umask(0);
-       umask(mask & ~0300);
+       if (mode == -1) {
+               umask(mask);
+               mode = (S_IXUSR | S_IXGRP | S_IXOTH |
+                               S_IWUSR | S_IWGRP | S_IWOTH |
+                               S_IRUSR | S_IRGRP | S_IROTH) & ~mask;
+       } else {
+               umask(mask & ~0300);
+       }
 
        do {
                c = 0;

diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c
index c2dde91c613a508e9e54c1a34d4218e2616048ae..5e183e61f103d82cdb255d3ec79f62ce66a7d99d 100644 (file)
--- a/miscutils/devfsd.c
+++ b/miscutils/devfsd.c
@@ -1547,7 +1547,7 @@ static int make_dir_tree (const char *path)
 #ifdef CONFIG_DEBUG
        msg_logger( NO_DIE, LOG_INFO, "make_dir_tree()\n");
 #endif
-       if (bb_make_directory( dirname((char *)path),  S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH ,FILEUTILS_RECUR )==-1)
+       if (bb_make_directory( dirname((char *)path), -1, FILEUTILS_RECUR )==-1)
        {
 #ifdef CONFIG_DEBUG
                msg_logger( NO_DIE, LOG_ERR, "make_dir_tree(): %s: %m\n", path);