From 68515d71057c968b8bd141a3e0dff9d427cae0cc Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Wed, 14 Nov 2007 17:35:43 -0600 Subject: [PATCH] Factor unix.process stuff out of io.unix.launcher --- extra/io/unix/launcher/launcher.factor | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) mode change 100755 => 100644 extra/io/unix/launcher/launcher.factor diff --git a/extra/io/unix/launcher/launcher.factor b/extra/io/unix/launcher/launcher.factor old mode 100755 new mode 100644 index d9a9ecb24d..4bdec01af5 --- a/extra/io/unix/launcher/launcher.factor +++ b/extra/io/unix/launcher/launcher.factor @@ -2,42 +2,24 @@ ! See http://factorcode.org/license.txt for BSD license. USING: io io.launcher io.unix.backend io.nonblocking sequences kernel namespaces math system alien.c-types -debugger continuations arrays assocs combinators ; +debugger continuations arrays assocs combinators unix.process ; IN: io.unix.launcher ! Search unix first USE: unix -: with-fork ( child parent -- pid ) - fork [ zero? -rot if ] keep ; inline - : get-arguments ( -- seq ) +command+ get [ "/bin/sh" "-c" rot 3array ] [ +arguments+ get ] if* ; -: >null-term-array f add >c-void*-array ; - -: prepare-execvp ( -- cmd args ) - #! Doesn't free any memory, so we only call this word - #! after forking. - get-arguments - [ malloc-char-string ] map - dup first swap >null-term-array ; - -: prepare-execve ( -- cmd args env ) - #! Doesn't free any memory, so we only call this word - #! after forking. - prepare-execvp - get-environment - [ "=" swap 3append malloc-char-string ] { } assoc>map - >null-term-array ; +: assoc>env ( assoc -- env ) [ "=" swap 3append ] { } assoc>map ; : (spawn-process) ( -- ) [ pass-environment? [ - prepare-execve execve + get-arguments get-environment assoc>env exec-args-with-env ] [ - prepare-execvp execvp + get-arguments exec-args-with-path ] if io-error ] [ error. :c flush ] recover 1 exit ;