projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- spelling
[oweals/busybox.git]
/
coreutils
/
mkdir.c
diff --git
a/coreutils/mkdir.c
b/coreutils/mkdir.c
index b42899a4a890180a16eeb901f4f6ec3b2e12a25b..47f4cc843c77c12d5680f600f4c13de2b6152113 100644
(file)
--- a/
coreutils/mkdir.c
+++ b/
coreutils/mkdir.c
@@
-1,7
+1,8
@@
+/* vi: set sw=4 ts=4: */
/*
* Mini mkdir implementation for busybox
*
/*
* Mini mkdir implementation for busybox
*
- * Copyright (C)
1998 by Erik Andersen <andersee@debian.org
>
+ * Copyright (C)
2001 Matt Kraai <kraai@alumni.carnegiemellon.edu
>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-19,65
+20,60
@@
*
*/
*
*/
-#include "internal.h"
-#include <stdio.h>
-#include <errno.h>
-#include <sys/param.h>
-
-const char mkdir_usage[] = "Usage: mkdir [OPTION] DIRECTORY...\n"
-"Create the DIRECTORY(ies), if they do not already exist\n\n"
-"-m\tset permission mode (as in chmod), not rwxrwxrwx - umask\n"
-"-p\tno error if existing, make parent directories as needed\n";
+/* BB_AUDIT SUSv3 compliant */
+/* http://www.opengroup.org/onlinepubs/007904975/utilities/mkdir.html */
+/* Mar 16, 2003 Manuel Novoa III (mjn3@codepoet.org)
+ *
+ * Fixed broken permission setting when -p was used; especially in
+ * conjunction with -m.
+ */
-static int parentFlag = FALSE;
-static int permFlag = FALSE;
-static mode_t mode = 0777;
+#include <stdlib.h>
+#include <unistd.h>
+#include <getopt.h> /* struct option */
+#include "busybox.h"
+#if ENABLE_FEATURE_MKDIR_LONG_OPTIONS
+static const struct option mkdir_long_options[] = {
+ { "mode", 1, NULL, 'm' },
+ { "parents", 0, NULL, 'p' },
+ { 0, 0, 0, 0 }
+};
+#endif
-
extern int mkdir_main
(int argc, char **argv)
+
int mkdir_main
(int argc, char **argv)
{
{
- argc--;
- argv++;
-
- /* Parse any options */
- while (argc > 1 && **argv == '-') {
- while (*++(*argv))
- switch (**argv) {
- case 'm':
- permFlag = TRUE;
- break;
- case 'p':
- parentFlag = TRUE;
- break;
- default:
- usage( mkdir_usage);
- }
- argc--;
- argv++;
- }
-
+ mode_t mode = (mode_t)(-1);
+ int status = EXIT_SUCCESS;
+ int flags = 0;
+ unsigned long opt;
+ char *smode;
- if (argc < 1) {
-
usage( mkdir_usage)
;
- }
-
-
while (--argc > 0
) {
-
struct stat statBuf
;
-
if (stat(*(++argv), &statBuf) != ENOENT
) {
-
fprintf(stderr, "%s: File exists\n", *argv
);
- return( FALSE);
+#if ENABLE_FEATURE_MKDIR_LONG_OPTIONS
+
bb_applet_long_options = mkdir_long_options
;
+#endif
+ opt = bb_getopt_ulflags(argc, argv, "m:p", &smode);
+
if(opt & 1
) {
+
mode = 0777
;
+
if (!bb_parse_mode (smode, &mode)
) {
+
bb_error_msg_and_die ("invalid mode `%s'", smode
);
+ }
}
}
- if (parentFlag == TRUE)
- createPath(*argv, mode);
- else {
- if (mkdir (*argv, mode) != 0) {
- perror(*argv);
- exit( FALSE);
- }
+ if(opt & 2)
+ flags |= FILEUTILS_RECUR;
+
+ if (optind == argc) {
+ bb_show_usage();
}
}
- }
- exit( TRUE);
-}
+ argv += optind;
+ do {
+ if (bb_make_directory(*argv, mode, flags)) {
+ status = EXIT_FAILURE;
+ }
+ } while (*++argv);
+
+ return status;
+}