From: Eric Andersen <andersen@codepoet.org>
Date: Wed, 13 Oct 2004 06:25:52 +0000 (-0000)
Subject: Make certain clients of bb_make_directory default to honoring
X-Git-Tag: 1_00~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0e020d10257a7f1e4cd526eb6c49ba67a442ba85;p=platform%2Fupstream%2Fbusybox.git

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 52edaa1..d10d665 100644
--- 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 d07ccb9..d96acf0 100644
--- 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 c2dde91..5e183e6 100644
--- 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);