diff options
author | Erik Andersen <andersen@codepoet.org> | 2000-04-04 18:49:18 +0000 |
---|---|---|
committer | Erik Andersen <andersen@codepoet.org> | 2000-04-04 18:49:18 +0000 |
commit | b99ca13261765f23a6c5785490ae101f9dbd4a16 (patch) | |
tree | c93fa608d5314d07aa746d56c14c9820f22e2648 | |
parent | 68a9ea4208d5661de225fec9be3ffff8b02b8d66 (diff) | |
download | busybox-w32-b99ca13261765f23a6c5785490ae101f9dbd4a16.tar.gz busybox-w32-b99ca13261765f23a6c5785490ae101f9dbd4a16.tar.bz2 busybox-w32-b99ca13261765f23a6c5785490ae101f9dbd4a16.zip |
usleep contributed by Nicolas Pitre <nico@cam.org>
-Erik
-rw-r--r-- | Changelog | 1 | ||||
-rw-r--r-- | applets/busybox.c | 3 | ||||
-rw-r--r-- | busybox.c | 3 | ||||
-rw-r--r-- | busybox.def.h | 1 | ||||
-rw-r--r-- | internal.h | 1 |
5 files changed, 9 insertions, 0 deletions
@@ -16,6 +16,7 @@ | |||
16 | and then adjusted a bit by me. | 16 | and then adjusted a bit by me. |
17 | * Added tr and dirname from John Lombardo <john@deltanet.com> | 17 | * Added tr and dirname from John Lombardo <john@deltanet.com> |
18 | * Added echo and test (from me). | 18 | * Added echo and test (from me). |
19 | * Added usleep contributed by Nicolas Pitre <nico@cam.org> | ||
19 | * tar wouldn't create directory entries that don't end in '/', | 20 | * tar wouldn't create directory entries that don't end in '/', |
20 | now it does (thanks to Avery Pennarun <apenwarr@worldvisions.ca>) | 21 | now it does (thanks to Avery Pennarun <apenwarr@worldvisions.ca>) |
21 | * Several fixes from Pavel Roskin <pavel_roskin@geocities.com>: | 22 | * Several fixes from Pavel Roskin <pavel_roskin@geocities.com>: |
diff --git a/applets/busybox.c b/applets/busybox.c index 95fee63d6..c2477a537 100644 --- a/applets/busybox.c +++ b/applets/busybox.c | |||
@@ -311,6 +311,9 @@ static const struct Applet applets[] = { | |||
311 | #ifdef BB_UPDATE | 311 | #ifdef BB_UPDATE |
312 | {"update", update_main, _BB_DIR_SBIN}, | 312 | {"update", update_main, _BB_DIR_SBIN}, |
313 | #endif | 313 | #endif |
314 | #ifdef BB_USLEEP | ||
315 | {"usleep", usleep_main, _BB_DIR_BIN}, | ||
316 | #endif | ||
314 | #ifdef BB_WC | 317 | #ifdef BB_WC |
315 | {"wc", wc_main, _BB_DIR_USR_BIN}, | 318 | {"wc", wc_main, _BB_DIR_USR_BIN}, |
316 | #endif | 319 | #endif |
@@ -311,6 +311,9 @@ static const struct Applet applets[] = { | |||
311 | #ifdef BB_UPDATE | 311 | #ifdef BB_UPDATE |
312 | {"update", update_main, _BB_DIR_SBIN}, | 312 | {"update", update_main, _BB_DIR_SBIN}, |
313 | #endif | 313 | #endif |
314 | #ifdef BB_USLEEP | ||
315 | {"usleep", usleep_main, _BB_DIR_BIN}, | ||
316 | #endif | ||
314 | #ifdef BB_WC | 317 | #ifdef BB_WC |
315 | {"wc", wc_main, _BB_DIR_USR_BIN}, | 318 | {"wc", wc_main, _BB_DIR_USR_BIN}, |
316 | #endif | 319 | #endif |
diff --git a/busybox.def.h b/busybox.def.h index 7b6d4e4ef..dd59a284a 100644 --- a/busybox.def.h +++ b/busybox.def.h | |||
@@ -92,6 +92,7 @@ | |||
92 | #define BB_TRUE_FALSE | 92 | #define BB_TRUE_FALSE |
93 | #define BB_TTY | 93 | #define BB_TTY |
94 | #define BB_UPTIME | 94 | #define BB_UPTIME |
95 | #define BB_USLEEP | ||
95 | #define BB_WC | 96 | #define BB_WC |
96 | #define BB_WHOAMI | 97 | #define BB_WHOAMI |
97 | #define BB_UMOUNT | 98 | #define BB_UMOUNT |
diff --git a/internal.h b/internal.h index e69e62534..b90ab7e18 100644 --- a/internal.h +++ b/internal.h | |||
@@ -157,6 +157,7 @@ extern int uname_main(int argc, char** argv); | |||
157 | extern int uptime_main(int argc, char** argv); | 157 | extern int uptime_main(int argc, char** argv); |
158 | extern int uniq_main(int argc, char** argv); | 158 | extern int uniq_main(int argc, char** argv); |
159 | extern int update_main(int argc, char** argv); | 159 | extern int update_main(int argc, char** argv); |
160 | extern int usleep_main(int argc, char** argv); | ||
160 | extern int wc_main(int argc, char** argv); | 161 | extern int wc_main(int argc, char** argv); |
161 | extern int whoami_main(int argc, char** argv); | 162 | extern int whoami_main(int argc, char** argv); |
162 | extern int yes_main(int argc, char** argv); | 163 | extern int yes_main(int argc, char** argv); |