From owner-svn-src-all@freebsd.org  Thu Mar  9 18:06:49 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 9FBABD0586C;
 Thu,  9 Mar 2017 18:06:49 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (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 6CEFC402;
 Thu,  9 Mar 2017 18:06:49 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v29I6mc9080193;
 Thu, 9 Mar 2017 18:06:48 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v29I6mNx080192;
 Thu, 9 Mar 2017 18:06:48 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201703091806.v29I6mNx080192@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
 using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Thu, 9 Mar 2017 18:06:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r314969 - head/usr.bin/localedef
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Mar 2017 18:06:49 -0000

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);
 	}