diff options
Diffstat (limited to 'src/libexecline')
-rw-r--r-- | src/libexecline/deps-lib/execline | 3 | ||||
-rw-r--r-- | src/libexecline/el_gspawn0.c | 16 | ||||
-rw-r--r-- | src/libexecline/el_spawn0.c | 2 | ||||
-rw-r--r-- | src/libexecline/el_spawn1.c | 16 |
4 files changed, 19 insertions, 18 deletions
diff --git a/src/libexecline/deps-lib/execline b/src/libexecline/deps-lib/execline index e896f2f..a1f7c74 100644 --- a/src/libexecline/deps-lib/execline +++ b/src/libexecline/deps-lib/execline @@ -9,7 +9,7 @@ el_popenv.o el_pushenv.o el_semicolon.o el_spawn0.o -el_spawn1.o +el_gspawn0.o el_substandrun.o el_substandrun_str.o el_substitute.o @@ -24,3 +24,4 @@ exlsn_main.o exlsn_free.o exlp.o -lskarnet +${SPAWN_LIB} diff --git a/src/libexecline/el_gspawn0.c b/src/libexecline/el_gspawn0.c new file mode 100644 index 0000000..d6e0d3a --- /dev/null +++ b/src/libexecline/el_gspawn0.c @@ -0,0 +1,16 @@ +/* ISC license. */ + +#include <skalibs/cspawn.h> + +#include <execline/config.h> +#include <execline/execline.h> + +pid_t el_gspawn0 (char const *prog, char const *const *argv, char const *const *envp) +{ + if (!argv[0]) + { + static char const *const newargv[3] = { EXECLINE_BINPREFIX "exit", "0", 0 } ; + return gcspawn(newargv[0], newargv, envp, 0, 0, 0) ; + } + else return gcspawn(prog, argv, envp, 0, 0, 0) ; +} diff --git a/src/libexecline/el_spawn0.c b/src/libexecline/el_spawn0.c index d4265a4..d397557 100644 --- a/src/libexecline/el_spawn0.c +++ b/src/libexecline/el_spawn0.c @@ -12,5 +12,5 @@ pid_t el_spawn0 (char const *prog, char const *const *argv, char const *const *e static char const *const newargv[3] = { EXECLINE_BINPREFIX "exit", "0", 0 } ; return cspawn(newargv[0], newargv, envp, 0, 0, 0) ; } - else return cspawn(prog, argv, envp, 0, 0, 00) ; + else return cspawn(prog, argv, envp, 0, 0, 0) ; } diff --git a/src/libexecline/el_spawn1.c b/src/libexecline/el_spawn1.c deleted file mode 100644 index d9a7f87..0000000 --- a/src/libexecline/el_spawn1.c +++ /dev/null @@ -1,16 +0,0 @@ -/* ISC license. */ - -#include <skalibs/cspawn.h> - -#include <execline/config.h> -#include <execline/execline.h> - -pid_t el_spawn1 (char const *prog, char const *const *argv, char const *const *envp, int *fd, int w) -{ - if (!argv[0]) - { - static char const *const newargv[3] = { EXECLINE_BINPREFIX "exit", "0", 0 } ; - return child_spawn1_pipe(newargv[0], newargv, 0, fd, w) ; - } - else return child_spawn1_pipe(prog, argv, envp, fd, w) ; -} |