mirror of
https://github.com/sheumann/hush.git
synced 2025-02-10 08:30:41 +00:00
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>
This commit is contained in:
parent
cfcb1dac83
commit
af36ba206f
@ -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, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
||||||
int mkdir_main(int argc UNUSED_PARAM, char **argv)
|
int mkdir_main(int argc UNUSED_PARAM, char **argv)
|
||||||
{
|
{
|
||||||
mode_t mode = (mode_t)(-1);
|
long mode = -1;
|
||||||
int status = EXIT_SUCCESS;
|
int status = EXIT_SUCCESS;
|
||||||
int flags = 0;
|
int flags = 0;
|
||||||
unsigned opt;
|
unsigned opt;
|
||||||
@ -68,10 +68,11 @@ int mkdir_main(int argc UNUSED_PARAM, char **argv)
|
|||||||
#endif
|
#endif
|
||||||
opt = getopt32(argv, "m:p" IF_SELINUX("Z:"), &smode IF_SELINUX(,&scontext));
|
opt = getopt32(argv, "m:p" IF_SELINUX("Z:"), &smode IF_SELINUX(,&scontext));
|
||||||
if (opt & 1) {
|
if (opt & 1) {
|
||||||
mode = 0777;
|
mode_t mmode = 0777;
|
||||||
if (!bb_parse_mode(smode, &mode)) {
|
if (!bb_parse_mode(smode, &mmode)) {
|
||||||
bb_error_msg_and_die("invalid mode '%s'", smode);
|
bb_error_msg_and_die("invalid mode '%s'", smode);
|
||||||
}
|
}
|
||||||
|
mode = mmode;
|
||||||
}
|
}
|
||||||
if (opt & 2)
|
if (opt & 2)
|
||||||
flags |= FILEUTILS_RECUR;
|
flags |= FILEUTILS_RECUR;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user