* lib: Convert tabs to spaces for ruby files per

	  http://redmine.ruby-lang.org/projects/ruby/wiki/DeveloperHowto#coding-style
	  Patch by Steve Klabnik [Ruby 1.9 - Bug #4730]
	  Patch by Jason Dew [Ruby 1.9 - Feature #4718]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31635 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 639 insertions, 639 deletions

diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb
index 825a1cc22f..14c6b07826 100644
--- a/lib/net/ftp.rb
+++ b/lib/net/ftp.rb
@@ -136,10 +136,10 @@ module Net
       @sock = NullSocket.new
       @logged_in = false
       if host
-	connect(host)
-	if user
-	  login(user, passwd, acct)
-	end
+        connect(host)
+        if user
+          login(user, passwd, acct)
+        end
       end
     end
 
@@ -197,10 +197,10 @@ module Net
     # else a TCPSocket is returned.
     def open_socket(host, port)
       if defined? SOCKSSocket and ENV["SOCKS_SERVER"]
-	@passive = true
-	return SOCKSSocket.open(host, port)
+        @passive = true
+        return SOCKSSocket.open(host, port)
       else
-	return TCPSocket.open(host, port)
+        return TCPSocket.open(host, port)
       end
     end
     private :open_socket
@@ -213,11 +213,11 @@ module Net
     #
     def connect(host, port = FTP_PORT)
       if @debug_mode
-	print "connect: ", host, ", ", port, "\n"
+        print "connect: ", host, ", ", port, "\n"
       end
       synchronize do
-	@sock = open_socket(host, port)
-	voidresp
+        @sock = open_socket(host, port)
+        voidresp
       end
     end
 
@@ -226,10 +226,10 @@ module Net
     #
     def set_socket(sock, get_greeting = true)
       synchronize do
-	@sock = sock
-	if get_greeting
-	  voidresp
-	end
+        @sock = sock
+        if get_greeting
+          voidresp
+        end
       end
     end
 
@@ -237,9 +237,9 @@ module Net
     # then the contents of the password are cleaned from the string using "*"
     def sanitize(s)
       if s =~ /^PASS /i
-	return s[0, 5] + "*" * (s.length - 5)
+        return s[0, 5] + "*" * (s.length - 5)
       else
-	return s
+        return s
       end
     end
     private :sanitize
@@ -248,7 +248,7 @@ module Net
     # and writes it to the socket.
     def putline(line)
       if @debug_mode
-	print "put: ", sanitize(line), "\n"
+        print "put: ", sanitize(line), "\n"
       end
       line = line + CRLF
       @sock.write(line)
@@ -261,7 +261,7 @@ module Net
       line = @sock.readline # if get EOF, raise EOFError
       line.sub!(/(\r\n|\n|\r)\z/n, "")
       if @debug_mode
-	print "get: ", sanitize(line), "\n"
+        print "get: ", sanitize(line), "\n"
       end
       return line
     end
@@ -272,11 +272,11 @@ module Net
       line = getline
       buff = line
       if line[3] == ?-
-	  code = line[0, 3]
-	begin
-	  line = getline
-	  buff << "\n" << line
-	end until line[0, 3] == code and line[3] != ?-
+        code = line[0, 3]
+        begin
+          line = getline
+          buff << "\n" << line
+        end until line[0, 3] == code and line[3] != ?-
       end
       return buff << "\n"
     end
@@ -290,13 +290,13 @@ module Net
       @last_response_code = @last_response[0, 3]
       case @last_response_code
       when /\A[123]/
-	return @last_response
+        return @last_response
       when /\A4/
-	raise FTPTempError, @last_response
+        raise FTPTempError, @last_response
       when /\A5/
-	raise FTPPermError, @last_response
+        raise FTPPermError, @last_response
       else
-	raise FTPProtoError, @last_response
+        raise FTPProtoError, @last_response
       end
     end
     private :getresp
@@ -306,7 +306,7 @@ module Net
     def voidresp
       resp = getresp
       if resp[0] != ?2
-	raise FTPReplyError, resp
+        raise FTPReplyError, resp
       end
     end
     private :voidresp
@@ -316,8 +316,8 @@ module Net
     #
     def sendcmd(cmd)
       synchronize do
-	putline(cmd)
-	return getresp
+        putline(cmd)
+        return getresp
       end
     end
 
@@ -326,8 +326,8 @@ module Net
     #
     def voidcmd(cmd)
       synchronize do
-	putline(cmd)
-	voidresp
+        putline(cmd)
+        voidresp
       end
     end
 
@@ -335,11 +335,11 @@ module Net
     def sendport(host, port)
       af = (@sock.peeraddr)[0]
       if af == "AF_INET"
-	cmd = "PORT " + (host.split(".") + port.divmod(256)).join(",")
+        cmd = "PORT " + (host.split(".") + port.divmod(256)).join(",")
       elsif af == "AF_INET6"
-	cmd = sprintf("EPRT |2|%s|%d|", host, port)
+        cmd = sprintf("EPRT |2|%s|%d|", host, port)
       else
-	raise FTPProtoError, host
+        raise FTPProtoError, host
       end
       voidcmd(cmd)
     end
@@ -360,10 +360,10 @@ module Net
     # sends the appropriate command to enable a passive connection
     def makepasv
       if @sock.peeraddr[0] == "AF_INET"
-	host, port = parse227(sendcmd("PASV"))
+        host, port = parse227(sendcmd("PASV"))
       else
-	host, port = parse229(sendcmd("EPSV"))
-	#     host, port = parse228(sendcmd("LPSV"))
+        host, port = parse229(sendcmd("EPSV"))
+        #     host, port = parse228(sendcmd("LPSV"))
       end
       return host, port
     end
@@ -372,36 +372,36 @@ module Net
     # Constructs a connection for transferring data
     def transfercmd(cmd, rest_offset = nil)
       if @passive
-	host, port = makepasv
-	conn = open_socket(host, port)
-	if @resume and rest_offset
-	  resp = sendcmd("REST " + rest_offset.to_s)
-	  if resp[0] != ?3
-	    raise FTPReplyError, resp
-	  end
-	end
-	resp = sendcmd(cmd)
+        host, port = makepasv
+        conn = open_socket(host, port)
+        if @resume and rest_offset
+          resp = sendcmd("REST " + rest_offset.to_s)
+          if resp[0] != ?3
+            raise FTPReplyError, resp
+          end
+        end
+        resp = sendcmd(cmd)
         # skip 2XX for some ftp servers
         resp = getresp if resp[0] == ?2
-	if resp[0] != ?1
-	  raise FTPReplyError, resp
-	end
+        if resp[0] != ?1
+          raise FTPReplyError, resp
+        end
       else
-	sock = makeport
-	if @resume and rest_offset
-	  resp = sendcmd("REST " + rest_offset.to_s)
-	  if resp[0] != ?3
-	    raise FTPReplyError, resp
-	  end
-	end
-	resp = sendcmd(cmd)
+        sock = makeport
+        if @resume and rest_offset
+          resp = sendcmd("REST " + rest_offset.to_s)
+          if resp[0] != ?3
+            raise FTPReplyError, resp
+          end
+        end
+        resp = sendcmd(cmd)
         # skip 2XX for some ftp servers
         resp = getresp if resp[0] == ?2
-	if resp[0] != ?1
-	  raise FTPReplyError, resp
-	end
-	conn = sock.accept
-	sock.close
+        if resp[0] != ?1
+          raise FTPReplyError, resp
+        end
+        conn = sock.accept
+        sock.close
       end
       return conn
     end
@@ -417,23 +417,23 @@ module Net
     #
     def login(user = "anonymous", passwd = nil, acct = nil)
       if user == "anonymous" and passwd == nil
-	passwd = "anonymous@"
+        passwd = "anonymous@"
       end
 
       resp = ""
       synchronize do
-	resp = sendcmd('USER ' + user)
-	if resp[0] == ?3
+        resp = sendcmd('USER ' + user)
+        if resp[0] == ?3
           raise FTPReplyError, resp if passwd.nil?
-	  resp = sendcmd('PASS ' + passwd)
-	end
-	if resp[0] == ?3
+          resp = sendcmd('PASS ' + passwd)
+        end
+        if resp[0] == ?3
           raise FTPReplyError, resp if acct.nil?
-	  resp = sendcmd('ACCT ' + acct)
-	end
+          resp = sendcmd('ACCT ' + acct)
+        end
       end
       if resp[0] != ?2
-	raise FTPReplyError, resp
+        raise FTPReplyError, resp
       end
       @welcome = resp
       send_type_command
@@ -448,7 +448,7 @@ module Net
     #
     def retrbinary(cmd, blocksize, rest_offset = nil) # :yield: data
       synchronize do
-	with_binary(true) do
+        with_binary(true) do
           conn = transfercmd(cmd, rest_offset)
           loop do
             data = conn.read(blocksize)
@@ -469,7 +469,7 @@ module Net
     #
     def retrlines(cmd) # :yield: line
       synchronize do
-	with_binary(false) do
+        with_binary(false) do
           conn = transfercmd(cmd)
           loop do
             line = conn.gets
@@ -493,7 +493,7 @@ module Net
         file.seek(rest_offset, IO::SEEK_SET)
       end
       synchronize do
-	with_binary(true) do
+        with_binary(true) do
           conn = transfercmd(cmd)
           loop do
             buf = file.read(blocksize)
@@ -522,7 +522,7 @@ module Net
     #
     def storlines(cmd, file, &block) # :yield: line
       synchronize do
-	with_binary(false) do
+        with_binary(false) do
           conn = transfercmd(cmd)
           loop do
             buf = file.gets
@@ -553,7 +553,7 @@ module Net
     # chunks.
     #
     def getbinaryfile(remotefile, localfile = File.basename(remotefile),
-		      blocksize = DEFAULT_BLOCKSIZE) # :yield: data
+                      blocksize = DEFAULT_BLOCKSIZE) # :yield: data
       result = nil
       if localfile
         if @resume
@@ -567,15 +567,15 @@ module Net
         result = ""
       end
       begin
-	f.binmode if localfile
-	retrbinary("RETR " + remotefile.to_s, blocksize, rest_offset) do |data|
-	  f.write(data) if localfile
-	  yield(data) if block_given?
+        f.binmode if localfile
+        retrbinary("RETR " + remotefile.to_s, blocksize, rest_offset) do |data|
+          f.write(data) if localfile
+          yield(data) if block_given?
           result.concat(data) if result
-	end
+        end
         return result
       ensure
-	f.close if localfile
+        f.close if localfile
       end
     end
 
@@ -594,15 +594,15 @@ module Net
         result = ""
       end
       begin
-	retrlines("RETR " + remotefile) do |line, newline|
+        retrlines("RETR " + remotefile) do |line, newline|
           l = newline ? line + "\n" : line
-	  f.print(l) if localfile
-	  yield(line, newline) if block_given?
+          f.print(l) if localfile
+          yield(line, newline) if block_given?
           result.concat(l) if result
-	end
+        end
         return result
       ensure
-	f.close if localfile
+        f.close if localfile
       end
     end
 
@@ -611,11 +611,11 @@ module Net
     # binary).  See #gettextfile and #getbinaryfile.
     #
     def get(remotefile, localfile = File.basename(remotefile),
-	    blocksize = DEFAULT_BLOCKSIZE, &block) # :yield: data
+            blocksize = DEFAULT_BLOCKSIZE, &block) # :yield: data
       if @binary
-	getbinaryfile(remotefile, localfile, blocksize, &block)
+        getbinaryfile(remotefile, localfile, blocksize, &block)
       else
-	gettextfile(remotefile, localfile, &block)
+        gettextfile(remotefile, localfile, &block)
       end
     end
 
@@ -625,7 +625,7 @@ module Net
     # data in +blocksize+ chunks.
     #
     def putbinaryfile(localfile, remotefile = File.basename(localfile),
-		      blocksize = DEFAULT_BLOCKSIZE, &block) # :yield: data
+                      blocksize = DEFAULT_BLOCKSIZE, &block) # :yield: data
       if @resume
         begin
           rest_offset = size(remotefile)
@@ -633,18 +633,18 @@ module Net
           rest_offset = nil
         end
       else
-	rest_offset = nil
+        rest_offset = nil
       end
       f = open(localfile)
       begin
-	f.binmode
+        f.binmode
         if rest_offset
           storbinary("APPE " + remotefile, f, blocksize, rest_offset, &block)
         else
           storbinary("STOR " + remotefile, f, blocksize, rest_offset, &block)
         end
       ensure
-	f.close
+        f.close
       end
     end
 
@@ -656,9 +656,9 @@ module Net
     def puttextfile(localfile, remotefile = File.basename(localfile), &block) # :yield: line
       f = open(localfile)
       begin
-	storlines("STOR " + remotefile, f, &block)
+        storlines("STOR " + remotefile, f, &block)
       ensure
-	f.close
+        f.close
       end
     end
 
@@ -667,11 +667,11 @@ module Net
     # (text or binary).  See #puttextfile and #putbinaryfile.
     #
     def put(localfile, remotefile = File.basename(localfile),
-	    blocksize = DEFAULT_BLOCKSIZE, &block)
+            blocksize = DEFAULT_BLOCKSIZE, &block)
       if @binary
-	putbinaryfile(localfile, remotefile, blocksize, &block)
+        putbinaryfile(localfile, remotefile, blocksize, &block)
       else
-	puttextfile(localfile, remotefile, &block)
+        puttextfile(localfile, remotefile, &block)
       end
     end
 
@@ -692,11 +692,11 @@ module Net
     def nlst(dir = nil)
       cmd = "NLST"
       if dir
-	cmd = cmd + " " + dir
+        cmd = cmd + " " + dir
       end
       files = []
       retrlines(cmd) do |line|
-	files.push(line)
+        files.push(line)
       end
       return files
     end
@@ -708,16 +708,16 @@ module Net
     def list(*args, &block) # :yield: line
       cmd = "LIST"
       args.each do |arg|
-	cmd = cmd + " " + arg.to_s
+        cmd = cmd + " " + arg.to_s
       end
       if block
-	retrlines(cmd, &block)
+        retrlines(cmd, &block)
       else
-	lines = []
-	retrlines(cmd) do |line|
-	  lines << line
-	end
-	return lines
+        lines = []
+        retrlines(cmd) do |line|
+          lines << line
+        end
+        return lines
       end
     end
     alias ls list
@@ -729,7 +729,7 @@ module Net
     def rename(fromname, toname)
       resp = sendcmd("RNFR " + fromname)
       if resp[0] != ?3
-	raise FTPReplyError, resp
+        raise FTPReplyError, resp
       end
       voidcmd("RNTO " + toname)
     end
@@ -740,11 +740,11 @@ module Net
     def delete(filename)
       resp = sendcmd("DELE " + filename)
       if resp[0, 3] == "250"
-	return
+        return
       elsif resp[0] == ?5
-	raise FTPPermError, resp
+        raise FTPPermError, resp
       else
-	raise FTPReplyError, resp
+        raise FTPReplyError, resp
       end
     end
 
@@ -753,14 +753,14 @@ module Net
     #
     def chdir(dirname)
       if dirname == ".."
-	begin
-	  voidcmd("CDUP")
-	  return
-	rescue FTPPermError => e
-	  if e.message[0, 3] != "500"
-	    raise e
-	  end
-	end
+        begin
+          voidcmd("CDUP")
+          return
+        rescue FTPPermError => e
+          if e.message[0, 3] != "500"
+            raise e
+          end
+        end
       end
       cmd = "CWD " + dirname
       voidcmd(cmd)
@@ -781,15 +781,15 @@ module Net
 
     MDTM_REGEXP = /^(\d\d\d\d)(\d\d)(\d\d)(\d\d)(\d\d)(\d\d)/  # :nodoc:
 
-    #
-    # Returns the last modification time of the (remote) file.  If +local+ is
-    # +true+, it is returned as a local time, otherwise it's a UTC time.
-    #
-    def mtime(filename, local = false)
-      str = mdtm(filename)
-      ary = str.scan(MDTM_REGEXP)[0].collect {|i| i.to_i}
-      return local ? Time.local(*ary) : Time.gm(*ary)
-    end
+      #
+      # Returns the last modification time of the (remote) file.  If +local+ is
+      # +true+, it is returned as a local time, otherwise it's a UTC time.
+      #
+      def mtime(filename, local = false)
+        str = mdtm(filename)
+        ary = str.scan(MDTM_REGEXP)[0].collect {|i| i.to_i}
+        return local ? Time.local(*ary) : Time.gm(*ary)
+      end
 
     #
     # Creates a remote directory.
@@ -821,7 +821,7 @@ module Net
     def system
       resp = sendcmd("SYST")
       if resp[0, 3] != "215"
-	raise FTPReplyError, resp
+        raise FTPReplyError, resp
       end
       return resp[4 .. -1]
     end
@@ -835,7 +835,7 @@ module Net
       @sock.send(line, Socket::MSG_OOB)
       resp = getmultiline
       unless ["426", "226", "225"].include?(resp[0, 3])
-	raise FTPProtoError, resp
+        raise FTPProtoError, resp
       end
       return resp
     end
@@ -856,7 +856,7 @@ module Net
     def mdtm(filename)
       resp = sendcmd("MDTM " + filename)
       if resp[0, 3] == "213"
-	return resp[3 .. -1].strip
+        return resp[3 .. -1].strip
       end
     end
 
@@ -866,7 +866,7 @@ module Net
     def help(arg = nil)
       cmd = "HELP"
       if arg
-	cmd = cmd + " " + arg
+        cmd = cmd + " " + arg
       end
       sendcmd(cmd)
     end
@@ -916,16 +916,16 @@ module Net
     # Returns host and port.
     def parse227(resp)
       if resp[0, 3] != "227"
-	raise FTPReplyError, resp
+        raise FTPReplyError, resp
       end
       left = resp.index("(")
       right = resp.index(")")
       if left == nil or right == nil
-	raise FTPProtoError, resp
+        raise FTPProtoError, resp
       end
       numbers = resp[left + 1 .. right - 1].split(",")
       if numbers.length != 6
-	raise FTPProtoError, resp
+        raise FTPProtoError, resp
       end
       host = numbers[0, 4].join(".")
       port = (numbers[4].to_i << 8) + numbers[5].to_i
@@ -939,31 +939,31 @@ module Net
     # Returns host and port.
     def parse228(resp)
       if resp[0, 3] != "228"
-	raise FTPReplyError, resp
+        raise FTPReplyError, resp
       end
       left = resp.index("(")
       right = resp.index(")")
       if left == nil or right == nil
-	raise FTPProtoError, resp
+        raise FTPProtoError, resp
       end
       numbers = resp[left + 1 .. right - 1].split(",")
       if numbers[0] == "4"
-	if numbers.length != 9 || numbers[1] != "4" || numbers[2 + 4] != "2"
-	  raise FTPProtoError, resp
-	end
-	host = numbers[2, 4].join(".")
-	port = (numbers[7].to_i << 8) + numbers[8].to_i
+        if numbers.length != 9 || numbers[1] != "4" || numbers[2 + 4] != "2"
+          raise FTPProtoError, resp
+        end
+        host = numbers[2, 4].join(".")
+        port = (numbers[7].to_i << 8) + numbers[8].to_i
       elsif numbers[0] == "6"
-	if numbers.length != 21 || numbers[1] != "16" || numbers[2 + 16] != "2"
-	  raise FTPProtoError, resp
-	end
-	v6 = ["", "", "", "", "", "", "", ""]
-	for i in 0 .. 7
-	  v6[i] = sprintf("%02x%02x", numbers[(i * 2) + 2].to_i,
-			  numbers[(i * 2) + 3].to_i)
-	end
-	host = v6[0, 8].join(":")
-	port = (numbers[19].to_i << 8) + numbers[20].to_i
+        if numbers.length != 21 || numbers[1] != "16" || numbers[2 + 16] != "2"
+          raise FTPProtoError, resp
+        end
+        v6 = ["", "", "", "", "", "", "", ""]
+        for i in 0 .. 7
+          v6[i] = sprintf("%02x%02x", numbers[(i * 2) + 2].to_i,
+                          numbers[(i * 2) + 3].to_i)
+        end
+        host = v6[0, 8].join(":")
+        port = (numbers[19].to_i << 8) + numbers[20].to_i
       end
       return host, port
     end
@@ -975,16 +975,16 @@ module Net
     # Returns host and port.
     def parse229(resp)
       if resp[0, 3] != "229"
-	raise FTPReplyError, resp
+        raise FTPReplyError, resp
       end
       left = resp.index("(")
       right = resp.index(")")
       if left == nil or right == nil
-	raise FTPProtoError, resp
+        raise FTPProtoError, resp
       end
       numbers = resp[left + 1 .. right - 1].split(resp[left + 1, 1])
       if numbers.length != 4
-	raise FTPProtoError, resp
+        raise FTPProtoError, resp
       end
       port = numbers[3].to_i
       host = (@sock.peeraddr())[3]
@@ -998,24 +998,24 @@ module Net
     # Returns host and port.
     def parse257(resp)
       if resp[0, 3] != "257"
-	raise FTPReplyError, resp
+        raise FTPReplyError, resp
       end
       if resp[3, 2] != ' "'
-	return ""
+        return ""
       end
       dirname = ""
       i = 5
       n = resp.length
       while i < n
-	c = resp[i, 1]
-	i = i + 1
-	if c == '"'
-	  if i > n or resp[i, 1] != '"'
-	    break
-	  end
-	  i = i + 1
-	end
-	dirname = dirname + c
+        c = resp[i, 1]
+        i = i + 1
+        if c == '"'
+          if i > n or resp[i, 1] != '"'
+            break
+          end
+          i = i + 1
+        end
+        dirname = dirname + c
       end
       return dirname
     end
diff --git a/lib/net/imap.rb b/lib/net/imap.rb
index 9a815d5678..cb3c22e0bc 100644
--- a/lib/net/imap.rb
+++ b/lib/net/imap.rb
@@ -1091,7 +1091,7 @@ module Net
             when UntaggedResponse
               record_response(resp.name, resp.data)
               if resp.data.instance_of?(ResponseText) &&
-                  (code = resp.data.code)
+                (code = resp.data.code)
                 record_response(code.name, code.data)
               end
               if resp.name == "BYE" && @logout_command_tag.nil?
@@ -1550,7 +1550,7 @@ module Net
       def ensure_nz_number(num)
         if num < -1 || num == 0 || num >= 4294967296
           msg = "nz_number must be non-zero unsigned 32-bit integer: " +
-                num.inspect
+            num.inspect
           raise DataFormatError, msg
         end
       end
@@ -2032,43 +2032,43 @@ module Net
       T_TEXT    = :TEXT
 
       BEG_REGEXP = /\G(?:\
-(?# 1:  SPACE   )( +)|\
-(?# 2:  NIL     )(NIL)(?=[\x80-\xff(){ \x00-\x1f\x7f%*#{'"'}\\\[\]+])|\
-(?# 3:  NUMBER  )(\d+)(?=[\x80-\xff(){ \x00-\x1f\x7f%*#{'"'}\\\[\]+])|\
-(?# 4:  ATOM    )([^\x80-\xff(){ \x00-\x1f\x7f%*#{'"'}\\\[\]+]+)|\
-(?# 5:  QUOTED  )"((?:[^\x00\r\n"\\]|\\["\\])*)"|\
-(?# 6:  LPAR    )(\()|\
-(?# 7:  RPAR    )(\))|\
-(?# 8:  BSLASH  )(\\)|\
-(?# 9:  STAR    )(\*)|\
-(?# 10: LBRA    )(\[)|\
-(?# 11: RBRA    )(\])|\
-(?# 12: LITERAL )\{(\d+)\}\r\n|\
-(?# 13: PLUS    )(\+)|\
-(?# 14: PERCENT )(%)|\
-(?# 15: CRLF    )(\r\n)|\
-(?# 16: EOF     )(\z))/ni
-
-      DATA_REGEXP = /\G(?:\
-(?# 1:  SPACE   )( )|\
-(?# 2:  NIL     )(NIL)|\
-(?# 3:  NUMBER  )(\d+)|\
-(?# 4:  QUOTED  )"((?:[^\x00\r\n"\\]|\\["\\])*)"|\
-(?# 5:  LITERAL )\{(\d+)\}\r\n|\
-(?# 6:  LPAR    )(\()|\
-(?# 7:  RPAR    )(\)))/ni
-
-      TEXT_REGEXP = /\G(?:\
-(?# 1:  TEXT    )([^\x00\r\n]*))/ni
-
-      RTEXT_REGEXP = /\G(?:\
-(?# 1:  LBRA    )(\[)|\
-(?# 2:  TEXT    )([^\x00\r\n]*))/ni
-
-      CTEXT_REGEXP = /\G(?:\
-(?# 1:  TEXT    )([^\x00\r\n\]]*))/ni
-
-      Token = Struct.new(:symbol, :value)
+                       (?# 1:  SPACE   )( +)|\
+                       (?# 2:  NIL     )(NIL)(?=[\x80-\xff(){ \x00-\x1f\x7f%*#{'"'}\\\[\]+])|\
+                         (?# 3:  NUMBER  )(\d+)(?=[\x80-\xff(){ \x00-\x1f\x7f%*#{'"'}\\\[\]+])|\
+                           (?# 4:  ATOM    )([^\x80-\xff(){ \x00-\x1f\x7f%*#{'"'}\\\[\]+]+)|\
+                             (?# 5:  QUOTED  )"((?:[^\x00\r\n"\\]|\\["\\])*)"|\
+                             (?# 6:  LPAR    )(\()|\
+                                               (?# 7:  RPAR    )(\))|\
+                                               (?# 8:  BSLASH  )(\\)|\
+                                               (?# 9:  STAR    )(\*)|\
+                                               (?# 10: LBRA    )(\[)|\
+                                                 (?# 11: RBRA    )(\])|\
+                                                 (?# 12: LITERAL )\{(\d+)\}\r\n|\
+                                                 (?# 13: PLUS    )(\+)|\
+                                                 (?# 14: PERCENT )(%)|\
+                                                 (?# 15: CRLF    )(\r\n)|\
+                                                 (?# 16: EOF     )(\z))/ni
+
+                                                 DATA_REGEXP = /\G(?:\
+                                                                   (?# 1:  SPACE   )( )|\
+                                                                   (?# 2:  NIL     )(NIL)|\
+                                                                   (?# 3:  NUMBER  )(\d+)|\
+                                                                   (?# 4:  QUOTED  )"((?:[^\x00\r\n"\\]|\\["\\])*)"|\
+                                                                   (?# 5:  LITERAL )\{(\d+)\}\r\n|\
+                                                                   (?# 6:  LPAR    )(\()|\
+                                                                                     (?# 7:  RPAR    )(\)))/ni
+
+                                                                                     TEXT_REGEXP = /\G(?:\
+                                                                                                       (?# 1:  TEXT    )([^\x00\r\n]*))/ni
+
+                                                                                                       RTEXT_REGEXP = /\G(?:\
+                                                                                                                          (?# 1:  LBRA    )(\[)|\
+                                                                                                                            (?# 2:  TEXT    )([^\x00\r\n]*))/ni
+
+                                                                                                                            CTEXT_REGEXP = /\G(?:\
+                                                                                                                                               (?# 1:  TEXT    )([^\x00\r\n\]]*))/ni
+
+                                                                                                                                               Token = Struct.new(:symbol, :value)
 
       def response
         token = lookahead
@@ -2932,11 +2932,11 @@ module Net
       end
 
       ADDRESS_REGEXP = /\G\
-(?# 1: NAME     )(?:NIL|"((?:[^\x80-\xff\x00\r\n"\\]|\\["\\])*)") \
-(?# 2: ROUTE    )(?:NIL|"((?:[^\x80-\xff\x00\r\n"\\]|\\["\\])*)") \
-(?# 3: MAILBOX  )(?:NIL|"((?:[^\x80-\xff\x00\r\n"\\]|\\["\\])*)") \
-(?# 4: HOST     )(?:NIL|"((?:[^\x80-\xff\x00\r\n"\\]|\\["\\])*)")\
-\)/ni
+        (?# 1: NAME     )(?:NIL|"((?:[^\x80-\xff\x00\r\n"\\]|\\["\\])*)") \
+        (?# 2: ROUTE    )(?:NIL|"((?:[^\x80-\xff\x00\r\n"\\]|\\["\\])*)") \
+        (?# 3: MAILBOX  )(?:NIL|"((?:[^\x80-\xff\x00\r\n"\\]|\\["\\])*)") \
+        (?# 4: HOST     )(?:NIL|"((?:[^\x80-\xff\x00\r\n"\\]|\\["\\])*)")\
+        \)/ni
 
       def address
         match(T_LPAR)
@@ -2965,62 +2965,62 @@ module Net
         return Address.new(name, route, mailbox, host)
       end
 
-#        def flag_list
-#       result = []
-#       match(T_LPAR)
-#       while true
-#         token = lookahead
-#         case token.symbol
-#         when T_RPAR
-#           shift_token
-#           break
-#         when T_SPACE
-#           shift_token
-#         end
-#         result.push(flag)
-#       end
-#       return result
-#        end
-
-#        def flag
-#       token = lookahead
-#       if token.symbol == T_BSLASH
-#         shift_token
-#         token = lookahead
-#         if token.symbol == T_STAR
-#           shift_token
-#           return token.value.intern
-#         else
-#           return atom.intern
-#         end
-#       else
-#         return atom
-#       end
-#        end
+      #        def flag_list
+      #       result = []
+      #       match(T_LPAR)
+      #       while true
+      #         token = lookahead
+      #         case token.symbol
+      #         when T_RPAR
+      #           shift_token
+      #           break
+      #         when T_SPACE
+      #           shift_token
+      #         end
+      #         result.push(flag)
+      #       end
+      #       return result
+      #        end
+
+      #        def flag
+      #       token = lookahead
+      #       if token.symbol == T_BSLASH
+      #         shift_token
+      #         token = lookahead
+      #         if token.symbol == T_STAR
+      #           shift_token
+      #           return token.value.intern
+      #         else
+      #           return atom.intern
+      #         end
+      #       else
+      #         return atom
+      #       end
+      #        end
 
       FLAG_REGEXP = /\
-(?# FLAG        )\\([^\x80-\xff(){ \x00-\x1f\x7f%"\\]+)|\
-(?# ATOM        )([^\x80-\xff(){ \x00-\x1f\x7f%*"\\]+)/n
-
-      def flag_list
-        if @str.index(/\(([^)]*)\)/ni, @pos)
-          @pos = $~.end(0)
-          return $1.scan(FLAG_REGEXP).collect { |flag, atom|
-            if atom
-              atom
-            else
-              symbol = flag.capitalize.untaint.intern
-              @flag_symbols[symbol] = true
-              if @flag_symbols.length > IMAP.max_flag_count
-                raise FlagCountError, "number of flag symbols exceeded"
+        (?# FLAG        )\\([^\x80-\xff(){ \x00-\x1f\x7f%"\\]+)|\
+          (?# ATOM        )([^\x80-\xff(){ \x00-\x1f\x7f%*"\\]+)/n
+
+            def flag_list
+              if @str.index(/\(([^)]*)\)/ni, @pos)
+                @pos = $~.end(0)
+                return $1.scan(FLAG_REGEXP).collect { |flag, atom|
+                  if atom
+                    atom
+                  else
+                    symbol = flag.capitalize.untaint.intern
+                    @flag_symbols[symbol] = true
+                    if @flag_symbols.length > IMAP.max_flag_count
+                      raise FlagCountError, "number of flag symbols exceeded"
+                    end
+                    symbol
+                  end
+                }
+              else
+                parse_error("invalid flag list")
               end
-              symbol
             end
-          }
-        else
-          parse_error("invalid flag list")
-        end
-      end
 
       def nstring
         token = lookahead
@@ -3347,73 +3347,73 @@ module Net
     # #authenticate().
     class DigestMD5Authenticator
       def process(challenge)
-	case @stage
-	when STAGE_ONE
-	  @stage = STAGE_TWO
-	  sparams = {}
-	  c = StringScanner.new(challenge)
-	  while c.scan(/(?:\s*,)?\s*(\w+)=("(?:[^\\"]+|\\.)*"|[^,]+)\s*/)
-	    k, v = c[1], c[2]
-	    if v =~ /^"(.*)"$/
-	      v = $1
-	      if v =~ /,/
-		v = v.split(',')
-	      end
-	    end
-	    sparams[k] = v
-	  end
-
-	  raise DataFormatError, "Bad Challenge: '#{challenge}'" unless c.rest.size == 0
-	  raise Error, "Server does not support auth (qop = #{sparams['qop'].join(',')})" unless sparams['qop'].include?("auth")
-
-	  response = {
-	    :nonce => sparams['nonce'],
-	    :username => @user,
-	    :realm => sparams['realm'],
-	    :cnonce => Digest::MD5.hexdigest("%.15f:%.15f:%d" % [Time.now.to_f, rand, Process.pid.to_s]),
-	    :'digest-uri' => 'imap/' + sparams['realm'],
-	    :qop => 'auth',
-	    :maxbuf => 65535,
-	    :nc => "%08d" % nc(sparams['nonce']),
-	    :charset => sparams['charset'],
-	  }
-
-	  response[:authzid] = @authname unless @authname.nil?
-
-	  # now, the real thing
-	  a0 = Digest::MD5.digest( [ response.values_at(:username, :realm), @password ].join(':') )
-
-	  a1 = [ a0, response.values_at(:nonce,:cnonce) ].join(':')
-	  a1 << ':' + response[:authzid] unless response[:authzid].nil?
-
-	  a2 = "AUTHENTICATE:" + response[:'digest-uri']
-	  a2 << ":00000000000000000000000000000000" if response[:qop] and response[:qop] =~ /^auth-(?:conf|int)$/
-
-	  response[:response] = Digest::MD5.hexdigest(
-	    [
-	     Digest::MD5.hexdigest(a1),
-	     response.values_at(:nonce, :nc, :cnonce, :qop),
-	     Digest::MD5.hexdigest(a2)
-	    ].join(':')
-	  )
-
-	  return response.keys.map {|key| qdval(key.to_s, response[key]) }.join(',')
-	when STAGE_TWO
-	  @stage = nil
-	  # if at the second stage, return an empty string
-	  if challenge =~ /rspauth=/
-	    return ''
-	  else
-	    raise ResponseParseError, challenge
-	  end
-	else
-	  raise ResponseParseError, challenge
-	end
+        case @stage
+        when STAGE_ONE
+          @stage = STAGE_TWO
+          sparams = {}
+          c = StringScanner.new(challenge)
+          while c.scan(/(?:\s*,)?\s*(\w+)=("(?:[^\\"]+|\\.)*"|[^,]+)\s*/)
+            k, v = c[1], c[2]
+            if v =~ /^"(.*)"$/
+              v = $1
+              if v =~ /,/
+                v = v.split(',')
+              end
+            end
+            sparams[k] = v
+          end
+
+          raise DataFormatError, "Bad Challenge: '#{challenge}'" unless c.rest.size == 0
+          raise Error, "Server does not support auth (qop = #{sparams['qop'].join(',')})" unless sparams['qop'].include?("auth")
+
+          response = {
+            :nonce => sparams['nonce'],
+            :username => @user,
+            :realm => sparams['realm'],
+            :cnonce => Digest::MD5.hexdigest("%.15f:%.15f:%d" % [Time.now.to_f, rand, Process.pid.to_s]),
+            :'digest-uri' => 'imap/' + sparams['realm'],
+            :qop => 'auth',
+            :maxbuf => 65535,
+            :nc => "%08d" % nc(sparams['nonce']),
+            :charset => sparams['charset'],
+          }
+
+          response[:authzid] = @authname unless @authname.nil?
+
+          # now, the real thing
+          a0 = Digest::MD5.digest( [ response.values_at(:username, :realm), @password ].join(':') )
+
+          a1 = [ a0, response.values_at(:nonce,:cnonce) ].join(':')
+          a1 << ':' + response[:authzid] unless response[:authzid].nil?
+
+          a2 = "AUTHENTICATE:" + response[:'digest-uri']
+          a2 << ":00000000000000000000000000000000" if response[:qop] and response[:qop] =~ /^auth-(?:conf|int)$/
+
+            response[:response] = Digest::MD5.hexdigest(
+              [
+                Digest::MD5.hexdigest(a1),
+                response.values_at(:nonce, :nc, :cnonce, :qop),
+                Digest::MD5.hexdigest(a2)
+          ].join(':')
+          )
+
+          return response.keys.map {|key| qdval(key.to_s, response[key]) }.join(',')
+        when STAGE_TWO
+          @stage = nil
+          # if at the second stage, return an empty string
+          if challenge =~ /rspauth=/
+            return ''
+          else
+            raise ResponseParseError, challenge
+          end
+        else
+          raise ResponseParseError, challenge
+        end
       end
 
       def initialize(user, password, authname = nil)
-	@user, @password, @authname = user, password, authname
-	@nc, @stage = {}, STAGE_ONE
+        @user, @password, @authname = user, password, authname
+        @nc, @stage = {}, STAGE_ONE
       end
 
       private
@@ -3422,23 +3422,23 @@ module Net
       STAGE_TWO = :stage_two
 
       def nc(nonce)
-	if @nc.has_key? nonce
-	  @nc[nonce] = @nc[nonce] + 1
-	else
-	  @nc[nonce] = 1
-	end
-	return @nc[nonce]
+        if @nc.has_key? nonce
+          @nc[nonce] = @nc[nonce] + 1
+        else
+          @nc[nonce] = 1
+        end
+        return @nc[nonce]
       end
 
       # some responses need quoting
       def qdval(k, v)
-	return if k.nil? or v.nil?
-	if %w"username authzid realm nonce cnonce digest-uri qop".include? k
-	  v.gsub!(/([\\"])/, "\\\1")
-	  return '%s="%s"' % [k, v]
-	else
-	  return '%s=%s' % [k, v]
-	end
+        return if k.nil? or v.nil?
+        if %w"username authzid realm nonce cnonce digest-uri qop".include? k
+          v.gsub!(/([\\"])/, "\\\1")
+          return '%s="%s"' % [k, v]
+        else
+          return '%s=%s' % [k, v]
+        end
       end
     end
     add_authenticator "DIGEST-MD5", DigestMD5Authenticator
@@ -3514,7 +3514,7 @@ usage: #{$0} [options] <host>
   --auth=AUTH                   specifies auth type
   --starttls                    use starttls
   --ssl                         use ssl
-EOF
+    EOF
   end
 
   begin
@@ -3649,7 +3649,7 @@ summary                         display summary
 fetch [msgno]                   display message
 logout                          logout
 help, ?                         display help message
-EOF
+          EOF
         else
           print "unknown command: ", cmd, "\n"
         end
diff --git a/lib/net/telnet.rb b/lib/net/telnet.rb
index c25930c48b..cb517c454e 100644
--- a/lib/net/telnet.rb
+++ b/lib/net/telnet.rb
@@ -433,18 +433,18 @@ module Net
       # combine CR+NULL into CR
       string = string.gsub(/#{CR}#{NULL}/no, CR) if @options["Telnetmode"]
 
-      # combine EOL into "\n"
-      string = string.gsub(/#{EOL}/no, "\n") unless @options["Binmode"]
-
-      # remove NULL
-      string = string.gsub(/#{NULL}/no, '') unless @options["Binmode"]
-
-      string.gsub(/#{IAC}(
-                   [#{IAC}#{AO}#{AYT}#{DM}#{IP}#{NOP}]|
-                   [#{DO}#{DONT}#{WILL}#{WONT}]
-                     [#{OPT_BINARY}-#{OPT_NEW_ENVIRON}#{OPT_EXOPL}]|
-                   #{SB}[^#{IAC}]*#{IAC}#{SE}
-                 )/xno) do
+        # combine EOL into "\n"
+        string = string.gsub(/#{EOL}/no, "\n") unless @options["Binmode"]
+
+        # remove NULL
+        string = string.gsub(/#{NULL}/no, '') unless @options["Binmode"]
+
+        string.gsub(/#{IAC}(
+          [#{IAC}#{AO}#{AYT}#{DM}#{IP}#{NOP}]|
+          [#{DO}#{DONT}#{WILL}#{WONT}]
+      [#{OPT_BINARY}-#{OPT_NEW_ENVIRON}#{OPT_EXOPL}]|
+      #{SB}[^#{IAC}]*#{IAC}#{SE}
+      )/xno) do
         if    IAC == $1  # handle escaped IAC characters
           IAC
         elsif AYT == $1  # respond to "IAC AYT" (are you there)
@@ -464,301 +464,301 @@ module Net
         elsif WILL[0] == $1[0]  # respond to "IAC WILL x"
           if    OPT_BINARY[0] == $1[1]
             self.write(IAC + DO + OPT_BINARY)
-          elsif OPT_ECHO[0] == $1[1]
-            self.write(IAC + DO + OPT_ECHO)
-          elsif OPT_SGA[0]  == $1[1]
-            @telnet_option["SGA"] = true
-            self.write(IAC + DO + OPT_SGA)
-          else
-            self.write(IAC + DONT + $1[1..1])
-          end
-          ''
-        elsif WONT[0] == $1[0]  # respond to "IAC WON'T x"
-          if    OPT_ECHO[0] == $1[1]
-            self.write(IAC + DONT + OPT_ECHO)
-          elsif OPT_SGA[0]  == $1[1]
-            @telnet_option["SGA"] = false
-            self.write(IAC + DONT + OPT_SGA)
-          else
-            self.write(IAC + DONT + $1[1..1])
-          end
-          ''
-        else
-          ''
-        end
-      end
-    end # preprocess
-
-    # Read data from the host until a certain sequence is matched.
-    #
-    # If a block is given, the received data will be yielded as it
-    # is read in (not necessarily all in one go), or nil if EOF
-    # occurs before any data is received.  Whether a block is given
-    # or not, all data read will be returned in a single string, or again
-    # nil if EOF occurs before any data is received.  Note that
-    # received data includes the matched sequence we were looking for.
-    #
-    # +options+ can be either a regular expression or a hash of options.
-    # If a regular expression, this specifies the data to wait for.
-    # If a hash, this can specify the following options:
-    #
-    # Match:: a regular expression, specifying the data to wait for.
-    # Prompt:: as for Match; used only if Match is not specified.
-    # String:: as for Match, except a string that will be converted
-    #          into a regular expression.  Used only if Match and
-    #          Prompt are not specified.
-    # Timeout:: the number of seconds to wait for data from the host
-    #           before raising a TimeoutError.  If set to false,
-    #           no timeout will occur.  If not specified, the
-    #           Timeout option value specified when this instance
-    #           was created will be used, or, failing that, the
-    #           default value of 10 seconds.
-    # Waittime:: the number of seconds to wait after matching against
-    #            the input data to see if more data arrives.  If more
-    #            data arrives within this time, we will judge ourselves
-    #            not to have matched successfully, and will continue
-    #            trying to match.  If not specified, the Waittime option
-    #            value specified when this instance was created will be
-    #            used, or, failing that, the default value of 0 seconds,
-    #            which means not to wait for more input.
-    # FailEOF:: if true, when the remote end closes the connection then an
-    #           EOFError will be raised. Otherwise, defaults to the old
-    #           behaviour that the function will return whatever data
-    #           has been received already, or nil if nothing was received.
-    #
-    def waitfor(options) # :yield: recvdata
-      time_out = @options["Timeout"]
-      waittime = @options["Waittime"]
-      fail_eof = @options["FailEOF"]
-
-      if options.kind_of?(Hash)
-        prompt   = if options.has_key?("Match")
-                     options["Match"]
-                   elsif options.has_key?("Prompt")
-                     options["Prompt"]
-                   elsif options.has_key?("String")
-                     Regexp.new( Regexp.quote(options["String"]) )
-                   end
-        time_out = options["Timeout"]  if options.has_key?("Timeout")
-        waittime = options["Waittime"] if options.has_key?("Waittime")
-        fail_eof = options["FailEOF"]  if options.has_key?("FailEOF")
-      else
-        prompt = options
-      end
+            elsif OPT_ECHO[0] == $1[1]
+              self.write(IAC + DO + OPT_ECHO)
+              elsif OPT_SGA[0]  == $1[1]
+                @telnet_option["SGA"] = true
+                self.write(IAC + DO + OPT_SGA)
+                else
+                  self.write(IAC + DONT + $1[1..1])
+                end
+                ''
+              elsif WONT[0] == $1[0]  # respond to "IAC WON'T x"
+                if    OPT_ECHO[0] == $1[1]
+                  self.write(IAC + DONT + OPT_ECHO)
+                elsif OPT_SGA[0]  == $1[1]
+                  @telnet_option["SGA"] = false
+                  self.write(IAC + DONT + OPT_SGA)
+                else
+                  self.write(IAC + DONT + $1[1..1])
+                end
+                ''
+              else
+                ''
+              end
+            end
+          end # preprocess
+
+          # Read data from the host until a certain sequence is matched.
+          #
+          # If a block is given, the received data will be yielded as it
+          # is read in (not necessarily all in one go), or nil if EOF
+          # occurs before any data is received.  Whether a block is given
+          # or not, all data read will be returned in a single string, or again
+          # nil if EOF occurs before any data is received.  Note that
+          # received data includes the matched sequence we were looking for.
+          #
+          # +options+ can be either a regular expression or a hash of options.
+          # If a regular expression, this specifies the data to wait for.
+          # If a hash, this can specify the following options:
+          #
+          # Match:: a regular expression, specifying the data to wait for.
+          # Prompt:: as for Match; used only if Match is not specified.
+          # String:: as for Match, except a string that will be converted
+          #          into a regular expression.  Used only if Match and
+          #          Prompt are not specified.
+          # Timeout:: the number of seconds to wait for data from the host
+          #           before raising a TimeoutError.  If set to false,
+          #           no timeout will occur.  If not specified, the
+          #           Timeout option value specified when this instance
+          #           was created will be used, or, failing that, the
+          #           default value of 10 seconds.
+          # Waittime:: the number of seconds to wait after matching against
+          #            the input data to see if more data arrives.  If more
+          #            data arrives within this time, we will judge ourselves
+          #            not to have matched successfully, and will continue
+          #            trying to match.  If not specified, the Waittime option
+          #            value specified when this instance was created will be
+          #            used, or, failing that, the default value of 0 seconds,
+          #            which means not to wait for more input.
+          # FailEOF:: if true, when the remote end closes the connection then an
+          #           EOFError will be raised. Otherwise, defaults to the old
+          #           behaviour that the function will return whatever data
+          #           has been received already, or nil if nothing was received.
+          #
+          def waitfor(options) # :yield: recvdata
+            time_out = @options["Timeout"]
+            waittime = @options["Waittime"]
+            fail_eof = @options["FailEOF"]
+
+            if options.kind_of?(Hash)
+              prompt   = if options.has_key?("Match")
+                           options["Match"]
+                         elsif options.has_key?("Prompt")
+                           options["Prompt"]
+                         elsif options.has_key?("String")
+                           Regexp.new( Regexp.quote(options["String"]) )
+                         end
+              time_out = options["Timeout"]  if options.has_key?("Timeout")
+              waittime = options["Waittime"] if options.has_key?("Waittime")
+              fail_eof = options["FailEOF"]  if options.has_key?("FailEOF")
+            else
+              prompt = options
+            end
 
-      if time_out == false
-        time_out = nil
-      end
+            if time_out == false
+              time_out = nil
+            end
 
-      line = ''
-      buf = ''
-      rest = ''
-      until(prompt === line and not IO::select([@sock], nil, nil, waittime))
-        unless IO::select([@sock], nil, nil, time_out)
-          raise TimeoutError, "timed out while waiting for more data"
-        end
-        begin
-          c = @sock.readpartial(1024 * 1024)
-          @dumplog.log_dump('<', c) if @options.has_key?("Dump_log")
-          if @options["Telnetmode"]
-            c = rest + c
-            if Integer(c.rindex(/#{IAC}#{SE}/no) || 0) <
-               Integer(c.rindex(/#{IAC}#{SB}/no) || 0)
-              buf = preprocess(c[0 ... c.rindex(/#{IAC}#{SB}/no)])
-              rest = c[c.rindex(/#{IAC}#{SB}/no) .. -1]
-            elsif pt = c.rindex(/#{IAC}[^#{IAC}#{AO}#{AYT}#{DM}#{IP}#{NOP}]?\z/no) ||
-                       c.rindex(/\r\z/no)
-              buf = preprocess(c[0 ... pt])
-              rest = c[pt .. -1]
-            else
-              buf = preprocess(c)
-              rest = ''
+            line = ''
+            buf = ''
+            rest = ''
+            until(prompt === line and not IO::select([@sock], nil, nil, waittime))
+              unless IO::select([@sock], nil, nil, time_out)
+                raise TimeoutError, "timed out while waiting for more data"
+              end
+              begin
+                c = @sock.readpartial(1024 * 1024)
+                @dumplog.log_dump('<', c) if @options.has_key?("Dump_log")
+                if @options["Telnetmode"]
+                  c = rest + c
+                  if Integer(c.rindex(/#{IAC}#{SE}/no) || 0) <
+                    Integer(c.rindex(/#{IAC}#{SB}/no) || 0)
+                    buf = preprocess(c[0 ... c.rindex(/#{IAC}#{SB}/no)])
+                    rest = c[c.rindex(/#{IAC}#{SB}/no) .. -1]
+                  elsif pt = c.rindex(/#{IAC}[^#{IAC}#{AO}#{AYT}#{DM}#{IP}#{NOP}]?\z/no) ||
+                    c.rindex(/\r\z/no)
+                    buf = preprocess(c[0 ... pt])
+                    rest = c[pt .. -1]
+                  else
+                    buf = preprocess(c)
+                    rest = ''
+                  end
+                else
+                  # Not Telnetmode.
+                  #
+                  # We cannot use preprocess() on this data, because that
+                  # method makes some Telnetmode-specific assumptions.
+                  buf = rest + c
+                  rest = ''
+                  unless @options["Binmode"]
+                    if pt = buf.rindex(/\r\z/no)
+                      buf = buf[0 ... pt]
+                      rest = buf[pt .. -1]
+                    end
+                    buf.gsub!(/#{EOL}/no, "\n")
+                  end
+                end
+                @log.print(buf) if @options.has_key?("Output_log")
+                line += buf
+                yield buf if block_given?
+              rescue EOFError # End of file reached
+                raise if fail_eof
+                if line == ''
+                  line = nil
+                  yield nil if block_given?
+                end
+                break
+              end
             end
-         else
-           # Not Telnetmode.
-           #
-           # We cannot use preprocess() on this data, because that
-           # method makes some Telnetmode-specific assumptions.
-           buf = rest + c
-           rest = ''
-           unless @options["Binmode"]
-             if pt = buf.rindex(/\r\z/no)
-               buf = buf[0 ... pt]
-               rest = buf[pt .. -1]
-             end
-             buf.gsub!(/#{EOL}/no, "\n")
-           end
+            line
           end
-          @log.print(buf) if @options.has_key?("Output_log")
-          line += buf
-          yield buf if block_given?
-        rescue EOFError # End of file reached
-          raise if fail_eof
-          if line == ''
-            line = nil
-            yield nil if block_given?
-          end
-          break
-        end
-      end
-      line
-    end
 
-    # Write +string+ to the host.
-    #
-    # Does not perform any conversions on +string+.  Will log +string+ to the
-    # dumplog, if the Dump_log option is set.
-    def write(string)
-      length = string.length
-      while 0 < length
-        IO::select(nil, [@sock])
-        @dumplog.log_dump('>', string[-length..-1]) if @options.has_key?("Dump_log")
-        length -= @sock.syswrite(string[-length..-1])
-      end
-    end
+          # Write +string+ to the host.
+          #
+          # Does not perform any conversions on +string+.  Will log +string+ to the
+          # dumplog, if the Dump_log option is set.
+          def write(string)
+            length = string.length
+            while 0 < length
+              IO::select(nil, [@sock])
+              @dumplog.log_dump('>', string[-length..-1]) if @options.has_key?("Dump_log")
+              length -= @sock.syswrite(string[-length..-1])
+            end
+          end
 
-    # Sends a string to the host.
-    #
-    # This does _not_ automatically append a newline to the string.  Embedded
-    # newlines may be converted and telnet command sequences escaped
-    # depending upon the values of telnetmode, binmode, and telnet options
-    # set by the host.
-    def print(string)
-      string = string.gsub(/#{IAC}/no, IAC + IAC) if @options["Telnetmode"]
-
-      if @options["Binmode"]
-        self.write(string)
-      else
-        if @telnet_option["BINARY"] and @telnet_option["SGA"]
-          # IAC WILL SGA IAC DO BIN send EOL --> CR
-          self.write(string.gsub(/\n/n, CR))
-        elsif @telnet_option["SGA"]
-          # IAC WILL SGA send EOL --> CR+NULL
-          self.write(string.gsub(/\n/n, CR + NULL))
-        else
-          # NONE send EOL --> CR+LF
-          self.write(string.gsub(/\n/n, EOL))
-        end
-      end
-    end
+          # Sends a string to the host.
+          #
+          # This does _not_ automatically append a newline to the string.  Embedded
+          # newlines may be converted and telnet command sequences escaped
+          # depending upon the values of telnetmode, binmode, and telnet options
+          # set by the host.
+          def print(string)
+            string = string.gsub(/#{IAC}/no, IAC + IAC) if @options["Telnetmode"]
+
+              if @options["Binmode"]
+                self.write(string)
+              else
+                if @telnet_option["BINARY"] and @telnet_option["SGA"]
+                  # IAC WILL SGA IAC DO BIN send EOL --> CR
+                  self.write(string.gsub(/\n/n, CR))
+                elsif @telnet_option["SGA"]
+                  # IAC WILL SGA send EOL --> CR+NULL
+                  self.write(string.gsub(/\n/n, CR + NULL))
+                else
+                  # NONE send EOL --> CR+LF
+                  self.write(string.gsub(/\n/n, EOL))
+                end
+              end
+          end
 
-    # Sends a string to the host.
-    #
-    # Same as #print(), but appends a newline to the string.
-    def puts(string)
-      self.print(string + "\n")
-    end
+          # Sends a string to the host.
+          #
+          # Same as #print(), but appends a newline to the string.
+          def puts(string)
+            self.print(string + "\n")
+          end
 
-    # Send a command to the host.
-    #
-    # More exactly, sends a string to the host, and reads in all received
-    # data until is sees the prompt or other matched sequence.
-    #
-    # If a block is given, the received data will be yielded to it as
-    # it is read in.  Whether a block is given or not, the received data
-    # will be return as a string.  Note that the received data includes
-    # the prompt and in most cases the host's echo of our command.
-    #
-    # +options+ is either a String, specified the string or command to
-    # send to the host; or it is a hash of options.  If a hash, the
-    # following options can be specified:
-    #
-    # String:: the command or other string to send to the host.
-    # Match:: a regular expression, the sequence to look for in
-    #         the received data before returning.  If not specified,
-    #         the Prompt option value specified when this instance
-    #         was created will be used, or, failing that, the default
-    #         prompt of /[$%#>] \z/n.
-    # Timeout:: the seconds to wait for data from the host before raising
-    #           a Timeout error.  If not specified, the Timeout option
-    #           value specified when this instance was created will be
-    #           used, or, failing that, the default value of 10 seconds.
-    #
-    # The command or other string will have the newline sequence appended
-    # to it.
-    def cmd(options) # :yield: recvdata
-      match    = @options["Prompt"]
-      time_out = @options["Timeout"]
-      fail_eof = @options["FailEOF"]
-
-      if options.kind_of?(Hash)
-        string   = options["String"]
-        match    = options["Match"]   if options.has_key?("Match")
-        time_out = options["Timeout"] if options.has_key?("Timeout")
-        fail_eof = options["FailEOF"] if options.has_key?("FailEOF")
-      else
-        string = options
-      end
+          # Send a command to the host.
+          #
+          # More exactly, sends a string to the host, and reads in all received
+          # data until is sees the prompt or other matched sequence.
+          #
+          # If a block is given, the received data will be yielded to it as
+          # it is read in.  Whether a block is given or not, the received data
+          # will be return as a string.  Note that the received data includes
+          # the prompt and in most cases the host's echo of our command.
+          #
+          # +options+ is either a String, specified the string or command to
+          # send to the host; or it is a hash of options.  If a hash, the
+          # following options can be specified:
+          #
+          # String:: the command or other string to send to the host.
+          # Match:: a regular expression, the sequence to look for in
+          #         the received data before returning.  If not specified,
+          #         the Prompt option value specified when this instance
+          #         was created will be used, or, failing that, the default
+          #         prompt of /[$%#>] \z/n.
+          # Timeout:: the seconds to wait for data from the host before raising
+          #           a Timeout error.  If not specified, the Timeout option
+          #           value specified when this instance was created will be
+          #           used, or, failing that, the default value of 10 seconds.
+          #
+          # The command or other string will have the newline sequence appended
+          # to it.
+          def cmd(options) # :yield: recvdata
+            match    = @options["Prompt"]
+            time_out = @options["Timeout"]
+            fail_eof = @options["FailEOF"]
+
+            if options.kind_of?(Hash)
+              string   = options["String"]
+              match    = options["Match"]   if options.has_key?("Match")
+              time_out = options["Timeout"] if options.has_key?("Timeout")
+              fail_eof = options["FailEOF"] if options.has_key?("FailEOF")
+            else
+              string = options
+            end
 
-      self.puts(string)
-      if block_given?
-        waitfor({"Prompt" => match, "Timeout" => time_out, "FailEOF" => fail_eof}){|c| yield c }
-      else
-        waitfor({"Prompt" => match, "Timeout" => time_out, "FailEOF" => fail_eof})
-      end
-    end
+            self.puts(string)
+            if block_given?
+              waitfor({"Prompt" => match, "Timeout" => time_out, "FailEOF" => fail_eof}){|c| yield c }
+            else
+              waitfor({"Prompt" => match, "Timeout" => time_out, "FailEOF" => fail_eof})
+            end
+          end
 
-    # Login to the host with a given username and password.
-    #
-    # The username and password can either be provided as two string
-    # arguments in that order, or as a hash with keys "Name" and
-    # "Password".
-    #
-    # This method looks for the strings "login" and "Password" from the
-    # host to determine when to send the username and password.  If the
-    # login sequence does not follow this pattern (for instance, you
-    # are connecting to a service other than telnet), you will need
-    # to handle login yourself.
-    #
-    # The password can be omitted, either by only
-    # provided one String argument, which will be used as the username,
-    # or by providing a has that has no "Password" key.  In this case,
-    # the method will not look for the "Password:" prompt; if it is
-    # sent, it will have to be dealt with by later calls.
-    #
-    # The method returns all data received during the login process from
-    # the host, including the echoed username but not the password (which
-    # the host should not echo).  If a block is passed in, this received
-    # data is also yielded to the block as it is received.
-    def login(options, password = nil) # :yield: recvdata
-      login_prompt = /[Ll]ogin[: ]*\z/n
-      password_prompt = /[Pp]ass(?:word|phrase)[: ]*\z/n
-      if options.kind_of?(Hash)
-        username = options["Name"]
-        password = options["Password"]
-	login_prompt = options["LoginPrompt"] if options["LoginPrompt"]
-	password_prompt = options["PasswordPrompt"] if options["PasswordPrompt"]
-      else
-        username = options
-      end
+          # Login to the host with a given username and password.
+          #
+          # The username and password can either be provided as two string
+          # arguments in that order, or as a hash with keys "Name" and
+          # "Password".
+          #
+          # This method looks for the strings "login" and "Password" from the
+          # host to determine when to send the username and password.  If the
+          # login sequence does not follow this pattern (for instance, you
+          # are connecting to a service other than telnet), you will need
+          # to handle login yourself.
+          #
+          # The password can be omitted, either by only
+          # provided one String argument, which will be used as the username,
+          # or by providing a has that has no "Password" key.  In this case,
+          # the method will not look for the "Password:" prompt; if it is
+          # sent, it will have to be dealt with by later calls.
+          #
+          # The method returns all data received during the login process from
+          # the host, including the echoed username but not the password (which
+          # the host should not echo).  If a block is passed in, this received
+          # data is also yielded to the block as it is received.
+          def login(options, password = nil) # :yield: recvdata
+            login_prompt = /[Ll]ogin[: ]*\z/n
+            password_prompt = /[Pp]ass(?:word|phrase)[: ]*\z/n
+            if options.kind_of?(Hash)
+              username = options["Name"]
+              password = options["Password"]
+              login_prompt = options["LoginPrompt"] if options["LoginPrompt"]
+              password_prompt = options["PasswordPrompt"] if options["PasswordPrompt"]
+            else
+              username = options
+            end
 
-      if block_given?
-        line = waitfor(login_prompt){|c| yield c }
-        if password
-          line += cmd({"String" => username,
-                       "Match" => password_prompt}){|c| yield c }
-          line += cmd(password){|c| yield c }
-        else
-          line += cmd(username){|c| yield c }
-        end
-      else
-        line = waitfor(login_prompt)
-        if password
-          line += cmd({"String" => username,
-                       "Match" => password_prompt})
-          line += cmd(password)
-        else
-          line += cmd(username)
-        end
-      end
-      line
-    end
+            if block_given?
+              line = waitfor(login_prompt){|c| yield c }
+              if password
+                line += cmd({"String" => username,
+                            "Match" => password_prompt}){|c| yield c }
+                line += cmd(password){|c| yield c }
+              else
+                line += cmd(username){|c| yield c }
+              end
+            else
+              line = waitfor(login_prompt)
+              if password
+                line += cmd({"String" => username,
+                            "Match" => password_prompt})
+                line += cmd(password)
+              else
+                line += cmd(username)
+              end
+            end
+            line
+          end
 
-    # Closes the connection
-    def close
-      @sock.close
-    end
+          # Closes the connection
+          def close
+            @sock.close
+          end
 
-  end  # class Telnet
-end  # module Net
+        end  # class Telnet
+        end  # module Net