svn commit: r314969 - head/usr.bin/localedef

[Konstantin Belousov]

On Thu, Mar 09, 2017 at 06:06:48PM +0000, Pedro F. Giffuni wrote:
> Author: pfg
> Date: Thu Mar  9 18:06:48 2017
> New Revision: 314969
> URL: https://svnweb.freebsd.org/changeset/base/314969
> 
> Log:
>   localedef(1): Fix mismatch in previous commit.
>   
>   delete_category is meant to replace fclose() and unlink().
>   This broke world.
>   
>   Found by:	kib
>   Pointedhat:	pfg
> 
> Modified:
>   head/usr.bin/localedef/localedef.c
> 
> Modified: head/usr.bin/localedef/localedef.c
> ==============================================================================
> --- head/usr.bin/localedef/localedef.c	Thu Mar  9 17:53:37 2017	(r314968)
> +++ head/usr.bin/localedef/localedef.c	Thu Mar  9 18:06:48 2017	(r314969)
> @@ -137,8 +137,6 @@ close_category(FILE *f)
>  {
>  	if (fchmod(fileno(f), 0644) < 0 ||
>  	    fclose(f) != 0) {
> -		(void) fclose(f);
> -		(void) unlink(category_file());
>  		errf(strerror(errno));
>  		delete_category(f);
>  	}
I still think that the fclose() call in the condition is also excessive.