projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Apply patch from Ghozlane Toumi to add -inum support to find.
[oweals/busybox.git]
/
include
/
usage.h
diff --git
a/include/usage.h
b/include/usage.h
index 0a0948bdd40beba4eb4700f2715205c17d145ec9..077306bdf7733cec885a794f5480cf7cf2f50615 100644
(file)
--- a/
include/usage.h
+++ b/
include/usage.h
@@
-1,12
+1,12
@@
#define addgroup_trivial_usage \
#define addgroup_trivial_usage \
- "[OPTIONS]
<group_name>
"
+ "[OPTIONS]
group_name [user_name]
"
#define addgroup_full_usage \
"Adds a group to the system" \
"Options:\n" \
"\t-g\t\tspecify gid\n"
#define adduser_trivial_usage \
#define addgroup_full_usage \
"Adds a group to the system" \
"Options:\n" \
"\t-g\t\tspecify gid\n"
#define adduser_trivial_usage \
- "[OPTIONS]
<user_name>
"
+ "[OPTIONS]
user_name
"
#define adduser_full_usage \
"Adds a user to the system" \
"Options:\n" \
#define adduser_full_usage \
"Adds a user to the system" \
"Options:\n" \
@@
-568,6
+568,16
@@
#else
#define USAGE_FIND_MTIME(a)
#endif
#else
#define USAGE_FIND_MTIME(a)
#endif
+#ifdef CONFIG_FEATURE_FIND_NEWER
+ #define USAGE_FIND_NEWER(a) a
+#else
+ #define USAGE_FIND_NEWER(a)
+#endif
+#ifdef CONFIG_FEATURE_FIND_INUM
+ #define USAGE_FIND_INUM(a) a
+#else
+ #define USAGE_FIND_INUM(a)
+#endif
#define find_trivial_usage \
"[PATH...] [EXPRESSION]"
#define find_trivial_usage \
"[PATH...] [EXPRESSION]"
@@
-583,7
+593,11
@@
) USAGE_FIND_PERM( \
"\n\t-perm PERMS\tPermissions match any of (+NNN); all of (-NNN);\n\t\t\tor exactly (NNN)" \
) USAGE_FIND_MTIME( \
) USAGE_FIND_PERM( \
"\n\t-perm PERMS\tPermissions match any of (+NNN); all of (-NNN);\n\t\t\tor exactly (NNN)" \
) USAGE_FIND_MTIME( \
- "\n\t-mtime TIME\tModified time is greater than (+N); less than (-N);\n\t\t\tor exactly (N) days")
+ "\n\t-mtime TIME\tModified time is greater than (+N); less than (-N);\n\t\t\tor exactly (N) days" \
+) USAGE_FIND_NEWER( \
+ "\n\t-newer FILE\tModified time is more recent than FILE's" \
+) USAGE_FIND_INUM( \
+ "\n\t-inum N\t\tFile has inode number N")
#define find_example_usage \
"$ find / -name /etc/passwd\n" \
"/etc/passwd\n"
#define find_example_usage \
"$ find / -name /etc/passwd\n" \
"/etc/passwd\n"
@@
-1032,6
+1046,11
@@
" ::shutdown:/bin/umount -a -r\n" \
" ::shutdown:/sbin/swapoff -a\n"
" ::shutdown:/bin/umount -a -r\n" \
" ::shutdown:/sbin/swapoff -a\n"
+#ifdef CONFIG_FEATURE_INSMOD_LOAD_MAP
+ #define USAGE_INSMOD_MAP(a) a
+#else
+ #define USAGE_INSMOD_MAP(a)
+#endif
#define insmod_trivial_usage \
"[OPTION]... MODULE [symbol=value]..."
#define insmod_full_usage \
#define insmod_trivial_usage \
"[OPTION]... MODULE [symbol=value]..."
#define insmod_full_usage \
@@
-1041,7
+1060,8
@@
"\t-k\tMake module autoclean-able.\n" \
"\t-v\tverbose output\n" \
"\t-L\tLock to prevent simultaneous loads of a module\n" \
"\t-k\tMake module autoclean-able.\n" \
"\t-v\tverbose output\n" \
"\t-L\tLock to prevent simultaneous loads of a module\n" \
- "\t-x\tdo not export externs"
+ USAGE_INSMOD_MAP("\t-m\tOutput load map to stdout") \
+ "\t-x\tdo not export externs\n"
#define ip_trivial_usage \
"[ OPTIONS ] { address | link | route | tunnel } { COMMAND | help }"
#define ip_trivial_usage \
"[ OPTIONS ] { address | link | route | tunnel } { COMMAND | help }"
@@
-1505,11
+1525,11
@@
"$ mv /tmp/foo /bin/bar\n"
#define nameif_trivial_usage \
"$ mv /tmp/foo /bin/bar\n"
#define nameif_trivial_usage \
- "[
OPTIONS
] [{IFNAME MACADDR}]"
+ "[
-s] [-c FILE
] [{IFNAME MACADDR}]"
#define nameif_full_usage \
"Nameif renaming network interface while it in the down state.\n\n" \
"Options:\n" \
#define nameif_full_usage \
"Nameif renaming network interface while it in the down state.\n\n" \
"Options:\n" \
- "\t-c FILE\t\tUse
another
configuration file (default is /etc/mactab)\n" \
+ "\t-c FILE\t\tUse configuration file (default is /etc/mactab)\n" \
"\t-s\t\tUse syslog (LOCAL0 facility).\n" \
"\tIFNAME MACADDR\tnew_interface_name interface_mac_address\n"
#define nameif_example_usage \
"\t-s\t\tUse syslog (LOCAL0 facility).\n" \
"\tIFNAME MACADDR\tnew_interface_name interface_mac_address\n"
#define nameif_example_usage \