X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fstrings.lisp;h=f935e1bd479db0b479068a6e812432dbfebe44d9;hb=49de6f6d8f67af0f2949d96bb90f2f97fe37a743;hp=6e7292cff8e8e89ea4f3a2f4b0a2dc8fb91fe996;hpb=6f682746787779a2475eec53d7d46efab891b392;p=uffi.git

diff --git a/src/strings.lisp b/src/strings.lisp
index 6e7292c..f935e1b 100644
--- a/src/strings.lisp
+++ b/src/strings.lisp
@@ -157,10 +157,11 @@ that LW/CMU automatically converts strings from c-calls."
        nil
      (if (eq ,locale :none)
 	 (fast-native-to-string ,obj ,length)
-       (excl:native-to-string
-	,obj 
-	,@(when length (list :length length))
-	:truncate (not ,null-terminated-p))))
+       (values
+	(excl:native-to-string
+	 ,obj 
+	 ,@(when length (list :length length))
+	 :truncate (not ,null-terminated-p)))))
   #+lispworks
   `(if (fli:null-pointer-p ,obj)
        nil
@@ -188,7 +189,9 @@ that LW/CMU automatically converts strings from c-calls."
   #+mcl
   `(if (ccl:%null-ptr-p ,obj)
      nil
-     (ccl:%get-cstring ,obj 0 ,@(if length (list length) nil)))
+    #+(and mcl (not openmcl)) (ccl:%get-cstring ,obj 0 ,@(if length (list length) nil))
+    #+openmcl (let ((str (ccl:%get-cstring ,obj)))
+		,(if length '(subseq str 0 length) 'str)))
   )
 
 
@@ -318,10 +321,10 @@ that LW/CMU automatically converts strings from c-calls."
 				    (* length sb-vm:n-byte-bits))
       result)))
 
-
-(def-function "strlen"
-    ((str (* :unsigned-char)))
-  :returning :unsigned-int)
+(eval-when (:compile-toplevel :load-toplevel :execute)
+   (def-function "strlen"
+     ((str (* :unsigned-char)))
+     :returning :unsigned-int))
 
 (def-type char-ptr-def (* :unsigned-char))
 
@@ -344,4 +347,4 @@ that LW/CMU automatically converts strings from c-calls."
   (let* ((len (or len (strlen s)))
          (str (make-string len)))
       (dotimes (i len str)
-        (setf (schar str i) (code-char (uffi:deref-array s '(:array :byte) i))))))
+        (setf (schar str i) (code-char (uffi:deref-array s '(:array :unsigned-byte) i))))))