maint: update all copyright year number ranges

[platform/upstream/coreutils.git] / src / mkdir.c

diff --git a/src/mkdir.c b/src/mkdir.c
index d865407..5f49395 100644 (file)
--- a/src/mkdir.c
+++ b/src/mkdir.c
@@ -1,5 +1,5 @@
 /* mkdir -- make directories
-   Copyright (C) 90, 1995-2002, 2004-2008 Free Software Foundation, Inc.
+   Copyright (C) 1990-2013 Free Software Foundation, Inc.
 
    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
@@ -24,21 +24,17 @@
 
 #include "system.h"
 #include "error.h"
-#include "lchmod.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 proper_name ("David MacKenzie")
 
-/* The name this program was run with. */
-char *program_name;
-
 static struct option const longopts[] =
 {
   {GETOPT_SELINUX_CONTEXT_OPTION_DECL},
@@ -54,11 +50,10 @@ void
 usage (int status)
 {
   if (status != EXIT_SUCCESS)
-    fprintf (stderr, _("Try `%s --help' for more information.\n"),
-            program_name);
+    emit_try_help ();
   else
     {
-      printf (_("Usage: %s [OPTION] DIRECTORY...\n"), program_name);
+      printf (_("Usage: %s [OPTION]... DIRECTORY...\n"), program_name);
       fputs (_("\
 Create the DIRECTORY(ies), if they do not already exist.\n\
 \n\
@@ -75,7 +70,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      emit_bug_reporting_address ();
+      emit_ancillary_info ();
     }
   exit (status);
 }
@@ -133,10 +128,10 @@ 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);
+                            o->mode, announce_mkdir,
+                            o->mode_bits, (uid_t) -1, (gid_t) -1, true)
+          ? EXIT_SUCCESS
+          : EXIT_FAILURE);
 }
 
 int
@@ -153,7 +148,7 @@ main (int argc, char **argv)
   options.created_directory_format = NULL;
 
   initialize_main (&argc, &argv);
-  program_name = argv[0];
+  set_program_name (argv[0]);
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
@@ -163,24 +158,24 @@ main (int argc, char **argv)
   while ((optc = getopt_long (argc, argv, "pm:vZ:", longopts, NULL)) != -1)
     {
       switch (optc)
-       {
-       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);
-       }
+        {
+        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)
@@ -191,8 +186,8 @@ main (int argc, char **argv)
 
   if (scontext && setfscreatecon (scontext) < 0)
     error (EXIT_FAILURE, errno,
-          _("failed to set default file creation context to %s"),
-          quote (scontext));
+           _("failed to set default file creation context to %s"),
+           quote (scontext));
 
   if (options.make_ancestor_function || specified_mode)
     {
@@ -201,19 +196,19 @@ main (int argc, char **argv)
       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);
-       }
+        {
+          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;
+        options.mode = S_IRWXUGO & ~umask_value;
     }
 
   exit (savewd_process_files (argc - optind, argv + optind,
-                             process_dir, &options));
+                              process_dir, &options));
 }