X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fmkdir.c;h=5f49395cd0dd5438f1db4ce6bae4692ee2c33ae2;hb=77da73c75432f3c5b4beebae7b0797a1e33160bc;hp=92d158c63bca6bc4f49abe273c7cfa692472bad5;hpb=c8da0cbba68139e51a274039e126d443d4eababf;p=platform%2Fupstream%2Fcoreutils.git diff --git a/src/mkdir.c b/src/mkdir.c index 92d158c..5f49395 100644 --- a/src/mkdir.c +++ b/src/mkdir.c @@ -1,10 +1,10 @@ /* mkdir -- make directories - Copyright (C) 90, 1995-2000 Free Software Foundation, Inc. + Copyright (C) 1990-2013 Free Software Foundation, Inc. - This program is free software; you can redistribute it and/or modify + 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, or (at your option) - any later version. + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -12,8 +12,7 @@ GNU General Public License for more details. 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. */ + along with this program. If not, see . */ /* David MacKenzie */ @@ -21,27 +20,24 @@ #include #include #include +#include #include "system.h" -#include "dirname.h" #include "error.h" -#include "makepath.h" +#include "mkdir-p.h" #include "modechange.h" +#include "prog-fprintf.h" #include "quote.h" +#include "savewd.h" -/* The official name of this program (e.g., no `g' prefix). */ +/* The official name of this program (e.g., no 'g' prefix). */ #define PROGRAM_NAME "mkdir" -#define AUTHORS "David MacKenzie" - -/* The name this program was run with. */ -char *program_name; - -/* If nonzero, ensure that all parents of the specified directory exist. */ -static int create_parents; +#define AUTHORS proper_name ("David MacKenzie") static struct option const longopts[] = { + {GETOPT_SELINUX_CONTEXT_OPTION_DECL}, {"mode", required_argument, NULL, 'm'}, {"parents", no_argument, NULL, 'p'}, {"verbose", no_argument, NULL, 'v'}, @@ -53,129 +49,166 @@ static struct option const longopts[] = void usage (int status) { - if (status != 0) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + if (status != EXIT_SUCCESS) + emit_try_help (); else { - printf (_("Usage: %s [OPTION] DIRECTORY...\n"), program_name); - printf (_("\ + printf (_("Usage: %s [OPTION]... DIRECTORY...\n"), program_name); + fputs (_("\ Create the DIRECTORY(ies), if they do not already exist.\n\ \n\ - -m, --mode=MODE set permission mode (as in chmod), not rwxrwxrwx - umask\n\ +"), stdout); + fputs (_("\ +Mandatory arguments to long options are mandatory for short options too.\n\ +"), stdout); + fputs (_("\ + -m, --mode=MODE set file mode (as in chmod), not a=rwx - umask\n\ -p, --parents no error if existing, make parent directories as needed\n\ -v, --verbose print a message for each created directory\n\ - --help display this help and exit\n\ - --version output version information and exit\n\ -")); - puts (_("\nReport bugs to .")); + -Z, --context=CTX set the SELinux security context of each created\n\ + directory to CTX\n\ +"), stdout); + fputs (HELP_OPTION_DESCRIPTION, stdout); + fputs (VERSION_OPTION_DESCRIPTION, stdout); + emit_ancillary_info (); } exit (status); } +/* Options passed to subsidiary functions. */ +struct mkdir_options +{ + /* Function to make an ancestor, or NULL if ancestors should not be + made. */ + int (*make_ancestor_function) (char const *, char const *, void *); + + /* Mode for ancestor directory. */ + mode_t ancestor_mode; + + /* Mode for directory itself. */ + mode_t mode; + + /* File mode bits affected by MODE. */ + mode_t mode_bits; + + /* If not null, format to use when reporting newly made directories. */ + char const *created_directory_format; +}; + +/* Report that directory DIR was made, if OPTIONS requests this. */ +static void +announce_mkdir (char const *dir, void *options) +{ + struct mkdir_options const *o = options; + if (o->created_directory_format) + prog_fprintf (stdout, o->created_directory_format, quote (dir)); +} + +/* Make ancestor directory DIR, whose last component is COMPONENT, + with options OPTIONS. Assume the working directory is COMPONENT's + parent. Return 0 if successful and the resulting directory is + readable, 1 if successful but the resulting directory is not + readable, -1 (setting errno) otherwise. */ +static int +make_ancestor (char const *dir, char const *component, void *options) +{ + struct mkdir_options const *o = options; + int r = mkdir (component, o->ancestor_mode); + if (r == 0) + { + r = ! (o->ancestor_mode & S_IRUSR); + announce_mkdir (dir, options); + } + return r; +} + +/* Process a command-line file name. */ +static int +process_dir (char *dir, struct savewd *wd, void *options) +{ + struct mkdir_options const *o = options; + return (make_dir_parents (dir, wd, o->make_ancestor_function, options, + o->mode, announce_mkdir, + o->mode_bits, (uid_t) -1, (gid_t) -1, true) + ? EXIT_SUCCESS + : EXIT_FAILURE); +} + int main (int argc, char **argv) { - mode_t newmode; - mode_t parent_mode; const char *specified_mode = NULL; - const char *verbose_fmt_string = NULL; - int errors = 0; int optc; + security_context_t scontext = NULL; + struct mkdir_options options; + + options.make_ancestor_function = NULL; + options.mode = S_IRWXUGO; + options.mode_bits = 0; + options.created_directory_format = NULL; - program_name = argv[0]; + initialize_main (&argc, &argv); + set_program_name (argv[0]); setlocale (LC_ALL, ""); bindtextdomain (PACKAGE, LOCALEDIR); textdomain (PACKAGE); atexit (close_stdout); - create_parents = 0; - - while ((optc = getopt_long (argc, argv, "pm:v", longopts, NULL)) != -1) + while ((optc = getopt_long (argc, argv, "pm:vZ:", longopts, NULL)) != -1) { switch (optc) - { - case 0: /* Long option. */ - break; - case 'p': - create_parents = 1; - break; - case 'm': - specified_mode = optarg; - break; - case 'v': /* --verbose */ - verbose_fmt_string = _("created directory %s"); - break; - case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); - default: - usage (1); - } + { + case 'p': + options.make_ancestor_function = make_ancestor; + break; + case 'm': + specified_mode = optarg; + break; + case 'v': /* --verbose */ + options.created_directory_format = _("created directory %s"); + break; + case 'Z': + scontext = optarg; + break; + case_GETOPT_HELP_CHAR; + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + default: + usage (EXIT_FAILURE); + } } if (optind == argc) { - error (0, 0, _("too few arguments")); - usage (1); + error (0, 0, _("missing operand")); + usage (EXIT_FAILURE); } - newmode = S_IRWXUGO; - { - mode_t umask_value = umask (0); - umask (umask_value); /* Restore the old value. */ - parent_mode = (newmode & (~ umask_value)) | S_IWUSR | S_IXUSR; - } - - if (specified_mode) - { - struct mode_change *change = mode_compile (specified_mode, 0); - newmode &= ~ umask (0); - if (change == MODE_INVALID) - error (1, 0, _("invalid mode %s"), quote (specified_mode)); - else if (change == MODE_MEMORY_EXHAUSTED) - xalloc_die (); - newmode = mode_adjust (newmode, change); - } + if (scontext && setfscreatecon (scontext) < 0) + error (EXIT_FAILURE, errno, + _("failed to set default file creation context to %s"), + quote (scontext)); - for (; optind < argc; ++optind) + if (options.make_ancestor_function || specified_mode) { - int fail = 0; - if (create_parents) - { - const char *parents = dir_name (argv[optind]); - fail = make_path (parents, parent_mode, parent_mode, - -1, -1, 1, verbose_fmt_string); - free (dir_name); - } - - if (fail == 0) - { - fail = mkdir (argv[optind], newmode); - if (fail) - error (0, errno, _("cannot create directory %s"), - quote (argv[optind])); - else if (verbose_fmt_string) - error (0, 0, verbose_fmt_string, quote (argv[optind])); - - /* mkdir(2) is required to honor only the file permission bits. - In particular, it needn't do anything about `special' bits, - so if any were set in newmode, apply them with chmod. - This extra step is necessary in some cases when the containing - directory has a default ACL. */ - - if (fail == 0 && specified_mode) - { - fail = chmod (argv[optind], newmode); - if (fail) - error (0, errno, _("cannot set permissions of directory %s"), - quote (argv[optind])); - } - } - - if (fail) - errors = 1; + mode_t umask_value = umask (0); + + options.ancestor_mode = (S_IRWXUGO & ~umask_value) | (S_IWUSR | S_IXUSR); + + if (specified_mode) + { + struct mode_change *change = mode_compile (specified_mode); + if (!change) + error (EXIT_FAILURE, 0, _("invalid mode %s"), + quote (specified_mode)); + options.mode = mode_adjust (S_IRWXUGO, true, umask_value, change, + &options.mode_bits); + free (change); + } + else + options.mode = S_IRWXUGO & ~umask_value; } - exit (errors); + exit (savewd_process_files (argc - optind, argv + optind, + process_dir, &options)); }