aboutsummaryrefslogtreecommitdiff
path: root/include/applets.src.h
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2014-04-19 15:04:39 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2014-04-19 15:04:39 +0200
commit5fd3ddfb243f8f3a8ef471ff8c323a76cf815574 (patch)
tree80138de44f47129192fc4d65ee89bb57a5975f3b /include/applets.src.h
parente152cb818903f219a641c03b7c3ef290ed39a49d (diff)
downloadbusybox-w32-5fd3ddfb243f8f3a8ef471ff8c323a76cf815574.tar.gz
busybox-w32-5fd3ddfb243f8f3a8ef471ff8c323a76cf815574.tar.bz2
busybox-w32-5fd3ddfb243f8f3a8ef471ff8c323a76cf815574.zip
modprobe-small: fix help messages for aliased module-related applets
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'include/applets.src.h')
-rw-r--r--include/applets.src.h50
1 files changed, 25 insertions, 25 deletions
diff --git a/include/applets.src.h b/include/applets.src.h
index 7dbd4c7f3..aedcf22dc 100644
--- a/include/applets.src.h
+++ b/include/applets.src.h
@@ -8,7 +8,7 @@
8 8
9/* 9/*
10name - applet name as it is typed on command line 10name - applet name as it is typed on command line
11name2 - applet name, converted to C (ether-wake: name2 = ether_wake) 11help - applet name, converted to C (ether-wake: help = ether_wake)
12main - corresponding <applet>_main to call (bzcat: main = bunzip2) 12main - corresponding <applet>_main to call (bzcat: main = bunzip2)
13l - location to install link to: [/usr]/[s]bin 13l - location to install link to: [/usr]/[s]bin
14s - suid type: 14s - suid type:
@@ -24,46 +24,46 @@ s - suid type:
24 24
25#if defined(PROTOTYPES) 25#if defined(PROTOTYPES)
26# define APPLET(name,l,s) int name##_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 26# define APPLET(name,l,s) int name##_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
27# define APPLET_ODDNAME(name,main,l,s,name2) int main##_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 27# define APPLET_ODDNAME(name,main,l,s,help) int main##_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
28# define APPLET_NOEXEC(name,main,l,s,name2) int main##_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 28# define APPLET_NOEXEC(name,main,l,s,help) int main##_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
29# define APPLET_NOFORK(name,main,l,s,name2) int main##_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 29# define APPLET_NOFORK(name,main,l,s,help) int main##_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
30 30
31#elif defined(NAME_MAIN_CNAME) 31#elif defined(NAME_MAIN)
32# define APPLET(name,l,s) name name##_main name 32# define APPLET(name,l,s) name name##_main
33# define APPLET_ODDNAME(name,main,l,s,name2) name main##_main name2 33# define APPLET_ODDNAME(name,main,l,s,help) name main##_main
34# define APPLET_NOEXEC(name,main,l,s,name2) name main##_main name2 34# define APPLET_NOEXEC(name,main,l,s,help) name main##_main
35# define APPLET_NOFORK(name,main,l,s,name2) name main##_main name2 35# define APPLET_NOFORK(name,main,l,s,help) name main##_main
36 36
37#elif defined(MAKE_USAGE) && ENABLE_FEATURE_VERBOSE_USAGE 37#elif defined(MAKE_USAGE) && ENABLE_FEATURE_VERBOSE_USAGE
38# define APPLET(name,l,s) MAKE_USAGE(#name, name##_trivial_usage name##_full_usage) 38# define APPLET(name,l,s) MAKE_USAGE(#name, name##_trivial_usage name##_full_usage)
39# define APPLET_ODDNAME(name,main,l,s,name2) MAKE_USAGE(#name, name2##_trivial_usage name2##_full_usage) 39# define APPLET_ODDNAME(name,main,l,s,help) MAKE_USAGE(#name, help##_trivial_usage help##_full_usage)
40# define APPLET_NOEXEC(name,main,l,s,name2) MAKE_USAGE(#name, name2##_trivial_usage name2##_full_usage) 40# define APPLET_NOEXEC(name,main,l,s,help) MAKE_USAGE(#name, help##_trivial_usage help##_full_usage)
41# define APPLET_NOFORK(name,main,l,s,name2) MAKE_USAGE(#name, name2##_trivial_usage name2##_full_usage) 41# define APPLET_NOFORK(name,main,l,s,help) MAKE_USAGE(#name, help##_trivial_usage help##_full_usage)
42 42
43#elif defined(MAKE_USAGE) && !ENABLE_FEATURE_VERBOSE_USAGE 43#elif defined(MAKE_USAGE) && !ENABLE_FEATURE_VERBOSE_USAGE
44# define APPLET(name,l,s) MAKE_USAGE(#name, name##_trivial_usage) 44# define APPLET(name,l,s) MAKE_USAGE(#name, name##_trivial_usage)
45# define APPLET_ODDNAME(name,main,l,s,name2) MAKE_USAGE(#name, name2##_trivial_usage) 45# define APPLET_ODDNAME(name,main,l,s,help) MAKE_USAGE(#name, help##_trivial_usage)
46# define APPLET_NOEXEC(name,main,l,s,name2) MAKE_USAGE(#name, name2##_trivial_usage) 46# define APPLET_NOEXEC(name,main,l,s,help) MAKE_USAGE(#name, help##_trivial_usage)
47# define APPLET_NOFORK(name,main,l,s,name2) MAKE_USAGE(#name, name2##_trivial_usage) 47# define APPLET_NOFORK(name,main,l,s,help) MAKE_USAGE(#name, help##_trivial_usage)
48 48
49#elif defined(MAKE_LINKS) 49#elif defined(MAKE_LINKS)
50# define APPLET(name,l,c) LINK l name 50# define APPLET(name,l,c) LINK l name
51# define APPLET_ODDNAME(name,main,l,s,name2) LINK l name 51# define APPLET_ODDNAME(name,main,l,s,help) LINK l name
52# define APPLET_NOEXEC(name,main,l,s,name2) LINK l name 52# define APPLET_NOEXEC(name,main,l,s,help) LINK l name
53# define APPLET_NOFORK(name,main,l,s,name2) LINK l name 53# define APPLET_NOFORK(name,main,l,s,help) LINK l name
54 54
55#elif defined(MAKE_SUID) 55#elif defined(MAKE_SUID)
56# define APPLET(name,l,s) SUID s l name 56# define APPLET(name,l,s) SUID s l name
57# define APPLET_ODDNAME(name,main,l,s,name2) SUID s l name 57# define APPLET_ODDNAME(name,main,l,s,help) SUID s l name
58# define APPLET_NOEXEC(name,main,l,s,name2) SUID s l name 58# define APPLET_NOEXEC(name,main,l,s,help) SUID s l name
59# define APPLET_NOFORK(name,main,l,s,name2) SUID s l name 59# define APPLET_NOFORK(name,main,l,s,help) SUID s l name
60 60
61#else 61#else
62 static struct bb_applet applets[] = { /* name, main, location, need_suid */ 62 static struct bb_applet applets[] = { /* name, main, location, need_suid */
63# define APPLET(name,l,s) { #name, #name, l, s }, 63# define APPLET(name,l,s) { #name, #name, l, s },
64# define APPLET_ODDNAME(name,main,l,s,name2) { #name, #main, l, s }, 64# define APPLET_ODDNAME(name,main,l,s,help) { #name, #main, l, s },
65# define APPLET_NOEXEC(name,main,l,s,name2) { #name, #main, l, s, 1 }, 65# define APPLET_NOEXEC(name,main,l,s,help) { #name, #main, l, s, 1 },
66# define APPLET_NOFORK(name,main,l,s,name2) { #name, #main, l, s, 1, 1 }, 66# define APPLET_NOFORK(name,main,l,s,help) { #name, #main, l, s, 1, 1 },
67#endif 67#endif
68 68
69#if ENABLE_INSTALL_NO_USR 69#if ENABLE_INSTALL_NO_USR
@@ -391,7 +391,7 @@ IF_WHOAMI(APPLET_NOFORK(whoami, whoami, BB_DIR_USR_BIN, BB_SUID_DROP, whoami))
391IF_YES(APPLET_NOFORK(yes, yes, BB_DIR_USR_BIN, BB_SUID_DROP, yes)) 391IF_YES(APPLET_NOFORK(yes, yes, BB_DIR_USR_BIN, BB_SUID_DROP, yes))
392IF_ZCIP(APPLET(zcip, BB_DIR_SBIN, BB_SUID_DROP)) 392IF_ZCIP(APPLET(zcip, BB_DIR_SBIN, BB_SUID_DROP))
393 393
394#if !defined(PROTOTYPES) && !defined(NAME_MAIN_CNAME) && !defined(MAKE_USAGE) \ 394#if !defined(PROTOTYPES) && !defined(NAME_MAIN) && !defined(MAKE_USAGE) \
395 && !defined(MAKE_LINKS) && !defined(MAKE_SUID) 395 && !defined(MAKE_LINKS) && !defined(MAKE_SUID)
396}; 396};
397#endif 397#endif