From owner-svn-src-all@FreeBSD.ORG  Tue Jul 14 09:19:34 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 194C6106564A;
	Tue, 14 Jul 2009 09:19:34 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 07E518FC19;
	Tue, 14 Jul 2009 09:19:34 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n6E9JXvT053242;
	Tue, 14 Jul 2009 09:19:33 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6E9JXsg053241;
	Tue, 14 Jul 2009 09:19:33 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <200907140919.n6E9JXsg053241@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Tue, 14 Jul 2009 09:19:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r195676 - head/usr.bin/mklocale
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 14 Jul 2009 09:19:34 -0000

Author: ed
Date: Tue Jul 14 09:19:33 2009
New Revision: 195676
URL: http://svn.freebsd.org/changeset/base/195676

Log:
  Make mklocale work again, now that fwrite()'s return codes are different.
  
  Submitted by:	Navdeep Parhar <nparhar gmail com>
  Approved by:	re (kib)

Modified:
  head/usr.bin/mklocale/yacc.y

Modified: head/usr.bin/mklocale/yacc.y
==============================================================================
--- head/usr.bin/mklocale/yacc.y	Tue Jul 14 04:35:13 2009	(r195675)
+++ head/usr.bin/mklocale/yacc.y	Tue Jul 14 09:19:33 2009	(r195676)
@@ -730,8 +730,8 @@ dump_tables()
     /*
      * PART 6: And finally the variable data
      */
-    if (fwrite(variable,
-	       ntohl(new_locale.variable_len), 1, fp) != 1) {
+    if (new_locale.variable_len != 0 &&
+	fwrite(variable, ntohl(new_locale.variable_len), 1, fp) != 1) {
 	perror(locale_file);
 	exit(1);
     }