mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-16 16:34:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'command-reader-fix'

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-12-07 13:55:48 +00:00
commit 1ce961f688
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/pocketmine/command/CommandReader.php
View File

@ -103,8 +103,7 @@ class CommandReader extends Thread{
private function readLine() : bool{ private function readLine() : bool{
$line = ""; $line = "";
if($this->type === self::TYPE_READLINE){ if($this->type === self::TYPE_READLINE){
$line = trim(readline("> ")); if(($raw = readline("> ")) !== false and ($line = trim($raw)) !== ""){
if($line !== ""){
readline_add_history($line); readline_add_history($line);
}else{ }else{
return true; return true;
@ -117,7 +116,9 @@ class CommandReader extends Thread{
} }
switch($this->type){ switch($this->type){
/** @noinspection PhpMissingBreakStatementInspection */
case self::TYPE_STREAM: case self::TYPE_STREAM:
//stream_select doesn't work on piped streams for some reason
$r = [$stdin]; $r = [$stdin];
if(($count = stream_select($r, $w, $e, 0, 200000)) === 0){ //nothing changed in 200000 microseconds if(($count = stream_select($r, $w, $e, 0, 200000)) === 0){ //nothing changed in 200000 microseconds
return true; return true;
@ -125,13 +126,6 @@ class CommandReader extends Thread{
$this->initStdin(); $this->initStdin();
} }
if(($raw = fgets($stdin)) !== false){
$line = trim($raw);
}else{
return false; //user pressed ctrl+c?
}
break;
case self::TYPE_PIPED: case self::TYPE_PIPED:
if(($raw = fgets($stdin)) === false){ //broken pipe or EOF if(($raw = fgets($stdin)) === false){ //broken pipe or EOF
$this->initStdin(); $this->initStdin();
@ -139,9 +133,9 @@ class CommandReader extends Thread{
$this->wait(200000); $this->wait(200000);
}); //prevent CPU waste if it's end of pipe }); //prevent CPU waste if it's end of pipe
return true; //loop back round return true; //loop back round
}else{
$line = trim($raw);
} }
$line = trim($raw);
break; break;
} }
} }