mirror of
git://git.suckless.org/sbase
synced 2024-12-22 07:01:15 +00:00
c82425e128
1) Any path passed to mkdir -p beginning with '/' failed, because it would cut out the first '/' immediately, passing "" to mkdir. 2) Running mkdir -p with a path/to/dir without trailing '/' would not create the directory. This is due to a wrong flag-check I added in the main-loop. It should now work as expected. 3) With the p-flag given, don't report an error in case the last dir also exists.
72 lines
1.1 KiB
C
72 lines
1.1 KiB
C
/* See LICENSE file for copyright and license details. */
|
|
#include <sys/stat.h>
|
|
|
|
#include <errno.h>
|
|
#include <stdlib.h>
|
|
|
|
#include "util.h"
|
|
|
|
static int
|
|
mkdirp(char *path)
|
|
{
|
|
char *p;
|
|
|
|
for (p = path + (*path == '/'); *p; p++) {
|
|
if (*p != '/')
|
|
continue;
|
|
*p = '\0';
|
|
if (mkdir(path, S_IRWXU | S_IRWXG | S_IRWXO) < 0 && errno != EEXIST) {
|
|
weprintf("mkdir %s:", path);
|
|
return -1;
|
|
}
|
|
*p = '/';
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void
|
|
usage(void)
|
|
{
|
|
eprintf("usage: %s [-p] [-m mode] name ...\n", argv0);
|
|
}
|
|
|
|
int
|
|
main(int argc, char *argv[])
|
|
{
|
|
mode_t mode = 0, mask;
|
|
int pflag = 0, mflag = 0, ret = 0;
|
|
|
|
ARGBEGIN {
|
|
case 'p':
|
|
pflag = 1;
|
|
break;
|
|
case 'm':
|
|
mflag = 1;
|
|
mask = getumask();
|
|
mode = parsemode(EARGF(usage()), mode, mask);
|
|
break;
|
|
default:
|
|
usage();
|
|
} ARGEND;
|
|
|
|
if (!argc)
|
|
usage();
|
|
|
|
for (; *argv; argc--, argv++) {
|
|
if (pflag && mkdirp(*argv) < 0) {
|
|
ret = 1;
|
|
} else if (mkdir(*argv, S_IRWXU | S_IRWXG | S_IRWXO) < 0) {
|
|
if (!(pflag && errno == EEXIST)) {
|
|
weprintf("mkdir %s:", *argv);
|
|
ret = 1;
|
|
}
|
|
} else if (mflag && chmod(*argv, mode) < 0) {
|
|
weprintf("chmod %s:", *argv);
|
|
ret = 1;
|
|
}
|
|
}
|
|
|
|
return ret;
|
|
}
|