aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2007-10-07 21:00:41 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2007-10-07 21:00:41 +0000
commit642a52d65e239c43f38ed6e98994191f24290490 (patch)
tree5312a61c6a79fecabb42332072329f8da1150bc8
parentd62fd84d4b309bc5fa6548288b82f21189d4f53f (diff)
downloadbusybox-w32-642a52d65e239c43f38ed6e98994191f24290490.tar.gz
busybox-w32-642a52d65e239c43f38ed6e98994191f24290490.tar.bz2
busybox-w32-642a52d65e239c43f38ed6e98994191f24290490.zip
make --help work for "individual applets" too.
-rw-r--r--applets/applets.c2
-rw-r--r--include/busybox.h2
-rwxr-xr-xscripts/trylink9
3 files changed, 5 insertions, 8 deletions
diff --git a/applets/applets.c b/applets/applets.c
index 49ad8599f..55f8e6b23 100644
--- a/applets/applets.c
+++ b/applets/applets.c
@@ -538,7 +538,7 @@ void run_applet_and_exit(const char *name, char **argv)
538 538
539int main(int argc, char **argv) 539int main(int argc, char **argv)
540{ 540{
541 bbox_prepare_main(); 541 bbox_prepare_main(argv);
542 542
543#if !BB_MMU 543#if !BB_MMU
544 /* NOMMU re-exec trick sets high-order bit in first byte of name */ 544 /* NOMMU re-exec trick sets high-order bit in first byte of name */
diff --git a/include/busybox.h b/include/busybox.h
index 3ab90d5c7..1ab51cf78 100644
--- a/include/busybox.h
+++ b/include/busybox.h
@@ -51,6 +51,6 @@ struct bb_applet {
51/* Defined in appletlib.c */ 51/* Defined in appletlib.c */
52extern const struct bb_applet applets[]; 52extern const struct bb_applet applets[];
53extern const unsigned short NUM_APPLETS; 53extern const unsigned short NUM_APPLETS;
54void bbox_prepare_main(void); 54void bbox_prepare_main(char **argv);
55 55
56#endif /* _BB_INTERNAL_H_ */ 56#endif /* _BB_INTERNAL_H_ */
diff --git a/scripts/trylink b/scripts/trylink
index e756461c8..d6538f12e 100755
--- a/scripts/trylink
+++ b/scripts/trylink
@@ -155,20 +155,17 @@ if test "$CONFIG_FEATURE_INDIVIDUAL" = y; then
155 | grep -v "^#" \ 155 | grep -v "^#" \
156 | grep -v "^$" \ 156 | grep -v "^$" \
157 > applet.lst 157 > applet.lst
158 while read name main cname; do 158 while read name main junk; do
159
160 test x"$cname" = "x[" && cname=test
161 test x"$cname" = "x[[" && cname=test
162 159
163 echo "\ 160 echo "\
164void bbox_prepare_main(void); 161void bbox_prepare_main(char **argv);
165int $main(int argc, char **argv); 162int $main(int argc, char **argv);
166 163
167const char *applet_name = \"$name\"; 164const char *applet_name = \"$name\";
168 165
169int main(int argc, char **argv) 166int main(int argc, char **argv)
170{ 167{
171 bbox_prepare_main(); 168 bbox_prepare_main(argv);
172 return $main(argc, argv); 169 return $main(argc, argv);
173} 170}
174" >"$sharedlib_dir/applet.c" 171" >"$sharedlib_dir/applet.c"