Changeset 9212

Timestamp:

Apr 20, 2008, 11:04:52 AM (11 years ago)

Author:

gb

Message:

Use reentrant version of #_readdir.
Need a new canonical foreign-type ordinal for that.
This is a little tricky to bootstrap, so new images.

Location:

trunk/source

Files:

• level-1/linux-files.lisp (modified) (1 diff)
• lib/foreign-types.lisp (modified) (1 diff)

trunk/source/level-1/linux-files.lisp

@@ -540 +540 @@
 
 (defun %read-dir (dir)
-  (let* ((res (#_readdir dir)))
-    (unless (%null-ptr-p res)
-      (get-foreign-namestring (pref res :dirent.d_name)))))
+  (rlet ((entry #>dirent)
+         (presult :address +null-ptr+))
+    (let* ((err (#_readdir_r dir entry presult))
+           (result (%get-ptr presult)))
+      (declare (fixnum err) (dynamic-extent result))
+      (when (zerop err)
+        (unless (%null-ptr-p result)
+          (get-foreign-namestring (pref result #>dirent.d_name)))))))
 
 (defun tcgetpgrp (fd)

trunk/source/lib/foreign-types.lisp

@@ -1713 +1713 @@
       (canonicalize-foreign-type-ordinal '(:* (:struct :hostent)))
       (canonicalize-foreign-type-ordinal '(:array :int 2))
-      (canonicalize-foreign-type-ordinal '(:array (:struct :pollfd) 1)))))
+      (canonicalize-foreign-type-ordinal '(:array (:struct :pollfd) 1))
+      (canonicalize-foreign-type-ordinal '(:struct :dirent)))))
 
 (defun install-standard-foreign-types (ftd)