X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Friece-filter.el;h=1249dd71253285f35a9f6673dad2ee0fd77c558d;hb=HEAD;hp=5dc9cf6e11537ae7fdd32b7ddbfd12bc4b300e75;hpb=7b239924e043d1a519b5efe06049c2cdf2e45c54;p=elisp%2Friece.git

diff --git a/lisp/riece-filter.el b/lisp/riece-filter.el
index 5dc9cf6..1249dd7 100644
--- a/lisp/riece-filter.el
+++ b/lisp/riece-filter.el
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
@@ -28,6 +28,7 @@
 (require 'riece-misc)
 (require 'riece-server)			;riece-close-server
 (require 'riece-identity)
+(require 'riece-debug)
 
 (defun riece-handle-numeric-reply (prefix number name string)
   (let ((base-number (* (/ number 100) 100))
@@ -40,12 +41,9 @@
 	     (format "riece-handle-default-%03d-message" base-number))))
     (if (and function
 	     (symbol-function function))
-	(condition-case error
-	    (funcall function prefix number name
-		     (riece-decode-coding-string string))
-	  (error
-	   (if riece-debug
-	       (message "Error in `%S': %S" function error)))))))
+	(riece-funcall-ignore-errors (symbol-name function)
+				     function prefix number name
+				     (riece-decode-coding-string string)))))
 
 (defun riece-handle-message (prefix message string)
   (if (and prefix
@@ -58,58 +56,59 @@
   (let ((function (intern-soft (concat "riece-handle-" message "-message")))
 	(hook (intern (concat "riece-" message "-hook")))
 	(after-hook (intern (concat "riece-after-" message "-hook"))))
-    (unless (condition-case error
-		(run-hook-with-args-until-success hook prefix string)
-	      (error
-	       (if riece-debug
-		   (message "Error in `%S': %S" hook error))
-	       nil))
+    (unless (riece-funcall-ignore-errors (symbol-name hook)
+					 #'run-hook-with-args-until-success
+					 hook prefix string)
       (if function
-	  (condition-case error
-	      (funcall function prefix string)
-	    (error
-	     (if riece-debug
-		 (message "Error in `%S': %S" function error)))))
-      (condition-case error
-	  (run-hook-with-args-until-success after-hook prefix string)
-	(error
-	 (if riece-debug
-	     (message "Error in `%S': %S" after-hook error)))))))
+	  (riece-funcall-ignore-errors (symbol-name function)
+				       function prefix string))
+      (riece-funcall-ignore-errors (symbol-name after-hook)
+				   #'run-hook-with-args-until-success
+				   after-hook prefix string))))
+
+(defsubst riece-chomp-string (string)
+  (if (string-match "\r\\'" string)
+      (substring string 0 (match-beginning 0))
+    string))
 
 (defun riece-filter (process input)
   (save-excursion
     (set-buffer (process-buffer process))
-    (goto-char riece-read-point)
-    (unless riece-debug
-      (delete-region (riece-line-beginning-position) (point-min))
-      (setq riece-read-point (point)))
+    (goto-char (point-max))
     (insert input)
-    (goto-char (prog1 riece-read-point
-		 (setq riece-read-point (point))))
-    (beginning-of-line)
-    (catch 'contiguous
-      (while (not (eobp))
-	(save-excursion
-	  (if (looking-at
-	       ":\\([^ ]+\\) +\\([0-5][0-9][0-9]\\) +\\([^ ]+\\) +\\(.*\\)\r\n")
-	      (riece-handle-numeric-reply
-	       (match-string 1)		;prefix
-	       (string-to-number (match-string 2)) ;number
-	       (match-string 3)		;name
-	       (match-string 4))		;reply string
-	    (if (looking-at "\\(:\\([^ ]+\\) +\\)?\\([^ ]+\\) +\\(.*\\)\r\n")
-		(riece-handle-message
-		 (match-string 2)	;optional prefix
-		 (match-string 3)	;command
-		 (match-string 4))	;params & trailing
-	      (if (looking-at ".*\r\n")
-		  (if riece-debug
-		      (message "Weird message from server: %s"
-			       (buffer-substring (point) (progn
-							   (end-of-line)
-							   (point)))))
-		(throw 'contiguous nil)))))
-	(forward-line)))))
+    (unless riece-filter-running
+      (unwind-protect
+	  (progn
+	    (setq riece-filter-running t)
+	    (goto-char riece-read-point)
+	    (beginning-of-line)
+	    (while (looking-at ".*\n")	;the input line is finished
+	      (save-excursion
+		(if (looking-at
+		     ":\\([^ ]+\\) +\\([0-5][0-9][0-9]\\) +\\([^ ]+\\)\
+ +\\(.*\\)")
+		    (riece-handle-numeric-reply
+		     (match-string 1)		;prefix
+		     (string-to-number (match-string 2)) ;number
+		     (match-string 3)		;name
+		     (riece-chomp-string (match-string 4))) ;reply string
+		  (if (looking-at "\\(:\\([^ ]+\\) +\\)?\\([^ ]+\\) +\\(.*\\)")
+		      (riece-handle-message
+		       (match-string 2)	;optional prefix
+		       (match-string 3)	;command
+		       (riece-chomp-string (match-string 4))
+					;params & trailing
+		       )
+		    (if riece-debug
+			(message "Weird message from server: %s"
+				 (buffer-substring (point) (progn
+							     (end-of-line)
+							     (point))))))))
+	      (forward-line))
+	    (unless riece-debug
+	      (delete-region (point-min) (point)))
+	    (setq riece-read-point (point)))
+	(setq riece-filter-running nil)))))
 
 (eval-when-compile
   (autoload 'riece-exit "riece"))
@@ -128,10 +127,11 @@
 			 riece-server-name)))
       (if riece-debug
 	  (if (equal server-name "")
-	      (message "Connection closed: %s"
-		       (substring status 0 (1- (length status))))
-	    (message "Connection to \"%s\" closed: %s"
-		     server-name (substring status 0 (1- (length status)))))
+	      (riece-debug (format "Connection closed: %s"
+				   (substring status 0 (1- (length status)))))
+	    (riece-debug (format "Connection to \"%s\" closed: %s"
+				 server-name
+				 (substring status 0 (1- (length status))))))
 	(if (equal server-name "")
 	    (message "Connection closed")
 	  (message "Connection to \"%s\" closed" server-name)))