setfacl: Rename the option --file to --set-file, as on Linux

Retain --file as an undocumented option for backwards compatibility.
This commit is contained in:
Ken Brown
2018-08-16 14:55:28 -04:00
committed by Corinna Vinschen
parent c8d4c99ecd
commit ed4d919c24
4 changed files with 11 additions and 4 deletions

View File

@@ -536,7 +536,7 @@ usage (FILE *stream)
"\n"
" -b, --remove-all remove all extended ACL entries\n"
" -x, --delete delete one or more specified ACL entries\n"
" -f, --file set ACL entries for FILE to ACL entries read\n"
" -f, --set-file set ACL entries for FILE to ACL entries read\n"
" from ACL_FILE\n"
" -k, --remove-default remove all default ACL entries\n"
" -m, --modify modify one or more specified ACL entries\n"
@@ -595,7 +595,7 @@ usage (FILE *stream)
" d[efault]:m[ask][:]\n"
" d[efault]:o[ther][:]\n"
"\n"
"-f, --file\n"
"-f, --set-file\n"
" Take the Acl_entries from ACL_FILE one per line. Whitespace characters are\n"
" ignored, and the character \"#\" may be used to start a comment. The special\n"
" filename \"-\" indicates reading from stdin.\n"
@@ -652,6 +652,7 @@ usage (FILE *stream)
struct option longopts[] = {
{"remove-all", no_argument, NULL, 'b'},
{"delete", required_argument, NULL, 'x'},
{"set-file", required_argument, NULL, 'f'},
{"file", required_argument, NULL, 'f'},
{"remove-default", no_argument, NULL, 'k'},
{"modify", required_argument, NULL, 'm'},