summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimo Teras <timo.teras@iki.fi>2012-02-10 07:55:24 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2012-02-23 02:22:25 (GMT)
commitaf36ba206f7cf0eef77a82af741766a2d03c51ad (patch)
treef0ef45fd3278b46b04c9baa932756a4e3aa8cd09
parentcfcb1dac83c9e18a06a07f0b212f6701bb87c2ad (diff)
downloadbusybox-af36ba206f7cf0eef77a82af741766a2d03c51ad.tar.gz
busybox-af36ba206f7cf0eef77a82af741766a2d03c51ad.tar.bz2
mkdir: fix permissions on 64-bit platforms
sizeof(long) != sizeof(mode_t), this causes the compare in bb_make_directory of (long)-1 != (mode_t)-1 to fail and mess up the permissions of final directory by doing chmod((mode_t) -1). Signed-off-by: Timo Teras <timo.teras@iki.fi> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--coreutils/mkdir.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/coreutils/mkdir.c b/coreutils/mkdir.c
index a4429b1..b33b6bb 100644
--- a/coreutils/mkdir.c
+++ b/coreutils/mkdir.c
@@ -54,7 +54,7 @@ static const char mkdir_longopts[] ALIGN1 =
int mkdir_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int mkdir_main(int argc UNUSED_PARAM, char **argv)
{
- mode_t mode = (mode_t)(-1);
+ long mode = -1;
int status = EXIT_SUCCESS;
int flags = 0;
unsigned opt;
@@ -68,10 +68,11 @@ int mkdir_main(int argc UNUSED_PARAM, char **argv)
#endif
opt = getopt32(argv, "m:p" IF_SELINUX("Z:"), &smode IF_SELINUX(,&scontext));
if (opt & 1) {
- mode = 0777;
- if (!bb_parse_mode(smode, &mode)) {
+ mode_t mmode = 0777;
+ if (!bb_parse_mode(smode, &mmode)) {
bb_error_msg_and_die("invalid mode '%s'", smode);
}
+ mode = mmode;
}
if (opt & 2)
flags |= FILEUTILS_RECUR;