svn commit: trunk/busybox: applets include scripts

[vda at busybox.net]

Author: vda
Date: 2007-10-07 14:00:41 -0700 (Sun, 07 Oct 2007)
New Revision: 20202

Log:
make --help work for "individual applets" too.



Modified:
   trunk/busybox/applets/applets.c
   trunk/busybox/include/busybox.h
   trunk/busybox/scripts/trylink


Changeset:
Modified: trunk/busybox/applets/applets.c
===================================================================
--- trunk/busybox/applets/applets.c	2007-10-07 20:46:34 UTC (rev 20201)
+++ trunk/busybox/applets/applets.c	2007-10-07 21:00:41 UTC (rev 20202)
@@ -538,7 +538,7 @@
 
 int main(int argc, char **argv)
 {
-	bbox_prepare_main();
+	bbox_prepare_main(argv);
 
 #if !BB_MMU
 	/* NOMMU re-exec trick sets high-order bit in first byte of name */

Modified: trunk/busybox/include/busybox.h
===================================================================
--- trunk/busybox/include/busybox.h	2007-10-07 20:46:34 UTC (rev 20201)
+++ trunk/busybox/include/busybox.h	2007-10-07 21:00:41 UTC (rev 20202)
@@ -51,6 +51,6 @@
 /* Defined in appletlib.c */
 extern const struct bb_applet applets[];
 extern const unsigned short NUM_APPLETS;
-void bbox_prepare_main(void);
+void bbox_prepare_main(char **argv);
 
 #endif	/* _BB_INTERNAL_H_ */

Modified: trunk/busybox/scripts/trylink
===================================================================
--- trunk/busybox/scripts/trylink	2007-10-07 20:46:34 UTC (rev 20201)
+++ trunk/busybox/scripts/trylink	2007-10-07 21:00:41 UTC (rev 20202)
@@ -155,20 +155,17 @@
     | grep -v "^#" \
     | grep -v "^$" \
     > applet.lst
-    while read name main cname; do
+    while read name main junk; do
 
-	test x"$cname" = "x[" && cname=test
-	test x"$cname" = "x[[" && cname=test
-
 	echo "\
-void bbox_prepare_main(void);
+void bbox_prepare_main(char **argv);
 int $main(int argc, char **argv);
 
 const char *applet_name = \"$name\";
 
 int main(int argc, char **argv)
 {
-	bbox_prepare_main();
+	bbox_prepare_main(argv);
 	return $main(argc, argv);
 }
 " >"$sharedlib_dir/applet.c"