diff options
| author | Erik Andersen <andersen@codepoet.org> | 2000-05-19 05:35:19 +0000 |
|---|---|---|
| committer | Erik Andersen <andersen@codepoet.org> | 2000-05-19 05:35:19 +0000 |
| commit | 330fd2b5767110f29544131d4c72c77e0506b6df (patch) | |
| tree | aa360774a903d3ebb0b2b5f3031c2e359f9c3afb /applets | |
| parent | d356c6e9d1bc091c64200ecc401aa9b6ffb53151 (diff) | |
| download | busybox-w32-330fd2b5767110f29544131d4c72c77e0506b6df.tar.gz busybox-w32-330fd2b5767110f29544131d4c72c77e0506b6df.tar.bz2 busybox-w32-330fd2b5767110f29544131d4c72c77e0506b6df.zip | |
More libc portability updates, add in the website (which has not been
archived previously). Wrote 'which' during the meeting today.
-Erik
Diffstat (limited to 'applets')
| -rw-r--r-- | applets/busybox.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/applets/busybox.c b/applets/busybox.c index 07caa3446..bf0591d66 100644 --- a/applets/busybox.c +++ b/applets/busybox.c | |||
| @@ -35,9 +35,7 @@ const struct BB_applet applets[] = { | |||
| 35 | #ifdef BB_BASENAME | 35 | #ifdef BB_BASENAME |
| 36 | {"basename", basename_main, _BB_DIR_USR_BIN}, | 36 | {"basename", basename_main, _BB_DIR_USR_BIN}, |
| 37 | #endif | 37 | #endif |
| 38 | #ifdef BB_BUSYBOX | ||
| 39 | {"busybox", busybox_main, _BB_DIR_BIN}, | 38 | {"busybox", busybox_main, _BB_DIR_BIN}, |
| 40 | #endif | ||
| 41 | #ifdef BB_BLOCK_DEVICE | 39 | #ifdef BB_BLOCK_DEVICE |
| 42 | {"block_device", block_device_main, _BB_DIR_SBIN}, | 40 | {"block_device", block_device_main, _BB_DIR_SBIN}, |
| 43 | #endif | 41 | #endif |
| @@ -329,6 +327,9 @@ const struct BB_applet applets[] = { | |||
| 329 | #ifdef BB_WC | 327 | #ifdef BB_WC |
| 330 | {"wc", wc_main, _BB_DIR_USR_BIN}, | 328 | {"wc", wc_main, _BB_DIR_USR_BIN}, |
| 331 | #endif | 329 | #endif |
| 330 | #ifdef BB_WHICH | ||
| 331 | {"which", which_main, _BB_DIR_USR_BIN}, | ||
| 332 | #endif | ||
| 332 | #ifdef BB_WHOAMI | 333 | #ifdef BB_WHOAMI |
| 333 | {"whoami", whoami_main, _BB_DIR_USR_BIN}, | 334 | {"whoami", whoami_main, _BB_DIR_USR_BIN}, |
| 334 | #endif | 335 | #endif |
| @@ -386,16 +387,14 @@ int busybox_main(int argc, char **argv) | |||
| 386 | if (been_there_done_that == 1 || argc < 1) { | 387 | if (been_there_done_that == 1 || argc < 1) { |
| 387 | const struct BB_applet *a = applets; | 388 | const struct BB_applet *a = applets; |
| 388 | 389 | ||
| 389 | fprintf(stderr, "BusyBox v%s (%s) multi-call binary -- GPL2\n\n", | 390 | fprintf(stderr, "BusyBox v%s (%s) multi-call binary -- GPL2\n\n" |
| 390 | BB_VER, BB_BT); | 391 | "Usage: busybox [function] [arguments]...\n" |
| 391 | fprintf(stderr, "Usage: busybox [function] [arguments]...\n"); | 392 | " or: [function] [arguments]...\n\n" |
| 392 | fprintf(stderr, " or: [function] [arguments]...\n\n"); | ||
| 393 | fprintf(stderr, | ||
| 394 | "\tBusyBox is a multi-call binary that combines many common Unix\n" | 393 | "\tBusyBox is a multi-call binary that combines many common Unix\n" |
| 395 | "\tutilities into a single executable. Most people will create a\n" | 394 | "\tutilities into a single executable. Most people will create a\n" |
| 396 | "\tlink to busybox for each function they wish to use, and BusyBox\n" | 395 | "\tlink to busybox for each function they wish to use, and BusyBox\n" |
| 397 | "\twill act like whatever it was invoked as.\n"); | 396 | "\twill act like whatever it was invoked as.\n" |
| 398 | fprintf(stderr, "\nCurrently defined functions:\n"); | 397 | "\nCurrently defined functions:\n", BB_VER, BB_BT); |
| 399 | 398 | ||
| 400 | while (a->name != 0) { | 399 | while (a->name != 0) { |
| 401 | col += | 400 | col += |