diff options
| author | Denys Vlasenko | 2010-06-05 23:11:07 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2010-06-05 23:11:07 +0200 |
| commit | 0e5ba0843b86a78d2d98a5fbaac8d33fe041f10e (patch) | |
| tree | 1f043ab8b4f8e1e57ddaf49e0ddf7677fedf7689 /include | |
| parent | 729ce473609fbe2aef656e6079d6b8a102962004 (diff) | |
| download | busybox-0e5ba0843b86a78d2d98a5fbaac8d33fe041f10e.zip busybox-0e5ba0843b86a78d2d98a5fbaac8d33fe041f10e.tar.gz | |
Remove requirement that include/applets.h must be sorted
First, I _again_ violated it - two xz-related applets are in wrong positions.
Second, planned in-applet help text thing will be so much easier without
this requirement...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/applets.h | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/include/applets.h b/include/applets.h index d8a706b..cf8de8e 100644 --- a/include/applets.h +++ b/include/applets.h @@ -4,11 +4,6 @@ * * If you write a new applet, you need to add an entry to this list to make * busybox aware of it. - * - * It is CRUCIAL that this listing be kept in ascii order, otherwise the binary - * search lookup contributed by Gaute B Strokkenes stops working. If you value - * your kneecaps, you'll be sure to *make sure* that any changes made to this - * file result in the listing remaining in ascii order. You have been warned. */ /* @@ -36,16 +31,16 @@ s - suid type: # define APPLET_NOFORK(name,main,l,s,name2) name main##_main name2 #elif defined(MAKE_USAGE) && ENABLE_FEATURE_VERBOSE_USAGE -# define APPLET(name,l,s) name##_trivial_usage name##_full_usage "\0" -# define APPLET_ODDNAME(name,main,l,s,name2) name2##_trivial_usage name2##_full_usage "\0" -# define APPLET_NOEXEC(name,main,l,s,name2) name2##_trivial_usage name2##_full_usage "\0" -# define APPLET_NOFORK(name,main,l,s,name2) name2##_trivial_usage name2##_full_usage "\0" +# define APPLET(name,l,s) MAKE_USAGE(#name, name##_trivial_usage name##_full_usage) +# define APPLET_ODDNAME(name,main,l,s,name2) MAKE_USAGE(#name, name2##_trivial_usage name2##_full_usage) +# define APPLET_NOEXEC(name,main,l,s,name2) MAKE_USAGE(#name, name2##_trivial_usage name2##_full_usage) +# define APPLET_NOFORK(name,main,l,s,name2) MAKE_USAGE(#name, name2##_trivial_usage name2##_full_usage) #elif defined(MAKE_USAGE) && !ENABLE_FEATURE_VERBOSE_USAGE -# define APPLET(name,l,s) name##_trivial_usage "\0" -# define APPLET_ODDNAME(name,main,l,s,name2) name2##_trivial_usage "\0" -# define APPLET_NOEXEC(name,main,l,s,name2) name2##_trivial_usage "\0" -# define APPLET_NOFORK(name,main,l,s,name2) name2##_trivial_usage "\0" +# define APPLET(name,l,s) MAKE_USAGE(#name, name##_trivial_usage) +# define APPLET_ODDNAME(name,main,l,s,name2) MAKE_USAGE(#name, name2##_trivial_usage) +# define APPLET_NOEXEC(name,main,l,s,name2) MAKE_USAGE(#name, name2##_trivial_usage) +# define APPLET_NOFORK(name,main,l,s,name2) MAKE_USAGE(#name, name2##_trivial_usage) #elif defined(MAKE_LINKS) # define APPLET(name,l,c) LINK l name |