154 lines
5.4 KiB
Diff
154 lines
5.4 KiB
Diff
--- acl-2.2.47_old/getfacl/getfacl.c 2008-02-07 04:39:57.000000000 +0100
|
|
+++ acl-2.2.47/getfacl/getfacl.c 2008-07-31 12:23:10.000000000 +0200
|
|
@@ -43,7 +43,7 @@
|
|
#define POSIXLY_CORRECT_STR "POSIXLY_CORRECT"
|
|
|
|
#if !POSIXLY_CORRECT
|
|
-# define CMD_LINE_OPTIONS "dRLP"
|
|
+# define CMD_LINE_OPTIONS "aceEsRLPtpndvh"
|
|
#endif
|
|
#define POSIXLY_CMD_LINE_OPTIONS "d"
|
|
|
|
@@ -555,23 +555,23 @@ void help(void)
|
|
#if !POSIXLY_CORRECT
|
|
} else {
|
|
printf(_(
|
|
-" --access display the file access control list only\n"
|
|
+" -a, --access display the file access control list only\n"
|
|
" -d, --default display the default access control list only\n"
|
|
-" --omit-header do not display the comment header\n"
|
|
-" --all-effective print all effective rights\n"
|
|
-" --no-effective print no effective rights\n"
|
|
-" --skip-base skip files that only have the base entries\n"
|
|
+" -c, --omit-header do not display the comment header\n"
|
|
+" -e, --all-effective print all effective rights\n"
|
|
+" -E, --no-effective print no effective rights\n"
|
|
+" -s, --skip-base skip files that only have the base entries\n"
|
|
" -R, --recursive recurse into subdirectories\n"
|
|
" -L, --logical logical walk, follow symbolic links\n"
|
|
" -P, --physical physical walk, do not follow symbolic links\n"
|
|
-" --tabular use tabular output format\n"
|
|
-" --numeric print numeric user/group identifiers\n"
|
|
-" --absolute-names don't strip leading '/' in pathnames\n"));
|
|
+" -t, --tabular use tabular output format\n"
|
|
+" -n, --numeric print numeric user/group identifiers\n"
|
|
+" -p, --absolute-names don't strip leading '/' in pathnames\n"));
|
|
}
|
|
#endif
|
|
printf(_(
|
|
-" --version print version and exit\n"
|
|
-" --help this help text\n"));
|
|
+" -v, --version print version and exit\n"
|
|
+" -h, --help this help text\n"));
|
|
}
|
|
|
|
int main(int argc, char *argv[])
|
|
--- acl-2.2.47_old/man/man1/getfacl.1 2008-02-07 04:39:57.000000000 +0100
|
|
+++ acl-2.2.47/man/man1/getfacl.1 2008-07-31 11:23:45.000000000 +0200
|
|
@@ -12,10 +12,10 @@ getfacl \- get file access control lists
|
|
.SH SYNOPSIS
|
|
|
|
.B getfacl
|
|
-[\-dRLPvh] file ...
|
|
+[\-aceEsRLPrpndvh] file ...
|
|
|
|
.B getfacl
|
|
-[\-dRLPvh] \-
|
|
+[\-aceEsRLPrpndvh] \-
|
|
|
|
.SH DESCRIPTION
|
|
For each file, getfacl displays the file name, owner, the group,
|
|
@@ -78,22 +78,22 @@ accessing the file mode.
|
|
|
|
.SS OPTIONS
|
|
.TP 4
|
|
-.I \-\-access
|
|
+.I \-a, \-\-access
|
|
Display the file access control list.
|
|
.TP
|
|
.I \-d, \-\-default
|
|
Display the default access control list.
|
|
.TP
|
|
-.I \-\-omit-header
|
|
+.I \-c, \-\-omit-header
|
|
Do not display the comment header (the first three lines of each file's output).
|
|
.TP
|
|
-.I \-\-all-effective
|
|
+.I \-e, \-\-all-effective
|
|
Print all effective rights comments, even if identical to the rights defined by the ACL entry.
|
|
.TP
|
|
-.I \-\-no-effective
|
|
+.I \-E, \-\-no-effective
|
|
Do not print effective rights comments.
|
|
.TP
|
|
-.I \-\-skip-base
|
|
+.I \-s, \-\-skip-base
|
|
Skip files that only have the base ACL entries (owner, group, others).
|
|
.TP
|
|
.I \-R, \-\-recursive
|
|
@@ -109,17 +109,20 @@ Physical walk, do not follow symbolic li
|
|
link arguments.
|
|
Only effective in combination with \-R.
|
|
.TP
|
|
-.I \-\-tabular
|
|
+.I \-t, \-\-tabular
|
|
Use an alternative tabular output format. The ACL and the default ACL are displayed side by side. Permissions that are ineffective due to the ACL mask entry are displayed capitalized. The entry tag names for the ACL_USER_OBJ and ACL_GROUP_OBJ entries are also displayed in capital letters, which helps in spotting those entries.
|
|
.TP
|
|
-.I \-\-absolute-names
|
|
+.I \-p, \-\-absolute-names
|
|
Do not strip leading slash characters (`/'). The default behavior is to
|
|
strip leading slash characters.
|
|
.TP
|
|
-.I \-\-version
|
|
+.I \-n, \-\-numeric
|
|
+List numeric user and group IDs
|
|
+.TP
|
|
+.I \-v, \-\-version
|
|
Print the version of getfacl and exit.
|
|
.TP
|
|
-.I \-\-help
|
|
+.I \-h, \-\-help
|
|
Print help explaining the command line options.
|
|
.TP
|
|
.I \-\-
|
|
--- acl-2.2.47_old/man/man1/setfacl.1 2008-02-07 04:39:57.000000000 +0100
|
|
+++ acl-2.2.47/man/man1/setfacl.1 2008-07-31 13:53:29.000000000 +0200
|
|
@@ -115,10 +115,10 @@ This also skips symbolic link arguments.
|
|
Only effective in combination with \-R.
|
|
This option cannot be mixed with `\-\-restore'.
|
|
.TP 4
|
|
-.I \-\-version
|
|
+.I \-v, \-\-version
|
|
Print the version of setfacl and exit.
|
|
.TP 4
|
|
-.I \-\-help
|
|
+.I \-h, \-\-help
|
|
Print help explaining the command line options.
|
|
.TP 4
|
|
.I \-\-
|
|
--- acl-2.2.47_old/setfacl/setfacl.c 2008-07-31 11:23:18.000000000 +0200
|
|
+++ acl-2.2.47/setfacl/setfacl.c 2008-07-31 12:23:13.000000000 +0200
|
|
@@ -42,10 +42,10 @@ extern int do_set(const char *path_p, co
|
|
|
|
/* '-' stands for `process non-option arguments in loop' */
|
|
#if !POSIXLY_CORRECT
|
|
-# define CMD_LINE_OPTIONS "-:bkndm:M:x:X:RLP"
|
|
+# define CMD_LINE_OPTIONS "-:bkndvhm:M:x:X:RLP"
|
|
# define CMD_LINE_SPEC "[-bkndRLP] { -m|-M|-x|-X ... } file ..."
|
|
#endif
|
|
-#define POSIXLY_CMD_LINE_OPTIONS "-:bkndm:M:x:X:"
|
|
+#define POSIXLY_CMD_LINE_OPTIONS "-:bkndvhm:M:x:X:"
|
|
#define POSIXLY_CMD_LINE_SPEC "[-bknd] {-m|-M|-x|-X ... } file ..."
|
|
|
|
struct option long_options[] = {
|
|
@@ -265,8 +265,8 @@ void help(void)
|
|
}
|
|
#endif
|
|
printf(_(
|
|
-" --version print version and exit\n"
|
|
-" --help this help text\n"));
|
|
+" -v, --version print version and exit\n"
|
|
+" -h, --help this help text\n"));
|
|
}
|
|
|
|
|