projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Stuf
[oweals/busybox.git]
/
applets
/
busybox.c
diff --git
a/applets/busybox.c
b/applets/busybox.c
index 4849ba0a4351c90c70c7a5abe23abf4365e05a0a..af81ad8a2996b15dd8a291a7ab352dedf9f6cd2c 100644
(file)
--- a/
applets/busybox.c
+++ b/
applets/busybox.c
@@
-51,6
+51,12
@@
static const struct Applet applets[] = {
#ifdef BB_FIND //usr/bin
{"find", find_main},
#endif
#ifdef BB_FIND //usr/bin
{"find", find_main},
#endif
+#ifdef BB_CHVT //usr/bin
+ {"chvt", chvt_main},
+#endif
+#ifdef BB_DEALLOCVT //usr/bin
+ {"deallocvt", deallocvt_main},
+#endif
#ifdef BB_FSCK_MINIX //sbin
{"fsck.minix", fsck_minix_main},
#endif
#ifdef BB_FSCK_MINIX //sbin
{"fsck.minix", fsck_minix_main},
#endif
@@
-66,6
+72,9
@@
static const struct Applet applets[] = {
#ifdef BB_INIT //sbin
{"init", init_main},
#endif
#ifdef BB_INIT //sbin
{"init", init_main},
#endif
+#ifdef BB_FEATURE_LINUXRC //
+ {"linuxrc", init_main},
+#endif
#ifdef BB_KILL //bin
{"kill", kill_main},
#endif
#ifdef BB_KILL //bin
{"kill", kill_main},
#endif
@@
-117,6
+126,9
@@
static const struct Applet applets[] = {
#ifdef BB_PRINTF //usr/bin
{"printf", printf_main},
#endif
#ifdef BB_PRINTF //usr/bin
{"printf", printf_main},
#endif
+#ifdef BB_PS //bin
+ {"ps", ps_main},
+#endif
#ifdef BB_PWD //bin
{"pwd", pwd_main},
#endif
#ifdef BB_PWD //bin
{"pwd", pwd_main},
#endif
@@
-133,18
+145,27
@@
static const struct Applet applets[] = {
{"fdisk", sfdisk_main},
{"sfdisk", sfdisk_main},
#endif
{"fdisk", sfdisk_main},
{"sfdisk", sfdisk_main},
#endif
+#ifdef BB_SED //bin
+ {"sed", sed_main},
+#endif
#ifdef BB_SLEEP //bin
{"sleep", sleep_main},
#endif
#ifdef BB_SLEEP //bin
{"sleep", sleep_main},
#endif
-#ifdef BB_TAR //bin
- {"tar", tar_main},
+#ifdef BB_SYNC //bin
+ {"sync", sync_main},
+#endif
+#ifdef BB_SYSLOGD //sbin
+ {"syslogd", syslogd_main},
+#endif
+#ifdef BB_LOGGER //usr/bin
+ {"logger", logger_main},
#endif
#ifdef BB_SWAPONOFF //sbin
{"swapon", swap_on_off_main},
{"swapoff", swap_on_off_main},
#endif
#endif
#ifdef BB_SWAPONOFF //sbin
{"swapon", swap_on_off_main},
{"swapoff", swap_on_off_main},
#endif
-#ifdef BB_
SYNC
//bin
- {"
sync", sync
_main},
+#ifdef BB_
TAR
//bin
+ {"
tar", tar
_main},
#endif
#ifdef BB_TOUCH //usr/bin
{"touch", touch_main},
#endif
#ifdef BB_TOUCH //usr/bin
{"touch", touch_main},
@@
-153,15
+174,18
@@
static const struct Applet applets[] = {
{"true", true_main},
{"false", false_main},
#endif
{"true", true_main},
{"false", false_main},
#endif
+#ifdef BB_UNAME //bin
+ {"uname", uname_main},
+#endif
#ifdef BB_UMOUNT //bin
{"umount", umount_main},
#endif
#ifdef BB_UPDATE //sbin
{"update", update_main},
#endif
#ifdef BB_UMOUNT //bin
{"umount", umount_main},
#endif
#ifdef BB_UPDATE //sbin
{"update", update_main},
#endif
-#ifdef BB_
ZCAT
//bin
- {"zcat",
zcat
_main},
- {"gunzip",
zcat
_main},
+#ifdef BB_
GUNZIP
//bin
+ {"zcat",
gunzip
_main},
+ {"gunzip",
gunzip
_main},
#endif
#ifdef BB_GZIP //bin
{"gzip", gzip_main},
#endif
#ifdef BB_GZIP //bin
{"gzip", gzip_main},
@@
-205,12
+229,12
@@
int busybox_main(int argc, char **argv)
if (been_there_done_that == 1 || argc < 1) {
const struct Applet *a = applets;
if (been_there_done_that == 1 || argc < 1) {
const struct Applet *a = applets;
- fprintf(stderr, "BusyBox v%s (%s) multi-call binary -- GPL2\n",
+ fprintf(stderr, "BusyBox v%s (%s) multi-call binary -- GPL2\n
\n
",
BB_VER, BB_BT);
BB_VER, BB_BT);
- fprintf(stderr, "
\nUsage:\t
[function] [arguments]...\n");
- fprintf(stderr, "
\tbusybox [function] [arguments]...
\n");
+ fprintf(stderr, "
Usage: busybox
[function] [arguments]...\n");
+ fprintf(stderr, "
or: [function] [arguments]...\n
\n");
fprintf(stderr,
fprintf(stderr,
- "\
n\
tMost people will create a symlink to busybox for each\n"
+ "\tMost people will create a symlink to busybox for each\n"
"\tfunction name, and busybox will act like whatever you invoke it as.\n");
fprintf(stderr, "\nCurrently defined functions:\n");
"\tfunction name, and busybox will act like whatever you invoke it as.\n");
fprintf(stderr, "\nCurrently defined functions:\n");