Use openpty() for run-program on FreeBSD.

Opening /dev/ptmx doesn't work for me on the default installation.

src/code/run-program.lisp

@@ -405,7 +405,7 @@ status slot."
 ;;; Find an unused pty. Return three values: the file descriptor for
 ;;; the master side of the pty, the file descriptor for the slave side
 ;;; of the pty, and the name of the tty device for the slave side.
-#-(or win32 openbsd)
+#-(or win32 openbsd freebsd)
 (progn
  (define-alien-routine ptsname c-string (fd int))
  (define-alien-routine grantpt boolean (fd int))
@@ -456,12 +456,13 @@ status slot."
  slave-name)))
  (sb-unix:unix-close master-fd))))))
  (error "could not find a pty")))
-#+openbsd
+
+#+(or openbsd freebsd)
 (progn
  (define-alien-routine openpty int (amaster int :out) (aslave int :out)
  (name (* char)) (termp (* t)) (winp (* t)))
  (defun find-a-pty ()
- (with-alien ((name-buf (array char 16)))
+ (with-alien ((name-buf (array char #.path-max)))
  (multiple-value-bind (return-val master-fd slave-fd)
  (openpty (cast name-buf (* char)) nil nil)
  (if (zerop return-val)

src/runtime/Config.x86-64-freebsd

@@ -17,7 +17,7 @@ ASSEM_SRC += ldso-stubs.S
 # worked fine for most things, but LOAD-FOREIGN & friends require
 # dlopen() etc., which in turn depend on dynamic linking of the
 # runtime.
-LINKFLAGS += -dynamic -export-dynamic
+OS_LIBS += -lutil
 
 # use libthr (1:1 threading). libpthread (m:n threading) does not work.
 ifdef LISP_FEATURE_SB_THREAD

src/runtime/Config.x86-freebsd

@@ -17,7 +17,9 @@ ASSEM_SRC += ldso-stubs.S
 # worked fine for most things, but LOAD-FOREIGN & friends require
 # dlopen() etc., which in turn depend on dynamic linking of the
 # runtime.
-LINKFLAGS += -dynamic -export-dynamic
+LINKFLAGS += -dynamic -Wl,--export-dynamic
+
+OS_LIBS += -lutil
 
 # use libthr (1:1 threading). libpthread (m:n threading) does not work.
 ifdef LISP_FEATURE_SB_THREAD

tests/run-program.impure.lisp

@@ -233,14 +233,17 @@
 
 (with-test (:name (:run-program :pty-stream) :fails-on :win32)
  (assert (equal "OK"
- (subseq
- (with-output-to-string (s)
- (assert (= 42 (process-exit-code
- (run-program "/bin/sh" '("-c" "echo OK; exit 42") :wait t
- :pty s))))
- s)
- 0
- 2))))
+ (handler-case
+ (with-timeout 1
+ (subseq
+ (with-output-to-string (s)
+ (assert (= 42 (process-exit-code
+ (run-program "/bin/sh" '("-c" "echo OK; exit 42") :wait t
+ :pty s))))
+ s)
+ 0
+ 2))
+ (timeout () "timeout")))))
 
 ;; Check whether RUN-PROGRAM puts its child process into the foreground
 ;; when stdin is inherited. If it fails to do so we will receive a SIGTTIN.

tools-for-build/grovel-headers.c

@@ -538,6 +538,8 @@ main(int argc, char *argv[])
  defconstant("kern-osrelease", KERN_OSRELEASE);
  defconstant("hw-model", HW_MODEL);
  defconstant("hw-pagesize", HW_PAGESIZE);
+
+ defconstant("path-max", PATH_MAX);
  printf("\n");
 #endif
 

tools-for-build/ldso-stubs.lisp

@@ -325,7 +325,7 @@ ldso_stub__ ## fct: ; \\
  '("ptsname"
  "grantpt"
  "unlockpt")
- #!+openbsd
+ #!+(or openbsd freebsd)
  '("openpty")
  '("dlclose"
  "dlerror"