From: Alexander Turenko <alexander.turenko@tarantool.org> To: Cyrill Gorcunov <gorcunov@gmail.com> Cc: tarantool-patches@dev.tarantool.org Subject: Re: [Tarantool-patches] [PATCH 06/13] popen: decouple logger fd from stderr Date: Fri, 10 Apr 2020 15:20:27 +0300 [thread overview] Message-ID: <20200410122027.r7vxyjsy6lgmuclf@tkn_work_nb> (raw) In-Reply-To: <20200410091824.GR3072@uranus> > > + /* > > + * We will call dup() in a loop until it will return > > + * fd > STDERR_FILENO. The array `discarded_fds` stores > > + * intermediate fds to close them after all dup() calls. > > + */ > > + static_assert(STDERR_FILENO + 1 == 3, > > + "Unexpected STDERR_FILENO constant"); > > We already have (in popen_new) > > static_assert(STDIN_FILENO == 0 && > STDOUT_FILENO == 1 && > STDERR_FILENO == 2, > "stdin/out/err are not posix compatible"); > > no need for this again. > > > + int discarded_fds[STDERR_FILENO + 1] = {-1, -1, -1}; > > And here we could > > int discarded_fds[POPEN_FLAG_FD_STDEND_BIT] > > the POPEN_FLAG_FD_STDEND_BIT constant introduced exactly for that. Okay, thanks! > > > + > > + for (size_t i = 0; i < lengthof(discarded_fds) + 1; ++i) { > > + int new_fd = dup(fd); > > + if (new_fd < 0) { > > + save_errno = errno; > > + break; > > + } > > + > > + /* Found wanted fd. */ > > + if (new_fd > STDERR_FILENO) { > > + res = new_fd; > > + break; > > + } > > + > > + /* Save to close then. */ > > + assert(i < lengthof(discarded_fds)); > > + discarded_fds[i] = new_fd; > > + } > > + > > + /* Close all intermediate fds (if any). */ > > + for (size_t i = 0; i < lengthof(discarded_fds); ++i) > > + if (discarded_fds[i] >= 0) > > + close(discarded_fds[i]); > > Wrap for() with {} please. No problem. Changed: diff --git a/src/lib/core/popen.c b/src/lib/core/popen.c index b8ce77494..ef2f8e2aa 100644 --- a/src/lib/core/popen.c +++ b/src/lib/core/popen.c @@ -90,9 +90,7 @@ dup_not_std_streams(int fd) * fd > STDERR_FILENO. The array `discarded_fds` stores * intermediate fds to close them after all dup() calls. */ - static_assert(STDERR_FILENO + 1 == 3, - "Unexpected STDERR_FILENO constant"); - int discarded_fds[STDERR_FILENO + 1] = {-1, -1, -1}; + int discarded_fds[POPEN_FLAG_FD_STDEND_BIT] = {-1, -1, -1}; for (size_t i = 0; i < lengthof(discarded_fds) + 1; ++i) { int new_fd = dup(fd); @@ -113,9 +111,10 @@ dup_not_std_streams(int fd) } /* Close all intermediate fds (if any). */ - for (size_t i = 0; i < lengthof(discarded_fds); ++i) + for (size_t i = 0; i < lengthof(discarded_fds); ++i) { if (discarded_fds[i] >= 0) close(discarded_fds[i]); + } /* Report an error if it occurs. */ if (res < 0) {
next prev parent reply other threads:[~2020-04-10 12:20 UTC|newest] Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-04-10 2:50 [Tarantool-patches] [PATCH 00/13] Popen Lua API: preliminary patches Alexander Turenko 2020-04-10 2:50 ` [Tarantool-patches] [PATCH 01/13] popen: require popen handle to be non-NULL Alexander Turenko 2020-04-10 7:16 ` Cyrill Gorcunov 2020-04-10 2:50 ` [Tarantool-patches] [PATCH 02/13] popen: remove retval from popen_state() Alexander Turenko 2020-04-10 7:17 ` Cyrill Gorcunov 2020-04-10 2:50 ` [Tarantool-patches] [PATCH 03/13] popen: add missed diag_set in popen_signal/delete Alexander Turenko 2020-04-10 7:23 ` Cyrill Gorcunov 2020-04-10 2:50 ` [Tarantool-patches] [PATCH 04/13] popen: add logging of fds closed in a child Alexander Turenko 2020-04-10 7:46 ` Cyrill Gorcunov 2020-04-10 12:19 ` Alexander Turenko 2020-04-10 2:50 ` [Tarantool-patches] [PATCH 05/13] say: allow to set a logger file descriptor Alexander Turenko 2020-04-10 8:33 ` Cyrill Gorcunov 2020-04-10 12:19 ` Alexander Turenko 2020-04-10 2:50 ` [Tarantool-patches] [PATCH 06/13] popen: decouple logger fd from stderr Alexander Turenko 2020-04-10 9:18 ` Cyrill Gorcunov 2020-04-10 12:20 ` Alexander Turenko [this message] 2020-04-10 2:50 ` [Tarantool-patches] [PATCH 07/13] popen: add const qualifier to popen_write_timeout Alexander Turenko 2020-04-10 8:04 ` Cyrill Gorcunov 2020-04-10 2:50 ` [Tarantool-patches] [PATCH 08/13] popen: unblock popen_read_timeout at a first byte Alexander Turenko 2020-04-10 8:10 ` Cyrill Gorcunov 2020-04-10 2:50 ` [Tarantool-patches] [PATCH 09/13] popen: remove redundant fd check before perform IO Alexander Turenko 2020-04-10 8:18 ` Cyrill Gorcunov 2020-04-10 2:50 ` [Tarantool-patches] [PATCH 10/13] popen: add missed diag_set() in popen IO functions Alexander Turenko 2020-04-10 8:28 ` Cyrill Gorcunov 2020-04-10 2:50 ` [Tarantool-patches] [PATCH 11/13] coio: fix obsoleted comment in coio_write_timeout Alexander Turenko 2020-04-10 8:28 ` Cyrill Gorcunov 2020-04-10 2:50 ` [Tarantool-patches] [PATCH 12/13] coio: add *_noxc read / write functions Alexander Turenko 2020-04-10 8:05 ` Konstantin Osipov 2020-04-10 8:17 ` Cyrill Gorcunov 2020-04-10 11:57 ` Alexander Turenko 2020-04-12 12:51 ` Alexander Turenko 2020-04-10 8:29 ` Cyrill Gorcunov 2020-04-10 2:50 ` [Tarantool-patches] [PATCH 13/13] popen: use of exception safe functions for IO Alexander Turenko 2020-04-10 11:50 ` Cyrill Gorcunov 2020-04-10 12:21 ` Alexander Turenko 2020-04-10 16:36 ` [Tarantool-patches] [PATCH 00/13] Popen Lua API: preliminary patches Kirill Yukhin
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200410122027.r7vxyjsy6lgmuclf@tkn_work_nb \ --to=alexander.turenko@tarantool.org \ --cc=gorcunov@gmail.com \ --cc=tarantool-patches@dev.tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH 06/13] popen: decouple logger fd from stderr' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox