aboutsummaryrefslogtreecommitdiffstats
path: root/init/builtins.c
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-08-20 09:18:38 -0700
committerandroid code review <noreply-gerritcodereview@google.com>2012-08-20 09:18:38 -0700
commit7c386a610d9164c12932452d1ff671e070956ec1 (patch)
tree8b8b400ec9e42493c65dbbf887770a20b1ba2c9a /init/builtins.c
parent36b1399d8cee09d4ffde3bf958322ab9556b8ebe (diff)
parent96d0a4dda81aaff3f72b9690d88eb40387ee9630 (diff)
downloadsystem_core-7c386a610d9164c12932452d1ff671e070956ec1.tar.gz
system_core-7c386a610d9164c12932452d1ff671e070956ec1.tar.bz2
system_core-7c386a610d9164c12932452d1ff671e070956ec1.zip
Merge "Extend and document the "wait" command"
Diffstat (limited to 'init/builtins.c')
-rw-r--r--init/builtins.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/init/builtins.c b/init/builtins.c
index 5bda7a07..882ceb59 100644
--- a/init/builtins.c
+++ b/init/builtins.c
@@ -799,6 +799,8 @@ int do_wait(int nargs, char **args)
{
if (nargs == 2) {
return wait_for_file(args[1], COMMAND_RETRY_TIMEOUT);
- }
- return -1;
+ } else if (nargs == 3) {
+ return wait_for_file(args[1], atoi(args[2]));
+ } else
+ return -1;
}