diff options
| author | Philip Guenther <guenther@cvs.openbsd.org> | 2014-09-02 00:21:01 +0000 |
|---|---|---|
| committer | Philip Guenther <guenther@cvs.openbsd.org> | 2014-09-02 00:21:01 +0000 |
| commit | cd715dc73ecad126f91ff303f1bf9953df6bdd7f (patch) | |
| tree | cbb445f5a683b379e57ff2b72a472508668e3864 | |
| parent | e45875c48ccbaeb8c52fbf3c57260e4ee3f9d076 (diff) | |
Fix previous commit: fd wasn't set in the FAE_DUP2 case
| -rw-r--r-- | lib/libc/gen/posix_spawn.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/libc/gen/posix_spawn.c b/lib/libc/gen/posix_spawn.c index c45080b1a11..c3ff251a0be 100644 --- a/lib/libc/gen/posix_spawn.c +++ b/lib/libc/gen/posix_spawn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: posix_spawn.c,v 1.4 2014/08/31 02:21:18 guenther Exp $ */ +/* $OpenBSD: posix_spawn.c,v 1.5 2014/09/02 00:21:00 guenther Exp $ */ /*- * Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org> * All rights reserved. @@ -158,14 +158,15 @@ process_file_actions_entry(posix_spawn_file_actions_entry_t *fae) /* * Perform a dup2(), making sure the FD_CLOEXEC flag is clear */ - if (fae->fae_fildes == fae->fae_newfildes) { + fd = fae->fae_fildes; + if (fd == fae->fae_newfildes) { int flags = fcntl(fd, F_GETFD); if (flags == -1 || ((flags & FD_CLOEXEC) && fcntl(fd, F_SETFD, flags & ~FD_CLOEXEC) == -1)) return (errno); - } else if (dup2(fae->fae_fildes, fae->fae_newfildes) == -1) + } else if (dup2(fd, fae->fae_newfildes) == -1) return (errno); break; case FAE_CLOSE: |