0.9.8.35:

	Add getpwnam and getpwuid to SB-POSIX...
	* ...in a fit of frustration ("why does this work in sb-bsd-sockets
	  and the exact same thing not work here?"), remove the
	  SB-POSIX-INTERNAL package and throw everything into SB-POSIX.
	  No more lurking issues with packages.

diff --git a/contrib/sb-posix/constants.lisp b/contrib/sb-posix/constants.lisp
index 776a60e..2920c01 100644 (file)
--- a/contrib/sb-posix/constants.lisp
+++ b/contrib/sb-posix/constants.lisp
@@ -12,6 +12,7 @@
  "fcntl.h"
  "netdb.h" "errno.h"
  "dirent.h" "signal.h"
+ "pwd.h"
  "unistd.h"
 
  "termios.h")
@@ -246,6 +247,27 @@
               (:c-string name "char *" "d_name"
                          :distrust-length #+sunos t #-sunos nil)) t)
 
+ ;; password database
+ (:structure alien-passwd
+             ("struct passwd"
+              (c-string-pointer name "char *" "pw_name")
+              (c-string-pointer passwd "char *" "pw_passwd")
+              (uid-t uid "uid_t" "pw_uid")
+              (gid-t gid "gid_t" "pw_gid")
+              ;; 'change', 'class', and 'expire' are not supported on Linux
+              #+nil
+              (time-t change "time_t" "pw_change")
+              #+nil
+              (c-string-pointer class "char *" "pw_class")
+              (c-string-pointer gecos "char *" "pw_gecos")
+              (c-string-pointer dir "char *" "pw_dir")
+              (c-string-pointer shell "char *" "pw_shell")
+              #+nil
+              (time-t expire "time_t" "pw_expire")
+              ;; 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")

diff --git a/contrib/sb-posix/defpackage.lisp b/contrib/sb-posix/defpackage.lisp
index e539cf3..85524e9 100644 (file)
--- a/contrib/sb-posix/defpackage.lisp
+++ b/contrib/sb-posix/defpackage.lisp
@@ -1,4 +1,5 @@
-(defpackage :sb-posix (:use)
+(defpackage :sb-posix (:use #:sb-alien #:cl)
+  (:shadow close open ftruncate truncate)
   (:export #:syscall-error #:syscall-errno
 
            ;; grovel structure accessors
@@ -7,9 +8,9 @@
 
            ;; wrapper class accessors
 
+           #:passwd-name #:passwd-passwd #:passwd-uid #:passwd-gid
+           #:passwd-gecos #:passwd-dir #:passwd-shell
            #: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))

diff --git a/contrib/sb-posix/designator.lisp b/contrib/sb-posix/designator.lisp
index d49c2fd..e3c0df7 100644 (file)
--- a/contrib/sb-posix/designator.lisp
+++ b/contrib/sb-posix/designator.lisp
@@ -1,4 +1,4 @@
-(in-package :sb-posix-internal)
+(in-package :sb-posix)
 (defvar *designator-types* (make-hash-table :test #'equal))
 
 (defmacro define-designator (name result &body conversions)

diff --git a/contrib/sb-posix/interface.lisp b/contrib/sb-posix/interface.lisp
index 1a3e6b2..1573952 100644 (file)
--- a/contrib/sb-posix/interface.lisp
+++ b/contrib/sb-posix/interface.lisp
@@ -1,4 +1,4 @@
-(cl:in-package :sb-posix-internal)
+(cl:in-package :sb-posix)
 
 (defmacro define-protocol-class
     (name alien-type superclasses slots &rest options)
@@ -73,28 +73,28 @@
 
 (define-call "access" int minusp (pathname filename) (mode int))
 (define-call "chdir" int minusp (pathname filename))
-(define-call "chmod" int minusp (pathname filename) (mode sb-posix::mode-t))
+(define-call "chmod" int minusp (pathname filename) (mode mode-t))
 (define-call "chown" int minusp (pathname filename)
-             (owner sb-posix::uid-t)  (group sb-posix::gid-t))
+             (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 sb-posix::mode-t))
+(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 sb-posix::mode-t))
+(define-call "fchmod" int minusp (fd file-descriptor) (mode mode-t))
 (define-call "fchown" int minusp (fd file-descriptor)
-             (owner sb-posix::uid-t)  (group sb-posix::gid-t))
+             (owner uid-t)  (group 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 "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 sb-posix::uid-t)  (group sb-posix::gid-t))
+             (owner uid-t)  (group 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))
-(define-call "mkfifo" int minusp (pathname filename) (mode sb-posix::mode-t))
-(define-call-internally open-with-mode "open" int minusp (pathname filename) (flags int) (mode sb-posix::mode-t))
+(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
@@ -105,7 +105,7 @@
 (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 sb-posix::off-t))
+(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))
 
@@ -130,79 +130,80 @@
       (fcntl-without-arg fd cmd)))
 
 (define-call "opendir" (* t) null-alien (pathname filename))
-(define-call "readdir" (* sb-posix::dirent)
+(define-call "readdir" (* dirent)
   ;; readdir() has the worst error convention in the world.  It's just
   ;; too painful to support.  (return is NULL _and_ errno "unchanged"
   ;; is not an error, it's EOF).
   not
   (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" sb-posix::mode-t never-fails (mode sb-posix::mode-t))
+(define-call "umask" mode-t never-fails (mode mode-t))
 
 ;;; uid, gid
 
-(define-call "geteuid" sb-posix::uid-t never-fails) ; "always successful", it says
-(define-call "getresuid" sb-posix::uid-t never-fails)
-(define-call "getuid" sb-posix::uid-t never-fails)
-(define-call "seteuid" int minusp (uid sb-posix::uid-t))
-(define-call "setfsuid" int minusp (uid sb-posix::uid-t))
+(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 sb-posix::uid-t) (euid sb-posix::uid-t))
+             (ruid uid-t) (euid uid-t))
 (define-call "setresuid" int minusp
-             (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)
-(define-call "getgid" sb-posix::gid-t never-fails)
-(define-call "getresgid" sb-posix::gid-t never-fails)
-(define-call "setegid" int minusp (gid sb-posix::gid-t))
-(define-call "setfsgid" int minusp (gid sb-posix::gid-t))
-(define-call "setgid" int minusp (gid sb-posix::gid-t))
+             (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 sb-posix::gid-t) (egid sb-posix::gid-t))
+             (rgid gid-t) (egid gid-t))
 (define-call "setresgid" int minusp
-             (rgid sb-posix::gid-t)
-             (egid sb-posix::gid-t) (sgid sb-posix::gid-t))
+             (rgid gid-t)
+             (egid gid-t) (sgid gid-t))
 
 ;;; processes, signals
 (define-call "alarm" int never-fails (seconds unsigned))
-(define-call "fork" sb-posix::pid-t minusp)
-(define-call "getpgid" sb-posix::pid-t minusp (pid sb-posix::pid-t))
-(define-call "getpid" sb-posix::pid-t never-fails)
-(define-call "getppid" sb-posix::pid-t never-fails)
-(define-call "getpgrp" sb-posix::pid-t never-fails)
-(define-call "getsid" sb-posix::pid-t minusp  (pid sb-posix::pid-t))
-(define-call "kill" int minusp (pid sb-posix::pid-t) (signal int))
+(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 sb-posix::pid-t) (pgid sb-posix::pid-t))
+             (pid pid-t) (pgid pid-t))
 (define-call "setpgrp" int minusp)
 
-(export 'sb-posix::wait :sb-posix)
-(declaim (inline sb-posix::wait))
-(defun sb-posix::wait (&optional statusptr)
+(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 sb-posix::pid-t (* int)))
+               (extern-alien "wait" (function pid-t (* int)))
                (sb-sys:vector-sap ptr))))
     (if (minusp pid)
         (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)
+(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 sb-posix::pid-t
-                                                 sb-posix::pid-t (* int) int))
+               (extern-alien "waitpid" (function pid-t
+                                                 pid-t (* int) int))
                              pid (sb-sys:vector-sap ptr) options)))
          (if (minusp pid)
              (syscall-error)
@@ -223,7 +224,7 @@
   (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 sb-posix::off-t))
+  (flags unsigned) (fd file-descriptor) (offset off-t))
 
 (define-call "munmap" int minusp
   (start sb-sys:system-area-pointer) (length unsigned))
@@ -233,17 +234,44 @@
 
 (define-call "getpagesize" int minusp)
 
-(define-protocol-class sb-posix::stat sb-posix::alien-stat ()
-  ((sb-posix::mode :initarg :mode :accessor sb-posix:stat-mode)
-   (sb-posix::ino :initarg :ino :accessor sb-posix:stat-ino)
-   (sb-posix::dev :initarg :dev :accessor sb-posix:stat-dev)
-   (sb-posix::nlink :initarg :nlink :accessor sb-posix:stat-nlink)
-   (sb-posix::uid :initarg :uid :accessor sb-posix:stat-uid)
-   (sb-posix::gid :initarg :gid :accessor sb-posix:stat-gid)
-   (sb-posix::size :initarg :size :accessor sb-posix:stat-size)
-   (sb-posix::atime :initarg :atime :accessor sb-posix:stat-atime)
-   (sb-posix::mtime :initarg :mtime :accessor sb-posix:stat-mtime)
-   (sb-posix::ctime :initarg :ctime :accessor sb-posix:stat-ctime)))
+;;; passwd database
+(define-protocol-class passwd alien-passwd ()
+  ((name :initarg :name :accessor passwd-name)
+   (passwd :initarg :passwd :accessor passwd-passwd)
+   (uid :initarg :uid :accessor passwd-uid)
+   (gid :initarg :gid :accessor passwd-gid)
+   (gecos :initarg :gecos :accessor passwd-gecos)
+   (dir :initarg :dir :accessor passwd-dir)
+   (shell :initarg :shell :accessor passwd-shell)))
+
+(defmacro define-pw-call (name arg type)
+  ;; FIXME: this isn't the documented way of doing this, surely?
+  (let ((lisp-name (intern (string-upcase name) :sb-posix)))
+    `(progn
+      (export ',lisp-name :sb-posix)
+      (declaim (inline ,lisp-name))
+      (defun ,lisp-name (,arg)
+        (let ((r (alien-funcall (extern-alien ,name ,type) ,arg)))
+          (if (null r)
+              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-protocol-class stat alien-stat ()
+  ((mode :initarg :mode :accessor stat-mode)
+   (ino :initarg :ino :accessor stat-ino)
+   (dev :initarg :dev :accessor stat-dev)
+   (nlink :initarg :nlink :accessor stat-nlink)
+   (uid :initarg :uid :accessor stat-uid)
+   (gid :initarg :gid :accessor stat-gid)
+   (size :initarg :size :accessor stat-size)
+   (atime :initarg :atime :accessor stat-atime)
+   (mtime :initarg :mtime :accessor stat-mtime)
+   (ctime :initarg :ctime :accessor stat-ctime)))
 
 (defmacro define-stat-call (name arg designator-fun type)
   ;; FIXME: this isn't the documented way of doing this, surely?
@@ -252,8 +280,8 @@
       (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 ()
+        (declare (type (or null (sb-alien:alien (* alien-stat))) stat))
+        (with-alien-stat a-stat ()
           (let ((r (alien-funcall
                     (extern-alien ,name ,type)
                     (,designator-fun ,arg)
@@ -262,26 +290,26 @@
               (syscall-error))
             (alien-to-stat a-stat stat)))))))
 
-(define-stat-call "stat" pathname sb-posix::filename
-                  (function int c-string (* sb-posix::alien-stat)))
-(define-stat-call "lstat" pathname sb-posix::filename
-                  (function int c-string (* sb-posix::alien-stat)))
-(define-stat-call "fstat" fd sb-posix::file-descriptor
-                  (function int int (* sb-posix::alien-stat)))
+(define-stat-call "stat" pathname filename
+                  (function int c-string (* alien-stat)))
+(define-stat-call "lstat" pathname filename
+                  (function int c-string (* alien-stat)))
+(define-stat-call "fstat" fd file-descriptor
+                  (function int int (* alien-stat)))
 
 
 ;;; mode flags
-(define-call "s_isreg" boolean never-fails (mode sb-posix::mode-t))
-(define-call "s_isdir" boolean never-fails (mode sb-posix::mode-t))
-(define-call "s_ischr" boolean never-fails (mode sb-posix::mode-t))
-(define-call "s_isblk" boolean never-fails (mode sb-posix::mode-t))
-(define-call "s_isfifo" boolean never-fails (mode sb-posix::mode-t))
-(define-call "s_islnk" boolean never-fails (mode sb-posix::mode-t))
-(define-call "s_issock" boolean never-fails (mode sb-posix::mode-t))
-
-(export 'sb-posix::pipe :sb-posix)
-(declaim (inline sb-posix::pipe))
-(defun sb-posix::pipe (&optional filedes2)
+(define-call "s_isreg" boolean never-fails (mode mode-t))
+(define-call "s_isdir" boolean never-fails (mode mode-t))
+(define-call "s_ischr" boolean never-fails (mode mode-t))
+(define-call "s_isblk" boolean never-fails (mode mode-t))
+(define-call "s_isfifo" boolean never-fails (mode mode-t))
+(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))))
@@ -293,35 +321,35 @@
       (syscall-error)))
   (values (aref filedes2 0) (aref filedes2 1)))
 
-(define-protocol-class sb-posix::termios sb-posix::alien-termios ()
-  ((sb-posix::iflag :initarg :iflag :accessor sb-posix:termios-iflag)
-   (sb-posix::oflag :initarg :oflag :accessor sb-posix:termios-oflag)
-   (sb-posix::cflag :initarg :cflag :accessor sb-posix:termios-cflag)
-   (sb-posix::lflag :initarg :lflag :accessor sb-posix:termios-lflag)
-   (sb-posix::cc :initarg :cc :accessor sb-posix:termios-cc :array-length sb-posix::nccs)))
-
-(export 'sb-posix::tcsetattr :sb-posix)
-(declaim (inline sb-posix::tcsetattr))
-(defun sb-posix::tcsetattr (fd actions termios)
-  (sb-posix::with-alien-termios a-termios ()
+(define-protocol-class termios alien-termios ()
+  ((iflag :initarg :iflag :accessor sb-posix:termios-iflag)
+   (oflag :initarg :oflag :accessor sb-posix:termios-oflag)
+   (cflag :initarg :cflag :accessor sb-posix:termios-cflag)
+   (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 (sb-posix::file-descriptor fd)))
+    (let ((fd (file-descriptor fd)))
       (let* ((r (alien-funcall
                  (extern-alien
                   "tcsetattr"
-                  (function int int int (* sb-posix::alien-termios)))
+                  (function int int int (* 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 ()
+(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 (* sb-posix::alien-termios)))
-              (sb-posix::file-descriptor fd)
+                            (function int int (* alien-termios)))
+              (file-descriptor fd)
               a-termios)))
       (when (minusp r)
         (syscall-error))
@@ -330,8 +358,8 @@
 
 ;;; environment
 
-(export 'sb-posix::getenv :sb-posix)
-(defun sb-posix::getenv (name)
+(export 'getenv :sb-posix)
+(defun getenv (name)
   (let ((r (alien-funcall
             (extern-alien "getenv" (function (* char) c-string))
             name)))

diff --git a/contrib/sb-posix/macros.lisp b/contrib/sb-posix/macros.lisp
index 2399c98..c691826 100644 (file)
--- a/contrib/sb-posix/macros.lisp
+++ b/contrib/sb-posix/macros.lisp
@@ -1,4 +1,4 @@
-(in-package :sb-posix-internal)
+(in-package :sb-posix)
 
 (define-designator filename c-string
   (pathname

diff --git a/contrib/sb-posix/posix-tests.lisp b/contrib/sb-posix/posix-tests.lisp
index cb382a3..ee7399b 100644 (file)
--- a/contrib/sb-posix/posix-tests.lisp
+++ b/contrib/sb-posix/posix-tests.lisp
@@ -387,3 +387,13 @@
                finally (return t)))
       (sb-posix:closedir dir)))
   t)
+
+(deftest pwent.1
+  ;; make sure that we found something
+  (not (sb-posix:getpwuid 0))
+  nil)
+
+(deftest pwent.2
+  ;; make sure that we found something
+  (not (sb-posix:getpwnam "root"))
+  nil)

diff --git a/version.lisp-expr b/version.lisp-expr
index 542b165..60c548c 100644 (file)
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"0.9.8.34"
+"0.9.8.35"