Changeset 2792

Show
Ignore:
Timestamp:
03/24/08 09:04:48 (8 months ago)
Author:
hans
Message:

Rename STREAM to ENCAPSULATED-STREAM to avoid package lock violation on SBCL.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/thirdparty/cl-smtp/cl-smtp.lisp

    r2790 r2792  
    110110                                  :local-hostname local-hostname))) 
    111111      (initiate-smtp-mail stream from to) 
    112       (funcall thunk  (make-instance 'smtp-output-stream :stream stream)) 
     112      (funcall thunk  (make-instance 'smtp-output-stream :encapsulated-stream stream)) 
    113113      (finish-smtp-mail stream)))) 
    114114 

  • trunk/thirdparty/cl-smtp/smtp-output-stream.lisp

    r2791 r2792  
    1818 
    1919(defclass smtp-output-stream (trivial-gray-stream-mixin fundamental-character-output-stream) 
    20   ((stream 
    21     :initarg :stream 
    22     :reader stream) 
     20  ((encapsulated-stream 
     21    :initarg :encapsulated-stream 
     22    :reader encapsulated-stream) 
    2323   (in-header 
    2424    :initform t 
    …… 
    4545 
    4646(defmethod close ((stream smtp-output-stream) &key abort) 
    47   (close (stream stream) :abort abort)) 
     47  (close (encapsulated-stream stream) :abort abort)) 
    4848 
    4949(defmethod stream-write-char ((stream smtp-output-stream) char) 
    …… 
    5151                   (line-has-non-ascii line-has-non-ascii) 
    5252                   (previous-char previous-char) 
    53                    (external-format external-format)) stream 
     53                   (external-format external-format) 
     54                   (encapsulated-stream encapsulated-stream)) stream 
    5455    (when in-header 
    5556      (cond 
    …… 
    5859         ;; Finish quoting 
    5960         (when line-has-non-ascii 
    60            (format (stream stream) "?=") 
     61           (format encapsulated-stream "?=") 
    6162           (setf line-has-non-ascii nil)) 
    6263         ;; Test for end of header 
    …… 
    6970        ((< 127 (char-code char)) 
    7071         (unless line-has-non-ascii 
    71            (format (stream stream) "=?~A?Q?" (flex:external-format-name external-format)) 
     72           (format encapsulated-stream "=?~A?Q?" (flex:external-format-name external-format)) 
    7273           (setf line-has-non-ascii t)) 
    7374         (loop for byte across (flex:string-to-octets (make-string 1 :initial-element char) 
    7475                                                      :external-format external-format) 
    75             do (format (stream stream) "=~2,'0X" byte)))) 
     76            do (format encapsulated-stream "=~2,'0X" byte)))) 
    7677      (setf previous-char char)) 
    7778      (when (eql char #\Newline) 
    78         (write-char #\Return (stream stream))) 
     79        (write-char #\Return encapsulated-stream)) 
    7980      (unless (< 127 (char-code char)) 
    80         (write-char char (stream stream))))) 
     81        (write-char char encapsulated-stream)))) 
    8182 
    8283(defmethod stream-write-sequence ((stream smtp-output-stream) sequence start end &key) 
    …… 
    8485      (loop for i from start below end 
    8586           do (stream-write-char stream (elt sequence i))) 
    86       (write-sequence sequence (stream stream) :start start :end end))) 
     87      (write-sequence sequence (encapsulated-stream stream) :start start :end end)))