diff options
| author | Denis Vlasenko | 2007-04-09 03:05:48 +0000 |
|---|---|---|
| committer | Denis Vlasenko | 2007-04-09 03:05:48 +0000 |
| commit | 32b633aa3f7e96bc1a31feb9d3937c0c340a7430 (patch) | |
| tree | 041e4a83f8d523c2d9b3b8b4abb410616e2694a1 /include | |
| parent | 786834bcee178ea6c05aa57869337f03678d02dc (diff) | |
| download | busybox-32b633aa3f7e96bc1a31feb9d3937c0c340a7430.zip busybox-32b633aa3f7e96bc1a31feb9d3937c0c340a7430.tar.gz | |
merge busybox.c into applets.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/applets.h | 8 | ||||
| -rw-r--r-- | include/busybox.h | 3 | ||||
| -rw-r--r-- | include/libbb.h | 1 |
3 files changed, 6 insertions, 6 deletions
diff --git a/include/applets.h b/include/applets.h index 0ead89d..e8d75b7 100644 --- a/include/applets.h +++ b/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 diff --git a/include/busybox.h b/include/busybox.h index 76ff7b7..9881374 100644 --- a/include/busybox.h +++ b/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; diff --git a/include/libbb.h b/include/libbb.h index 6731adf..8f43aea 100644 --- a/include/libbb.h +++ b/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 |