X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fstrings.cl;h=e6abd8045490ab08383874e8a3b0685dc6972dc0;hb=0ed0429c5921629ae1912f96379a8715e2d48a3b;hp=95fdadf3289e1f0d3e3b83433d34a842d663c4d8;hpb=fb93b1923db347f01bdebc7226e5e1eaacacc9f9;p=uffi.git

diff --git a/src/strings.cl b/src/strings.cl
index 95fdadf..e6abd80 100644
--- a/src/strings.cl
+++ b/src/strings.cl
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: strings.cl,v 1.6 2002/03/17 17:33:30 kevin Exp $
+;;;; $Id: strings.cl,v 1.10 2002/03/21 05:57:03 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -87,9 +87,11 @@ that CMU automatically converts strings from c-calls."
       :null-terminated-p ,null-terminated-p
       :external-format '(:latin-1 :eol-style :lf)))      
   #+cmu
-  `(cmucl-naturalize-cstring (alien:alien-sap ,obj)
-			      :length ,length
-			      :null-terminated-p ,null-terminated-p)
+  `(if (null-pointer-p ,obj)
+    nil
+    (cmucl-naturalize-cstring (alien:alien-sap ,obj)
+     :length ,length
+     :null-terminated-p ,null-terminated-p))
   )
 
 (defmacro convert-to-foreign-string (obj)
@@ -105,17 +107,21 @@ that CMU automatically converts strings from c-calls."
   (let ((size (gensym))
 	(storage (gensym))
 	(i (gensym)))
-    `(when (stringp ,obj)
+    `(etypecase ,obj
+      (null 
+       (alien:sap-alien (system:int-sap 0) (* (alien:unsigned 8))))
+      (string
        (let* ((,size (length ,obj))
-	      (,storage (alien:make-alien char (1+ ,size))))
-	 (setq ,storage (alien:cast ,storage (* char)))
-	 (dotimes (,i ,size)
-	   (declare (fixnum ,i)
-		    (optimize (speed 3) (safety 0)))
-	   (setf (alien:deref ,storage ,i) (char-code (char ,obj ,i))))
-	 (setf (alien:deref ,storage ,size) 0)
-	 ,storage)))
-  )
+	      (,storage (alien:make-alien (alien:unsigned 8) (1+ ,size))))
+	 (setq ,storage (alien:cast ,storage (* (alien:unsigned 8))))
+	 (locally
+	     (declare (optimize (speed 3) (safety 0)))
+	   (dotimes (,i ,size)
+	     (declare (fixnum ,i))
+	     (setf (alien:deref ,storage ,i) (char-code (char ,obj ,i))))
+	   (setf (alien:deref ,storage ,size) 0))
+	 ,storage))))
+      )
 
 
 (defmacro allocate-foreign-string (size &key (unsigned t))
@@ -138,22 +144,32 @@ that CMU automatically converts strings from c-calls."
   `(ff:allocate-fobject :char :c ,size)
   )
 
-(defmacro with-cstring ((foreign-string lisp-string) &body body)
+(defmacro with-foreign-string ((foreign-string lisp-string) &body body)
+  (let ((result (gensym)))
+    `(let* ((,foreign-string (convert-to-foreign-string ,lisp-string))
+	    (,result (progn ,@body)))
+      (declare (dynamic-extent ,foreign-string))
+      (free-foreign-object ,foreign-string)
+      ,result)))
+
+(defmacro with-cstring ((cstring lisp-string) &body body)
   #+cmu
-  `(let ((,foreign-string ,lisp-string)) ,@body) 
+  `(let ((,cstring ,lisp-string)) ,@body) 
   #+allegro
   (let ((acl-native (gensym)))
     `(excl:with-native-string (,acl-native ,lisp-string)
-       (let ((,foreign-string (if ,lisp-string ,acl-native 0)))
+       (let ((,cstring (if ,lisp-string ,acl-native 0)))
 	 ,@body)))
   #+lispworks
   (let ((result (gensym)))
-    `(let* ((,foreign-string (convert-to-cstring ,lisp-string))
-	    (,result ,@body))
-       (fli:free-foreign-object ,foreign-string)
+    `(let* ((,cstring (convert-to-cstring ,lisp-string))
+	    (,result (progn ,@body)))
+       (fli:free-foreign-object ,cstring)
        ,result))
   )
 
+
+
 ;; Modified from CMUCL's source to handle non-null terminated strings
 #+cmu
 (defun cmucl-naturalize-cstring (sap &key