summaryrefslogtreecommitdiffstats
path: root/winsup/utils
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2015-02-28 13:13:19 +0000
committerCorinna Vinschen <corinna@vinschen.de>2015-02-28 13:13:19 +0000
commit3da543e5bd2436d9d9c3946da9e8e58c5be88ecc (patch)
tree217c48a9f425c7b902c3a9f25824c1dcec3bb97d /winsup/utils
parent146200310f31ea493aaa0a8e258605dca51ac450 (diff)
downloadcygnal-3da543e5bd2436d9d9c3946da9e8e58c5be88ecc.tar.gz
cygnal-3da543e5bd2436d9d9c3946da9e8e58c5be88ecc.tar.bz2
cygnal-3da543e5bd2436d9d9c3946da9e8e58c5be88ecc.zip
* getfacl.c (usage): Change --all to --access, --dir to --default.
Align text to output of Linux tool. (longopts): Add --access and --default options.
Diffstat (limited to 'winsup/utils')
-rw-r--r--winsup/utils/ChangeLog6
-rw-r--r--winsup/utils/getfacl.c12
2 files changed, 12 insertions, 6 deletions
diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog
index 08ef371a0..ef6d32e7d 100644
--- 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 ed1adfce7..0bc484877 100644
--- 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'},