diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2018-09-14 22:38:28 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2018-09-14 22:38:28 +0000 |
| commit | f7e8333c60883a93e3fd3eb52d761868b3234bf4 (patch) | |
| tree | 27f225f997a8c5207fa805d1c9827c8dbf7746be | |
| parent | fb51953404b6ae56528294c7a40ad956b054abef (diff) | |
| download | skalibs-f7e8333c60883a93e3fd3eb52d761868b3234bf4.tar.gz skalibs-f7e8333c60883a93e3fd3eb52d761868b3234bf4.tar.xz skalibs-f7e8333c60883a93e3fd3eb52d761868b3234bf4.zip | |
bugfix: child_spawn2 error path
| -rw-r--r-- | src/libstddjb/child_spawn1_internal.c | 2 | ||||
| -rw-r--r-- | src/libstddjb/child_spawn2.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libstddjb/child_spawn1_internal.c b/src/libstddjb/child_spawn1_internal.c index 38a6e60..0f9cb16 100644 --- a/src/libstddjb/child_spawn1_internal.c +++ b/src/libstddjb/child_spawn1_internal.c @@ -103,7 +103,7 @@ pid_t child_spawn1_internal (char const *prog, char const *const *argv, char con if ((to & 2) && (fd_copy(!(to & 1), to & 1) < 0)) goto err ; sig_blocknone() ; pathexec_run(prog, argv, envp) ; -err: + err: e = errno ; fd_write(syncp[1], (char *)&e, sizeof(e)) ; _exit(127) ; diff --git a/src/libstddjb/child_spawn2.c b/src/libstddjb/child_spawn2.c index 01f144d..244d09b 100644 --- a/src/libstddjb/child_spawn2.c +++ b/src/libstddjb/child_spawn2.c @@ -40,7 +40,7 @@ pid_t child_spawn2 (char const *prog, char const *const *argv, char const *const int e ; if (pipe(p[0]) < 0) return 0 ; if (ndelay_on(p[0][0]) < 0 || coe(p[0][0]) < 0 || pipe(p[1]) < 0) { e = errno ; goto errp ; } - if (ndelay_on(p[1][1]) < 0 || coe(p[1][1]) < 0) { e = errno ; goto errsp ; } + if (ndelay_on(p[1][1]) < 0 || coe(p[1][1]) < 0) { e = errno ; goto errp1 ; } #ifdef SKALIBS_HASPOSIXSPAWN |