0.8.12.7: Merge package locks, AKA "what can go wrong with a 3783 line patch?"

[sbcl.git] / src / code / target-c-call.lisp

diff --git a/src/code/target-c-call.lisp b/src/code/target-c-call.lisp
index 4b70eaf..3292453 100644 (file)
--- a/src/code/target-c-call.lisp
+++ b/src/code/target-c-call.lisp
@@ -1,5 +1,10 @@
-;;;; This file contains some extensions to the Alien facility to
-;;;; simplify importing C interfaces.
+;;;; FIXME: This file and host-c-call.lisp are separate from the
+;;;; rest of the alien source code for historical reasons: CMU CL
+;;;; made a distinction between the stuff in the C-CALL package and
+;;;; stuff in the ALIEN package. There's no obvious boundary
+;;;; there, though, and SBCL doesn't try to make this distinction,
+;;;; so it might make sense to just merge these files in with the
+;;;; rest of the SB-ALIEN code.
 
 ;;;; This software is part of the SBCL system. See the README file for
 ;;;; more information.
@@ -10,7 +15,7 @@
 ;;;; provided with absolutely no warranty. See the COPYING and CREDITS
 ;;;; files for more information.
 
-(in-package "SB!C-CALL")
+(in-package "SB!ALIEN")
 \f
 ;;;; extra types
 
@@ -30,17 +35,16 @@
 (define-alien-type-translator void ()
   (parse-alien-type '(values) (sb!kernel:make-null-lexenv)))
 \f
-#+nil 
-(define-alien-routine strlen integer
-  (s (* char)))
-
 (defun %naturalize-c-string (sap)
   (declare (type system-area-pointer sap))
-  (with-alien ((ptr (* char) sap))
-    (let* ((length (alien-funcall (extern-alien "strlen"
-                                               (function integer (* char)))
-                                 ptr))
-          (result (make-string length)))
+  (locally
       (declare (optimize (speed 3) (safety 0)))
-      (sb!kernel:%byte-blt sap 0 result 0 length)
-      result)))
+    (let ((length (loop for offset of-type fixnum upfrom 0
+                        until (zerop (sap-ref-8 sap offset))
+                        finally (return offset))))
+      (let ((result (make-string length :element-type 'base-char)))
+       (sb!kernel:copy-from-system-area sap 0
+                                         result (* sb!vm:vector-data-offset
+                                                   sb!vm:n-word-bits)
+                                         (* length sb!vm:n-byte-bits))
+       result))))