diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-20 10:29:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-20 10:29:38 -0700 |
| commit | c3a4a054a99b62cb4fd593d95f3b2b0017202b20 (patch) | |
| tree | cddcd3ae3eb65204dee253507603a5edf25505bc /init/builtins.c | |
| parent | 80da83ac31925326b3a76f10564c05f2043c70f0 (diff) | |
| parent | 3af04b71e51e89af02a1fe526e4fc32dce0100d3 (diff) | |
| download | system_core-c3a4a054a99b62cb4fd593d95f3b2b0017202b20.tar.gz system_core-c3a4a054a99b62cb4fd593d95f3b2b0017202b20.tar.bz2 system_core-c3a4a054a99b62cb4fd593d95f3b2b0017202b20.zip | |
am 3af04b71: am 7c386a61: Merge "Extend and document the "wait" command"
* commit '3af04b71e51e89af02a1fe526e4fc32dce0100d3':
Extend and document the "wait" command
Diffstat (limited to 'init/builtins.c')
| -rw-r--r-- | init/builtins.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/init/builtins.c b/init/builtins.c index bb963c14..aaf85d9b 100644 --- a/init/builtins.c +++ b/init/builtins.c @@ -813,6 +813,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; } |