summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDenis Vlasenko2008-11-24 13:25:20 +0000
committerDenis Vlasenko2008-11-24 13:25:20 +0000
commita9acbe6caddc59e7e25f4e469322e5c210e17775 (patch)
tree4e11174d18e586c5f7510adf31323f9dd98d7446 /include
parent00d8417631b1ae378d708e885dce74bafb02be96 (diff)
downloadbusybox-a9acbe6caddc59e7e25f4e469322e5c210e17775.zip
busybox-a9acbe6caddc59e7e25f4e469322e5c210e17775.tar.gz
timeout: new applet. 370 bytes. by Roberto Foglietta.
Diffstat (limited to 'include')
-rw-r--r--include/applets.h1
-rw-r--r--include/libbb.h2
-rw-r--r--include/usage.h6
3 files changed, 8 insertions, 1 deletions
diff --git a/include/applets.h b/include/applets.h
index 286f71d..fb904bb 100644
--- a/include/applets.h
+++ b/include/applets.h
@@ -372,6 +372,7 @@ USE_TFTP(APPLET(tftp, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
USE_TFTPD(APPLET(tftpd, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
#endif
USE_TIME(APPLET(time, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
+USE_TIMEOUT(APPLET(timeout, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
USE_TOP(APPLET(top, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
USE_TOUCH(APPLET_NOFORK(touch, touch, _BB_DIR_BIN, _BB_SUID_NEVER, touch))
USE_TR(APPLET(tr, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
diff --git a/include/libbb.h b/include/libbb.h
index 85a915e..77c4c60 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -923,7 +923,7 @@ void bb_displayroutes(int noresolve, int netstatfmt) FAST_FUNC;
* yet doesn't represent any valid Unicode characher.
* Also, -1 is reserved for error indication and we don't use it. */
enum {
- KEYCODE_UP = -2,
+ KEYCODE_UP = -2,
KEYCODE_DOWN = -3,
KEYCODE_RIGHT = -4,
KEYCODE_LEFT = -5,
diff --git a/include/usage.h b/include/usage.h
index 49c9400..3c657a1 100644
--- a/include/usage.h
+++ b/include/usage.h
@@ -4321,6 +4321,12 @@
"\nOptions:" \
"\n -v Verbose" \
+#define timeout_trivial_usage \
+ "[-t SECS] [-s SIG] PROG [ARGS]"
+#define timeout_full_usage "\n\n" \
+ "Runs PROG. Sends SIG to it if it is not gone in SECS seconds.\n" \
+ "Defaults: SECS: 10, SIG: TERM.\n" \
+
#define top_trivial_usage \
"[-b] [-nCOUNT] [-dSECONDS]"
#define top_full_usage "\n\n" \