diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-20 09:41:53 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-20 09:41:53 -0700 |
| commit | 3af04b71e51e89af02a1fe526e4fc32dce0100d3 (patch) | |
| tree | 30d93c119a13fb4c5a6153dcd6ce767e345370cd /init/builtins.c | |
| parent | cd82a6fea05d1fa06cb0ac56d2dbb27b013b8eaa (diff) | |
| parent | 7c386a610d9164c12932452d1ff671e070956ec1 (diff) | |
| download | system_core-3af04b71e51e89af02a1fe526e4fc32dce0100d3.tar.gz system_core-3af04b71e51e89af02a1fe526e4fc32dce0100d3.tar.bz2 system_core-3af04b71e51e89af02a1fe526e4fc32dce0100d3.zip | |
am 7c386a61: Merge "Extend and document the "wait" command"
* commit '7c386a610d9164c12932452d1ff671e070956ec1':
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 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; } |