minor fixes- handle windows newline, send replies to correct stream

triffid · Apr 7, 2012 · 56274b9 · 56274b9
1 parent 1ca3176
commit 56274b9
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/controller/daemon.pl b/controller/daemon.pl
@@ -71,6 +71,7 @@ sub close_loaded {
 sub parseInputLine {
 	my ($source, $replydest, $inline) = @_;
 	chomp $inline;
+	$inline =~ s/[\r\n]*$//s;
 	switch ($inline) {
 		case /^poke$/ {
 			$printer->{token}++;
@@ -171,7 +172,7 @@ sub parseInputLine {
 		}
 		else {
 			if ($inline =~ /\S/) {
-				$printer->enqueue(\*STDIN, $inline);
+				$printer->enqueue($source, $inline);
 			}
 			last;
 		}