aboutsummaryrefslogtreecommitdiff
path: root/toys/posix/mkdir.c
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2014-03-11 20:44:55 -0500
committerRob Landley <rob@landley.net>2014-03-11 20:44:55 -0500
commitca1b60e3bdb19eca981e5ccf4e07100aafddb007 (patch)
tree96c6370fc73f015c20031194551d9238dd176191 /toys/posix/mkdir.c
parenta8b88fe47237028fb5314c4c572a738b967b10b7 (diff)
downloadtoybox-ca1b60e3bdb19eca981e5ccf4e07100aafddb007.tar.gz
Move mkpathat to lib, remove redundant function used by patch.
Diffstat (limited to 'toys/posix/mkdir.c')
-rw-r--r--toys/posix/mkdir.c49
1 files changed, 0 insertions, 49 deletions
diff --git a/toys/posix/mkdir.c b/toys/posix/mkdir.c
index 25dfb0de..5cbc28db 100644
--- a/toys/posix/mkdir.c
+++ b/toys/posix/mkdir.c
@@ -25,55 +25,6 @@ GLOBALS(
char *arg_mode;
)
-// flags: 1=make last dir (with mode lastmode, otherwise skips last component)
-// 2=make path (already exists is ok)
-// 4=verbose
-// returns 0 = path ok, 1 = error
-int mkpathat(int atfd, char *dir, mode_t lastmode, int flags)
-{
- struct stat buf;
- char *s;
-
- // mkdir -p one/two/three is not an error if the path already exists,
- // but is if "three" is a file. The others we dereference and catch
- // not-a-directory along the way, but the last one we must explicitly
- // test for. Might as well do it up front.
-
- if (!fstatat(atfd, dir, &buf, 0) && !S_ISDIR(buf.st_mode)) {
- errno = EEXIST;
- return 1;
- }
-
- // Skip leading / of absolute paths
- while (*dir == '/') dir++;
-
- for (s=dir; ;s++) {
- char save = 0;
- mode_t mode = (0777&~toys.old_umask)|0300;
-
- // Skip leading / of absolute paths.
- if (*s == '/' && (flags&2)) {
- save = *s;
- *s = 0;
- } else if (*s) continue;
-
- // Use the mode from the -m option only for the last directory.
- if (!save) {
- if (flags&1) mode = lastmode;
- else break;
- }
-
- if (mkdirat(atfd, dir, mode)) {
- if (!(flags&2) || errno != EEXIST) return 1;
- } else if (flags&4)
- fprintf(stderr, "%s: created directory '%s'\n", toys.which->name, dir);
-
- if (!(*s = save)) break;
- }
-
- return 0;
-}
-
void mkdir_main(void)
{
char **s;