Bananymous/banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mkdir: Don't fail the target exists and -p was given

Browse Source
This commit is contained in:
Bananymous
2026-07-07 15:26:38 +03:00
parent 3ee6240806
commit e352bfbb23
1 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
userspace/programs/mkdir/main.cpp
View File

@@ -8,7 +8,7 @@
static const char* s_argv0 { nullptr }; static const char* s_argv0 { nullptr };
bool create_parents(const char* path, bool verbose) static bool create_parents(const char* path, bool verbose)
{ {
char buffer[PATH_MAX]; char buffer[PATH_MAX];
for (size_t i = 0; path[i];) for (size_t i = 0; path[i];)
@@ -21,32 +21,47 @@ bool create_parents(const char* path, bool verbose)
break; break;
buffer[i] = '\0'; buffer[i] = '\0';
if (mkdir(buffer, 0) == -1) struct stat st;
if (stat(path, &st) == 0)
{ {
if (errno == EEXIST) if (S_ISDIR(st.st_mode))
continue; continue;
fprintf(stderr, "%s: cannot create '%s': %s\n", s_argv0, path, strerror(EEXIST));
return false;
}
if (errno != ENOENT || mkdir(path, 0) == -1)
{
fprintf(stderr, "%s: cannot create '%s': %s\n", s_argv0, path, strerror(errno)); fprintf(stderr, "%s: cannot create '%s': %s\n", s_argv0, path, strerror(errno));
return false; return false;
} }
const mode_t filemask = umask(0);
umask(filemask);
chmod(buffer, (S_IWUSR | S_IXUSR | ~filemask) & 0777);
if (verbose) if (verbose)
printf("%s: created directory '%s'\n", s_argv0, path); printf("%s: created directory '%s'\n", s_argv0, path);
const mode_t filemask = umask(0);
umask(filemask);
chmod(buffer, (S_IWUSR | S_IXUSR | ~filemask) & 0777);
} }
return true; return true;
} }
bool create_directory(const char* path, mode_t mode, bool verbose, bool parents) static bool create_directory(const char* path, mode_t mode, bool verbose, bool parents)
{ {
if (parents && !create_parents(path, verbose)) if (parents && !create_parents(path, verbose))
return false; return false;
if (mkdir(path, mode) == -1) struct stat st;
if (stat(path, &st) == 0)
{
if (parents && S_ISDIR(st.st_mode))
return true;
fprintf(stderr, "%s: cannot create '%s': %s\n", s_argv0, path, strerror(EEXIST));
return false;
}
if (errno != ENOENT || mkdir(path, mode) == -1)
{ {
fprintf(stderr, "%s: cannot create '%s': %s\n", s_argv0, path, strerror(errno)); fprintf(stderr, "%s: cannot create '%s': %s\n", s_argv0, path, strerror(errno));
return false; return false;