X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fstrings.cl;h=06ffa5226edcc5e166b4291bc3416ef39bb674d5;hb=0c9dc6958a373b41b8cc25e9e121c36dedc289d4;hp=75496e08a3c77a1069e774bea0155d641e6f73d0;hpb=379a7c3e7b8249ace498d8733c87a3f575a7c799;p=uffi.git

diff --git a/src/strings.cl b/src/strings.cl
index 75496e0..06ffa52 100644
--- a/src/strings.cl
+++ b/src/strings.cl
@@ -1,4 +1,4 @@
-;;;; -*- Mode: ANSI-Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*-
+;;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10; Package: UFFI -*-
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: strings.cl,v 1.12 2002/03/22 20:51:08 kevin Exp $
+;;;; $Id: strings.cl,v 1.18 2002/04/28 06:03:13 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -23,7 +23,9 @@
 (def-constant +null-cstring-pointer+
     #+cmu nil
     #+allegro 0
-    #+lispworks (fli:make-pointer :address 0 :type '(:unsigned :char)))
+    #+lispworks (fli:make-pointer :address 0 :type '(:unsigned :char))
+    #-(or cmu allegro lispworks) nil
+)
 
 (defmacro convert-from-cstring (obj)
   "Converts a string from a c-call. Same as convert-from-foreign-string, except
@@ -67,6 +69,12 @@ that LW/CMU automatically converts strings from c-calls."
 	 ,@body)))
   )
 
+(defmacro with-cstrings (bindings &rest body)
+  (if bindings
+      `(with-cstring ,(car bindings)
+	(with-cstrings ,(cdr bindings)
+	  ,@body))
+      `(progn ,@body)))
 
 ;;; Foreign string functions
 
@@ -150,7 +158,6 @@ that LW/CMU automatically converts strings from c-calls."
   )
 
 (defmacro with-foreign-string ((foreign-string lisp-string) &body body)
-  #-(or lispworks cmu) 
   (let ((result (gensym)))
     `(let* ((,foreign-string (convert-to-foreign-string ,lisp-string))
 	    (,result (progn ,@body)))
@@ -159,9 +166,6 @@ that LW/CMU automatically converts strings from c-calls."
       ,result)))
 
 
-
-
-
 ;; Modified from CMUCL's source to handle non-null terminated strings
 #+cmu
 (defun cmucl-naturalize-cstring (sap &key