* getfacl.c (usage): Change --all to --access, --dir to --default.

	Align text to output of Linux tool.
	(longopts): Add --access and --default options.

diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog
index 08ef371a03580d4297e977e52da3c849acfbf1b8..ef6d32e7d894fe3c97f945e1a1044621ebb38175 100644 (file)
--- a/winsup/utils/ChangeLog
+++ b/winsup/utils/ChangeLog
@@ -1,3 +1,9 @@
+2015-02-28  Corinna Vinschen  <corinna@vinschen.de>
+
+       * getfacl.c (usage): Change --all to --access, --dir to --default.
+       Align text to output of Linux tool.
+       (longopts): Add --access and --default options.
+
 2015-02-25  Corinna Vinschen  <corinna@vinschen.de>
 
        * mkgroup.c (MAX_SID_LEN): Remove.  Instead, use SECURITY_MAX_SID_SIZE

diff --git a/winsup/utils/getfacl.c b/winsup/utils/getfacl.c
index ed1adfce7142f8e5afed2a2ec68b683651b17d08..0bc4848779584dec18f408bb11c0605779a88fab 100644 (file)
--- a/winsup/utils/getfacl.c
+++ b/winsup/utils/getfacl.c
@@ -1,6 +1,6 @@
 /* getfacl.c
 
-   Copyright 2000, 2001, 2002, 2003, 2004, 2009, 2011, 2014 Red Hat Inc.
+   Copyright 2000, 2001, 2002, 2003, 2004, 2009, 2011, 2014, 2015 Red Hat Inc.
 
    Written by Corinna Vinschen <vinschen@redhat.com>
 
@@ -69,11 +69,9 @@ usage (FILE * stream)
            "\n"
            "Display file and directory access control lists (ACLs).\n"
            "\n"
-           "  -a, --all      display the filename, the owner, the group, and\n"
-           "                 the ACL of the file\n"
-           "  -d, --dir      display the filename, the owner, the group, and\n"
-           "                 the default ACL of the directory, if it exists\n"
-           "  -h, --help     output usage information and exit\n"
+           "  -a, --access   display the file access control list\n"
+           "  -d, --default  display the default access control list\n"
+           "  -h, --help     print help explaining the command line options\n"
            "  -n, --noname   display user and group IDs instead of names\n"
            "  -V, --version  output version information and exit\n"
            "\n"
@@ -113,7 +111,9 @@ usage (FILE * stream)
 }
 
 struct option longopts[] = {
+  {"access", no_argument, NULL, 'a'},
   {"all", no_argument, NULL, 'a'},
+  {"default", no_argument, NULL, 'd'},
   {"dir", no_argument, NULL, 'd'},
   {"help", no_argument, NULL, 'h'},
   {"noname", no_argument, NULL, 'n'},