Update of /project/cl-smtp/cvsroot/cl-smtp
In directory common-lisp.net:/tmp/cvs-serv15472
Modified Files:
CHANGELOG README cl-smtp.asd cl-smtp.lisp clisp.lisp
Log Message:
add win32 support for clisp, remove :cl-smtp-authentication,
always use CL-BASE64
Date: Tue Dec 20 15:37:54 2005
Author: jidzikowski
Index: cl-smtp/CHANGELOG
diff -u cl-smtp/CHANGELOG:1.3 cl-smtp/CHANGELOG:1.4
--- cl-smtp/CHANGELOG:1.3 Sun Dec 11 21:45:54 2005
+++ cl-smtp/CHANGELOG Tue Dec 20 15:37:51 2005
@@ -1,6 +1,13 @@
+Version 20051220.1
+2005-12-20
+"ADD" win32 support for clisp
+"REMOVE" :cl-smtp-authentication
+"CHANGE" always use CL-BASE64 package
+Change cl-smtp.asd, cl-smtp.lisp, clisp.lisp, README, CHANGELOG
+
Version 20051211.1
2005-12-11
-add :cl-smtp-authentication for reader macro, that you can use cl-smtp with and
+"ADD" :cl-smtp-authentication for reader macro, that you can use cl-smtp with and
without authentication support
Change cl-smtp.asd, cl-smtp.lisp, README, CHANGELOG
Index: cl-smtp/README
diff -u cl-smtp/README:1.2 cl-smtp/README:1.3
--- cl-smtp/README:1.2 Sun Dec 11 21:45:54 2005
+++ cl-smtp/README Tue Dec 20 15:37:52 2005
@@ -2,18 +2,14 @@
CL-SMTP is a simple lisp smtp client.
It works in ACL, SBCL, CMUCL, OPENMCL, LISPWORKS and CLISP.
-new with authentication support for PLAIn and LOGIN authentication method
+new with authentication support for PLAIN and LOGIN authentication method
+
+used CL-BASE64 package
See INSTALL for prerequisites and build details.
To use cl-smtp:
-(asdf:operate 'asdf:load-op 'cl-smtp)
-
-For use cl-smtp with authentication support you need cl-base64 package and
-add :cl-smtp-authentication to features
-
-(push :cl-smtp-authentication *features*)
(asdf:operate 'asdf:load-op 'cl-smtp)
------------------------------------------------
Index: cl-smtp/cl-smtp.asd
diff -u cl-smtp/cl-smtp.asd:1.3 cl-smtp/cl-smtp.asd:1.4
--- cl-smtp/cl-smtp.asd:1.3 Sun Dec 11 21:45:54 2005
+++ cl-smtp/cl-smtp.asd Tue Dec 20 15:37:52 2005
@@ -26,12 +26,9 @@
(in-package :cl-smtp)
(asdf:defsystem :cl-smtp
- :version "20051211.1"
+ :version "20051220.1"
:depends-on
- #+(and cl-smtp-authentication (not allegro))
(:cl-base64)
- #-cl-smtp-authentication
- ()
:components
(#+sbcl(:file "sbcl")
#+allegro(:file "acl")
Index: cl-smtp/cl-smtp.lisp
diff -u cl-smtp/cl-smtp.lisp:1.3 cl-smtp/cl-smtp.lisp:1.4
--- cl-smtp/cl-smtp.lisp:1.3 Sun Dec 11 21:45:54 2005
+++ cl-smtp/cl-smtp.lisp Tue Dec 20 15:37:52 2005
@@ -59,9 +59,8 @@
(defun string-to-base64-string (str)
(declare (ignorable str))
- #+(and cl-smtp-authentication allegro) (excl:string-to-base64-string str)
- #+(and cl-smtp-authentication (not allegro))
- (cl-base64:string-to-base64-string str))
+ #+allegro (excl:string-to-base64-string str)
+ #-allegro (cl-base64:string-to-base64-string str))
(defun send-email (host from to subject message
@@ -78,9 +77,6 @@
(defun send-smtp (host from to subject message
&key (port 25) cc bcc reply-to extra-headers
display-name authentication)
- #-cl-smtp-authentication
- (when authentication
- (error "cl-smtp was not compiled with authentication support, push :cl-smtp-authentication to *features* bevor load cl-smtp.asd"))
(let ((sock (socket-stream (make-smtp-socket host port))))
(unwind-protect
(progn
Index: cl-smtp/clisp.lisp
diff -u cl-smtp/clisp.lisp:1.1.1.1 cl-smtp/clisp.lisp:1.2
--- cl-smtp/clisp.lisp:1.1.1.1 Tue Nov 1 19:34:57 2005
+++ cl-smtp/clisp.lisp Tue Dec 20 15:37:52 2005
@@ -20,7 +20,10 @@
(defun make-smtp-socket (host port)
(handler-case
- (socket:socket-connect port host :element-type 'character)
+ (socket:socket-connect port host :element-type 'character
+ :external-format
+ (ext:make-encoding :charset charset:utf-8
+ :line-terminator :unix))
(serious-condition (e)
(error "could not create client socket:~A" e))))
@@ -28,4 +31,8 @@
socket)
(defun get-host-name ()
- (linux:gethostname 256))
+ #+linux(linux:gethostname 256)
+ #-linux(let ((str (machine-instance)))
+ (if (position #\Space str)
+ (subseq str 0 (position #\Space str))
+ str)))