;;;;
;;;; Copyright (c) 2002 Kevin M. Rosenberg
;;;;
-;;;; $Id: strings.cl,v 1.2 2002/03/10 00:11:47 kevin Exp $
+;;;; $Id: strings.cl,v 1.4 2002/03/10 11:13:07 kevin Exp $
;;;;
;;;; This file is part of the UFFI.
;;;;
(in-package :uffi)
-(defmacro convert-from-c-string (obj)
+(def-constant +null-cstring-pointer+
+ #+cmu nil
+ #+allegro 0
+ #+lispworks (fli:make-pointer :address 0 :type :char))
+
+(defmacro convert-from-cstring (obj)
"Converts a string from a c-call. Same as convert-from-foreign-string, except
that CMU automatically converts strings from c-calls."
#+cmu obj
(values (excl:native-to-string ,stored)))))
)
-(defmacro convert-to-c-string (obj)
+(defmacro convert-to-cstring (obj)
#+lispworks
`(if (null ,obj)
- +null-c-string-pointer+
- (fli:convert-to-foreign-string ,obj))
+ +null-cstring-pointer+
+ (fli:make-pointer
+ :address (fli:pointer-address (fli:convert-to-foreign-string ,obj))
+ :type :char))
#+allegro
`(if (null ,obj)
0
(declare (ignore obj))
)
-(defmacro free-c-string (obj)
+(defmacro free-cstring (obj)
#+lispworks
`(unless (fli:null-pointer-p ,obj)
(fli:free-foreign-object ,obj))
:null-terminated-p ,null-terminated-p
:external-format '(:latin-1 :eol-style :lf)))
#+cmu
- `(cmucl-naturalize-c-string (alien:alien-sap ,obj)
+ `(cmucl-naturalize-cstring (alien:alien-sap ,obj)
:length ,length
:null-terminated-p ,null-terminated-p)
)
(defmacro convert-to-foreign-string (obj)
#+lispworks
`(if (null ,obj)
- +null-c-string-pointer+
- (fli:convert-to-foreign-string ,obj))
+ +null-cstring-pointer+
+ (fli:make-pointer
+ :address (fli:pointer-address (fli:convert-to-foreign-string ,obj))
+ :type :char))
#+allegro
`(if (null ,obj)
0
)
-(defmacro allocate-foreign-string (size)
+(defmacro allocate-foreign-string (size &key (unsigned nil))
#+cmu
(let ((array-def (gensym)))
`(let ((,array-def (list 'alien:array 'c-call:char ,size)))
- (eval `(alien:cast (alien:make-alien ,,array-def) (* (alien:unsigned 8))))))
+ (eval `(alien:cast (alien:make-alien ,,array-def)
+ ,(if ,unsigned
+ '(* (alien:unsigned 8))
+ '(* (alien:signed 8)))))))
#+lispworks
- `(fli:allocate-foreign-object :type '(:unsigned :char) :nelems ,size)
+ `(fli:allocate-foreign-object :type
+ ,(if unsigned
+ ''(:unsigned :char)
+ :char)
+ :nelems ,size)
+ #+allegro
+ (declare (ignore unsigned))
#+allegro
`(ff:allocate-fobject :char :c ,size)
)
-(defmacro with-c-string ((foreign-string lisp-string) &body body)
+(defmacro with-cstring ((foreign-string lisp-string) &body body)
#+cmu
`(let ((,foreign-string ,lisp-string)) ,@body)
#+allegro
,@body)))
#+lispworks
(let ((result (gensym)))
- `(let* ((,foreign-string (convert-to-c-string ,lisp-string))
+ `(let* ((,foreign-string (convert-to-cstring ,lisp-string))
(,result ,@body))
(fli:free-foreign-object ,foreign-string)
,result))
;; Modified from CMUCL's source to handle non-null terminated strings
#+cmu
-(defun cmucl-naturalize-c-string (sap &key
+(defun cmucl-naturalize-cstring (sap &key
length
(null-terminated-p t))
(declare (type system:system-area-pointer sap))