Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 9 Mar 2017 18:06:48 +0000 (UTC)
From:      "Pedro F. Giffuni" <pfg@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r314969 - head/usr.bin/localedef
Message-ID:  <201703091806.v29I6mNx080192@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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);
 	}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703091806.v29I6mNx080192>