Menu
▾
▴
[Sbcl-commits] CVS: sbcl/contrib/sb-posix constants.lisp,1.17,1.18 defpackage.lisp,1.5,1.6 designator.lisp,1.3,1.4 interface.lisp,1.21,1.22 macros.lisp,1.12,1.13 posix-tests.lisp,1.17,1.18
|
From: William H. N. <wn...@us...> - 2005-07-14 16:31:25
|
Update of /cvsroot/sbcl/sbcl/contrib/sb-posix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9215/contrib/sb-posix Modified Files: constants.lisp defpackage.lisp designator.lisp interface.lisp macros.lisp posix-tests.lisp Log Message: 0.9.2.43: another slice of whitespace canonicalization (Anyone who ends up here with "cvs annotate" probably wants to look at the "tabby" tagged version.) Index: constants.lisp =================================================================== RCS file: /cvsroot/sbcl/sbcl/contrib/sb-posix/constants.lisp,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- constants.lisp 4 Aug 2004 10:54:18 -0000 1.17 +++ constants.lisp 14 Jul 2005 16:30:09 -0000 1.18 @@ -6,11 +6,11 @@ (#||# "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" - "fcntl.h" - "netdb.h" "errno.h" + "fcntl.h" + "netdb.h" "errno.h" "dirent.h" "signal.h" "unistd.h" @@ -28,7 +28,7 @@ (:type nlink-t "nlink_t") (:type time-t "time_t") (:type dev-t "dev_t") - + ;; signals (:integer SIGHUP "SIGHUP" #+sb-doc "terminal line hangup." t) (:integer SIGINT "SIGINT" #+sb-doc "interrupt program." t) @@ -195,7 +195,7 @@ (:integer edquot "EDQUOT" nil t) (:integer enomedium "ENOMEDIUM" nil t) (:integer emediumtype "EMEDIUMTYPE" nil t) - + ;; wait (:integer wnohang "WNOHANG") (:integer wuntraced "WUNTRACED") @@ -242,22 +242,22 @@ ;; opendir() (:structure dirent - ("struct dirent" - (:c-string name "char *" "d_name" - :distrust-length #+sunos t #-sunos nil)) t) + ("struct dirent" + (:c-string name "char *" "d_name" + :distrust-length #+sunos t #-sunos nil)) t) (:structure alien-stat - ("struct stat" - (mode-t mode "mode_t" "st_mode") - (ino-t ino "ino_t" "st_ino") - (dev-t dev "dev_t" "st_dev") - (nlink-t nlink "nlink_t" "st_nlink") - (uid-t uid "uid_t" "st_uid") - (gid-t gid "gid_t" "st_gid") - (off-t size "off_t" "st_size") - (time-t atime "time_t" "st_atime") - (time-t mtime "time_t" "st_mtime") - (time-t ctime "time_t" "st_ctime"))) + ("struct stat" + (mode-t mode "mode_t" "st_mode") + (ino-t ino "ino_t" "st_ino") + (dev-t dev "dev_t" "st_dev") + (nlink-t nlink "nlink_t" "st_nlink") + (uid-t uid "uid_t" "st_uid") + (gid-t gid "gid_t" "st_gid") + (off-t size "off_t" "st_size") + (time-t atime "time_t" "st_atime") + (time-t mtime "time_t" "st_mtime") + (time-t ctime "time_t" "st_ctime"))) ;; open() (:integer o-rdonly "O_RDONLY" nil t) @@ -275,7 +275,7 @@ (:integer o-directory "O_DIRECTORY" nil t) (:integer o-direct "O_DIRECT" nil t) (:integer o-async "O_ASYNC" nil t) - (:integer o-largefile "O_LARGEFILE" nil t) ; hmm... + (:integer o-largefile "O_LARGEFILE" nil t) ; hmm... (:integer o-dsync "O_DSYNC" nil t) (:integer o-rsync "O_RSYNC" nil t) @@ -301,15 +301,15 @@ (:type speed-t "speed_t" nil t) (:type tcflag-t "tcflag_t" nil t) (:integer nccs "NCCS" nil t) - + (:structure alien-termios - ("struct termios" - (tcflag-t iflag "tcflag_t" "c_iflag") - (tcflag-t oflag "tcflag_t" "c_oflag") - (tcflag-t cflag "tcflag_t" "c_cflag") - (tcflag-t lflag "tcflag_t" "c_lflag") - ((array cc-t) cc "cc_t" "c_cc"))) - + ("struct termios" + (tcflag-t iflag "tcflag_t" "c_iflag") + (tcflag-t oflag "tcflag_t" "c_oflag") + (tcflag-t cflag "tcflag_t" "c_cflag") + (tcflag-t lflag "tcflag_t" "c_lflag") + ((array cc-t) cc "cc_t" "c_cc"))) + (:integer veof "VEOF" nil t) (:integer veol "VEOL" nil t) (:integer verase "VERASE" nil t) @@ -330,7 +330,7 @@ (:integer inlcr "INLCR" nil t) (:integer inpck "INPCK" nil t) (:integer istrip "ISTRIP" nil t) - #+xsi ; FIXME: an extension, apparently + #+xsi ; FIXME: an extension, apparently (:integer ixany "IXANY" nil t) (:integer ixoff "IXOFF" nil t) (:integer ixon "IXON" nil t) @@ -415,5 +415,5 @@ (:integer tcion "TCION" nil t) (:integer tcooff "TCOOFF" nil t) (:integer tcoon "TCOON" nil t) - + ) Index: defpackage.lisp =================================================================== RCS file: /cvsroot/sbcl/sbcl/contrib/sb-posix/defpackage.lisp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- defpackage.lisp 1 Jun 2004 17:02:23 -0000 1.5 +++ defpackage.lisp 14 Jul 2005 16:30:09 -0000 1.6 @@ -1,15 +1,15 @@ (defpackage :sb-posix (:use) (:export #:syscall-error #:syscall-errno - ;; grovel structure accessors - - #:dirent-name + ;; grovel structure accessors - ;; wrapper class accessors - - #:stat-mode #:stat-ino #:stat-dev #:stat-nlink #:stat-uid - #:stat-gid #:stat-size #:stat-atime #:stat-mtime #:stat-ctime - #:termios-iflag #:termios-oflag #:termios-cflag - #:termios-lflag #:termios-cc)) + #:dirent-name + + ;; wrapper class accessors + + #:stat-mode #:stat-ino #:stat-dev #:stat-nlink #:stat-uid + #:stat-gid #:stat-size #:stat-atime #:stat-mtime #:stat-ctime + #:termios-iflag #:termios-oflag #:termios-cflag + #:termios-lflag #:termios-cc)) (defpackage :sb-posix-internal (:use #:sb-alien #:cl)) Index: designator.lisp =================================================================== RCS file: /cvsroot/sbcl/sbcl/contrib/sb-posix/designator.lisp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- designator.lisp 19 Aug 2003 13:04:39 -0000 1.3 +++ designator.lisp 14 Jul 2005 16:30:09 -0000 1.4 @@ -3,16 +3,16 @@ (defmacro define-designator (name result &body conversions) (let ((type `(quote (or ,@(mapcar #'car conversions)))) - (typename (intern (format nil "~A-~A" - (symbol-name name) - (symbol-name :designator)) - #.*package*))) + (typename (intern (format nil "~A-~A" + (symbol-name name) + (symbol-name :designator)) + #.*package*))) `(progn (eval-when (:compile-toplevel :load-toplevel :execute) - (deftype ,typename () ,type) - (setf (gethash ',name *designator-types*) ',result)) + (deftype ,typename () ,type) + (setf (gethash ',name *designator-types*) ',result)) (defun ,(intern (symbol-name name) :sb-posix) (,name) - (declare (type ,typename ,name)) - (etypecase ,name - ,@conversions))))) + (declare (type ,typename ,name)) + (etypecase ,name + ,@conversions))))) Index: interface.lisp =================================================================== RCS file: /cvsroot/sbcl/sbcl/contrib/sb-posix/interface.lisp,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- interface.lisp 30 Apr 2005 19:43:57 -0000 1.21 +++ interface.lisp 14 Jul 2005 16:30:09 -0000 1.22 @@ -1,65 +1,65 @@ (cl:in-package :sb-posix-internal) -(defmacro define-protocol-class +(defmacro define-protocol-class (name alien-type superclasses slots &rest options) (let ((to-protocol (intern (format nil "ALIEN-TO-~A" name))) - (to-alien (intern (format nil "~A-TO-ALIEN" name)))) + (to-alien (intern (format nil "~A-TO-ALIEN" name)))) `(progn - (defclass ,name ,superclasses - ,(loop for slotd in slots - collect (ldiff slotd (member :array-length slotd))) - ,@options) + (defclass ,name ,superclasses + ,(loop for slotd in slots + collect (ldiff slotd (member :array-length slotd))) + ,@options) (declaim (inline ,to-alien ,to-protocol)) (defun ,to-protocol (alien &optional instance) - (declare (type (sb-alien:alien (* ,alien-type)) alien) - (type (or null ,name) instance)) - (unless instance - (setf instance (make-instance ',name))) - ,@(loop for slotd in slots - ;; FIXME: slotds in source are more complicated in general - ;; - ;; FIXME: baroque construction of intricate fragility - for array-length = (getf (cdr slotd) :array-length) - if array-length - collect `(progn - (let ((array (make-array ,array-length))) - (setf (slot-value instance ',(car slotd)) - array) - (dotimes (i ,array-length) - (setf (aref array i) - (sb-alien:deref - (sb-alien:slot alien ',(car slotd)) - i))))) - else - collect `(setf (slot-value instance ',(car slotd)) - (sb-alien:slot alien ',(car slotd)))) - instance) + (declare (type (sb-alien:alien (* ,alien-type)) alien) + (type (or null ,name) instance)) + (unless instance + (setf instance (make-instance ',name))) + ,@(loop for slotd in slots + ;; FIXME: slotds in source are more complicated in general + ;; + ;; FIXME: baroque construction of intricate fragility + for array-length = (getf (cdr slotd) :array-length) + if array-length + collect `(progn + (let ((array (make-array ,array-length))) + (setf (slot-value instance ',(car slotd)) + array) + (dotimes (i ,array-length) + (setf (aref array i) + (sb-alien:deref + (sb-alien:slot alien ',(car slotd)) + i))))) + else + collect `(setf (slot-value instance ',(car slotd)) + (sb-alien:slot alien ',(car slotd)))) + instance) (defun ,to-alien (instance &optional alien) - (declare (type (or null (sb-alien:alien (* ,alien-type))) alien) - (type ,name instance)) - (unless alien - (setf alien (sb-alien:make-alien ,alien-type))) - ,@(loop for slotd in slots - for array-length = (getf (cdr slotd) :array-length) - if array-length - collect `(progn - (let ((array (slot-value instance ',(car slotd)))) - (dotimes (i ,array-length) - (setf (sb-alien:deref - (sb-alien:slot alien ',(car slotd)) - i) - (aref array i))))) - else - collect `(setf (sb-alien:slot alien ',(car slotd)) - (slot-value instance ',(car slotd))))) + (declare (type (or null (sb-alien:alien (* ,alien-type))) alien) + (type ,name instance)) + (unless alien + (setf alien (sb-alien:make-alien ,alien-type))) + ,@(loop for slotd in slots + for array-length = (getf (cdr slotd) :array-length) + if array-length + collect `(progn + (let ((array (slot-value instance ',(car slotd)))) + (dotimes (i ,array-length) + (setf (sb-alien:deref + (sb-alien:slot alien ',(car slotd)) + i) + (aref array i))))) + else + collect `(setf (sb-alien:slot alien ',(car slotd)) + (slot-value instance ',(car slotd))))) (find-class ',name)))) (define-condition sb-posix:syscall-error (error) ((errno :initarg :errno :reader sb-posix:syscall-errno)) (:report (lambda (c s) - (let ((errno (sb-posix:syscall-errno c))) - (format s "System call error ~A (~A)" - errno (sb-int:strerror errno)))))) + (let ((errno (sb-posix:syscall-errno c))) + (format s "System call error ~A (~A)" + errno (sb-int:strerror errno)))))) (defun syscall-error () (error 'sb-posix:syscall-error :errno (get-errno))) @@ -75,7 +75,7 @@ (define-call "chdir" int minusp (pathname filename)) (define-call "chmod" int minusp (pathname filename) (mode sb-posix::mode-t)) (define-call "chown" int minusp (pathname filename) - (owner sb-posix::uid-t) (group sb-posix::gid-t)) + (owner sb-posix::uid-t) (group sb-posix::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 sb-posix::mode-t)) @@ -84,12 +84,12 @@ (define-call "fchdir" int minusp (fd file-descriptor)) (define-call "fchmod" int minusp (fd file-descriptor) (mode sb-posix::mode-t)) (define-call "fchown" int minusp (fd file-descriptor) - (owner sb-posix::uid-t) (group sb-posix::gid-t)) + (owner sb-posix::uid-t) (group sb-posix::gid-t)) (define-call "fdatasync" int minusp (fd file-descriptor)) (define-call "ftruncate" int minusp (fd file-descriptor) (length sb-posix::off-t)) (define-call "fsync" int minusp (fd file-descriptor)) (define-call "lchown" int minusp (pathname filename) - (owner sb-posix::uid-t) (group sb-posix::gid-t)) + (owner sb-posix::uid-t) (group sb-posix::gid-t)) (define-call "link" int minusp (oldpath filename) (newpath filename)) (define-call "lseek" sb-posix::off-t minusp (fd file-descriptor) (offset sb-posix::off-t) (whence int)) (define-call "mkdir" int minusp (pathname filename) (mode sb-posix::mode-t)) @@ -115,8 +115,8 @@ (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))) + ((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)) @@ -125,8 +125,8 @@ (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))) + ((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 "opendir" (* t) null-alien (pathname filename)) @@ -148,10 +148,10 @@ (define-call "seteuid" int minusp (uid sb-posix::uid-t)) (define-call "setfsuid" int minusp (uid sb-posix::uid-t)) (define-call "setreuid" int minusp - (ruid sb-posix::uid-t) (euid sb-posix::uid-t)) + (ruid sb-posix::uid-t) (euid sb-posix::uid-t)) (define-call "setresuid" int minusp - (ruid sb-posix::uid-t) (euid sb-posix::uid-t) - (suid sb-posix::uid-t)) + (ruid sb-posix::uid-t) (euid sb-posix::uid-t) + (suid sb-posix::uid-t)) (define-call "setuid" int minusp (uid sb-posix::uid-t)) (define-call "getegid" sb-posix::gid-t never-fails) @@ -161,10 +161,10 @@ (define-call "setfsgid" int minusp (gid sb-posix::gid-t)) (define-call "setgid" int minusp (gid sb-posix::gid-t)) (define-call "setregid" int minusp - (rgid sb-posix::gid-t) (egid sb-posix::gid-t)) + (rgid sb-posix::gid-t) (egid sb-posix::gid-t)) (define-call "setresgid" int minusp - (rgid sb-posix::gid-t) - (egid sb-posix::gid-t) (sgid sb-posix::gid-t)) + (rgid sb-posix::gid-t) + (egid sb-posix::gid-t) (sgid sb-posix::gid-t)) ;;; processes, signals (define-call "alarm" int never-fails (seconds unsigned)) @@ -178,7 +178,7 @@ (define-call "killpg" int minusp (pgrp int) (signal int)) (define-call "pause" int minusp) (define-call "setpgid" int minusp - (pid sb-posix::pid-t) (pgid sb-posix::pid-t)) + (pid sb-posix::pid-t) (pgid sb-posix::pid-t)) (define-call "setpgrp" int minusp) (export 'sb-posix::wait :sb-posix) @@ -186,27 +186,27 @@ (defun sb-posix::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 sb-posix::pid-t (* int))) - (sb-sys:vector-sap ptr)))) + (pid (alien-funcall + (extern-alien "wait" (function sb-posix::pid-t (* int))) + (sb-sys:vector-sap ptr)))) (if (minusp pid) - (syscall-error) - (values pid (aref ptr 0))))) + (syscall-error) + (values pid (aref ptr 0))))) (export 'sb-posix::waitpid :sb-posix) (declaim (inline sb-posix::waitpid)) (defun sb-posix::waitpid (pid options &optional statusptr) (declare (type (sb-alien:alien sb-posix::pid-t) pid) - (type (sb-alien:alien int) options) - (type (or null (simple-array (signed-byte 32) (1))) statusptr)) + (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 sb-posix::pid-t - sb-posix::pid-t (* int) int)) - pid (sb-sys:vector-sap ptr) options))) - (if (minusp pid) - (syscall-error) - (values pid (aref ptr 0))))) + (pid (alien-funcall + (extern-alien "waitpid" (function sb-posix::pid-t + sb-posix::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)) @@ -252,22 +252,22 @@ (export ',lisp-name :sb-posix) (declaim (inline ,lisp-name)) (defun ,lisp-name (,arg &optional stat) - (declare (type (or null (sb-alien:alien (* sb-posix::alien-stat))) stat)) - (sb-posix::with-alien-stat a-stat () - (let ((r (alien-funcall - (extern-alien ,name ,type) - (,designator-fun ,arg) - a-stat))) - (when (minusp r) - (syscall-error)) - (alien-to-stat a-stat stat))))))) + (declare (type (or null (sb-alien:alien (* sb-posix::alien-stat))) stat)) + (sb-posix::with-alien-stat a-stat () + (let ((r (alien-funcall + (extern-alien ,name ,type) + (,designator-fun ,arg) + a-stat))) + (when (minusp r) + (syscall-error)) + (alien-to-stat a-stat stat))))))) (define-stat-call "stat" pathname sb-posix::filename - (function int c-string (* sb-posix::alien-stat))) + (function int c-string (* sb-posix::alien-stat))) (define-stat-call "lstat" pathname sb-posix::filename - (function int c-string (* sb-posix::alien-stat))) + (function int c-string (* sb-posix::alien-stat))) (define-stat-call "fstat" fd sb-posix::file-descriptor - (function int int (* sb-posix::alien-stat))) + (function int int (* sb-posix::alien-stat))) ;;; mode flags @@ -286,9 +286,9 @@ (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)))) + ;; 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))) @@ -307,24 +307,24 @@ (termios-to-alien termios a-termios) (let ((fd (sb-posix::file-descriptor fd))) (let* ((r (alien-funcall - (extern-alien - "tcsetattr" - (function int int int (* sb-posix::alien-termios))) - fd actions a-termios))) - (when (minusp r) - (syscall-error))) + (extern-alien + "tcsetattr" + (function int int int (* sb-posix::alien-termios))) + fd actions a-termios))) + (when (minusp r) + (syscall-error))) (values)))) (export 'sb-posix::tcgetattr :sb-posix) (declaim (inline sb-posix::tcgetattr)) (defun sb-posix::tcgetattr (fd &optional termios) (sb-posix::with-alien-termios a-termios () (let ((r (alien-funcall - (extern-alien "tcgetattr" - (function int int (* sb-posix::alien-termios))) - (sb-posix::file-descriptor fd) - a-termios))) + (extern-alien "tcgetattr" + (function int int (* sb-posix::alien-termios))) + (sb-posix::file-descriptor fd) + a-termios))) (when (minusp r) - (syscall-error)) + (syscall-error)) (setf termios (alien-to-termios a-termios termios)))) termios) @@ -333,8 +333,8 @@ (export 'sb-posix::getenv :sb-posix) (defun sb-posix::getenv (name) (let ((r (alien-funcall - (extern-alien "getenv" (function (* char) c-string)) - name))) + (extern-alien "getenv" (function (* char) c-string)) + name))) (declare (type (alien (* char)) r)) (unless (null-alien r) (cast r c-string)))) Index: macros.lisp =================================================================== RCS file: /cvsroot/sbcl/sbcl/contrib/sb-posix/macros.lisp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- macros.lisp 5 Jul 2005 12:27:35 -0000 1.12 +++ macros.lisp 14 Jul 2005 16:30:09 -0000 1.13 @@ -1,33 +1,33 @@ (in-package :sb-posix-internal) -;;; some explanation may be necessary. The namestring "[foo]" +;;; some explanation may be necessary. The namestring "[foo]" ;;; denotes a wild pathname. When there's a file on the disk whose ;;; Unix name is "[foo]", the appropriate CL namestring for it is ;;; "\\[foo]". So, don't call NAMESTRING, instead call a function ;;; that gets us the Unix name (defun native-filename (pathname) (let ((directory (pathname-directory pathname)) - (name (pathname-name pathname)) - (type (pathname-type pathname))) + (name (pathname-name pathname)) + (type (pathname-type pathname))) (with-output-to-string (s nil :element-type 'base-char) (etypecase directory - (string (write-string directory s)) - (list - (when (eq (car directory) :absolute) - (write-char #\/ s)) - (dolist (piece (cdr directory)) - (etypecase piece - (string (write-string piece s) (write-char #\/ s)) - ((member :up) (write-string "../" s)))))) + (string (write-string directory s)) + (list + (when (eq (car directory) :absolute) + (write-char #\/ s)) + (dolist (piece (cdr directory)) + (etypecase piece + (string (write-string piece s) (write-char #\/ s)) + ((member :up) (write-string "../" s)))))) (etypecase name - (null) + (null) (string (write-string name s))) (etypecase type - (null) - (string (write-char #\. s) (write-string type s)))))) + (null) + (string (write-char #\. s) (write-string type s)))))) (define-designator filename c-string - (pathname + (pathname (native-filename (translate-logical-pathname filename))) (string filename)) @@ -47,31 +47,31 @@ (intern (substitute #\- #\_ (string-upcase s)) :sb-posix)) (defmacro define-call-internally (lisp-name c-name return-type error-predicate - &rest arguments) + &rest arguments) (if (sb-sys:find-foreign-symbol-address c-name) `(progn - (declaim (inline ,lisp-name)) - (defun ,lisp-name ,(mapcar #'car arguments) - (let ((r (alien-funcall - (extern-alien - ,c-name - (function ,return-type - ,@(mapcar - (lambda (x) - (gethash (cadr x) - *designator-types* - (cadr x))) - arguments))) - ,@(mapcar (lambda (x) - (if (nth-value 1 - (gethash (cadr x) - *designator-types*)) - `(,(intern (symbol-name (cadr x)) - :sb-posix) - ,(car x)) - (car x))) - arguments)))) - (if (,error-predicate r) (syscall-error) r)))) + (declaim (inline ,lisp-name)) + (defun ,lisp-name ,(mapcar #'car arguments) + (let ((r (alien-funcall + (extern-alien + ,c-name + (function ,return-type + ,@(mapcar + (lambda (x) + (gethash (cadr x) + *designator-types* + (cadr x))) + arguments))) + ,@(mapcar (lambda (x) + (if (nth-value 1 + (gethash (cadr x) + *designator-types*)) + `(,(intern (symbol-name (cadr x)) + :sb-posix) + ,(car x)) + (car x))) + arguments)))) + (if (,error-predicate r) (syscall-error) r)))) `(sb-int:style-warn "Didn't find definition for ~S" ,c-name))) (defmacro define-call (name return-type error-predicate &rest arguments) @@ -79,10 +79,10 @@ `(progn (export ',lisp-name :sb-posix) (define-call-internally ,lisp-name - ,name - ,return-type - ,error-predicate - ,@arguments)))) + ,name + ,return-type + ,error-predicate + ,@arguments)))) (defmacro define-entry-point (name arglist &body body) (let ((lisp-name (lisp-for-c-symbol name))) @@ -90,4 +90,4 @@ (export ',lisp-name :sb-posix) (declaim (inline ,lisp-name)) (defun ,lisp-name ,arglist - ,@body)))) + ,@body)))) Index: posix-tests.lisp =================================================================== RCS file: /cvsroot/sbcl/sbcl/contrib/sb-posix/posix-tests.lisp,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- posix-tests.lisp 6 Jan 2005 12:47:57 -0000 1.17 +++ posix-tests.lisp 14 Jul 2005 16:30:09 -0000 1.18 @@ -6,8 +6,8 @@ (defvar *test-directory* (ensure-directories-exist (merge-pathnames (make-pathname :directory '(:relative "test-lab")) - (make-pathname :directory - (pathname-directory *load-truename*))))) + (make-pathname :directory + (pathname-directory *load-truename*))))) (defvar *current-directory* *default-pathname-defaults*) @@ -15,14 +15,14 @@ (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))) + 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) `(deftest ,name (block ,name (when (= (sb-posix:geteuid) 0) - (return-from ,name (values ,@values))) + (return-from ,name (values ,@values))) ,form) ,@values)) @@ -61,9 +61,9 @@ (deftest chdir.error.1 (let ((dne (make-pathname :directory '(:relative "chdir.does-not-exist")))) (handler-case - (sb-posix:chdir (merge-pathnames dne *test-directory*)) + (sb-posix:chdir (merge-pathnames dne *test-directory*)) (sb-posix:syscall-error (c) - (sb-posix:syscall-errno c)))) + (sb-posix:syscall-errno c)))) #.sb-posix::enoent) (deftest chdir.error.2 @@ -76,7 +76,7 @@ (deftest mkdir.1 (let ((dne (make-pathname :directory '(:relative "mkdir.does-not-exist.1")))) (unwind-protect - (sb-posix:mkdir (merge-pathnames dne *test-directory*) 0) + (sb-posix:mkdir (merge-pathnames dne *test-directory*) 0) ;; FIXME: no delete-directory in CL, but using our own operators ;; is probably not ideal (ignore-errors (sb-posix:rmdir (merge-pathnames dne *test-directory*))))) @@ -85,7 +85,7 @@ (deftest mkdir.2 (let ((dne (make-pathname :directory '(:relative "mkdir.does-not-exist.2")))) (unwind-protect - (sb-posix:mkdir (namestring (merge-pathnames dne *test-directory*)) 0) + (sb-posix:mkdir (namestring (merge-pathnames dne *test-directory*)) 0) (ignore-errors (sb-posix:rmdir (merge-pathnames dne *test-directory*))))) 0) @@ -105,21 +105,21 @@ (define-eacces-test mkdir.error.3 (let* ((dir (merge-pathnames - (make-pathname :directory '(:relative "mkdir.error.3")) - *test-directory*)) - (dir2 (merge-pathnames - (make-pathname :directory '(:relative "does-not-exist")) - dir))) + (make-pathname :directory '(:relative "mkdir.error.3")) + *test-directory*)) + (dir2 (merge-pathnames + (make-pathname :directory '(:relative "does-not-exist")) + dir))) (sb-posix:mkdir dir 0) (handler-case - (sb-posix:mkdir dir2 0) + (sb-posix:mkdir dir2 0) (sb-posix:syscall-error (c) - (sb-posix:rmdir dir) - (sb-posix:syscall-errno c)) + (sb-posix:rmdir dir) + (sb-posix:syscall-errno c)) (:no-error (result) - (sb-posix:rmdir dir2) - (sb-posix:rmdir dir) - result))) + (sb-posix:rmdir dir2) + (sb-posix:rmdir dir) + result))) #.sb-posix::eacces) (deftest rmdir.1 @@ -136,10 +136,10 @@ (deftest rmdir.error.1 (let ((dne (make-pathname :directory '(:relative "rmdir.dne.error.1")))) - (handler-case - (sb-posix:rmdir (merge-pathnames dne *test-directory*)) + (handler-case + (sb-posix:rmdir (merge-pathnames dne *test-directory*)) (sb-posix:syscall-error (c) - (sb-posix:syscall-errno c)))) + (sb-posix:syscall-errno c)))) #.sb-posix::enoent) (deftest rmdir.error.2 @@ -158,74 +158,74 @@ (deftest rmdir.error.4 (let* ((dir (ensure-directories-exist - (merge-pathnames - (make-pathname :directory '(:relative "rmdir.error.4")) - *test-directory*))) - (file (make-pathname :name "foo" :defaults dir))) + (merge-pathnames + (make-pathname :directory '(:relative "rmdir.error.4")) + *test-directory*))) + (file (make-pathname :name "foo" :defaults dir))) (with-open-file (s file :direction :output) (write "" :stream s)) (handler-case - (sb-posix:rmdir dir) + (sb-posix:rmdir dir) (sb-posix:syscall-error (c) - (delete-file file) - (sb-posix:rmdir dir) - (let ((errno (sb-posix:syscall-errno c))) - ;; documented by POSIX - (or (= errno sb-posix::eexist) (= errno sb-posix::enotempty)))))) + (delete-file file) + (sb-posix:rmdir dir) + (let ((errno (sb-posix:syscall-errno c))) + ;; documented by POSIX + (or (= errno sb-posix::eexist) (= errno sb-posix::enotempty)))))) t) (define-eacces-test rmdir.error.5 (let* ((dir (merge-pathnames - (make-pathname :directory '(:relative "rmdir.error.5")) - *test-directory*)) - (dir2 (merge-pathnames - (make-pathname :directory '(:relative "unremovable")) - dir))) + (make-pathname :directory '(:relative "rmdir.error.5")) + *test-directory*)) + (dir2 (merge-pathnames + (make-pathname :directory '(:relative "unremovable")) + dir))) (sb-posix:mkdir dir +mode-rwx-all+) (sb-posix:mkdir dir2 +mode-rwx-all+) (sb-posix:chmod dir 0) (handler-case - (sb-posix:rmdir dir2) + (sb-posix:rmdir dir2) (sb-posix:syscall-error (c) - (sb-posix:chmod dir (logior sb-posix::s-iread sb-posix::s-iwrite sb-posix::s-iexec)) - (sb-posix:rmdir dir2) - (sb-posix:rmdir dir) - (sb-posix:syscall-errno c)) + (sb-posix:chmod dir (logior sb-posix::s-iread sb-posix::s-iwrite sb-posix::s-iexec)) + (sb-posix:rmdir dir2) + (sb-posix:rmdir dir) + (sb-posix:syscall-errno c)) (:no-error (result) - (sb-posix:chmod dir (logior sb-posix::s-iread sb-posix::s-iwrite sb-posix::s-iexec)) - (sb-posix:rmdir dir) - result))) + (sb-posix:chmod dir (logior sb-posix::s-iread sb-posix::s-iwrite sb-posix::s-iexec)) + (sb-posix:rmdir dir) + result))) #.sb-posix::eacces) (deftest stat.1 (let* ((stat (sb-posix:stat *test-directory*)) - (mode (sb-posix::stat-mode stat))) + (mode (sb-posix::stat-mode stat))) ;; FIXME: Ugly ::s everywhere (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)) (deftest stat.2 (let* ((stat (sb-posix:stat "/")) - (mode (sb-posix::stat-mode stat))) + (mode (sb-posix::stat-mode stat))) ;; it's logically possible for / to be writeable by others... but ;; if it is, either someone is playing with strange security ;; modules or they want to know about it anyway. (logand mode sb-posix::s-iwoth)) 0) - + (deftest stat.3 (let* ((now (get-universal-time)) - ;; FIXME: (encode-universal-time 00 00 00 01 01 1970) - (unix-now (- now 2208988800)) - (stat (sb-posix:stat *test-directory*)) - (atime (sb-posix::stat-atime stat))) + ;; FIXME: (encode-universal-time 00 00 00 01 01 1970) + (unix-now (- now 2208988800)) + (stat (sb-posix:stat *test-directory*)) + (atime (sb-posix::stat-atime stat))) ;; FIXME: breaks if mounted noatime :-( (< (- atime unix-now) 10)) t) (deftest stat.4 (let* ((stat (sb-posix:stat (make-pathname :directory '(:absolute :up)))) - (mode (sb-posix::stat-mode stat))) + (mode (sb-posix::stat-mode stat))) ;; it's logically possible for / to be writeable by others... but ;; if it is, either someone is playing with strange security ;; modules or they want to know about it anyway. @@ -243,27 +243,27 @@ (define-eacces-test stat.error.2 (let* ((dir (merge-pathnames - (make-pathname :directory '(:relative "stat.error.2")) - *test-directory*)) - (file (merge-pathnames - (make-pathname :name "unstatable") - dir))) + (make-pathname :directory '(:relative "stat.error.2")) + *test-directory*)) + (file (merge-pathnames + (make-pathname :name "unstatable") + dir))) (sb-posix:mkdir dir +mode-rwx-all+) (with-open-file (s file :direction :output) (write "" :stream s)) (sb-posix:chmod dir 0) (handler-case - (sb-posix:stat file) + (sb-posix:stat file) (sb-posix:syscall-error (c) - (sb-posix:chmod dir (logior sb-posix::s-iread sb-posix::s-iwrite sb-posix::s-iexec)) - (sb-posix:unlink file) - (sb-posix:rmdir dir) - (sb-posix:syscall-errno c)) + (sb-posix:chmod dir (logior sb-posix::s-iread sb-posix::s-iwrite sb-posix::s-iexec)) + (sb-posix:unlink file) + (sb-posix:rmdir dir) + (sb-posix:syscall-errno c)) (:no-error (result) - (sb-posix:chmod dir (logior sb-posix::s-iread sb-posix::s-iwrite sb-posix::s-iexec)) - (sb-posix:unlink file) - (sb-posix:rmdir dir) - result))) + (sb-posix:chmod dir (logior sb-posix::s-iread sb-posix::s-iwrite sb-posix::s-iexec)) + (sb-posix:unlink file) + (sb-posix:rmdir dir) + result))) #.sb-posix::eacces) ;;; stat-mode tests @@ -366,14 +366,14 @@ (deftest fcntl.1 (let ((fd (sb-posix:open "/dev/null" sb-posix::o-nonblock))) (/= 0 (logand (sb-posix:fcntl fd sb-posix::f-getfl) - sb-posix::o-nonblock))) + sb-posix::o-nonblock))) t) (deftest opendir.1 (let ((dir (sb-posix:opendir "/"))) (unwind-protect (sb-alien:null-alien dir) (unless (sb-alien:null-alien dir) - (sb-posix:closedir dir)))) + (sb-posix:closedir dir)))) nil) (deftest readdir.1 |