summaryrefslogtreecommitdiffstats
path: root/commands/timeout.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-04-29 20:13:22 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2012-05-14 08:37:39 +0200
commit9b42dfff0f2cecb6a9c7581c4c0c59ed9c9c586d (patch)
tree7fb7cf36a4cfa157d5d7da573bbf3270a3070277 /commands/timeout.c
parent9ede56ad2476461f2b93374c433473e046fa7757 (diff)
downloadbarebox-9b42dfff0f2cecb6a9c7581c4c0c59ed9c9c586d.tar.gz
timeout: allow to set a variable with the key pressed
Useful if we want to know which key caused the timeout. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'commands/timeout.c')
-rw-r--r--commands/timeout.c16
1 files changed, 14 insertions, 2 deletions
diff --git a/commands/timeout.c b/commands/timeout.c
index 01ece52..d4e90cd 100644
--- a/commands/timeout.c
+++ b/commands/timeout.c
@@ -25,6 +25,7 @@
#include <errno.h>
#include <getopt.h>
#include <clock.h>
+#include <environment.h>
#define TIMEOUT_RETURN (1 << 0)
#define TIMEOUT_CTRLC (1 << 1)
@@ -35,9 +36,11 @@ static int do_timeout(int argc, char *argv[])
{
int timeout = 3, ret = 1;
int flags = 0, opt, countdown;
+ int key = 0;
uint64_t start, second;
+ const char *varname = NULL;
- while((opt = getopt(argc, argv, "t:crsa")) > 0) {
+ while((opt = getopt(argc, argv, "t:crsav:")) > 0) {
switch(opt) {
case 'r':
flags |= TIMEOUT_RETURN;
@@ -51,6 +54,9 @@ static int do_timeout(int argc, char *argv[])
case 's':
flags |= TIMEOUT_SILENT;
break;
+ case 'v':
+ varname = optarg;
+ break;
default:
return 1;
}
@@ -71,13 +77,14 @@ static int do_timeout(int argc, char *argv[])
do {
if (tstc()) {
- int key = getc();
+ key = getc();
if (flags & TIMEOUT_CTRLC && key == 3)
goto out;
if (flags & TIMEOUT_ANYKEY)
goto out;
if (flags & TIMEOUT_RETURN && key == '\n')
goto out;
+ key = 0;
}
if (!(flags & TIMEOUT_SILENT) && is_timeout(second, SECOND)) {
printf("\b\b%2d", countdown--);
@@ -87,6 +94,11 @@ static int do_timeout(int argc, char *argv[])
ret = 0;
out:
+ if (varname && key) {
+ char str[2] = { };
+ str[0] = key;
+ setenv(varname, str);
+ }
if (!(flags & TIMEOUT_SILENT))
printf("\n");