Fixed.

[riece] / lisp / riece-async.el

diff --git a/lisp/riece-async.el b/lisp/riece-async.el
index 30eb658..930a2c3 100644 (file)
--- a/lisp/riece-async.el
+++ b/lisp/riece-async.el
@@ -37,6 +37,8 @@
 
 ;;; Code:
 
+(require 'riece-options)
+
 (defgroup riece-async nil
   "Connect to IRC server via asynchronous proxy"
   :prefix "riece-"
@@ -51,7 +53,7 @@
   '("\
 require 'io/nonblock'
 socket = TCPSocket.new(" host ", " service ")
-$stdout.write(\"NOTICE CONNECTED #{$$}\r\n\")
+$stdout.write(\"NOTICE CONNECTED #{$$}\\r\\n\")
 $stdout.flush
 $stdout.nonblock = true
 trap('STOP', 'IGNORE')
@@ -61,6 +63,11 @@ buf = ''
 loop do
   rfds, wfds, = select([socket, $stdin], wfds_in)
   unless wfds.empty?
+    until buf.length <= " max-buffer-size "
+      i = buf.index(\"\\r\\n\")
+      break unless i
+      buf.slice!(0 .. i + 1)
+    end
     begin
       until buf.empty?
         len = $stdout.syswrite(buf)
@@ -71,28 +78,24 @@ loop do
     end
   end
   if rfds.include?(socket)
-    line = socket.gets(\"\r\n\")
+    line = socket.gets(\"\\r\\n\")
     break unless line
-    if line =~ /^(?::[^ ]+ +)?PING +(.+)\r\n/i
-      socket.write(\"PONG #{$1}\r\n\")
+    if line =~ /^(?::[^ ]+ +)?PING +(.+)\\r\\n/i
+      socket.write(\"PONG #{$1}\\r\\n\")
       socket.flush
     else
       wfds_in = [$stdout]
       buf << line
-      until buf.length <= " max-buffer-size "
-        buf.slice!(0 .. buf.index(\"\r\n\"))
-      end
     end
   end
   if rfds.include?($stdin)
-    line = $stdin.gets(\"\r\n\")
+    line = $stdin.gets(\"\\r\\n\")
     break unless line
     socket.write(line)
     socket.flush
   end
 end
 socket.close
-exit
 ")
   "Ruby program of asynchronous proxy."
   :type 'list
@@ -103,6 +106,9 @@ exit
   :type 'integer
   :group 'riece-async)
 
+(defconst riece-async-description
+  "Keep IRC connection with external process")
+
 (defun riece-async-substitute-variables (program variable value)
   (setq program (copy-sequence program))
   (let ((pointer program))