d9fa4b3ae7
1) No need for strchr() in mkdirp or a while-loop. Rewrite it in a sane and readable way. 2) fix usage according to the manpage. 3) order includes, don't align local variables. 4) argc-style-fix. 5) BUGFIX: Don't try to chmod() *argv when mkdir() / mkdirp() failed. 6) Add newline before return in two places.
70 lines
1.1 KiB
C
70 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 = path;
|
|
|
|
for (p = 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 (!pflag && mkdir(*argv, S_IRWXU | S_IRWXG | S_IRWXO) < 0) {
|
|
weprintf("mkdir %s:", *argv);
|
|
ret = 1;
|
|
} else if (mflag && chmod(*argv, mode) < 0) {
|
|
weprintf("chmod %s:", *argv);
|
|
ret = 1;
|
|
}
|
|
}
|
|
|
|
return ret;
|
|
}
|