diff options
Diffstat (limited to 'release/src/router/busybox/libbb/make_directory.c')
| -rw-r--r-- | release/src/router/busybox/libbb/make_directory.c | 123 |
1 files changed, 77 insertions, 46 deletions
diff --git a/release/src/router/busybox/libbb/make_directory.c b/release/src/router/busybox/libbb/make_directory.c index 0a9d7b16..391493cd 100644 --- a/release/src/router/busybox/libbb/make_directory.c +++ b/release/src/router/busybox/libbb/make_directory.c @@ -1,67 +1,98 @@ /* vi: set sw=4 ts=4: */ /* - * Mini make_directory implementation for busybox + * parse_mode implementation for busybox * - * Copyright (C) 2001 Matt Kraai. + * Copyright (C) 2003 Manuel Novoa III <mjn3@codepoet.org> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + */ + +/* Mar 5, 2003 Manuel Novoa III * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * This is the main work function for the 'mkdir' applet. As such, it + * strives to be SUSv3 compliant in it's behaviour when recursively + * making missing parent dirs, and in it's mode setting of the final + * directory 'path'. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * To recursively build all missing intermediate directories, make + * sure that (flags & FILEUTILS_RECUR) is non-zero. Newly created + * intermediate directories will have at least u+wx perms. * + * To set specific permissions on 'path', pass the appropriate 'mode' + * val. Otherwise, pass -1 to get default permissions. */ -#include <errno.h> -#include <fcntl.h> -#include <sys/stat.h> -#include <sys/types.h> -#include <unistd.h> -#include <stdlib.h> - #include "libbb.h" -/* Create the directory PATH with mode MODE, or the default if MODE is -1. - * Also create parent directories as necessary if flags contains - * FILEUTILS_RECUR. */ +/* This function is used from NOFORK applets. It must not allocate anything */ -int make_directory (char *path, long mode, int flags) +int FAST_FUNC bb_make_directory(char *path, long mode, int flags) { - if (!(flags & FILEUTILS_RECUR)) { - if (mkdir (path, 0777) < 0) { - perror_msg ("Cannot create directory `%s'", path); - return -1; - } + mode_t mask; + const char *fail_msg; + char *s = path; + char c; + struct stat st; - if (mode != -1 && chmod (path, mode) < 0) { - perror_msg ("Cannot set permissions of directory `%s'", path); - return -1; + mask = umask(0); + umask(mask & ~0300); /* Ensure intermediate dirs are wx */ + + while (1) { + c = '\0'; + + if (flags & FILEUTILS_RECUR) { /* Get the parent. */ + /* Bypass leading non-'/'s and then subsequent '/'s. */ + while (*s) { + if (*s == '/') { + do { + ++s; + } while (*s == '/'); + c = *s; /* Save the current char */ + *s = '\0'; /* and replace it with nul. */ + break; + } + ++s; + } } - } else { - struct stat st; - if (stat (path, &st) < 0 && errno == ENOENT) { - char *parent = dirname (path); - mode_t mask = umask (0); - umask (mask); + if (!c) /* Last component uses orig umask */ + umask(mask); - if (make_directory (parent, (0777 & ~mask) | 0300, - FILEUTILS_RECUR) < 0) - return -1; - free (parent); + if (mkdir(path, 0777) < 0) { + /* If we failed for any other reason than the directory + * already exists, output a diagnostic and return -1. */ + if (errno != EEXIST + || !(flags & FILEUTILS_RECUR) + || ((stat(path, &st) < 0) || !S_ISDIR(st.st_mode)) + ) { + fail_msg = "create"; + umask(mask); + break; + } + /* Since the directory exists, don't attempt to change + * permissions if it was the full target. Note that + * this is not an error condition. */ + if (!c) { + umask(mask); + return 0; + } + } - if (make_directory (path, mode, 0) < 0) - return -1; + if (!c) { + /* Done. If necessary, update perms on the newly + * created directory. Failure to update here _is_ + * an error. */ + if ((mode != -1) && (chmod(path, mode) < 0)) { + fail_msg = "set permissions of"; + break; + } + return 0; } - } - return 0; + /* Remove any inserted nul from the path (recursive mode). */ + *s = c; + } /* while (1) */ + + bb_perror_msg("cannot %s directory '%s'", fail_msg, path); + return -1; } |