summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Andersen2000-04-04 18:49:18 +0000
committerErik Andersen2000-04-04 18:49:18 +0000
commitb99ca13261765f23a6c5785490ae101f9dbd4a16 (patch)
treec93fa608d5314d07aa746d56c14c9820f22e2648
parent68a9ea4208d5661de225fec9be3ffff8b02b8d66 (diff)
downloadbusybox-b99ca13261765f23a6c5785490ae101f9dbd4a16.zip
busybox-b99ca13261765f23a6c5785490ae101f9dbd4a16.tar.gz
usleep contributed by Nicolas Pitre <nico@cam.org>
-Erik
-rw-r--r--Changelog1
-rw-r--r--applets/busybox.c3
-rw-r--r--busybox.c3
-rw-r--r--busybox.def.h1
-rw-r--r--internal.h1
5 files changed, 9 insertions, 0 deletions
diff --git a/Changelog b/Changelog
index 3b083f3..327c1ea 100644
--- 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 95fee63..c2477a5 100644
--- 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 95fee63..c2477a5 100644
--- 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 7b6d4e4..dd59a28 100644
--- 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 e69e625..b90ab7e 100644
--- 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);