Skip to content

Commit 6d090b5

Browse files
author
wakou
committed
wakou
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_4@932 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
1 parent 410820a commit 6d090b5

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

lib/net/telnet.rb

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -510,12 +510,7 @@ def write(string)
510510
end
511511
end
512512

513-
def print(string)
514-
if $VERBOSE
515-
$stderr.puts 'WARNING: Telnet#print("string") NOT adds "\n" to the last of "string", in the future.'
516-
$stderr.puts ' cf. Telnet#puts().'
517-
end
518-
string = string + "\n"
513+
def _print(string)
519514
string = string.gsub(/#{IAC}/no, IAC + IAC) if @options["Telnetmode"]
520515

521516
if @options["Binmode"]
@@ -535,7 +530,15 @@ def print(string)
535530
end
536531

537532
def puts(string)
538-
self.print(string)
533+
self._print(string + "\n")
534+
end
535+
536+
def print(string)
537+
if $VERBOSE
538+
$stderr.puts 'WARNING: Telnet#print("string") NOT adds "\n" to the last of "string", in the future.'
539+
$stderr.puts ' cf. Telnet#puts().'
540+
end
541+
self.puts(string)
539542
end
540543

541544
def cmd(options)
@@ -550,7 +553,7 @@ def cmd(options)
550553
string = options
551554
end
552555

553-
self.print(string)
556+
self.puts(string)
554557
if iterator?
555558
waitfor({"Prompt" => match, "Timeout" => time_out}){|c| yield c }
556559
else

0 commit comments

Comments
 (0)