usleep contributed by Nicolas Pitre <nico@cam.org>

 -Erik

diff --git a/Changelog b/Changelog
index 3b083f3abee03428801823826696cb55df33fbec..327c1eab58d3fab2160cb1faf3ae69888fd1b23c 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -16,6 +16,7 @@
            and then adjusted a bit by me.
        * Added tr and dirname from John Lombardo <john@deltanet.com> 
        * Added echo and test (from me).
+       * Added usleep contributed by Nicolas Pitre <nico@cam.org>
        * tar wouldn't create directory entries that don't end in '/',
            now it does (thanks to Avery Pennarun <apenwarr@worldvisions.ca>)
        * Several fixes from Pavel Roskin <pavel_roskin@geocities.com>:

diff --git a/applets/busybox.c b/applets/busybox.c
index 95fee63d6d99b4d153a6da2661c6d993ec394d6b..c2477a537285e511d25d0c75bb1dff0175bb035d 100644 (file)
--- a/applets/busybox.c
+++ b/applets/busybox.c
@@ -311,6 +311,9 @@ static const struct Applet applets[] = {
 #ifdef BB_UPDATE
        {"update", update_main, _BB_DIR_SBIN},
 #endif
+#ifdef BB_USLEEP
+       {"usleep", usleep_main, _BB_DIR_BIN},
+#endif
 #ifdef BB_WC
        {"wc", wc_main, _BB_DIR_USR_BIN},
 #endif

diff --git a/busybox.c b/busybox.c
index 95fee63d6d99b4d153a6da2661c6d993ec394d6b..c2477a537285e511d25d0c75bb1dff0175bb035d 100644 (file)
--- a/busybox.c
+++ b/busybox.c
@@ -311,6 +311,9 @@ static const struct Applet applets[] = {
 #ifdef BB_UPDATE
        {"update", update_main, _BB_DIR_SBIN},
 #endif
+#ifdef BB_USLEEP
+       {"usleep", usleep_main, _BB_DIR_BIN},
+#endif
 #ifdef BB_WC
        {"wc", wc_main, _BB_DIR_USR_BIN},
 #endif

diff --git a/busybox.def.h b/busybox.def.h
index 7b6d4e4efec6ac7663d7dbc4280975e046983775..dd59a284a1d5d47021cc70387fefb8aa411e47e9 100644 (file)
--- a/busybox.def.h
+++ b/busybox.def.h
@@ -92,6 +92,7 @@
 #define BB_TRUE_FALSE
 #define BB_TTY
 #define BB_UPTIME
+#define BB_USLEEP
 #define BB_WC
 #define BB_WHOAMI
 #define BB_UMOUNT

diff --git a/internal.h b/internal.h
index e69e625347060340bfa777eb7b0658fea8baa4f7..b90ab7e1848e662e36c728952dbcc9cba0bcb51b 100644 (file)
--- a/internal.h
+++ b/internal.h
@@ -157,6 +157,7 @@ extern int uname_main(int argc, char** argv);
 extern int uptime_main(int argc, char** argv);
 extern int uniq_main(int argc, char** argv);
 extern int update_main(int argc, char** argv);
+extern int usleep_main(int argc, char** argv);
 extern int wc_main(int argc, char** argv);
 extern int whoami_main(int argc, char** argv);
 extern int yes_main(int argc, char** argv);