X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Frfc2231.el;h=48aa89c975721a897c59afc04ca2975ad0773029;hb=5beb390633ce1e32cdf319c6ba19926244bbfdf2;hp=05a3440e22aaba2fd4f4239a28e1d521e5d5d3d4;hpb=8982d6bef0da4b9d53d2e62f8aef7fb75cd581fb;p=gnus

diff --git a/lisp/rfc2231.el b/lisp/rfc2231.el
index 05a3440e2..48aa89c97 100644
--- a/lisp/rfc2231.el
+++ b/lisp/rfc2231.el
@@ -1,25 +1,22 @@
 ;;; rfc2231.el --- Functions for decoding rfc2231 headers
 
-;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2012 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
 
 ;; 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., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -61,7 +58,7 @@ must never cause a Lisp error."
 	 ;; The most likely cause of an error is unbalanced parentheses
 	 ;; or double-quotes.  If all parentheses and double-quotes are
 	 ;; quoted meaninglessly with backslashes, removing them might
-	 ;; make it parseable.  Let's try...
+	 ;; make it parsable.  Let's try...
 	 (error
 	  (let (mod)
 	    (when (and (string-match "\\\\\"" string)
@@ -162,14 +159,14 @@ must never cause a Lisp error."
 			  (buffer-substring
 			   (point)
 			   (progn
-			     (forward-sexp)
-			     ;; We might not have reached at the end of
-			     ;; the value because of non-ascii chars,
-			     ;; so we should jump over them if any.
-			     (while (and (not (eobp))
-					 (> (char-after) ?\177))
+			     ;; Jump over asterisk, non-ASCII
+			     ;; and non-boundary characters.
+			     (while (and c
+					 (or (eq c ?*)
+					     (> c ?\177)
+					     (not (eq (char-syntax c) ? ))))
 			       (forward-char 1)
-			       (forward-sexp))
+			       (setq c (char-after)))
 			     (point)))))
 		   (t
 		    (error "Invalid header: %s" string)))
@@ -187,11 +184,19 @@ must never cause a Lisp error."
 		in (sort parameters (lambda (e1 e2)
 				      (< (or (caddr e1) 0)
 					 (or (caddr e2) 0))))
-		do (if (or (not (setq elem (assq attribute cparams)))
-			   (and (numberp part)
-				(zerop part)))
-		       (push (list attribute value encoded) cparams)
-		     (setcar (cdr elem) (concat (cadr elem) value))))
+		do (cond
+		    ;; First part.
+		    ((or (not (setq elem (assq attribute cparams)))
+			 (and (numberp part)
+			      (zerop part)))
+		     (push (list attribute value encoded) cparams))
+		    ;; Repetition of a part; do nothing.
+		    ((and elem
+			  (null number))
+		     )
+		    ;; Concatenate continuation parts.
+		    (t
+		     (setcar (cdr elem) (concat (cadr elem) value)))))
 	  ;; Finally decode encoded values.
 	  (cons type (mapcar
 		      (lambda (elem)
@@ -216,11 +221,11 @@ These look like:
     (mm-with-unibyte-buffer
       (insert value)
       (goto-char (point-min))
-      (while (search-forward "%" nil t)
+      (while (re-search-forward "%\\([0-9A-Fa-f][0-9A-Fa-f]\\)" nil t)
 	(insert
 	 (prog1
-	     (string-to-number (buffer-substring (point) (+ (point) 2)) 16)
-	   (delete-region (1- (point)) (+ (point) 2)))))
+	     (string-to-number (match-string 1) 16)
+	   (delete-region (match-beginning 0) (match-end 0)))))
       ;; Decode using the charset, if any.
       (if (memq coding-system '(nil ascii))
 	  (buffer-string)
@@ -298,5 +303,4 @@ the result of this function."
 
 (provide 'rfc2231)
 
-;;; arch-tag: c3ab751d-d108-406a-b301-68882ad8cd63
 ;;; rfc2231.el ends here