X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcode%2Frun-program.lisp;h=9bd487d1dc4873cf77ef687bb6a2378e85bdea0b;hb=34dd23563d2f5cf05c72b971da0d0b065a09bf2a;hp=6fcfa5555baad1d9727bcdfe80eb514721df5a6a;hpb=e33fb894f991b2926d8f3bace9058e4c0b2c3a37;p=sbcl.git

diff --git a/src/code/run-program.lisp b/src/code/run-program.lisp
index 6fcfa55..9bd487d 100644
--- a/src/code/run-program.lisp
+++ b/src/code/run-program.lisp
@@ -108,10 +108,10 @@
 
 ;;;; Import wait3(2) from Unix.
 
-(sb-alien:define-alien-routine ("wait3" c-wait3) sb-c-call:int
-  (status sb-c-call:int :out)
-  (options sb-c-call:int)
-  (rusage sb-c-call:int))
+(sb-alien:define-alien-routine ("wait3" c-wait3) sb-alien:int
+  (status sb-alien:int :out)
+  (options sb-alien:int)
+  (rusage sb-alien:int))
 
 (defconstant wait-wnohang #-svr4 1 #+svr4 #o100)
 (defconstant wait-wuntraced #-svr4 2 #+svr4 4)
@@ -202,7 +202,7 @@
 #-hpux
 ;;; Find the current foreground process group id.
 (defun find-current-foreground-process (proc)
-  (sb-alien:with-alien ((result sb-c-call:int))
+  (sb-alien:with-alien ((result sb-alien:int))
     (multiple-value-bind
 	  (wonp error)
 	(sb-unix:unix-ioctl (sb-sys:fd-stream-fd (process-pty proc))
@@ -307,17 +307,17 @@
 #+FreeBSD
 (define-alien-type nil
   (struct sgttyb
-	  (sg-ispeed sb-c-call:char)	; input speed
-	  (sg-ospeed sb-c-call:char)	; output speed
-	  (sg-erase sb-c-call:char)	; erase character
-	  (sg-kill sb-c-call:char)	; kill character
-	  (sg-flags sb-c-call:short)))	; mode flags
+	  (sg-ispeed sb-alien:char)	; input speed
+	  (sg-ospeed sb-alien:char)	; output speed
+	  (sg-erase sb-alien:char)	; erase character
+	  (sg-kill sb-alien:char)	; kill character
+	  (sg-flags sb-alien:short)))	; mode flags
 #+OpenBSD
 (define-alien-type nil
   (struct sgttyb
-	  (sg-four sb-c-call:int)
-	  (sg-chars (array sb-c-call:char 4))
-	  (sg-flags sb-c-call:int)))
+	  (sg-four sb-alien:int)
+	  (sg-chars (array sb-alien:char 4))
+	  (sg-flags sb-alien:int)))
 
 ;;; Find an unused pty. Return three values: the file descriptor for
 ;;; the master side of the pty, the file descriptor for the slave side
@@ -435,14 +435,14 @@
 	     ,@body)
 	(sb-sys:deallocate-system-memory ,sap ,size)))))
 
-(sb-alien:define-alien-routine spawn sb-c-call:int
-  (program sb-c-call:c-string)
-  (argv (* sb-c-call:c-string))
-  (envp (* sb-c-call:c-string))
-  (pty-name sb-c-call:c-string)
-  (stdin sb-c-call:int)
-  (stdout sb-c-call:int)
-  (stderr sb-c-call:int))
+(sb-alien:define-alien-routine spawn sb-alien:int
+  (program sb-alien:c-string)
+  (argv (* sb-alien:c-string))
+  (envp (* sb-alien:c-string))
+  (pty-name sb-alien:c-string)
+  (stdin sb-alien:int)
+  (stdout sb-alien:int)
+  (stderr sb-alien:int))
 
 ;;; Is UNIX-FILENAME the name of a file that we can execute?
 (defun unix-filename-is-executable-p (unix-filename)
@@ -669,54 +669,54 @@
     (setf handler
 	  (sb-sys:add-fd-handler
 	   descriptor
-	   :input #'(lambda (fd)
-		      (declare (ignore fd))
-		      (loop
-			  (unless handler
-			    (return))
-			  (multiple-value-bind
-				(result readable/errno)
-			      (sb-unix:unix-select (1+ descriptor)
-						   (ash 1 descriptor)
-						   0 0 0)
-			    (cond ((null result)
-				   (error "~@<couldn't select on sub-process: ~
+	   :input (lambda (fd)
+		    (declare (ignore fd))
+		    (loop
+		     (unless handler
+		       (return))
+		     (multiple-value-bind
+			 (result readable/errno)
+			 (sb-unix:unix-select (1+ descriptor)
+					      (ash 1 descriptor)
+					      0 0 0)
+		       (cond ((null result)
+			      (error "~@<couldn't select on sub-process: ~
                                            ~2I~_~A~:>"
-					  (strerror readable/errno)))
-				  ((zerop result)
-				   (return))))
-			(sb-alien:with-alien ((buf (sb-alien:array
-						    sb-c-call:char
-						    256)))
-			  (multiple-value-bind
-				(count errno)
-			      (sb-unix:unix-read descriptor
-						 (alien-sap buf)
-						 256)
-			    (cond ((or (and (null count)
-					    (eql errno sb-unix:eio))
-				       (eql count 0))
-				   (sb-sys:remove-fd-handler handler)
-				   (setf handler nil)
-				   (decf (car cookie))
-				   (sb-unix:unix-close descriptor)
-				   (return))
-				  ((null count)
-				   (sb-sys:remove-fd-handler handler)
-				   (setf handler nil)
-				   (decf (car cookie))
-				   (error
-				    "~@<couldn't read input from sub-process: ~
+				     (strerror readable/errno)))
+			     ((zerop result)
+			      (return))))
+		     (sb-alien:with-alien ((buf (sb-alien:array
+						 sb-alien:char
+						 256)))
+		       (multiple-value-bind
+			   (count errno)
+			   (sb-unix:unix-read descriptor
+					      (alien-sap buf)
+					      256)
+			 (cond ((or (and (null count)
+					 (eql errno sb-unix:eio))
+				    (eql count 0))
+				(sb-sys:remove-fd-handler handler)
+				(setf handler nil)
+				(decf (car cookie))
+				(sb-unix:unix-close descriptor)
+				(return))
+			       ((null count)
+				(sb-sys:remove-fd-handler handler)
+				(setf handler nil)
+				(decf (car cookie))
+				(error
+				 "~@<couldn't read input from sub-process: ~
                                      ~2I~_~A~:>"
-				    (strerror errno)))
-				  (t
-				   (sb-kernel:copy-from-system-area
-				    (alien-sap buf) 0
-				    string (* sb-vm:vector-data-offset
-					      sb-vm:n-word-bits)
-				    (* count sb-vm:n-byte-bits))
-				   (write-string string stream
-						 :end count)))))))))))
+				 (strerror errno)))
+			       (t
+				(sb-kernel:copy-from-system-area
+				 (alien-sap buf) 0
+				 string (* sb-vm:vector-data-offset
+					   sb-vm:n-word-bits)
+				 (* count sb-vm:n-byte-bits))
+				(write-string string stream
+					      :end count)))))))))))
 
 ;;; Find a file descriptor to use for object given the direction.
 ;;; Returns the descriptor. If object is :STREAM, returns the created