Patch from Russell Coker:
I've attached my latest SE Linux patch for busybox against the latest CVS version of busybox.
This commit is contained in:
@ -882,6 +882,12 @@
|
||||
"\t-u\tthe hardware clock is kept in coordinated universal time\n" \
|
||||
"\t-l\tthe hardware clock is kept in local time"
|
||||
|
||||
#ifdef CONFIG_SELINUX
|
||||
#define USAGE_SELINUX(a, b) a
|
||||
#else
|
||||
#define USAGE_SELINUX(a, b) b
|
||||
#endif
|
||||
|
||||
#define id_trivial_usage \
|
||||
"[OPTIONS]... [USERNAME]"
|
||||
#define id_full_usage \
|
||||
@ -889,6 +895,7 @@
|
||||
"Options:\n" \
|
||||
"\t-g\tprints only the group ID\n" \
|
||||
"\t-u\tprints only the user ID\n" \
|
||||
USAGE_SELINUX("\t-c\tprints only the security context\n", "") \
|
||||
"\t-n\tprint a name instead of a number (with for -ug)\n" \
|
||||
"\t-r\tprints the real user ID instead of the effective ID (with -ug)"
|
||||
#define id_example_usage \
|
||||
@ -1347,7 +1354,7 @@
|
||||
#define USAGE_AUTOWIDTH(a)
|
||||
#endif
|
||||
#define ls_trivial_usage \
|
||||
"[-1Aa" USAGE_LS_TIMESTAMPS("c") "Cd" USAGE_LS_TIMESTAMPS("e") USAGE_LS_FILETYPES("F") "iln" USAGE_LS_FILETYPES("p") USAGE_LS_FOLLOWLINKS("L") USAGE_LS_RECURSIVE("R") USAGE_LS_SORTFILES("rS") "s" USAGE_AUTOWIDTH("T") USAGE_LS_TIMESTAMPS("tu") USAGE_LS_SORTFILES("v") USAGE_AUTOWIDTH("w") "x" USAGE_LS_SORTFILES("X") USAGE_HUMAN_READABLE("h") USAGE_NOT_HUMAN_READABLE("") "k] [filenames...]"
|
||||
"[-1Aa" USAGE_LS_TIMESTAMPS("c") "Cd" USAGE_LS_TIMESTAMPS("e") USAGE_LS_FILETYPES("F") "iln" USAGE_LS_FILETYPES("p") USAGE_LS_FOLLOWLINKS("L") USAGE_LS_RECURSIVE("R") USAGE_LS_SORTFILES("rS") "s" USAGE_AUTOWIDTH("T") USAGE_LS_TIMESTAMPS("tu") USAGE_LS_SORTFILES("v") USAGE_AUTOWIDTH("w") "x" USAGE_LS_SORTFILES("X") USAGE_HUMAN_READABLE("h") USAGE_NOT_HUMAN_READABLE("") "k" USAGE_SELINUX("K", "") "] [filenames...]"
|
||||
#define ls_full_usage \
|
||||
"List directory contents\n\n" \
|
||||
"Options:\n" \
|
||||
@ -1377,8 +1384,7 @@
|
||||
USAGE_LS_SORTFILES("\t-X\tsort the listing by extension\n") \
|
||||
USAGE_HUMAN_READABLE( \
|
||||
"\t-h\tprint sizes in human readable format (e.g., 1K 243M 2G )\n" \
|
||||
"\t-k\tprint sizes in kilobytes(default)") USAGE_NOT_HUMAN_READABLE( \
|
||||
"\t-k\tprint sizes in kilobytes(compatibility)")
|
||||
USAGE_SELINUX("\t-k\tprint security context\n\t-K\tprint security context in long format\n", "")
|
||||
|
||||
#define lsmod_trivial_usage \
|
||||
""
|
||||
@ -1786,7 +1792,8 @@
|
||||
""
|
||||
#define ps_full_usage \
|
||||
"Report process status\n" \
|
||||
"\nThis version of ps accepts no options."
|
||||
USAGE_SELINUX("\nOptions:\n\t-c\tshow SE Linux context", "\nThis version of ps accepts no options.")
|
||||
|
||||
#define ps_example_usage \
|
||||
"$ ps\n" \
|
||||
" PID Uid Gid State Command\n" \
|
||||
|
Reference in New Issue
Block a user