X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fsb-posix%2Finterface.lisp;h=c09968af26244d94908e25942f73f4f79f39ac11;hb=c553e4be6da2d18f0827f190589c88e837b8b8a6;hp=110a4eab0ad3ae064064bb40a98267d9fa43b8b4;hpb=118aab27966ff6d70477c7091c5f54888075c313;p=sbcl.git diff --git a/contrib/sb-posix/interface.lisp b/contrib/sb-posix/interface.lisp index 110a4ea..c09968a 100644 --- a/contrib/sb-posix/interface.lisp +++ b/contrib/sb-posix/interface.lisp @@ -169,7 +169,8 @@ (let* ((external-format sb-alien::*default-c-string-external-format*) (arg (sb-ext:string-to-octets (filename template) - :external-format external-format))) + :external-format external-format + :null-terminate t))) (sb-sys:with-pinned-objects (arg) ;; accommodate for the call-by-reference ;; nature of mks/dtemp's template strings. @@ -181,7 +182,8 @@ ;; FIXME: We'd rather return pathnames, but other ;; SB-POSIX functions like this return strings... (let ((pathname (sb-ext:octets-to-string - arg :external-format external-format))) + arg :external-format external-format + :end (1- (length arg))))) ,(if values '(values result pathname) 'pathname)))))) @@ -279,10 +281,16 @@ (define-call "setup_mach_exceptions" void never-fails) (define-call ("posix_fork" :c-name "fork") pid-t minusp) (defun fork () - (let ((pid (posix-fork))) - (when (= pid 0) - (setup-mach-exceptions)) - pid)) + (tagbody + (sb-thread::with-all-threads-lock + (when (cdr sb-thread::*all-threads*) + (go :error)) + (let ((pid (posix-fork))) + (when (= pid 0) + (setup-mach-exceptions)) + (return-from fork pid))) + :error + (error "Cannot fork with multiple threads running."))) (export 'fork :sb-posix)) #-mach-exception-handler @@ -296,7 +304,8 @@ (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)) + (define-call "setpgrp" int minusp) + (define-call "setsid" pid-t minusp)) (defmacro with-growing-c-string ((buffer size) &body body) (sb-int:with-unique-names (c-string-block) @@ -408,6 +417,10 @@ (define-call "msync" int minusp (addr sb-sys:system-area-pointer) (length unsigned) (flags int))) +;;; mlockall, munlockall +(define-call "mlockall" int minusp (flags int)) +(define-call "munlockall" int minusp) + #-win32 (define-call "getpagesize" int minusp) #+win32 @@ -438,22 +451,6 @@ (:documentation "Instances of this class represent entries in the system's user database.")) -(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 - (export ',lisp-name :sb-posix) - (declaim (inline ,lisp-name)) - (defun ,lisp-name (,arg) - (let ((r (alien-funcall (extern-alien ,name ,type) ,arg))) - (if (null-alien r) - nil - (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)) - ;;; group database #-win32 (define-protocol-class group alien-group () @@ -461,7 +458,7 @@ (passwd :initarg :passwd :accessor group-passwd) (gid :initarg :gid :accessor group-gid))) -(defmacro define-gr-call (name arg type) +(defmacro define-obj-call (name arg type conv) #-win32 ;; FIXME: this isn't the documented way of doing this, surely? (let ((lisp-name (intern (string-upcase name) :sb-posix))) @@ -472,10 +469,12 @@ (let ((r (alien-funcall (extern-alien ,name ,type) ,arg))) (if (null-alien r) nil - (alien-to-group r))))))) + (,conv r))))))) -(define-gr-call "getgrnam" login-name (function (* alien-group) c-string)) -(define-gr-call "getgrgid" gid (function (* alien-group) gid-t)) +(define-obj-call "getpwnam" login-name (function (* alien-passwd) c-string) alien-to-passwd) +(define-obj-call "getpwuid" uid (function (* alien-passwd) uid-t) alien-to-passwd) +(define-obj-call "getgrnam" login-name (function (* alien-group) c-string) alien-to-group) +(define-obj-call "getgrgid" gid (function (* alien-group) gid-t) alien-to-group) #-win32 @@ -622,6 +621,11 @@ (syscall-error)) (setf termios (alien-to-termios a-termios termios)))) termios) + (define-call "tcdrain" int minusp (fd file-descriptor)) + (define-call "tcflow" int minusp (fd file-descriptor) (action int)) + (define-call "tcflush" int minusp (fd file-descriptor) (queue-selector int)) + (define-call "tcgetsid" pid-t minusp (fd file-descriptor)) + (define-call "tcsendbreak" int minusp (fd file-descriptor) (duration int)) (export 'cfsetispeed :sb-posix) (declaim (inline cfsetispeed)) (defun cfsetispeed (speed &optional termios) @@ -732,7 +736,38 @@ (declare (type (alien (* char)) r)) (unless (null-alien r) (cast r c-string)))) -(define-call "putenv" int minusp (string c-string)) +#-win32 +(progn + (define-call "setenv" int minusp (name c-string) (value c-string) (overwrite int)) + (define-call "unsetenv" int minusp (name c-string)) + (export 'putenv :sb-posix) + (defun putenv (string) + (declare (string string)) + ;; We don't want to call actual putenv: the string passed to putenv ends + ;; up in environ, and we any string we allocate GC might move. + ;; + ;; This makes our wrapper nonconformant if you squit hard enough, but + ;; users who care about that should really be calling putenv() directly in + ;; order to be able to manage memory sanely. + (let ((p (position #\= string)) + (n (length string))) + (if p + (if (= p n) + (unsetenv (subseq string 0 p)) + (setenv (subseq string 0 p) (subseq string (1+ p)) 1)) + (error "Invalid argument to putenv: ~S" string))))) +#+win32 +(progn + ;; Windows doesn't define a POSIX setenv, but happily their _putenv is sane. + (define-call* "putenv" int minusp (string c-string)) + (defun setenv (name value overwrite) + (declare (string name value)) + (if (and (zerop overwrite) (sb-posix:getenv name)) + 0 + (putenv (concatenate 'string name "=" value)))) + (defun unsetenv (name) + (declare (string name)) + (putenv (concatenate 'string name "=")))) ;;; syslog #-win32