aboutsummaryrefslogtreecommitdiff
path: root/coreutils
diff options
context:
space:
mode:
authorTimo Teras <timo.teras@iki.fi>2012-02-10 09:55:24 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2012-02-23 03:22:25 +0100
commitaf36ba206f7cf0eef77a82af741766a2d03c51ad (patch)
treef0ef45fd3278b46b04c9baa932756a4e3aa8cd09 /coreutils
parentcfcb1dac83c9e18a06a07f0b212f6701bb87c2ad (diff)
downloadbusybox-w32-af36ba206f7cf0eef77a82af741766a2d03c51ad.tar.gz
busybox-w32-af36ba206f7cf0eef77a82af741766a2d03c51ad.tar.bz2
busybox-w32-af36ba206f7cf0eef77a82af741766a2d03c51ad.zip
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>
Diffstat (limited to 'coreutils')
-rw-r--r--coreutils/mkdir.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/coreutils/mkdir.c b/coreutils/mkdir.c
index a4429b1cb..b33b6bba3 100644
--- a/coreutils/mkdir.c
+++ b/coreutils/mkdir.c
@@ -54,7 +54,7 @@ static const char mkdir_longopts[] ALIGN1 =
54int mkdir_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 54int mkdir_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
55int mkdir_main(int argc UNUSED_PARAM, char **argv) 55int mkdir_main(int argc UNUSED_PARAM, char **argv)
56{ 56{
57 mode_t mode = (mode_t)(-1); 57 long mode = -1;
58 int status = EXIT_SUCCESS; 58 int status = EXIT_SUCCESS;
59 int flags = 0; 59 int flags = 0;
60 unsigned opt; 60 unsigned opt;
@@ -68,10 +68,11 @@ int mkdir_main(int argc UNUSED_PARAM, char **argv)
68#endif 68#endif
69 opt = getopt32(argv, "m:p" IF_SELINUX("Z:"), &smode IF_SELINUX(,&scontext)); 69 opt = getopt32(argv, "m:p" IF_SELINUX("Z:"), &smode IF_SELINUX(,&scontext));
70 if (opt & 1) { 70 if (opt & 1) {
71 mode = 0777; 71 mode_t mmode = 0777;
72 if (!bb_parse_mode(smode, &mode)) { 72 if (!bb_parse_mode(smode, &mmode)) {
73 bb_error_msg_and_die("invalid mode '%s'", smode); 73 bb_error_msg_and_die("invalid mode '%s'", smode);
74 } 74 }
75 mode = mmode;
75 } 76 }
76 if (opt & 2) 77 if (opt & 2)
77 flags |= FILEUTILS_RECUR; 78 flags |= FILEUTILS_RECUR;