[Sbcl-commits] CVS: sbcl/contrib/sb-posix constants.lisp,1.21,1.22 defpackage.lisp,1.7,1.8 interface.lisp,1.23,1.24 macros.lisp,1.15,1.16 posix-tests.lisp,1.19,1.20

[Nikodemus S. <de...@us...>]

Update of /cvsroot/sbcl/sbcl/contrib/sb-posix
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28488/contrib/sb-posix

Modified Files:
	constants.lisp defpackage.lisp interface.lisp macros.lisp 
	posix-tests.lisp 
Log Message:
0.9.11.31: misc win32 improvements
  * Check for correct "expand" in canonicalize-whitespace, and skip
     canonicalization if it doesn't seem right. (Windows "expand" is
     something quite different.)
  * RUN-PROGRAM now always returns a process structure, which reports
     the exit-code of the process when :WAIT was true. :WAIT nil
     process-structures still keep their :RUNNING status indefinitely
     on Windows, though.
  * FIND-EXECUTABLE-IN-SEARCH-PATH actually searches the path, and adds
     "exe" as :TYPE if :TYPE is missing on Windows.
  * ASDF:RUN-SHELL-COMMAND searches for Bourne-shell on Windows, as there
     is no default location.
  * SB-GROVEL directly runs gcc and the groveler instead of indirecting 
     via shell, and the groveler directly writes to the lisp-file instead
     of via stdout and shell redirection.
  * Hack SB-POSIX till it builds and passes all applicable tests on Windows. 
     Mostly this involved plenty of #-win32, but a few tests needed to
     be adjusted for the delication Microsoft constitution.
  * Implement COPY-STREAM in ASDF-INSTALL so that it doesn't have to
     depend on SB-EXECUTABLE.
  * Take the .exe suffix into account when installing over an old SBCL
     on MSYS.
  * Adjust UNPARSE-NATIVE-WIN32-NAMESTRING slightly: Windows OS functions
     like stat don't like to have directory names ending with a slash.

This is good enough to run unpatched Slime with *COMMUNICATION-STYLE*
NIL, and build & pass tests with all contribs except SB-SIMPLE-STREAMS.



Index: constants.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/contrib/sb-posix/constants.lisp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- constants.lisp	11 Jan 2006 21:32:20 -0000	1.21
+++ constants.lisp	13 Apr 2006 22:52:56 -0000	1.22
@@ -6,27 +6,36 @@
 (#||#
  "sys/types.h"
  "sys/stat.h"
-
- "sys/socket.h" "sys/un.h" "netinet/in.h" "netinet/in_systm.h"
- "netinet/ip.h" "net/if.h" "netinet/tcp.h" "sys/mman.h" "sys/wait.h"
+ #-win32 "sys/socket.h"
+ #-win32 "sys/un.h"
+ #-win32 "netinet/in.h"
+ #-win32 "netinet/in_systm.h"
+ #-win32 "netinet/ip.h"
+ #-win32 "net/if.h"
+ #-win32 "netinet/tcp.h"
+ #-win32 "sys/mman.h"
+ #-win32 "sys/wait.h"
  "fcntl.h"
- "netdb.h" "errno.h"
+ #-win32 "netdb.h"
+ "errno.h"
  "dirent.h" "signal.h"
- "pwd.h"
+ #-win32 "pwd.h"
  "unistd.h"
-
- "termios.h")
+ #-win32 "termios.h")
 
 ;;; then the stuff we're looking for
 ((:integer af-inet "AF_INET" "IP Protocol family" t)
 
- (:type uid-t "uid_t")
- (:type gid-t "gid_t")
-
+ ;; KLUDGE: These types simply do not seem to exist on Windows,
+ ;; but we'll provide these anyways -- at least in a way that should
+ ;; match with stat.
+ (:type uid-t   #-win32 "uid_t"   #+win32 "short")
+ (:type gid-t   #-win32 "gid_t"   #+win32 "short")
+ (:type nlink-t #-win32 "nlink_t" #+win32 "short")
+ 
  (:type pid-t "pid_t")
  (:type ino-t "ino_t")
 
- (:type nlink-t "nlink_t")
  (:type time-t "time_t")
  (:type dev-t "dev_t")
 
@@ -248,6 +257,7 @@
                          :distrust-length #+sunos t #-sunos nil)) t)
 
  ;; password database
+ #-win32
  (:structure alien-passwd
              ("struct passwd"
               (c-string-pointer name "char *" "pw_name")
@@ -267,7 +277,7 @@
               ;; OS X manpages say this exists.  they lie!
               #+nil
               (:integer fields "int" "pw_fields")))
-
+ 
  (:structure alien-stat
              ("struct stat"
               (mode-t mode "mode_t" "st_mode")
@@ -323,11 +333,14 @@
  (:integer f-setown "F_SETOWN" nil t)
 
  ;; tcgetattr(), tcsetattr()
+ #-win32
  (:type cc-t "cc_t")
+ #-win32
  (:type speed-t "speed_t" nil t)
+ #-win32
  (:type tcflag-t "tcflag_t" nil t)
  (:integer nccs "NCCS" nil t)
-
+ #-win32
  (:structure alien-termios
              ("struct termios"
               (tcflag-t iflag "tcflag_t" "c_iflag")

Index: defpackage.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/contrib/sb-posix/defpackage.lisp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- defpackage.lisp	11 Jan 2006 21:32:20 -0000	1.7
+++ defpackage.lisp	13 Apr 2006 22:52:56 -0000	1.8
@@ -14,3 +14,6 @@
            #:stat-gid #:stat-size #:stat-atime #:stat-mtime #:stat-ctime
            #:termios-iflag #:termios-oflag #:termios-cflag
            #:termios-lflag #:termios-cc))
+
+#+win32
+(load-shared-object "msvcrt.dll")

Index: interface.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/contrib/sb-posix/interface.lisp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- interface.lisp	11 Jan 2006 21:32:20 -0000	1.23
+++ interface.lisp	13 Apr 2006 22:52:56 -0000	1.24
@@ -70,65 +70,36 @@
   nil)
 
 ;;; filesystem access
+(defmacro define-call* (name &rest arguments)
+  #-win32 `(define-call ,name ,@arguments)
+  #+win32 `(define-call ,(concatenate 'string "_" name) ,@arguments))
 
-(define-call "access" int minusp (pathname filename) (mode int))
-(define-call "chdir" int minusp (pathname filename))
-(define-call "chmod" int minusp (pathname filename) (mode mode-t))
-(define-call "chown" int minusp (pathname filename)
-             (owner uid-t)  (group gid-t))
-(define-call "chroot" int minusp (pathname filename))
-(define-call "close" int minusp (fd file-descriptor))
-(define-call "creat" int minusp (pathname filename) (mode mode-t))
-(define-call "dup" int minusp (oldfd file-descriptor))
-(define-call "dup2" int minusp (oldfd file-descriptor) (newfd file-descriptor))
-(define-call "fchdir" int minusp (fd file-descriptor))
-(define-call "fchmod" int minusp (fd file-descriptor) (mode mode-t))
-(define-call "fchown" int minusp (fd file-descriptor)
-             (owner uid-t)  (group gid-t))
-(define-call "fdatasync" int minusp (fd file-descriptor))
-(define-call "ftruncate" int minusp (fd file-descriptor) (length off-t))
-(define-call "fsync" int minusp (fd file-descriptor))
-(define-call "lchown" int minusp (pathname filename)
-             (owner uid-t)  (group gid-t))
-(define-call "link" int minusp (oldpath filename) (newpath filename))
-(define-call "lseek" off-t minusp (fd file-descriptor) (offset off-t) (whence int))
-(define-call "mkdir" int minusp (pathname filename) (mode mode-t))
-(define-call "mkfifo" int minusp (pathname filename) (mode mode-t))
-(define-call-internally open-with-mode "open" int minusp (pathname filename) (flags int) (mode mode-t))
-(define-call-internally open-without-mode "open" int minusp (pathname filename) (flags int))
-(define-entry-point "open" (pathname flags &optional (mode nil mode-supplied))
-  (if mode-supplied
-      (open-with-mode pathname flags mode)
-      (open-without-mode pathname flags)))
-;;(define-call "readlink" int minusp (path filename) (buf (* t)) (len int))
+(define-call* "access" int minusp (pathname filename) (mode int))
+(define-call* "chdir" int minusp (pathname filename))
+(define-call* "chmod" int minusp (pathname filename) (mode mode-t))
+(define-call* "close" int minusp (fd file-descriptor))
+(define-call* "creat" int minusp (pathname filename) (mode mode-t))
+(define-call* "dup" int minusp (oldfd file-descriptor))
+(define-call* "dup2" int minusp (oldfd file-descriptor)
+              (newfd file-descriptor))
+(define-call* "lseek" off-t minusp (fd file-descriptor) (offset off-t)
+              (whence int))
+(define-call* "mkdir" int minusp (pathname filename) (mode mode-t))
+(macrolet ((def (x)
+               `(progn
+                 (define-call-internally open-with-mode ,x int minusp
+                   (pathname filename) (flags int) (mode mode-t))
+                 (define-call-internally open-without-mode ,x int minusp
+                   (pathname filename) (flags int))
+                 (define-entry-point ,x
+                     (pathname flags &optional (mode nil mode-supplied))
+                   (if mode-supplied
+                       (open-with-mode pathname flags mode)
+                       (open-without-mode pathname flags))))))
+    (def #-win32 "open" #+win32 "_open"))
 (define-call "rename" int minusp (oldpath filename) (newpath filename))
-(define-call "rmdir" int minusp (pathname filename))
-(define-call "symlink" int minusp (oldpath filename) (newpath filename))
-(define-call "sync" void never-fails)
-(define-call "truncate" int minusp (pathname filename) (length off-t))
-(define-call "unlink" int minusp (pathname filename))
-(define-call "mkstemp" int minusp (template c-string))
-
-(define-call-internally ioctl-without-arg "ioctl" int minusp (fd file-descriptor) (cmd int))
-(define-call-internally ioctl-with-int-arg "ioctl" int minusp (fd file-descriptor) (cmd int) (arg int))
-(define-call-internally ioctl-with-pointer-arg "ioctl" int minusp (fd file-descriptor) (cmd int) (arg alien-pointer-to-anything-or-nil))
-(define-entry-point "ioctl" (fd cmd &optional (arg nil argp))
-  (if argp
-      (etypecase arg
-        ((alien int) (ioctl-with-int-arg fd cmd arg))
-        ((or (alien (* t)) null) (ioctl-with-pointer-arg fd cmd arg)))
-      (ioctl-without-arg fd cmd)))
-
-(define-call-internally fcntl-without-arg "fcntl" int minusp (fd file-descriptor) (cmd int))
-(define-call-internally fcntl-with-int-arg "fcntl" int minusp (fd file-descriptor) (cmd int) (arg int))
-(define-call-internally fcntl-with-pointer-arg "fcntl" int minusp (fd file-descriptor) (cmd int) (arg alien-pointer-to-anything-or-nil))
-(define-entry-point "fcntl" (fd cmd &optional (arg nil argp))
-  (if argp
-      (etypecase arg
-        ((alien int) (fcntl-with-int-arg fd cmd arg))
-        ((or (alien (* t)) null) (fcntl-with-pointer-arg fd cmd arg)))
-      (fcntl-without-arg fd cmd)))
-
+(define-call* "rmdir" int minusp (pathname filename))
+(define-call* "unlink" int minusp (pathname filename))
 (define-call "opendir" (* t) null-alien (pathname filename))
 (define-call "readdir" (* dirent)
   ;; readdir() has the worst error convention in the world.  It's just
@@ -138,103 +109,154 @@
   (dir (* t)))
 (define-call "closedir" int minusp (dir (* t)))
 ;; need to do this here because we can't do it in the DEFPACKAGE
+(define-call* "umask" mode-t never-fails (mode mode-t))
+(define-call* "getpid" pid-t never-fails)
 
-(define-call "umask" mode-t never-fails (mode mode-t))
-
-;;; uid, gid
-
-(define-call "geteuid" uid-t never-fails) ; "always successful", it says
-(define-call "getresuid" uid-t never-fails)
-(define-call "getuid" uid-t never-fails)
-(define-call "seteuid" int minusp (uid uid-t))
-(define-call "setfsuid" int minusp (uid uid-t))
-(define-call "setreuid" int minusp
-             (ruid uid-t) (euid uid-t))
-(define-call "setresuid" int minusp
-             (ruid uid-t) (euid uid-t)
-             (suid uid-t))
-(define-call "setuid" int minusp (uid uid-t))
+#-win32
+(progn
+  (define-call "chown" int minusp (pathname filename)
+               (owner uid-t) (group gid-t))
+  (define-call "chroot" int minusp (pathname filename))
+  (define-call "fchdir" int minusp (fd file-descriptor))
+  (define-call "fchmod" int minusp (fd file-descriptor) (mode mode-t))
+  (define-call "fchown" int minusp (fd file-descriptor)
+             (owner uid-t)  (group gid-t))
+  (define-call "fdatasync" int minusp (fd file-descriptor))
+  (define-call "ftruncate" int minusp (fd file-descriptor) (length off-t))
+  (define-call "fsync" int minusp (fd file-descriptor))
+  (define-call "lchown" int minusp (pathname filename)
+               (owner uid-t)  (group gid-t))
+  (define-call "link" int minusp (oldpath filename) (newpath filename))
+  (define-call "mkfifo" int minusp (pathname filename) (mode mode-t))
+  (define-call "symlink" int minusp (oldpath filename) (newpath filename))
+  (define-call "sync" void never-fails)
+  (define-call "truncate" int minusp (pathname filename) (length off-t))
+  ;; FIXME: Windows does have _mktemp, which has a slightlty different
+  ;; interface
+  (define-call "mkstemp" int minusp (template c-string))
+  (define-call-internally ioctl-without-arg "ioctl" int minusp
+                          (fd file-descriptor) (cmd int))
+  (define-call-internally ioctl-with-int-arg "ioctl" int minusp
+                          (fd file-descriptor) (cmd int) (arg int))
+  (define-call-internally ioctl-with-pointer-arg "ioctl" int minusp
+                          (fd file-descriptor) (cmd int)
+                          (arg alien-pointer-to-anything-or-nil))
+  (define-entry-point "ioctl" (fd cmd &optional (arg nil argp))
+    (if argp
+        (etypecase arg
+          ((alien int) (ioctl-with-int-arg fd cmd arg))
+          ((or (alien (* t)) null) (ioctl-with-pointer-arg fd cmd arg)))
+        (ioctl-without-arg fd cmd)))
+  (define-call-internally fcntl-without-arg "fcntl" int minusp
+                          (fd file-descriptor) (cmd int))
+  (define-call-internally fcntl-with-int-arg "fcntl" int minusp
+                          (fd file-descriptor) (cmd int) (arg int))
+  (define-call-internally fcntl-with-pointer-arg "fcntl" int minusp
+                          (fd file-descriptor) (cmd int)
+                          (arg alien-pointer-to-anything-or-nil))
+  (define-entry-point "fcntl" (fd cmd &optional (arg nil argp))
+    (if argp
+        (etypecase arg
+          ((alien int) (fcntl-with-int-arg fd cmd arg))
+          ((or (alien (* t)) null) (fcntl-with-pointer-arg fd cmd arg)))
+        (fcntl-without-arg fd cmd)))
 
-(define-call "getegid" gid-t never-fails)
-(define-call "getgid" gid-t never-fails)
-(define-call "getresgid" gid-t never-fails)
-(define-call "setegid" int minusp (gid gid-t))
-(define-call "setfsgid" int minusp (gid gid-t))
-(define-call "setgid" int minusp (gid gid-t))
-(define-call "setregid" int minusp
-             (rgid gid-t) (egid gid-t))
-(define-call "setresgid" int minusp
-             (rgid gid-t)
-             (egid gid-t) (sgid gid-t))
+  ;; uid, gid
+  (define-call "geteuid" uid-t never-fails) ; "always successful", it says
+  (define-call "getresuid" uid-t never-fails)
+  (define-call "getuid" uid-t never-fails)
+  (define-call "seteuid" int minusp (uid uid-t))
+  (define-call "setfsuid" int minusp (uid uid-t))
+  (define-call "setreuid" int minusp (ruid uid-t) (euid uid-t))
+  (define-call "setresuid" int minusp (ruid uid-t) (euid uid-t) (suid uid-t))
+  (define-call "setuid" int minusp (uid uid-t))  
+  (define-call "getegid" gid-t never-fails)
+  (define-call "getgid" gid-t never-fails)
+  (define-call "getresgid" gid-t never-fails)
+  (define-call "setegid" int minusp (gid gid-t))
+  (define-call "setfsgid" int minusp (gid gid-t))
+  (define-call "setgid" int minusp (gid gid-t))
+  (define-call "setregid" int minusp (rgid gid-t) (egid gid-t))
+  (define-call "setresgid" int minusp (rgid gid-t) (egid gid-t) (sgid gid-t))
 
-;;; processes, signals
-(define-call "alarm" int never-fails (seconds unsigned))
-(define-call "fork" pid-t minusp)
-(define-call "getpgid" pid-t minusp (pid pid-t))
-(define-call "getpid" pid-t never-fails)
-(define-call "getppid" pid-t never-fails)
-(define-call "getpgrp" pid-t never-fails)
-(define-call "getsid" pid-t minusp  (pid pid-t))
-(define-call "kill" int minusp (pid pid-t) (signal int))
-(define-call "killpg" int minusp (pgrp int) (signal int))
-(define-call "pause" int minusp)
-(define-call "setpgid" int minusp
-             (pid pid-t) (pgid pid-t))
-(define-call "setpgrp" int minusp)
+  ;; processes, signals
+  (define-call "alarm" int never-fails (seconds unsigned))
+  (define-call "fork" pid-t minusp)
+  (define-call "getpgid" pid-t minusp (pid pid-t))
+  (define-call "getppid" pid-t never-fails)
+  (define-call "getpgrp" pid-t never-fails)
+  (define-call "getsid" pid-t minusp  (pid pid-t))
+  (define-call "kill" int minusp (pid pid-t) (signal int))
+  (define-call "killpg" int minusp (pgrp int) (signal int))
+  (define-call "pause" int minusp)
+  (define-call "setpgid" int minusp (pid pid-t) (pgid pid-t))
+  (define-call "setpgrp" int minusp))
 
-(export 'wait :sb-posix)
-(declaim (inline wait))
-(defun wait (&optional statusptr)
-  (declare (type (or null (simple-array (signed-byte 32) (1))) statusptr))
-  (let* ((ptr (or statusptr (make-array 1 :element-type '(signed-byte 32))))
-         (pid (alien-funcall
-               (extern-alien "wait" (function pid-t (* int)))
-               (sb-sys:vector-sap ptr))))
-    (if (minusp pid)
-        (syscall-error)
-        (values pid (aref ptr 0)))))
+;;(define-call "readlink" int minusp (path filename) (buf (* t)) (len int))
 
-(export 'waitpid :sb-posix)
-(declaim (inline waitpid))
-(defun waitpid (pid options &optional statusptr)
-  (declare (type (sb-alien:alien pid-t) pid)
-           (type (sb-alien:alien int) options)
-           (type (or null (simple-array (signed-byte 32) (1))) statusptr))
-  (let* ((ptr (or statusptr (make-array 1 :element-type '(signed-byte 32))))
-         (pid (alien-funcall
-               (extern-alien "waitpid" (function pid-t
-                                                 pid-t (* int) int))
-                             pid (sb-sys:vector-sap ptr) options)))
-         (if (minusp pid)
-             (syscall-error)
-             (values pid (aref ptr 0)))))
+#-win32
+(progn
+ (export 'wait :sb-posix)
+ (declaim (inline wait))
+ (defun wait (&optional statusptr)
+   (declare (type (or null (simple-array (signed-byte 32) (1))) statusptr))
+   (let* ((ptr (or statusptr (make-array 1 :element-type '(signed-byte 32))))
+          (pid (alien-funcall
+                (extern-alien "wait" (function pid-t (* int)))
+                (sb-sys:vector-sap ptr))))
+     (if (minusp pid)
+         (syscall-error)
+         (values pid (aref ptr 0))))))
 
-;; waitpid macros
-(define-call "wifexited" boolean never-fails (status int))
-(define-call "wexitstatus" int never-fails (status int))
-(define-call "wifsignaled" boolean never-fails (status int))
-(define-call "wtermsig" int never-fails (status int))
-(define-call "wifstopped" boolean never-fails (status int))
-(define-call "wstopsig" int never-fails (status int))
-#+nil ; see alien/waitpid-macros.c
-(define-call "wifcontinued" boolean never-fails (status int))
+#-win32
+(progn
+ (export 'waitpid :sb-posix)
+ (declaim (inline waitpid))
+ (defun waitpid (pid options &optional statusptr)
+   (declare (type (sb-alien:alien pid-t) pid)
+            (type (sb-alien:alien int) options)
+            (type (or null (simple-array (signed-byte 32) (1))) statusptr))
+   (let* ((ptr (or statusptr (make-array 1 :element-type '(signed-byte 32))))
+          (pid (alien-funcall
+                (extern-alien "waitpid" (function pid-t
+                                                  pid-t (* int) int))
+                pid (sb-sys:vector-sap ptr) options)))
+     (if (minusp pid)
+         (syscall-error)
+         (values pid (aref ptr 0)))))
+ ;; waitpid macros
+ (define-call "wifexited" boolean never-fails (status int))
+ (define-call "wexitstatus" int never-fails (status int))
+ (define-call "wifsignaled" boolean never-fails (status int))
+ (define-call "wtermsig" int never-fails (status int))
+ (define-call "wifstopped" boolean never-fails (status int))
+ (define-call "wstopsig" int never-fails (status int))
+ #+nil ; see alien/waitpid-macros.c
+ (define-call "wifcontinued" boolean never-fails (status int)))
 
 ;;; mmap, msync
-(define-call "mmap" sb-sys:system-area-pointer
-  (lambda (res)
-    (= (sb-sys:sap-int res) #.(1- (expt 2 sb-vm::n-machine-word-bits))))
-  (addr sap-or-nil) (length unsigned) (prot unsigned)
-  (flags unsigned) (fd file-descriptor) (offset off-t))
+#-win32
+(progn
+ (define-call "mmap" sb-sys:system-area-pointer
+   (lambda (res)
+     (= (sb-sys:sap-int res) #.(1- (expt 2 sb-vm::n-machine-word-bits))))
+   (addr sap-or-nil) (length unsigned) (prot unsigned)
+   (flags unsigned) (fd file-descriptor) (offset off-t))
 
-(define-call "munmap" int minusp
-  (start sb-sys:system-area-pointer) (length unsigned))
+ (define-call "munmap" int minusp
+   (start sb-sys:system-area-pointer) (length unsigned))
 
 (define-call "msync" int minusp
-  (addr sb-sys:system-area-pointer) (length unsigned) (flags int))
+  (addr sb-sys:system-area-pointer) (length unsigned) (flags int)))
 
+#-win32
 (define-call "getpagesize" int minusp)
+#+win32
+;;; KLUDGE: This could be taken from GetSystemInfo
+(export (defun getpagesize () 4096))
 
 ;;; passwd database
+#-win32
 (define-protocol-class passwd alien-passwd ()
   ((name :initarg :name :accessor passwd-name)
    (passwd :initarg :passwd :accessor passwd-passwd)
@@ -245,6 +267,7 @@
    (shell :initarg :shell :accessor passwd-shell)))
 
 (defmacro define-pw-call (name arg type)
+  #-win32
   ;; FIXME: this isn't the documented way of doing this, surely?
   (let ((lisp-name (intern (string-upcase name) :sb-posix)))
     `(progn
@@ -256,10 +279,8 @@
               r
               (alien-to-passwd r)))))))
 
-(define-pw-call "getpwnam" login-name
-                (function (* alien-passwd) c-string))
-(define-pw-call "getpwuid" uid
-                (function (* alien-passwd) uid-t))
+(define-pw-call "getpwnam" login-name (function (* alien-passwd) c-string))
+(define-pw-call "getpwuid" uid (function (* alien-passwd) uid-t))
 
 (define-protocol-class stat alien-stat ()
   ((mode :initarg :mode :accessor stat-mode)
@@ -275,7 +296,7 @@
 
 (defmacro define-stat-call (name arg designator-fun type)
   ;; FIXME: this isn't the documented way of doing this, surely?
-  (let ((lisp-name (intern (string-upcase name) :sb-posix)))
+  (let ((lisp-name (lisp-for-c-symbol name)))
     `(progn
       (export ',lisp-name :sb-posix)
       (declaim (inline ,lisp-name))
@@ -290,11 +311,20 @@
               (syscall-error))
             (alien-to-stat a-stat stat)))))))
 
-(define-stat-call "stat" pathname filename
+(define-stat-call #-win32 "stat" #+win32 "_stat" pathname filename
                   (function int c-string (* alien-stat)))
+
+#-win32
 (define-stat-call "lstat" pathname filename
                   (function int c-string (* alien-stat)))
-(define-stat-call "fstat" fd file-descriptor
+;;; No symbolic links on Windows, so use stat
+#+win32
+(progn
+  (declaim (inline lstat))
+  (export (defun lstat (filename &optional stat)
+            (if stat (stat filename stat) (stat filename)))))
+
+(define-stat-call #-win32 "fstat" #+win32 "_fstat" fd file-descriptor
                   (function int int (* alien-stat)))
 
 
@@ -307,20 +337,23 @@
 (define-call "s_islnk" boolean never-fails (mode mode-t))
 (define-call "s_issock" boolean never-fails (mode mode-t))
 
-(export 'pipe :sb-posix)
-(declaim (inline pipe))
-(defun pipe (&optional filedes2)
-  (declare (type (or null (simple-array (signed-byte 32) (2))) filedes2))
-  (unless filedes2
-    (setq filedes2 (make-array 2 :element-type '(signed-byte 32))))
-  (let ((r (alien-funcall
-            ;; FIXME: (* INT)?  (ARRAY INT 2) would be better
-            (extern-alien "pipe" (function int (* int)))
-            (sb-sys:vector-sap filedes2))))
-    (when (minusp r)
-      (syscall-error)))
-  (values (aref filedes2 0) (aref filedes2 1)))
+#-win32
+(progn
+ (export 'pipe :sb-posix)
+ (declaim (inline pipe))
+ (defun pipe (&optional filedes2)
+   (declare (type (or null (simple-array (signed-byte 32) (2))) filedes2))
+   (unless filedes2
+     (setq filedes2 (make-array 2 :element-type '(signed-byte 32))))
+   (let ((r (alien-funcall
+             ;; FIXME: (* INT)?  (ARRAY INT 2) would be better
+             (extern-alien "pipe" (function int (* int)))
+             (sb-sys:vector-sap filedes2))))
+     (when (minusp r)
+       (syscall-error)))
+   (values (aref filedes2 0) (aref filedes2 1))))
 
+#-win32
 (define-protocol-class termios alien-termios ()
   ((iflag :initarg :iflag :accessor sb-posix:termios-iflag)
    (oflag :initarg :oflag :accessor sb-posix:termios-oflag)
@@ -328,33 +361,35 @@
    (lflag :initarg :lflag :accessor sb-posix:termios-lflag)
    (cc :initarg :cc :accessor sb-posix:termios-cc :array-length nccs)))
 
-(export 'tcsetattr :sb-posix)
-(declaim (inline tcsetattr))
-(defun tcsetattr (fd actions termios)
-  (with-alien-termios a-termios ()
-    (termios-to-alien termios a-termios)
-    (let ((fd (file-descriptor fd)))
-      (let* ((r (alien-funcall
-                 (extern-alien
-                  "tcsetattr"
-                  (function int int int (* alien-termios)))
-                 fd actions a-termios)))
-        (when (minusp r)
-          (syscall-error)))
-      (values))))
-(export 'tcgetattr :sb-posix)
-(declaim (inline tcgetattr))
-(defun tcgetattr (fd &optional termios)
-  (with-alien-termios a-termios ()
-    (let ((r (alien-funcall
-              (extern-alien "tcgetattr"
-                            (function int int (* alien-termios)))
-              (file-descriptor fd)
-              a-termios)))
-      (when (minusp r)
-        (syscall-error))
-      (setf termios (alien-to-termios a-termios termios))))
-  termios)
+#-win32
+(progn
+ (export 'tcsetattr :sb-posix)
+ (declaim (inline tcsetattr))
+ (defun tcsetattr (fd actions termios)
+   (with-alien-termios a-termios ()
+     (termios-to-alien termios a-termios)
+     (let ((fd (file-descriptor fd)))
+       (let* ((r (alien-funcall
+                  (extern-alien
+                   "tcsetattr"
+                   (function int int int (* alien-termios)))
+                  fd actions a-termios)))
+         (when (minusp r)
+           (syscall-error)))
+       (values))))
+ (export 'tcgetattr :sb-posix)
+ (declaim (inline tcgetattr))
+ (defun tcgetattr (fd &optional termios)
+   (with-alien-termios a-termios ()
+     (let ((r (alien-funcall
+               (extern-alien "tcgetattr"
+                             (function int int (* alien-termios)))
+               (file-descriptor fd)
+               a-termios)))
+       (when (minusp r)
+         (syscall-error))
+       (setf termios (alien-to-termios a-termios termios))))
+   termios))
 
 ;;; environment
 

Index: macros.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/contrib/sb-posix/macros.lisp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- macros.lisp	11 Jan 2006 21:32:20 -0000	1.15
+++ macros.lisp	13 Apr 2006 22:52:56 -0000	1.16
@@ -18,7 +18,8 @@
   ((alien (* t)) alien-pointer-to-anything-or-nil))
 
 (defun lisp-for-c-symbol (s)
-  (intern (substitute #\- #\_ (string-upcase s)) :sb-posix))
+  (let ((root (if (eql #\_ (char s 0)) (subseq s 1) s)))
+    (intern (substitute #\- #\_ (string-upcase root)) :sb-posix)))
 
 (defmacro define-call-internally (lisp-name c-name return-type error-predicate
                                   &rest arguments)

Index: posix-tests.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/contrib/sb-posix/posix-tests.lisp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- posix-tests.lisp	11 Jan 2006 21:32:20 -0000	1.19
+++ posix-tests.lisp	13 Apr 2006 22:52:56 -0000	1.20
@@ -14,11 +14,15 @@
 (defvar *this-file* *load-truename*)
 
 (eval-when (:compile-toplevel :load-toplevel)
-  (defconstant +mode-rwx-all+ (logior sb-posix::s-irusr sb-posix::s-iwusr sb-posix::s-ixusr
-                                      sb-posix::s-irgrp sb-posix::s-iwgrp sb-posix::s-ixgrp
-                                      sb-posix::s-iroth sb-posix::s-iwoth sb-posix::s-ixoth)))
+  (defconstant +mode-rwx-all+
+    (logior sb-posix::s-irusr sb-posix::s-iwusr sb-posix::s-ixusr
+            #-win32
+            (logior
+             sb-posix::s-irgrp sb-posix::s-iwgrp sb-posix::s-ixgrp            
+             sb-posix::s-iroth sb-posix::s-iwoth sb-posix::s-ixoth))))
 
 (defmacro define-eacces-test (name form &rest values)
+  #-win32
   `(deftest ,name
     (block ,name
       (when (= (sb-posix:geteuid) 0)
@@ -31,19 +35,19 @@
   0)
 
 (deftest chdir.2
-  (sb-posix:chdir (namestring *test-directory*))
+    (sb-posix:chdir (namestring *test-directory*))
   0)
 
 (deftest chdir.3
-  (sb-posix:chdir "/")
+    (sb-posix:chdir "/")
   0)
 
 (deftest chdir.4
-  (sb-posix:chdir #p"/")
+    (sb-posix:chdir #p"/")
   0)
 
 (deftest chdir.5
-  (sb-posix:chdir *current-directory*)
+    (sb-posix:chdir *current-directory*)
   0)
 
 (deftest chdir.6
@@ -71,7 +75,10 @@
       (sb-posix:chdir *this-file*)
     (sb-posix:syscall-error (c)
       (sb-posix:syscall-errno c)))
-  #.sb-posix::enotdir)
+  #-win32
+  #.sb-posix:enotdir
+  #+win32
+  #.sb-posix:einval)
 
 (deftest mkdir.1
   (let ((dne (make-pathname :directory '(:relative "mkdir.does-not-exist.1"))))
@@ -98,10 +105,13 @@
 
 (deftest mkdir.error.2
   (handler-case
-      (sb-posix:mkdir "/" 0)
+      (sb-posix:mkdir #-win32 "/" #+win32 "C:/" 0)
     (sb-posix:syscall-error (c)
       (sb-posix:syscall-errno c)))
-  #.sb-posix::eexist)
+  #-win32
+  #.sb-posix::eexist
+  #+win32
+  #.sb-posix:eacces)
 
 (define-eacces-test mkdir.error.3
   (let* ((dir (merge-pathnames
@@ -147,14 +157,20 @@
       (sb-posix:rmdir *this-file*)
     (sb-posix:syscall-error (c)
       (sb-posix:syscall-errno c)))
-  #.sb-posix::enotdir)
+  #-win32
+  #.sb-posix::enotdir
+  #+win32
+  #.sb-posix::einval)
 
 (deftest rmdir.error.3
   (handler-case
-      (sb-posix:rmdir "/")
+      (sb-posix:rmdir #-win32 "/" #+win32 "C:/")
     (sb-posix:syscall-error (c)
       (sb-posix:syscall-errno c)))
-  #.sb-posix::ebusy)
+  #-win32
+  #.sb-posix::ebusy
+  #+win32
+  #.sb-posix::eacces)
 
 (deftest rmdir.error.4
   (let* ((dir (ensure-directories-exist
@@ -162,7 +178,7 @@
                 (make-pathname :directory '(:relative "rmdir.error.4"))
                 *test-directory*)))
          (file (make-pathname :name "foo" :defaults dir)))
-    (with-open-file (s file :direction :output)
+    (with-open-file (s file :direction :output :if-exists nil)
       (write "" :stream s))
     (handler-case
         (sb-posix:rmdir dir)
@@ -204,6 +220,7 @@
     (logand mode (logior sb-posix::s-iread sb-posix::s-iwrite sb-posix::s-iexec)))
   #.(logior sb-posix::s-iread sb-posix::s-iwrite sb-posix::s-iexec))
 
+#-win32
 (deftest stat.2
   (let* ((stat (sb-posix:stat "/"))
          (mode (sb-posix::stat-mode stat)))
@@ -223,6 +240,7 @@
     (< (- atime unix-now) 10))
   t)
 
+#-win32
 (deftest stat.4
   (let* ((stat (sb-posix:stat (make-pathname :directory '(:absolute :up))))
          (mode (sb-posix::stat-mode stat)))
@@ -304,11 +322,13 @@
     (sb-posix:s-isfifo mode))
   nil)
 
+#-win32
 (deftest stat-mode.6
   (with-stat-mode (mode *test-directory*)
     (sb-posix:s-issock mode))
   nil)
 
+#-win32
 (deftest stat-mode.7
   (let ((link-pathname (make-pathname :name "stat-mode.7"
                                       :defaults *test-directory*)))
@@ -332,11 +352,14 @@
       (ignore-errors (delete-file pathname))))
   t)
 
+(defvar *test-directory* (merge-pathnames "test-lab/"))
 ;;; see comment in filename's designator definition, in macros.lisp
 (deftest filename-designator.1
   (let ((file (format nil "~A/[foo].txt" (namestring *test-directory*))))
     ;; creat() with a string as argument
-    (sb-posix:creat file 0)
+    (let ((fd (sb-posix:creat file sb-posix:s-iwrite)))
+      #+win32
+      (sb-posix:close fd))
     ;; if this test fails, it will probably be with
     ;; "System call error 2 (No such file or directory)"
     (let ((*default-pathname-defaults* *test-directory*))
@@ -344,18 +367,26 @@
   0)
 
 (deftest open.1
-  (let ((fd (sb-posix:open *test-directory* sb-posix::o-rdonly)))
-    (ignore-errors (sb-posix:close fd))
-    (< fd 0))
+    (let ((name (merge-pathnames "open-test.txt" *test-directory*)))
+      (unwind-protect
+           (progn
+             (sb-posix:close (sb-posix:creat name sb-posix:s-iwrite))
+             (let ((fd (sb-posix:open name sb-posix::o-rdonly)))
+               (ignore-errors (sb-posix:close fd))
+               (< fd 0)))
+        (ignore-errors (sb-posix:unlink name))))
   nil)
 
 (deftest open.error.1
   (handler-case (sb-posix:open *test-directory* sb-posix::o-wronly)
     (sb-posix:syscall-error (c)
       (sb-posix:syscall-errno c)))
-  #.sb-posix::eisdir)
+  #-win32
+  #.sb-posix::eisdir
+  #+win32
+  #.sb-posix:eacces)
 
-#-(and x86-64 linux)
+#-(or (and x86-64 linux) win32)
 (deftest fcntl.1
   (let ((fd (sb-posix:open "/dev/null" sb-posix::o-nonblock)))
     (= (sb-posix:fcntl fd sb-posix::f-getfl) sb-posix::o-nonblock))
@@ -388,11 +419,13 @@
       (sb-posix:closedir dir)))
   t)
 
+#-win32
 (deftest pwent.1
   ;; make sure that we found something
   (not (sb-posix:getpwuid 0))
   nil)
 
+#-win32
 (deftest pwent.2
   ;; make sure that we found something
   (not (sb-posix:getpwnam "root"))