RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 07:57:47 +00:00
Code Issues Activity Actions

mkdir: Add -p option to create parent directories

Browse source
This commit is contained in:
Linus Groh 2020-04-27 13:08:14 +01:00 • committed by Andreas Kling
parent cd81aa41f0
commit 8f2300afb5
2 changed files with 49 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Base/usr/share/man/man1/mkdir.md
View file

@ -5,17 +5,21 @@ mkdir - create directories
## Synopsis ## Synopsis
```**sh ```**sh
$ mkdir directories... $ mkdir [ options...] directories...
``` ```
## Description ## Description
Create a new empty directory for each of the given *directories*. Create a new empty directory for each of the given *directories*.
## Options
* `-p`, `--parents`: Create parent directories if they don't exist
## Examples ## Examples
```sh ```sh
$ mkdir /tmp/foo $ mkdir -p /tmp/foo/bar
``` ```
## See also ## See also

47
Userland/mkdir.cpp
View file

@ -25,28 +25,67 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <AK/FileSystemPath.h>
#include <AK/StringBuilder.h>
#include <LibCore/ArgsParser.h> #include <LibCore/ArgsParser.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h> #include <unistd.h>
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
if (pledge("stdio cpath", nullptr) < 0) { if (pledge("stdio cpath rpath", nullptr) < 0) {
perror("pledge"); perror("pledge");
return 1; return 1;
} }
bool create_parents = false;
Vector<const char*> directories; Vector<const char*> directories;
Core::ArgsParser args_parser; Core::ArgsParser args_parser;
args_parser.add_option(create_parents, "Create parent directories if they don't exist", "parents", 'p');
args_parser.add_positional_argument(directories, "Directories to create", "directories"); args_parser.add_positional_argument(directories, "Directories to create", "directories");
args_parser.parse(argc, argv); args_parser.parse(argc, argv);
// FIXME: Support -m/--mode option
mode_t mode = 0755;
bool has_errors = false; bool has_errors = false;
for (auto& directory : directories) { for (auto& directory : directories) {
if (mkdir(directory, 0755) < 0) { FileSystemPath canonical_path(directory);
perror("mkdir"); if (!create_parents) {
has_errors = true; if (mkdir(canonical_path.string().characters(), mode) < 0) {
perror("mkdir");
has_errors = true;
}
continue;
}
StringBuilder path_builder;
if (canonical_path.is_absolute())
path_builder.append("/");
for (auto& part : canonical_path.parts()) {
path_builder.append(part);
auto path = path_builder.build();
struct stat st;
if (stat(path.characters(), &st) < 0) {
if (errno != ENOENT) {
perror("stat");
has_errors = true;
break;
}
if (mkdir(path.characters(), mode) < 0) {
perror("mkdir");
has_errors = true;
break;
}
} else {
if (!S_ISDIR(st.st_mode)) {
fprintf(stderr, "mkdir: cannot create directory '%s': not a directory\n", path.characters());
has_errors = true;
break;
}
}
path_builder.append("/");
} }
} }
return has_errors ? 1 : 0; return has_errors ? 1 : 0;