merge busybox.c into applets.c

include/applets.h

@@ -11,10 +11,6 @@
  * file result in the listing remaining in ascii order. You have been warned.
  */
 
-#undef APPLET
-#undef APPLET_ODDNAME
-#undef APPLET_NOUSAGE
-
 /*
 name  - applet name as it is typed on command line
 name2 - applet name, converted to C (ether-wake: name2 = ether_wake)
@@ -352,3 +348,7 @@ USE_ZCIP(APPLET(zcip, _BB_DIR_SBIN, _BB_SUID_NEVER))
 };
 
 #endif
+
+#undef APPLET
+#undef APPLET_NOUSAGE
+#undef APPLET_ODDNAME

include/busybox.h

@@ -31,8 +31,7 @@ struct BB_applet {
 	__extension__ enum SUIDRoot need_suid:4;
 };
 
-/* Defined in busybox.c and applet.c */
-extern int busybox_main(int argc, char **argv);
+/* Defined in applet.c */
 extern const struct BB_applet applets[];
 extern const unsigned short NUM_APPLETS;
 

include/libbb.h

@@ -663,6 +663,7 @@ const struct hwtype *get_hwntype(int type);
 
 #ifndef BUILD_INDIVIDUAL
 extern struct BB_applet *find_applet_by_name(const char *name);
+/* Returns only if applet is not found. */
 extern void run_applet_by_name(const char *name, int argc, char **argv);
 #endif