svn commit: r325357 - head/lib/libc/stdio

[Cy Schubert]

In message <201711031315.vA3DF6Oc041175 at slippy.cwsent.com>, Cy Schubert 
writes:
> In message <201711031308.vA3D8Tj1051559 at repo.freebsd.org>, Cy Schubert 
> writes:
> > Author: cy
> > Date: Fri Nov  3 13:08:29 2017
> > New Revision: 325357
> > URL: https://svnweb.freebsd.org/changeset/base/325357
> > 
> > Log:
> >   While discussing the new gets_s.c in D12785, ed@ suggested putting
> >   {}'s around the if (c == EOF) block to prevent potential 'trailing else'
> >   issues from being introduced when refactoring. As my gets_s() code
> >   is based on this, it makes sense to fix the same issue here first
> >   here and now, then do an svn copy again to capture this history).
> >   
> >   Suggested by:	ed@ in D12785
> > 
> > Modified:
> >   head/lib/libc/stdio/gets.c
> > 
> > Modified: head/lib/libc/stdio/gets.c
> > ===========================================================================
> ==
> > =
> > --- head/lib/libc/stdio/gets.c	Fri Nov  3 12:52:59 2017	(r32535
> > 6)
> > +++ head/lib/libc/stdio/gets.c	Fri Nov  3 13:08:29 2017	(r32535
> > 7)
> > @@ -61,13 +61,13 @@ gets(char *buf)
> >  		warned = 1;
> >  	}
> >  	for (s = buf; (c = __sgetc(stdin)) != '\n'; ) {
> > -		if (c == EOF)
> > +		if (c == EOF) {
> >  			if (s == buf) {
> >  				ret = NULL;
> >  				goto end;
> >  			} else
> >  				break;
> > -		else
> > +		} else
> >  			*s++ = c;
> >  	}
> >  	*s = 0;
> 
> This should probably be MFCed too.
> 
> MFC after:		2 weeks

Also, apologies to Ed Maste. Credit should go to emaste@ instead of ed@ 
(both listed as reviewers on D12785).


-- 
Cheers,
Cy Schubert <Cy.Schubert at cschubert.com>
FreeBSD UNIX:  <cy at FreeBSD.org>   Web:  http://www.FreeBSD.org

	The need of the many outweighs the greed of the few.