r4948: Auto commit for Debian build

[clsql.git] / uffi / clsql-uffi.lisp

diff --git a/uffi/clsql-uffi.lisp b/uffi/clsql-uffi.lisp
index 98936c04325754145cc7312cfbe92428f26d796f..3c4c8180e23e9736587da7ea3a3c83fc02719c82 100644 (file)
--- a/uffi/clsql-uffi.lisp
+++ b/uffi/clsql-uffi.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmers:   Kevin M. Rosenberg
 ;;;; Date Started:  Mar 2002
 ;;;;
-;;;; $Id: clsql-uffi.lisp,v 1.1 2002/09/30 10:19:24 kevin Exp $
+;;;; $Id: clsql-uffi.lisp,v 1.7 2003/05/15 07:39:42 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -83,21 +83,63 @@
 (defmacro split-64-bit-integer (int64)
   `(values (ash ,int64 -32) (logand ,int64 +2^32-1+)))
 
+(defvar +ascii-N-value+ (char-code #\N))
+(defvar +ascii-U-value+ (char-code #\U))
+
+(uffi:def-type char-ptr-def (* :unsigned-char))
+
+(defun char-ptr-points-to-null (char-ptr)
+  "Returns T if foreign character pointer refers to 'NULL' string. Only called for numeric entries"
+  ;; Uses short cut and returns T if first character is #\N. It should
+  ;; never be non-numeric
+  (declare (type char-ptr-def char-ptr))
+  (let ((char (uffi:ensure-char-character
+              (uffi:deref-pointer char-ptr :char))))
+    (eql char #\N)))
+    
 (defun convert-raw-field (char-ptr types index)
   (let ((type (if (listp types)
                  (nth index types)
                  types)))
-    (case type
-      (:double
-       (atof char-ptr))
-      ((or :int32 :int)
-       (atoi char-ptr))
-      (:int64
-       (uffi:with-foreign-object (high32-ptr :int)
-        (let ((low32 (atol64 char-ptr high32-ptr))
-              (high32 (uffi:deref-pointer high32-ptr :int)))
-          (if (zerop high32)
-              low32
-              (make-64-bit-integer high32 low32)))))
+    (cond
+      ((and (or (eq type :double) (eq type :int32) (eq type :int)
+               (eq type :int64))
+           (char-ptr-points-to-null char-ptr))
+       nil)
       (t
-       (uffi:convert-from-foreign-string char-ptr)))))
+       (case type
+        (:double
+         (atof char-ptr))
+        ((or :int32 :int)
+         (atoi char-ptr))
+        (:int64
+         (uffi:with-foreign-object (high32-ptr :int)
+           (let ((low32 (atol64 char-ptr high32-ptr))
+                 (high32 (uffi:deref-pointer high32-ptr :int)))
+             (if (zerop high32)
+                 low32
+                 (make-64-bit-integer high32 low32)))))
+        (t
+         (native-to-string char-ptr)
+         #+ignore
+         (uffi:convert-from-foreign-string char-ptr)))))))
+  
+
+(uffi:def-function "strlen"
+    ((str (* :unsigned-char)))
+  :returning :unsigned-int)
+
+(defun native-to-string (s)
+  (declare (optimize (speed 3) (space 0) (safety 0) (compilation-speed 0))
+          (type char-ptr-def s))
+  (let* ((len (strlen s))
+        (str (make-string len)))
+    (declare (fixnum len)
+            (simple-string str))
+    (do ((i 0))
+       ((= i len))
+      (declare (fixnum i))
+      (setf (schar str i)
+       (code-char (uffi:deref-array s '(:array :unsigned-char) i)))
+      (incf i))
+    str))