Re: [PATCH] script: close file descriptors on exec

[Ruediger Meier <sweet_f_a@gmx.de>]

On Friday 15 April 2016, Karel Zak wrote:
> On Fri, Apr 15, 2016 at 09:22:14AM +0200, Ruediger Meier wrote:
> > On Thursday 14 April 2016, Sami Kerola wrote:
> > > The commands spawned from script(1) will never need access
> > > various file descriptors the script(1) is using.
> > >
> > > Signed-off-by: Sami Kerola <kerolasa@iki.fi>
> > > ---
> > >  term-utils/script.c | 12 ++++++------
> > >  1 file changed, 6 insertions(+), 6 deletions(-)
> > >
> > > diff --git a/term-utils/script.c b/term-utils/script.c
> > > index 1199742..88b522a 100644
> > > --- a/term-utils/script.c
> > > +++ b/term-utils/script.c
> > > @@ -419,15 +419,15 @@ 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 ? "ae" : "we")) == 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", "we")))
> > >  				err(EXIT_FAILURE, _("cannot open %s"), "/dev/stderr");
> > > -		} else if (!(ctl->timingfp = fopen(ctl->tname, "w")))
> > > +		} else if (!(ctl->timingfp = fopen(ctl->tname, "we")))
> >
> > "e" works for glibc only.
>
> Yep, see c.h, should be
>
>     else if (!(ctl->timingfp = fopen(ctl->tname, "w" UL_CLOEXECSTR)))

Could be also fixed here:
login-utils/sulogin-consoles.c:163:  if (!(fp = fopen(file, "re")))
login-utils/sulogin-consoles.c:364:  fc = fopen("/proc/consoles", "re");


>     Karel