From owner-svn-src-head@freebsd.org  Thu Mar  9 17:54:52 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 43625D05590;
 Thu,  9 Mar 2017 17:54:52 +0000 (UTC)
 (envelope-from kostikbel@gmail.com)
Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id CEE431CE5;
 Thu,  9 Mar 2017 17:54:51 +0000 (UTC)
 (envelope-from kostikbel@gmail.com)
Received: from tom.home (kib@localhost [127.0.0.1])
 by kib.kiev.ua (8.15.2/8.15.2) with ESMTPS id v29Hskfr078994
 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO);
 Thu, 9 Mar 2017 19:54:46 +0200 (EET)
 (envelope-from kostikbel@gmail.com)
DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua v29Hskfr078994
Received: (from kostik@localhost)
 by tom.home (8.15.2/8.15.2/Submit) id v29Hskku078993;
 Thu, 9 Mar 2017 19:54:46 +0200 (EET)
 (envelope-from kostikbel@gmail.com)
X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com
 using -f
Date: Thu, 9 Mar 2017 19:54:46 +0200
From: Konstantin Belousov <kostikbel@gmail.com>
To: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Cc: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: Re: svn commit: r314961 - head/usr.bin/localedef
Message-ID: <20170309175446.GD16105@kib.kiev.ua>
References: <201703091521.v29FL3da010200@repo.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <201703091521.v29FL3da010200@repo.freebsd.org>
User-Agent: Mutt/1.8.0 (2017-02-23)
X-Spam-Status: No, score=-2.0 required=5.0 tests=ALL_TRUSTED,BAYES_00,
 DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no
 autolearn_force=no version=3.4.1
X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on tom.home
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Mar 2017 17:54:52 -0000

On Thu, Mar 09, 2017 at 03:21:03PM +0000, Pedro F. Giffuni wrote:
>  void
> +delete_category(FILE *f)
> +{
> +	(void) fclose(f);
> +	(void) unlink(category_file());
> +}
> +
> +void
>  close_category(FILE *f)
>  {
> -	if (fchmod(fileno(f), 0644) < 0) {
> +	if (fchmod(fileno(f), 0644) < 0 ||
> +	    fclose(f) != 0) {
>  		(void) fclose(f);
>  		(void) unlink(category_file());
>  		errf(strerror(errno));
> +		delete_category(f);
>  	}
If you look carefully, there are too many fclose() there: one optional in
the condition, then unconditional fclose() even if one in the condition
failed, and then one more in delete_category().