diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-11-24 13:25:20 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-11-24 13:25:20 +0000 |
| commit | a9acbe6caddc59e7e25f4e469322e5c210e17775 (patch) | |
| tree | 4e11174d18e586c5f7510adf31323f9dd98d7446 /include | |
| parent | 00d8417631b1ae378d708e885dce74bafb02be96 (diff) | |
| download | busybox-w32-a9acbe6caddc59e7e25f4e469322e5c210e17775.tar.gz busybox-w32-a9acbe6caddc59e7e25f4e469322e5c210e17775.tar.bz2 busybox-w32-a9acbe6caddc59e7e25f4e469322e5c210e17775.zip | |
timeout: new applet. 370 bytes. by Roberto Foglietta.
Diffstat (limited to 'include')
| -rw-r--r-- | include/applets.h | 1 | ||||
| -rw-r--r-- | include/libbb.h | 2 | ||||
| -rw-r--r-- | include/usage.h | 6 |
3 files changed, 8 insertions, 1 deletions
diff --git a/include/applets.h b/include/applets.h index 286f71d1e..fb904bb9f 100644 --- a/include/applets.h +++ b/include/applets.h | |||
| @@ -372,6 +372,7 @@ USE_TFTP(APPLET(tftp, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) | |||
| 372 | USE_TFTPD(APPLET(tftpd, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) | 372 | USE_TFTPD(APPLET(tftpd, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) |
| 373 | #endif | 373 | #endif |
| 374 | USE_TIME(APPLET(time, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) | 374 | USE_TIME(APPLET(time, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) |
| 375 | USE_TIMEOUT(APPLET(timeout, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) | ||
| 375 | USE_TOP(APPLET(top, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) | 376 | USE_TOP(APPLET(top, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) |
| 376 | USE_TOUCH(APPLET_NOFORK(touch, touch, _BB_DIR_BIN, _BB_SUID_NEVER, touch)) | 377 | USE_TOUCH(APPLET_NOFORK(touch, touch, _BB_DIR_BIN, _BB_SUID_NEVER, touch)) |
| 377 | USE_TR(APPLET(tr, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) | 378 | USE_TR(APPLET(tr, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) |
diff --git a/include/libbb.h b/include/libbb.h index 85a915ec1..77c4c6088 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
| @@ -923,7 +923,7 @@ void bb_displayroutes(int noresolve, int netstatfmt) FAST_FUNC; | |||
| 923 | * yet doesn't represent any valid Unicode characher. | 923 | * yet doesn't represent any valid Unicode characher. |
| 924 | * Also, -1 is reserved for error indication and we don't use it. */ | 924 | * Also, -1 is reserved for error indication and we don't use it. */ |
| 925 | enum { | 925 | enum { |
| 926 | KEYCODE_UP = -2, | 926 | KEYCODE_UP = -2, |
| 927 | KEYCODE_DOWN = -3, | 927 | KEYCODE_DOWN = -3, |
| 928 | KEYCODE_RIGHT = -4, | 928 | KEYCODE_RIGHT = -4, |
| 929 | KEYCODE_LEFT = -5, | 929 | KEYCODE_LEFT = -5, |
diff --git a/include/usage.h b/include/usage.h index 49c94000b..3c657a15e 100644 --- a/include/usage.h +++ b/include/usage.h | |||
| @@ -4321,6 +4321,12 @@ | |||
| 4321 | "\nOptions:" \ | 4321 | "\nOptions:" \ |
| 4322 | "\n -v Verbose" \ | 4322 | "\n -v Verbose" \ |
| 4323 | 4323 | ||
| 4324 | #define timeout_trivial_usage \ | ||
| 4325 | "[-t SECS] [-s SIG] PROG [ARGS]" | ||
| 4326 | #define timeout_full_usage "\n\n" \ | ||
| 4327 | "Runs PROG. Sends SIG to it if it is not gone in SECS seconds.\n" \ | ||
| 4328 | "Defaults: SECS: 10, SIG: TERM.\n" \ | ||
| 4329 | |||
| 4324 | #define top_trivial_usage \ | 4330 | #define top_trivial_usage \ |
| 4325 | "[-b] [-nCOUNT] [-dSECONDS]" | 4331 | "[-b] [-nCOUNT] [-dSECONDS]" |
| 4326 | #define top_full_usage "\n\n" \ | 4332 | #define top_full_usage "\n\n" \ |