X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=uffi%2Fclsql-uffi.lisp;h=fda60ecf21aee1332a5d348f09072982c8154c5f;hp=63267022dc7ce8c7710b36edee0c395907ce35d8;hb=d2d49ab13c98bc7a1819a0fd3968268a5567bdc3;hpb=f1ff5842ce264fbe47e8ef98e33e4aca3b71d863

diff --git a/uffi/clsql-uffi.lisp b/uffi/clsql-uffi.lisp
index 6326702..fda60ec 100644
--- a/uffi/clsql-uffi.lisp
+++ b/uffi/clsql-uffi.lisp
@@ -7,9 +7,7 @@
 ;;;; Programmers:   Kevin M. Rosenberg
 ;;;; Date Started:  Mar 2002
 ;;;;
-;;;; $Id$
-;;;;
-;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
+;;;; This file, part of CLSQL, is Copyright (c) 2002-2010 by Kevin M. Rosenberg
 ;;;;
 ;;;; CLSQL users are granted the rights to distribute and use this software
 ;;;; as governed by the terms of the Lisp Lesser GNU Public License
@@ -30,39 +28,49 @@
        (nreverse new-types))
     (declare (fixnum length-types length-auto-list i))
     (if (>= i length-types)
-	(push t new-types) ;; types is shorted than num-fields
-	(push
-	 (case (nth i types)
-	   (:int
-	    (case (nth i auto-list)
-	      (:int32
-	       :int32)
-	      (:int64
-	       :int64)
-	      (t
-	       t)))
-	   (:double
-	    (case (nth i auto-list)
-	      (:double
-	       :double)
-	      (t
-	       t)))
-	   (:int32
-	    (if (eq :int32 (nth i auto-list))
-		:int32
-		t))
-	   (:int64
-	    (if (eq :int64 (nth i auto-list))
-		:int64
-		t))
-	   (t
-	    t))
-	 new-types))))
+        (push t new-types) ;; types is shorter than num-fields
+        (push
+         (case (nth i types)
+           (:int
+            (case (nth i auto-list)
+              (:int32
+               :int32)
+              (:int64
+               :int64)
+              (t
+               t)))
+           (:double
+            (case (nth i auto-list)
+              (:double
+               :double)
+              (t
+               t)))
+           (:int32
+            (if (eq :int32 (nth i auto-list))
+                :int32
+                t))
+           (:int64
+            (if (eq :int64 (nth i auto-list))
+                :int64
+              t))
+           (:blob
+            :blob)
+           (:uint
+            :uint)
+           (t
+            t))
+         new-types))))
 
 (uffi:def-function "atoi"
     ((str (* :unsigned-char)))
   :returning :int)
 
+(uffi:def-function ("strtoul" c-strtoul)
+    ((str (* :unsigned-char))
+     (endptr (* :unsigned-char))
+     (radix :int))
+  :returning :unsigned-long)
+
 (uffi:def-function "atol"
     ((str (* :unsigned-char)))
   :returning :long)
@@ -73,45 +81,73 @@
 
 (uffi:def-function "atol64"
     ((str (* :unsigned-char))
-     (high32 (* :int)))
+     (high32 (* :unsigned-int)))
+  :module "clsql-uffi"
   :returning :unsigned-int)
 
 (uffi:def-constant +2^32+ 4294967296)
+(uffi:def-constant +2^64+ 18446744073709551616)
 (uffi:def-constant +2^32-1+ (1- +2^32+))
 
 (defmacro make-64-bit-integer (high32 low32)
-  `(+ ,low32 (ash ,high32 32)))
+  `(if (zerop (ldb (byte 1 31) ,high32))
+       (+ ,low32 (ash ,high32 32))
+     (- (+ ,low32 (ash ,high32 32)) +2^64+)))
+
+;; From high to low ints
+(defmacro make-128-bit-integer (a b c d)
+  `(+ ,d (ash ,c 32) (ash ,b 64) (ash ,a 96)))
 
 (defmacro split-64-bit-integer (int64)
   `(values (ash ,int64 -32) (logand ,int64 +2^32-1+)))
 
 (uffi:def-type char-ptr-def (* :unsigned-char))
 
+(defun strtoul (char-ptr)
+  (declare (optimize (speed 3) (safety 0) (space 0))
+           (type char-ptr-def char-ptr))
+  (c-strtoul char-ptr uffi:+null-cstring-pointer+ 10))
+
 (defun convert-raw-field (char-ptr types index &optional length)
   (declare (optimize (speed 3) (safety 0) (space 0))
- 	   (type char-ptr-def char-ptr))
-  (let ((type (if (listp types)
-		  (nth index types)
-		  types)))
+           (type char-ptr-def char-ptr))
+  (let ((type (if (consp types)
+                  (nth index types)
+                  types)))
     (cond
       ((uffi:null-pointer-p char-ptr)
        nil)
       (t
        (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
+         (:double
+          (atof char-ptr))
+         (:int
+          (atol char-ptr))
+         (:int32
+          (atoi char-ptr))
+         (:uint32
+          (strtoul char-ptr))
+         (:uint
+          (strtoul char-ptr))
+         ((:int64 :uint64)
+          (uffi:with-foreign-object (high32-ptr :unsigned-int)
+            (let ((low32 (atol64 char-ptr high32-ptr))
+                  (high32 (uffi:deref-pointer high32-ptr :unsigned-int)))
+              (if (zerop high32)
+                  low32
+                (make-64-bit-integer high32 low32)))))
+         (:blob
+          (if length
+              (uffi:convert-from-foreign-usb8 char-ptr length)
+            (error "Can't return blob since length is not specified.")))
+         (t
+          ;; sb-unicode still broken with converting with length, assume
+          ;; that string is null terminated
+          #+sb-unicode
+          (uffi:convert-from-foreign-string char-ptr :locale :none)
+          #-sb-unicode
           (if length
-	      (uffi:convert-from-foreign-string char-ptr :locale :none
+              (uffi:convert-from-foreign-string char-ptr :locale :none
                                                 :null-terminated-p nil
                                                 :length length)
             (uffi:convert-from-foreign-string char-ptr :locale :none))))))))