aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Janda <felix.janda@posteo.de>2012-12-23 16:25:31 +0100
committerFelix Janda <felix.janda@posteo.de>2012-12-23 16:25:31 +0100
commit208f6c16e146a6745a45c3ec7e019a1d8cb7ade3 (patch)
treea8a9ee756345ae42a028ea58c0ff1a5b2f7b2f63
parentca4035bdacfd83f815323c9c597f2683fc4aa218 (diff)
downloadtoybox-208f6c16e146a6745a45c3ec7e019a1d8cb7ade3.tar.gz
Add -m option to mkdir
-rw-r--r--toys/posix/mkdir.c20
1 files changed, 14 insertions, 6 deletions
diff --git a/toys/posix/mkdir.c b/toys/posix/mkdir.c
index 33fb8326..746a918a 100644
--- a/toys/posix/mkdir.c
+++ b/toys/posix/mkdir.c
@@ -4,31 +4,33 @@
*
* See http://opengroup.org/onlinepubs/9699919799/utilities/mkdir.html
*
- * TODO: Add -m
-USE_MKDIR(NEWTOY(mkdir, "<1p", TOYFLAG_BIN))
+USE_MKDIR(NEWTOY(mkdir, "<1pm:", TOYFLAG_BIN))
config MKDIR
bool "mkdir"
default y
help
- usage: mkdir [-p] [dirname...]
+ usage: mkdir [-p] [-m mode] [dirname...]
Create one or more directories.
-p make parent directories as needed.
+ -m set permissions of directory to mode.
*/
#define FOR_mkdir
#include "toys.h"
GLOBALS(
- long mode;
+ char *arg_mode;
+ mode_t mode;
)
static int do_mkdir(char *dir)
{
struct stat buf;
char *s;
+ mode_t mode = 0777;
// mkdir -p one/two/three is not an error if the path already exists,
// but is if "three" is a file. The others we dereference and catch
@@ -44,12 +46,16 @@ static int do_mkdir(char *dir)
char save=0;
// Skip leading / of absolute paths.
- if (s!=dir && *s == '/' && toys.optflags) {
+ if (s!=dir && *s == '/' && (toys.optflags&FLAG_p)) {
save = *s;
*s = 0;
} else if (*s) continue;
- if (mkdir(dir, TT.mode)<0 && (!toys.optflags || errno != EEXIST))
+ // Use the mode from the -m option only for the last directory.
+ if ((toys.optflags&FLAG_m) && save != '/')
+ mode = TT.mode;
+
+ if (mkdir(dir, mode)<0 && ((toys.optflags&~FLAG_p) || errno != EEXIST))
return 1;
if (!(*s = save)) break;
@@ -63,6 +69,8 @@ void mkdir_main(void)
char **s;
TT.mode = 0777;
+ if(toys.optflags&FLAG_m)
+ TT.mode = string_to_mode(TT.arg_mode, TT.mode);
for (s=toys.optargs; *s; s++) {
if (do_mkdir(*s)) {