diff options
| author | Sami Kerola | 2016-04-02 22:30:15 +0200 |
|---|---|---|
| committer | Sami Kerola | 2016-04-17 00:09:26 +0200 |
| commit | 760e5e682dbaf2c4f5ed5a27119cc8a95ccce993 (patch) | |
| tree | 0e799d4b5fb57727eccfb772497b33c3480d1797 /term-utils/script.c | |
| parent | docs: optinal option arguments should be long-only (diff) | |
| download | kernel-qcow2-util-linux-760e5e682dbaf2c4f5ed5a27119cc8a95ccce993.tar.gz kernel-qcow2-util-linux-760e5e682dbaf2c4f5ed5a27119cc8a95ccce993.tar.xz kernel-qcow2-util-linux-760e5e682dbaf2c4f5ed5a27119cc8a95ccce993.zip | |
script: close file descriptors on exec
The commands spawned from script(1) will never need access various file
descriptors the script(1) is using.
Reviewed-by: Ruediger Meier <sweet_f_a@gmx.de>
Reviewed-by: Karel Zak <kzak@redhat.com>
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
Diffstat (limited to 'term-utils/script.c')
| -rw-r--r-- | term-utils/script.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/term-utils/script.c b/term-utils/script.c index 119974230..279b9ecfe 100644 --- a/term-utils/script.c +++ b/term-utils/script.c @@ -419,15 +419,16 @@ static void do_io(struct script_control *ctl) }; - if ((ctl->typescriptfp = fopen(ctl->fname, ctl->append ? "a" : "w")) == NULL) { + if ((ctl->typescriptfp = + fopen(ctl->fname, ctl->append ? "a" UL_CLOEXECSTR : "w" UL_CLOEXECSTR)) == NULL) { warn(_("cannot open %s"), ctl->fname); fail(ctl); } if (ctl->timing) { if (!ctl->tname) { - if (!(ctl->timingfp = fopen("/dev/stderr", "w"))) + if (!(ctl->timingfp = fopen("/dev/stderr", "w" UL_CLOEXECSTR))) err(EXIT_FAILURE, _("cannot open %s"), "/dev/stderr"); - } else if (!(ctl->timingfp = fopen(ctl->tname, "w"))) + } else if (!(ctl->timingfp = fopen(ctl->tname, "w" UL_CLOEXECSTR))) err(EXIT_FAILURE, _("cannot open %s"), ctl->tname); } @@ -515,7 +516,7 @@ static void getslave(struct script_control *ctl) { #ifndef HAVE_LIBUTIL ctl->line[strlen("/dev/")] = 't'; - ctl->slave = open(ctl->line, O_RDWR); + ctl->slave = open(ctl->line, O_RDWR | O_CLOEXEC); if (ctl->slave < 0) { warn(_("cannot open %s"), ctl->line); fail(ctl); @@ -625,7 +626,7 @@ static void getmaster(struct script_control *ctl) break; for (cp = "0123456789abcdef"; *cp; cp++) { *pty = *cp; - ctl->master = open(ctl->line, O_RDWR); + ctl->master = open(ctl->line, O_RDWR | O_CLOEXEC); if (ctl->master >= 0) { char *tp = &ctl->line[strlen("/dev/")]; int ok; @@ -765,7 +766,7 @@ int main(int argc, char **argv) * handled according to their default dispositions */ sigprocmask(SIG_BLOCK, &ctl.sigset, &ctl.sigorg); - if ((ctl.sigfd = signalfd(-1, &ctl.sigset, 0)) < 0) + if ((ctl.sigfd = signalfd(-1, &ctl.sigset, SFD_CLOEXEC)) < 0) err(EXIT_FAILURE, _("cannot set signal handler")); DBG(SIGNAL, ul_debug("signal fd=%d", ctl.sigfd)); |